zine_brewer 1.6.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f47a38372b16bb0fdf904883a92e1b1e6c312b535e7efeba1c5ea5f34143d89
-  data.tar.gz: 057c4e1ed3e0408135326a69db755a4d50b4a4cef5e10ab3969030f6e78fe289
+  metadata.gz: 9377b1600b8679c919199df61d3c142c7f8a0c9c1972d891a31cd6429b406a49
+  data.tar.gz: b100b1ad9d96943035a8acd2dd043aa27499c348d8e9a9b9c4bbef47b9d2d0b2
 SHA512:
-  metadata.gz: c9a74e98d128f27bb27f859e80a45eb2bf242c5eeb523be44795a6d06cae851ad66b004a74338e6893312ceff02d31efa8f3864147c3ece6eb4cb1688b47c605
-  data.tar.gz: 41ad0cf51d8e2d6c2aa466bb9bf752c4c3158f2ee2d33365f60fa06a1bd77b11ba0d32c2e74f3931f41f29b874eab4eccf94e520d8e39f66347ad2b3f6839cb8
+  metadata.gz: ba17f9a2b9d9288b7e54e97f3fa9ccacfa9bebfad069810bd8fb20526e012d32a944f3c1bb44851b5d899d4c94b532c958bb8a2c8dbe2d36abd381f258b2bd99
+  data.tar.gz: b5e927c93f297b95758ad684cb54e770a981372fc2815e1f50f7d2de0d4347edf504b5f269ba0b50518fadbd09ed3550d0adc51a022c1e5504cd8ad105bd1ddc

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/Gemfile

@@ -4,3 +4,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 12.0"
+
+gem "rspec", "~> 3.0"
+
+gem "pry"

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

@@ -75,10 +75,12 @@ module Kramdown
       end
 
       def convert_definition_table(el, indent)
+        th_width = el.attr.delete('th-width')
+        th = th_width.nil? ? "<th>" : "<th width=\"#{th_width}\">"
         raw_caption = el.attr.delete('caption')
         rows = raw_caption.nil? ? '' : table_caption(raw_caption)
         inner(el.children.first, indent).scan(/(<dt>.+?<\/dt>|<dd>.+?<\/dd>)/m).
-          map{|x| x.first.sub(/\A<dt>(.+)<\/dt>\z/m, "<th>\\1</th>")}.
+          map{|x| x.first.sub(/\A<dt>(.+)<\/dt>\z/m, "#{th}\\1</th>")}.
           map{|x| x.sub(/\A<dd>(.+)<\/dd>\z/m, "<td>\\1</td>")}.
           each_slice(2) do |x|
             row = x.map{|c| ('  '*(indent + 2)) + c}.join("\n")
@@ -121,10 +123,6 @@ module Kramdown
         format_as_span_html(el.type, attr, res)
       end
 
-      def convert_span(el, indent)
-        format_as_span_html('span', el.attr, inner(el, indent))
-      end
-
       def convert_em(el, indent)
         format_as_span_html('strong', el.attr, inner(el, indent))
       end

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

@@ -29,7 +29,6 @@ module Kramdown
         end
 
         @block_parsers.insert(5, :column, :definition_table, :wraparound,:div, :page)
-        @span_parsers.insert(5, :span)
 
         @page = 0
         @fn_counter = 0
@@ -159,7 +158,7 @@ module Kramdown
         if @fn_number.has_key?(@src[1])
           warning("Duplicate footnote name '#{@src[1]}' on line #{start_line_number} - overwriting")
         end
