zine_brewer 1.12.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad4e1505aec3445698ee2379fc61664afeefb206088cd7fed4d21df7bb099bf4
-  data.tar.gz: 6af351541b67ed6f5fe4170666d9dc1ac9620dbe4af254fe2cda26f053a8be4b
+  metadata.gz: 2e9749eeb87c18d45d601098a97d225114426d859ec980e3e3db30783f196500
+  data.tar.gz: be180320edbb5f17f357c96436d0ebb47eda2baf0fa15d7f9b88b1c9ef929fd7
 SHA512:
-  metadata.gz: '088226779a253bcf796774ee5236a3be7232d63b6ef4f88bc09eb91e079aa1c7309bd75d416538617bd58f627e707bf6b287b962a3e52bf7e208534187e34f9e'
-  data.tar.gz: fbf9e7f883ccf4807d4239e28400bde61675d612d2c626dd2cb29912f5ada929e53b2d55193b8656ee8aa0a4154ef5c72c9c5bd16378c39a8bc3481ca86ea340
+  metadata.gz: 9e4624c2f80f9998395e05f8a669a4bbaae065c7b11b70371cfad1d1454bdb8f0e4f72a577ad3ee117bbf47cbb98107a988126012a4705d83d0933086e74e3d3
+  data.tar.gz: 4b9e7d60fcad4cf98ee247f897c490e5c497a0eef2e41ff756435f93fca215a5e880408880923f255551327f51b4aeecfddfe226816b9870622211186f744352

data/lib/zine_brewer/main.rb

@@ -25,13 +25,6 @@ module ZineBrewer
 
       @dir = File.dirname(path)
 
-      @article_id = begin
-                      File.open("#{@dir}/id.txt", "rt").read.chomp
-                    rescue
-                      docdir = File.basename(@dir)
-                      /^\d+$/ =~ docdir ? docdir : '■記事ID■'
-                    end
-
       header, body = /\A((?:.|\n)*?)<%-- page -->/.match(input_data).yield_self do |m|
         if m.nil?
           ['', "\n\n" + Commons + "\n\n" + input_data]
@@ -40,26 +33,28 @@ module ZineBrewer
         end
       end
 
-      @article_id = $+ if header.sub!(/^■記事ID■[^0-9]+(\d+)$/, '')
+      @article_id = if header.sub!(/^■記事ID■[^0-9]+(\d+)$/, '')
+                      Regexp.last_match[1]
+                    else
+                      /^\d+/.match(File.basename(@dir)).yield_self{|m| m.nil? ? '■記事ID■' : m[0]}
+                    end
       h = header.strip.split(/\n\n+/)
-      @corner = set_header_item(h[0], '記事・ニュースのコーナー')
-      @title  = set_header_item(h[1], 'タイトル' )
-      @lead   = set_header_item(h[2], 'nil')
-      @pic    = set_header_item(h[3], 'dummy.png')
-      @author = set_header_item(h[4], '著者 クレジット')
-      @css    = set_header_item(h[5], '')
+      @corner, @title, @lead, @author = [0, 1, 2, 4].map{|i| set_header_item(h[i], '')}
+      @pic = set_header_item(h[3], ''){ "#{@article_id}_#{h[3]}" }
+      @css = set_header_item(h[5], ''){ h[5].each_line.map{|i| '.c-article_content ' + i }.join }
 
       @pp_header = make_pp_header
       @converted = convert(body)
     end
 
-    def set_header_item(target, default)
-      if /\A\ufeff?[\-%]+\Z/ =~ target || target.nil?
-        default.define_singleton_method(:is_complete?){ false }
-        default
+    def set_header_item(value, alt)
+      if /\A\ufeff?[\-%]+\Z/ =~ value || value.nil?
+        alt.define_singleton_method(:is_complete?){ false }
+        alt
       else
-        target.define_singleton_method(:is_complete?){ true }
-        target
+        value = yield if block_given?
+        value.define_singleton_method(:is_complete?){ true }
+        value
       end
     end
 
@@ -70,7 +65,7 @@ module ZineBrewer
       header_output << "［リード］\n<p>#{@lead}</p>" if @lead.is_complete?
       header_output << "［タイトル画像］\n#{@pic}" if @pic.is_complete?
       header_output << "［著者クレジット］\n#{@author}" if @author.is_complete?
-      header_output << "［追加CSS］\n#{@css.each_line.map{|i| '.c-article_content ' + i }.join}" if @css.is_complete?
+      header_output << "［追加CSS］\n#{@css}" if @css.is_complete?
       header_output.join("\n\n")
     end
 

data/lib/zine_brewer/templates/fig_p.rb

@@ -25,7 +25,7 @@ class Fig_P < Mustache
   {{/imgs_list}}
   <figcaption style="text-align:left;">
     <strong>{{name}}（{{huri}}）氏</strong><br/>
-    <span markdown="span">{{title}}</span>
+    <span markdown="span">{{& title}}</span>
     <div markdown="span" style="margin-top:6px;">
       {{& caption}}
     </div>

data/lib/zine_brewer/version.rb

@@ -1,3 +1,3 @@
 module ZineBrewer
-  VERSION = "1.12.0"
+  VERSION = "1.13.1"
 end

data/zine_brewer.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Akinori Ichigo"]
   spec.email         = ["akinori.ichigo@gmail.com"]
 
-  spec.summary       = %q{Kramdown to HTML converter for Shoeisha Web Media}
+  spec.summary       = %q{Kramdown to HTML converter for a web media}
   spec.homepage      = "https://github.com/akinori-ichigo/zine_brewer"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zine_brewer
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Akinori Ichigo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -96,5 +96,5 @@ requirements: []
 rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
-summary: Kramdown to HTML converter for Shoeisha Web Media
+summary: Kramdown to HTML converter for a web media
 test_files: []