zine_brewer 1.2.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cfdaa4752f297553002e48ebdcb2f865632942198aba89cc5bcc4eecccf5d17
-  data.tar.gz: 578d33b80e31f298e9b689bf55052afe16e48d2fec61ce093ea49ceb80381072
+  metadata.gz: 9f47a38372b16bb0fdf904883a92e1b1e6c312b535e7efeba1c5ea5f34143d89
+  data.tar.gz: 057c4e1ed3e0408135326a69db755a4d50b4a4cef5e10ab3969030f6e78fe289
 SHA512:
-  metadata.gz: db5d725e128377f6fc87c11802f19f2c3d5a7410cab23cbf5a07b75275f68bd983233040927761c53ab903a24a3628f27d53f50d072a184bf03eb9f8c69f1e1f
-  data.tar.gz: 73b938d7e8e3073d6bc73c62a0edc2418dfa5966837109593f2baddbec5724880c0ece68851a986effb0dc585b4888657bef9db0351428eb9c3cd67a481a90c9
+  metadata.gz: c9a74e98d128f27bb27f859e80a45eb2bf242c5eeb523be44795a6d06cae851ad66b004a74338e6893312ceff02d31efa8f3864147c3ece6eb4cb1688b47c605
+  data.tar.gz: 41ad0cf51d8e2d6c2aa466bb9bf752c4c3158f2ee2d33365f60fa06a1bd77b11ba0d32c2e74f3931f41f29b874eab4eccf94e520d8e39f66347ad2b3f6839cb8

data/README.md

@@ -20,7 +20,17 @@ Or install it yourself as:
 
 ## Usage
 
-    $ zine_brewer [kramdown_document_filename]
+As the converting command:
+
+    $ zine_brewer [kramdown_document_filepath]
+
+As the converting server:
+
+    $ zine_brewing_server
+
+When you run the command above,
+or send kramdown_document_filepath to the zine_brewing_server,
+the convertion is done as below.
 
 * The header part is converted and written out as "proof/header.txt".
 * The body part is converted and written out as "proof/body.txt".
@@ -108,6 +118,8 @@ ZineBrewerで扱う原稿は「ヘッダー」と「本文」に分かれます
 
 ### 本文
 
+本文をHTMLに変換したファイルは、proof/body.txtとして出力されます。
+
 #### ■ページの起こし
 
 **本文の各ページの先頭には、ページの起こしとして必ず`<%-- page -->`を記述してください。** 1ページ目の起こしは、ヘッダーとの境界にもなります。
@@ -294,7 +306,7 @@ width: 450px
 ===wraparound
 
 {:.imgR}
-<<Fig_A>>
+<<Fig_N>>
 src: 1234_fig.png
 width: 200px
 
@@ -311,7 +323,7 @@ width: 200px
 ===wraparound
 
 {:.imgR}
-<<Fig_A>>
+<<Fig_N>>
 src: 1234_fig.png
 width: 200px
 
@@ -325,7 +337,7 @@ width: 200px
 
 #### ■脚注の書き方
 