-        a = %!<a href="#fnref:#{@fn_number[@src[1]]}">[#{@fn_number[@src[1]]}]</a>: #{@src[2].strip}!
+        a = %!<a href="#fnref:#{@fn_number[@src[1]]}">\\[#{@fn_number[@src[1]]}\\]</a>: #{@src[2].strip}!
         p = new_block_el(:p, nil, {'id' => "fn:#{@fn_number[@src[1]]}"})
         p.children << new_block_el(:raw_text, a, nil)
         if @tree.children.last.type == :footnote_definition_sekd

data/lib/zine_brewer/main.rb

@@ -49,6 +49,7 @@ module ZineBrewer
       @author = set_header_item(h[4], '著者 クレジット')
       @css    = set_header_item(h[5], '')
 
+      @pp_header = make_pp_header
       @converted = convert(body)
     end
 
@@ -62,6 +63,17 @@ module ZineBrewer
       end
     end
 
+    def make_pp_header
+      header_output = []
+      header_output << "［コーナー］\n#{@corner}" if @corner.is_complete?
+      header_output << "［タイトル］\n#{@title}" if @title.is_complete?
+      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}" if @css.is_complete?
+      header_output.join("\n\n")
+    end
+
     ## Writing out header and body to each file
     def write_out
       make_proof_directory
@@ -78,15 +90,8 @@ module ZineBrewer
     end
 
     def write_proof_header
-      header_output = ""
-      header_output << "［コーナー］\n#{@corner}\n\n" if @corner.is_complete?
-      header_output << "［タイトル］\n#{@title}\n\n" if @title.is_complete?
-      header_output << "［リード］\n<p>#{@lead}</p>\n\n" if @lead.is_complete?
-      header_output << "［タイトル画像］\n#{@pic}\n\n" if @pic.is_complete?
-      header_output << "［著者クレジット］\n#{@author}\n\n" if @author.is_complete?
-      header_output << "［追加CSS］\n#{@css}\n\n" if @css.is_complete?
       File.open("#{@proof_dir}/header.txt", 'wb') do |f|
-        f.write(header_output)
+        f.write(@pp_header)
       end
     end
 
@@ -120,6 +125,11 @@ module ZineBrewer
       ### Converts a markdown document and returns that converted body
       dkmn.convert
     end
+
+    ### pretty print of the converted document
+    def pretty_print
+      @pp_header + "\n\n" + @converted
+    end
   end
 end
 

data/lib/zine_brewer/templates/bookranking.rb

@@ -13,7 +13,7 @@ class BookRanking < Mustache
   @template = <<EOT
   <div class="imgLRBlock cf">
     <figure class="imgR">
-      <a href="{{url}}" target="_blank"><img alt="{{title}}" src="{{cover}}" style="border:1px solid #808080; width:100px;" title="{{title}}" /></a></figure>
+      <a href="{{url}}" target="_blank"><img alt="{{title}}" loading="lazy" src="{{cover}}" style="border:1px solid #808080;" width="100" title="{{title}}" /></a></figure>
     <p markdown="1">　{{& description}}</p>
   </div>
 EOT
@@ -25,7 +25,7 @@ EOT
   def cover
     case File.dirname(src)
     when ".", "images"
-      f = File.basename(l_src)
+      f = File.basename(src)
       "/static/images/article/■記事ID■/#{/^\d+_/ =~ f ? f : '■記事ID■_' + f}"
     when "common"
       "/static/images/article/common/#{File.basename(src)}"

data/lib/zine_brewer/templates/casts.rb

@@ -21,7 +21,7 @@ class Casts < Mustache
     {{#title_sw}}<h4>{{title}}</h4>{{/title_sw}}
     <div class="imgLRBlock cf">
       <figure class="imgL">
-        <img src="{{fig_src}}" alt="{{name}}" style="height:135px;" />
+        <img src="{{fig_src}}" loading="lazy" alt="{{name}}" height="135" width="110" />
       </figure>
       <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>

data/lib/zine_brewer/templates/fig/module_fig_base.rb

@@ -10,8 +10,7 @@ module Fig_00
       a_img[:fig_src] = make_src(h["src"])
       a_img[:href] = h["href"]
       a_img[:alt] = make_alt(h["alt"])
-      a_img[:img_style] = make_img_style(h["width"], h["height"]) \
-        unless h["width"].nil? && h["height"].nil?
+      a_img[:img_size] = make_img_size(h["width"], h["height"])
       result << a_img
     end
     result
@@ -54,13 +53,11 @@ module Fig_00
     end
   end
   
-  def make_img_style(l_width, l_height)
+  def make_img_size(l_width, l_height)
     s = []
-    s << "width:#{l_width};" unless l_width.nil?
-    s << "height:#{l_height};" unless l_height.nil?
-    unless s.all?{|v| v.nil? }
-      %Q{style="#{s.join(' ').strip}" }
-    end
+    s << %Q{width="#{l_width}"} unless l_width.nil?
+    s << %Q{height="#{l_height}"} unless l_height.nil?
+    s.join(' ').strip
   end
 
 end

data/lib/zine_brewer/templates/fig_a.rb

@@ -3,11 +3,10 @@
 require 'mustache'
 
 require_relative 'fig/module_fig_base'
-require_relative 'fig/module_fig_plus'
 
 class Fig_A < Mustache
 
-  include Fig_00, Fig_01
+  include Fig_00
 
   # <<Fig_A>>
   # src: 画像ファイル名
@@ -18,9 +17,9 @@ class Fig_A < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <a href="{{fig_src}}" target="_blank"><img src="{{fig_src}}" alt="{{alt}}" {{& img_style}}/></a>
+  <a href="{{fig_src}}" target="_blank"><img src="{{fig_src}}" loading="lazy" alt="{{alt}}"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} /></a>
   {{/imgs_list}}
-  <figcaption markdown="span">{{#figcaption_sw}}{{& caption}}<br/>{{/figcaption_sw}}［画像クリックで拡大表示］</figcaption>
+  <figcaption markdown="span">{{#caption}}{{& caption}}<br/>{{/caption}}［画像クリックで拡大表示］</figcaption>
 </figure>
 EOT
 

data/lib/zine_brewer/templates/fig_h.rb

@@ -3,11 +3,10 @@
 require 'mustache'
 
 require_relative 'fig/module_fig_base'
-require_relative 'fig/module_fig_plus'
 
 class Fig_H < Mustache
 
-  include Fig_00, Fig_01
+  include Fig_00
 
   # <<Fig_H>>
   # src: 画像ファイル名
@@ -19,9 +18,9 @@ class Fig_H < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  {{#href}}<a href="{{href}}" target="_blank">{{/href}}<img src="{{fig_src}}" alt="{{alt}}" {{& img_style}}/>{{#href}}</a>{{/href}}
+  <a href="{{href}}" target="_blank"><img src="{{fig_src}}" loading="lazy" alt="{{alt}}"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} /></a>
   {{/imgs_list}}
-  {{#figcaption_sw}}<figcaption markdown="span">{{& caption}}</figcaption>{{/figcaption_sw}}
+  {{#caption}}<figcaption markdown="span">{{& caption}}</figcaption>{{/caption}}
 </figure>
 EOT
 

data/lib/zine_brewer/templates/fig_n.rb

@@ -3,11 +3,10 @@
 require 'mustache'
 
 require_relative 'fig/module_fig_base'
-require_relative 'fig/module_fig_plus'
 
 class Fig_N < Mustache
 
-  include Fig_00, Fig_01
+  include Fig_00
 
   # <<Fig_N>>
   # src: 画像ファイル名
@@ -19,9 +18,9 @@ class Fig_N < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <img src="{{fig_src}}" alt="{{alt}}" {{& img_style}}/>
+  <img src="{{fig_src}}" loading="lazy" alt="{{alt}}"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} />
   {{/imgs_list}}
-  {{#figcaption_sw}}<figcaption markdown="span">{{caption}}{{& cited_from}}</figcaption>{{/figcaption_sw}}
+  {{#caption}}<figcaption markdown="span">{{caption}}</figcaption>{{/caption}}
 </figure>
 EOT
 

data/lib/zine_brewer/templates/fig_p.rb

@@ -20,7 +20,7 @@ class Fig_P < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <img src="{{fig_src}}" alt="{{name}}氏" {{& img_style}} />
+  <img src="{{fig_src}}" loading="lazy" alt="{{name}}氏"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} />
   {{/imgs_list}}
   <div style="text-align:left; padding:0px 35px;">
     <figcaption><strong>{{name}}（{{huri}}）氏</strong></figcaption>

data/lib/zine_brewer/templates/fig_z.rb

@@ -3,11 +3,10 @@
 require 'mustache'
 
 require_relative 'fig/module_fig_base'
-require_relative 'fig/module_fig_plus'
 
 class Fig_Z < Mustache
 
-  include Fig_00, Fig_01
+  include Fig_00
 
   # <<Fig_Z>>
   # src: 画像ファイル名
@@ -18,9 +17,9 @@ class Fig_Z < Mustache
   @template = <<EOT
 <figure>
   {{#imgs_list}}
-  <a href="{{fig_src}}" rel="lightbox" target="_blank"><img src="{{fig_src}}" alt="{{alt}}" {{& img_style}}/></a>
+  <a href="{{fig_src}}" rel="lightbox" target="_blank"><img src="{{fig_src}}" loading="lazy" alt="{{alt}}"{{#width}} width="{{width}}"{{/width}}{{#height}} height="{{height}}"{{/height}} /></a>
   {{/imgs_list}}
-  <figcaption markdown="span">{{#figcaption_sw}}{{& caption}}<br/>{{/figcaption_sw}}［画像クリックで拡大表示］</figcaption>
+  <figcaption markdown="span">{{#caption}}{{& caption}}<br/>{{/caption}}［画像クリックで拡大表示］</figcaption>
 </figure>
 EOT
 

data/lib/zine_brewer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zine_brewer
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Akinori Ichigo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -47,6 +47,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -63,7 +64,6 @@ files:
 - lib/zine_brewer/templates/bookranking.rb
 - lib/zine_brewer/templates/casts.rb
 - lib/zine_brewer/templates/fig/module_fig_base.rb
-- lib/zine_brewer/templates/fig/module_fig_plus.rb
 - lib/zine_brewer/templates/fig_a.rb
 - lib/zine_brewer/templates/fig_h.rb
 - lib/zine_brewer/templates/fig_n.rb
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.14
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Kramdown to HTML converter for Shoeisha Web Media

data/lib/zine_brewer/templates/fig/module_fig_plus.rb

@@ -1,15 +0,0 @@
-# coding: utf-8
-
-module Fig_01
-  
-  def open_which
-    defined?(href)
-  end
-
-  def figcaption_sw
-    defined?(cap)
-  end
-
-end
-
-