-次のように、本文テキスト中の脚注を付けたい言葉などに`[^1]`などとアンカーを付け、脚注を置きたい場所に`[^1]: 〜`という形で脚注本体を書きます。脚注本体のコロンを忘れなく。脚注番号で使えるのは半角数字のみです。
+次のように、本文テキスト中の脚注を付けたい言葉などに`[^1]`などとアンカーを付け、脚注を置きたい場所に`[^1]: 〜`という形で脚注本体を書きます。脚注本体のコロンを忘れなく。脚注番号には半角英数字が使えます（[^1]、[^imi01]など）。変換後は出現順に[1]、[2]という通し番号による表記に変わります。
 
 ```
 　ほら、ここに難しい専門用語[^1]が1つ。ここにも意味の分からない専門用語[^2]がもう1つ。

data/exe/zine_brewing_server

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require "socket"
+require "zine_brewer"
+
+server = TCPServer.open('localhost', 53623)
+loop do
+  socket = server.accept
+  begin
+    filepath = socket.gets.chomp
+    zine = ZineBrewer::Application.new(filepath)
+    zine.write_out
+    socket.write 'Conversion from Markdown to HTML is done. The output files (header.txt / body.txt) are in proof directory.'
+  rescue => e
+    socket.write e.message
+  ensure
+    socket.close
+  end
+end
+

data/lib/zine_brewer/kramdown/converter/sehtml.rb

@@ -86,7 +86,12 @@ module Kramdown
           end
         format_as_indented_block_html('table', el.attr, rows, indent)
       end
-      
+
+      def convert_dt(el, indent)
+        result = super
+        result.sub(/<dt>\\/, '<dt>')
+      end
+
       def convert_div(el, indent)
         format_as_indented_block_html('div', el.attr, inner(el, indent), indent)
       end

data/lib/zine_brewer/kramdown/parser/sekd.rb

@@ -36,6 +36,8 @@ module Kramdown
         @fn_number = Hash.new{|h, k| h[k] = (@fn_counter += 1).to_s }
       end
 
+      LIST_START_OL = /^(#{OPT_SPACE}(?:[^\\]|)\d+\.)(#{PATTERN_TAIL})/
+
       # Parse the fenced codeblock at the current location
       # code highlighting by Google Prettify.
       def parse_codeblock_fenced_sekd

data/lib/zine_brewer/main.rb

@@ -20,8 +20,7 @@ module ZineBrewer
         Encoding.default_external =  Kconv.guess(File.open(path, 'r:BINARY').read)
         input_data = File.open(path, 'rt').read.encode('UTF-8')
       rescue
-        puts 'ERROR: There is not the input file. Check the input file.'
-        exit
+        raise 'ERROR: The input file does not exist. Check it.'
       end
 
       @dir = File.dirname(path)

data/lib/zine_brewer/templates/bookranking.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'mustache'
+
 class BookRanking < Mustache
 
   # <<BookRanking>>
@@ -23,7 +25,8 @@ EOT
   def cover
     case File.dirname(src)
     when ".", "images"
-      "/static/images/article/■記事ID■/#{File.basename(src)}"
+      f = File.basename(l_src)
+      "/static/images/article/■記事ID■/#{/^\d+_/ =~ f ? f : '■記事ID■_' + f}"
     when "common"
       "/static/images/article/common/#{File.basename(src)}"
     else

data/lib/zine_brewer/templates/casts.rb

@@ -1,13 +1,16 @@
 # coding: utf-8
 
+require 'mustache'
+
 class Casts < Mustache
 
   # <<Casts>>
   # casts:
-  #   src:  写真ファイル名
-  #   name: 姓 名
-  #   huri: ふり がな
-  #   cap:  プロフィール
+  #   title: 見出し
+  #   src:   写真ファイル名
+  #   name:  姓 名
+  #   huri:  ふり がな
+  #   cap:   プロフィール
 
   # CSSに下記の登録が必要
   # article#contents div.article div.casts>div ~ div { margin-top:8px; }
@@ -15,11 +18,12 @@ class Casts < Mustache
   @template = <<EOT
   <div class="casts" style="margin-bottom:30px; padding:13px 13px 3px; border:solid 2px #eee;">
   {{#prof_list}}
+    {{#title_sw}}<h4>{{title}}</h4>{{/title_sw}}
     <div class="imgLRBlock cf">
       <figure class="imgL">
         <img src="{{fig_src}}" alt="{{name}}" style="height:135px;" />
       </figure>
-      <p class="ovh" markdown="span" style="font-size:14px; line-height:1.7; margin-bottom:10px;"><strong>{{name}}（{{huri}}）氏</strong><br />{{& caption}}</p>
+      <p class="ovh" markdown="span" style="font-size:14px; line-height:1.7; margin-bottom:10px;"><strong style="font-size:15px;">{{name}}（{{huri}}）氏</strong><br />{{& caption}}</p>
     </div>
   {{/prof_list}}
   </div>
@@ -30,6 +34,8 @@ EOT
     (casts rescue a_cast_param).each do |h|
       a_cast = {}
       raise "Error: No src:" if h["src"].nil?
+      a_cast[:title] = h["title"]
+      a_cast[:title_sw] = !h["title"].nil?
       a_cast[:fig_src] = make_src(h["src"])
       a_cast[:name] = h["name"]
       a_cast[:huri] = h["huri"]
@@ -41,7 +47,8 @@ EOT
 
   private
   def a_cast_param
-    [{"src" => (src rescue nil),
+    [{"title" => (title rescue nil),
+      "src" => (src rescue nil),
       "name" => (name rescue nil),
       "huri" => (huri rescue nil),
       "cap" => (cap rescue nil)}]
@@ -50,7 +57,8 @@ EOT
   def make_src(l_src)
     case File.dirname(l_src)
     when ".", "images"
-      "/static/images/article/■記事ID■/#{File.basename(l_src)}"
+      f = File.basename(l_src)
+      "/static/images/article/■記事ID■/#{/^\d+_/ =~ f ? f : '■記事ID■_' + f}"
     when "common"
       "/static/images/article/common/#{File.basename(l_src)}"
     else
@@ -68,37 +76,3 @@ EOT
 
 end
 
-__END__
-
-{:.casts %margin-bottom:45px; %padding:13px 13px 3px; %border:solid 2px #eee;}
-===div
-
-{:.imgLRBlock .cf}
-===div
-{:.imgL}
-<<Fig_N>>
-src: 2096_misonou_p.jpg
-height: 135px
-
-{:.ovh markdown="1" %font-size:14px; %line-height:1.7; %margin-bottom:10px;}
-**御園生 銀平（みそのう ぎんぺい）氏**<br/>
-ソフトバンク株式会社[[ ]]{:%font-size:3px;}人事本部[[ ]]{:%font-size:3px;}戦略企画統括部[[ ]]{:%font-size:3px;}人材戦略部[[ ]]{:%font-size:3px;}デジタルHR推進課。<br/>
-（※御園生様のプロフィールを100〜150字程度でお願いいたします）。
-==/div
-
-{:.imgLRBlock .cf}
-===div
-{:.imgL}
-<<Fig_N>>
-src: 2096_shikauchi_p.jpg
-height: 135px
-
-{:.ovh markdown="1" %font-size:14px; %line-height:1.7; %margin-bottom:10px;}
-**鹿内 学（しかうち まなぶ）氏**<br/>
-博士（理学）。株式会社シンギュレイト 代表。<br/>
-働く中でのコミュニケーション・データから関係性に注目した次世代ピープルアナリティクスにとりくむ。代表を務めるシンギュレイトでは1 on 1や会議で利用できる可視化ツールを提供中。働く組織の科学と実用をめざす。情報量規準が好き、サッカー好き、漫画好き。
-==/div
-
-==/div
-
-

data/lib/zine_brewer/templates/fig_a.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'mustache'
+
 require_relative 'fig/module_fig_base'
 require_relative 'fig/module_fig_plus'
 

data/lib/zine_brewer/templates/fig_h.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'mustache'
+
 require_relative 'fig/module_fig_base'
 require_relative 'fig/module_fig_plus'
 

data/lib/zine_brewer/templates/fig_n.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'mustache'
+
 require_relative 'fig/module_fig_base'
 require_relative 'fig/module_fig_plus'
 

data/lib/zine_brewer/templates/fig_p.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'mustache'
+
 require_relative 'fig/module_fig_base'
 
 class Fig_P < Mustache

data/lib/zine_brewer/templates/fig_z.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'mustache'
+
 require_relative 'fig/module_fig_base'
 require_relative 'fig/module_fig_plus'
 

data/lib/zine_brewer/version.rb

@@ -1,3 +1,3 @@
 module ZineBrewer
-  VERSION = "1.2.1"
+  VERSION = "1.6.0"
 end

data/zine_brewer.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "mustache"
   spec.add_runtime_dependency "darkmouun"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zine_brewer
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Akinori Ichigo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2021-03-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: darkmouun
   requirement: !ruby/object:Gem::Requirement
@@ -29,6 +43,7 @@ email:
 - akinori.ichigo@gmail.com
 executables:
 - zine_brewer
+- zine_brewing_server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -40,6 +55,7 @@ files:
 - bin/console
 - bin/setup
 - exe/zine_brewer
+- exe/zine_brewing_server
 - lib/zine_brewer.rb
 - lib/zine_brewer/kramdown/converter/sehtml.rb
 - lib/zine_brewer/kramdown/parser/sekd.rb
@@ -77,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.14
 signing_key:
 specification_version: 4
 summary: Kramdown to HTML converter for Shoeisha Web Media