bookify 2.1.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a42bf3c7616f841c546fc492437d850fdf78a3f1814fb326d9daaef407f7e802
-  data.tar.gz: 404e2b27ad30b93b70517d748d5b3e1d0a01e0a07fb559f0033f8a8c39459e8e
+  metadata.gz: d51ebed7b740e8227ef917d1cb77b8b69697a3897679be78fc7e0d75224eab1a
+  data.tar.gz: 0e39ed24007b1ed3385ee72505d6060c3fa484b8b6cc54af9629355e935d122a
 SHA512:
-  metadata.gz: 9277e6cf6924393c9d7bd411ce863b84a443ae96ac45c4b7d96e6a579b9b937a3e0fb4872a1b51c199bbd2dee71bea0356af4c895ae09a0e32c9f654834cdd7a
-  data.tar.gz: 9692038f1a3d8f81a6e22389837d445918036df6c60e20d732943f7b3bd81865b07376cd7e1f193890e91a8eaab91894e3e5785f8834f501d8abd7a16a7fc4e0
+  metadata.gz: 9db685fcb9815e6888ed42b92c5c4c3d3b36536d689c31d7fbe0cd2b54657f46ffbad78189943e1ac31655c4a793ec2320c674eb89951b07e4cb0523df19a433
+  data.tar.gz: c69cc884d4af8bb320208932ddb6e68bdc848143cbcdfd19143a9e8dace6db447771734d2ceb715d3926ee52c91fdef0a83b57c48e5d243f3d0d62240922f00c

data/lib/bookify.rb

@@ -6,10 +6,14 @@ require "prawn/table"
 require "redcarpet"
 require "htmlentities"
 
+require_relative "prawn_ext/font_metric_cache"
+
 module Bookify
 end
 
 Dir["#{File.dirname(__FILE__)}/bookify/node/*.rb"].each { |f| require f }
 
+require_relative "bookify/markdown"
 require_relative "bookify/node"
 require_relative "bookify/renderer"
+require_relative "bookify/sections"

data/lib/bookify/markdown.rb

@@ -0,0 +1,44 @@
+class Bookify::Markdown < Redcarpet::Render::HTML
+  @@preprocessors = []
+  @@postprocessors = []
+
+  def preprocess(string)
+    Bookify::Markdown.preprocessors.each do |preproc|
+      string = preproc.call(string)
+    end
+
+    string
+  end
+
+  def postprocess(string)
+    Bookify::Markdown.postprocessors.each do |postproc|
+      string = postproc.call(string)
+    end
+
+    string
+  end
+
+  def self.add_preprocessor(preprocessor)
+    @@preprocessors << preprocessor
+  end
+
+  def self.reset_preprocessors
+    @@preprocessors = []
+  end
+
+  def self.preprocessors
+    @@preprocessors
+  end
+
+  def self.add_postprocessor(postprocessor)
+    @@postprocessors << postprocessor
+  end
+
+  def self.reset_postprocessors
+    @@postprocessors = []
+  end
+
+  def self.postprocessors
+    @@postprocessors
+  end
+end

data/lib/bookify/node/base.rb

@@ -3,10 +3,10 @@ module Bookify::Node
     attr_accessor :node, :pdf
 
     FONTS = {
-      h1:      ["Book Antiqua", size: 16, style: :bold],
-      h2:      ["Book Antiqua", size: 12, style: :bold],
-      h3:      ["Book Antiqua", size: 11, style: :bold],
-      h4:      ["Book Antiqua", size: 10, style: :bold],
+      h1: ["Book Antiqua", size: 18, style: :bold],
+      h2: ["Book Antiqua", size: 12, style: :bold],
+      h3: ["Book Antiqua", size: 12, style: :bold],
+      h4: ["Book Antiqua", size: 11, style: :bold],
       primary: ["Book Antiqua", size: 10]
     }
 
@@ -27,12 +27,12 @@ module Bookify::Node
       (element.attr(:class) || "").split(" ")
     end
 
-    def font(name)
-      pdf.font *FONTS[name]
+    def font(name, &block)
+      pdf.font(*FONTS[name], &block)
     end
 
     def clean_html(html)
-      html.gsub(/\n/, "").gsub(/\s+/, " ")
+      html.delete("\n").gsub(/\s+/, " ")
     end
 
     def decode_html(html)

data/lib/bookify/node/h1.rb

@@ -4,12 +4,19 @@ module Bookify::Node
   class H1 < Base
     def render
       break_if_close_to_bottom(250)
-      move_down 20 unless pdf.y == page_top
-      font :h1
+      move_down 30 unless pdf.y == page_top
+
       html = decode_html(node.inner_html.strip)
-      outline.page title: html, destination: dest_xyz(0, pdf.y, nil, pdf.page)
-      text html, align: :center
-      move_down 10
+      dest = dest_xyz(0, pdf.y, nil, pdf.page)
+
+      Bookify::Sections.add(:h1, html, dest)
+      add_dest(html, dest)
+
+      font :h1 do
+        text html, align: :center
+      end
+
+      move_down 30
     end
 
     def page_top

data/lib/bookify/node/h2.rb

@@ -3,10 +3,21 @@ require_relative "base"
 module Bookify::Node
   class H2 < Base
     def render
-      font :h2
       move_down 5
       break_if_close_to_bottom
-      text decode_html(node.inner_html.strip)
+
+      html = decode_html(node.inner_html.strip)
+      dest = dest_xyz(0, pdf.y, nil, pdf.page)
+      parent_h1 = Bookify::Sections.current_h1_title
+
+      Bookify::Sections.add(:h2, html, dest)
+      add_dest(html, dest)
+      add_dest("#{parent_h1}/#{html}", dest) if parent_h1
+
+      font :h2 do
+        text html
+      end
+
       move_down 1
       stroke { horizontal_rule }
       move_down 10

data/lib/bookify/node/h3.rb

@@ -3,11 +3,14 @@ require_relative "base"
 module Bookify::Node
   class H3 < Base
     def render
-      font :h3
       move_down 5
       break_if_close_to_bottom
-      text decode_html(node.inner_html.strip)
-      move_down 2
+
+      font :h3 do
+        text decode_html(node.inner_html.strip)
+      end
+
+      move_down 5
     end
   end
 end

data/lib/bookify/node/h4.rb

@@ -5,9 +5,12 @@ module Bookify::Node
     def render
       move_down 5
       break_if_close_to_bottom
-      font :h4
-      text decode_html(node.inner_html.strip)
-      move_down 2
+
+      font :h4 do
+        text decode_html(node.inner_html.strip)
+      end
+
+      move_down 5
     end
   end
 end

data/lib/bookify/node/image.rb

@@ -1,15 +1,23 @@
 require_relative "base"
+require "open-uri"
 
 module Bookify::Node
   class Image < Base
     def render
       options = {
         position: html_classes.include?("center") ? :center : :left,
-        fit: [bounds.width, -1],
+        fit: [bounds.width, -1]
       }
 
-      image node.attr(:src), options
+      image image_from_node(node), options
       move_down 15
     end
+
+    private
+
+    def image_from_node(node)
+      src = node.attr(:src)
+      /^https?\:\/\//.match?(src) ? URI.open(src) : src
+    end
   end
 end

data/lib/bookify/node/paragraph.rb

@@ -13,9 +13,12 @@ module Bookify::Node
           align: html_classes.include?("center") ? :center : :left
         }
 
-        html = clean_html(node.inner_html.gsub("\n", " "))
-        font :primary
-        text html, options
+        html = clean_html(node.inner_html.tr("\n", " "))
+
+        font :primary do
+          text html, options
+        end
+
         move_down 10
       end
     end

data/lib/bookify/node/table.rb

@@ -5,19 +5,20 @@ module Bookify::Node
     def render
       font :primary
 
-      table table_data, header: true, width: bounds.width do
+      options = {
+        header: true,
+        width: bounds.width,
+        row_colors: ["FFFFFF", "EEEEEE"]
+      }
+
+      table table_data, options do
         cells.borders = []
 
-        row(0).borders = [:top, :bottom]
-        row(0).border_top_width = 0.5
+        row(0).borders = [:bottom]
         row(0).border_bottom_width = 0.5
         row(0).font_style = :bold
 
-        row(-1).borders = [:bottom]
-        row(-1).border_bottom_width = 0.5
-
-        cells.columns(0).padding = [5, 5, 5, 0]
-        cells.columns(-1).padding = [5, 0, 5, 5]
+        cells.padding = 5
       end
 
       move_down 15

data/lib/bookify/renderer.rb

@@ -1,7 +1,5 @@
 class Bookify::Renderer
-  MARKDOWN_CONVERTER = Redcarpet::Markdown.new(Redcarpet::Render::HTML, tables: true)
-
-  attr_accessor :input_file, :output_file, :layout, :columns, :input_text, :column_spacer, :margin
+  attr_accessor :input_file, :output_file, :layout, :columns, :input_text, :column_spacer, :margin, :page_size
 
   def self.from_args(args)
     if ["-l", "--landscape"].include?(args[0])
@@ -19,7 +17,7 @@ class Bookify::Renderer
     new(layout: layout, columns: columns, input_file: input_file, output_file: output_file)
   end
 
-  def initialize(layout: :landscape, columns: 2, output_file:, input_file: nil, input_text: nil, column_spacer: nil, margin: 50)
+  def initialize(layout: :portrait, columns: 2, output_file:, input_file: nil, input_text: nil, column_spacer: nil, margin: 50, page_size: nil)
     @layout = layout
     @columns = columns
     @output_file = output_file
@@ -27,17 +25,21 @@ class Bookify::Renderer
     @input_text = input_text
     @column_spacer = column_spacer
     @margin = margin
+    @page_size = page_size
   end
 
   def render
-    Prawn::Document.generate(output_file, margin: margin, page_layout: layout) do |pdf|
+    doc_opts = {margin: margin, page_layout: layout, page_size: page_size}.compact
+    Bookify::Sections.reset
+
+    Prawn::Document.generate(output_file, doc_opts) do |pdf|
       font_path = "#{File.dirname(__FILE__)}/../../fonts"
 
       pdf.font_families["Book Antiqua"] = {
         normal: {file: "#{font_path}/BookAntiqua.ttf"},
         bold: {file: "#{font_path}/BookAntiqua-Bold.ttf"},
         italic: {file: "#{font_path}/BookAntiqua-Italic.ttf"},
-        bold_italic: {file: "#{font_path}/BookAntiqua-BoldItalic.ttf"},
+        bold_italic: {file: "#{font_path}/BookAntiqua-BoldItalic.ttf"}
       }
 
       pdf.fill_color "000000"
@@ -48,6 +50,14 @@ class Bookify::Renderer
       pdf.column_box [0, pdf.cursor], columns: columns, width: pdf.bounds.width, spacer: (column_spacer || pdf.font_size) do
         doc.children.each { |c| Bookify::Node.render(c, pdf) }
       end
+
+      Bookify::Sections.all.each do |section|
+        pdf.outline.section(section[:title], destination: section[:dest]) do
+          section[:subsections].each do |subsection|
+            pdf.outline.page title: subsection[:title], destination: subsection[:dest]
+          end
+        end
+      end
     end
   end
 
@@ -62,6 +72,10 @@ class Bookify::Renderer
   end
 
   def html
-    @html ||= MARKDOWN_CONVERTER.render(markdown)
+    @html ||= markdown_converter.render(markdown)
+  end
+
+  def markdown_converter
+    Redcarpet::Markdown.new(Bookify::Markdown, tables: true)
   end
 end

data/lib/bookify/sections.rb

@@ -0,0 +1,31 @@
+module Bookify
+  module Sections
+    InvalidLevel = Class.new(StandardError)
+
+    @@sections = []
+
+    def self.add(level, title, dest)
+      case level
+      when :h1
+        @@sections << {title: title, dest: dest, subsections: []}
+      when :h2
+        return if @@sections.empty?
+        @@sections.last[:subsections] << {title: title, dest: dest}
+      else
+        raise InvalidLevel, level
+      end
+    end
+
+    def self.all
+      @@sections
+    end
+
+    def self.current_h1_title
+      @@sections.any? ? @@sections.last[:title] : nil
+    end
+
+    def self.reset
+      @@sections = []
+    end
+  end
+end

data/lib/prawn_ext/font_metric_cache.rb

@@ -0,0 +1,29 @@
+# https://github.com/prawnpdf/prawn/issues/1140
+
+module Prawn
+  class FontMetricCache
+    def width_of(string, options)
+      f = if options[:style]
+        # override style with :style => :bold
+        @document.find_font(@document.font.family, style: options[:style])
+      else
+        @document.font
+      end
+
+      encoded_string = f.normalize_encoding(string)
+
+      key = CacheEntry.new(f.hash, options, encoded_string)
+
+      @cache[key] ||= f.compute_width_of(encoded_string, options)
+
+      length = @cache[key]
+
+      character_count = @document.font.character_count(encoded_string)
+      if character_count.positive?
+        length += @document.character_spacing * (character_count - 1)
+      end
+
+      length
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookify
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Joey Schoblaska
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,6 +107,7 @@ files:
 - fonts/BookAntiqua-Italic.ttf
 - fonts/BookAntiqua.ttf
 - lib/bookify.rb
+- lib/bookify/markdown.rb
 - lib/bookify/node.rb
 - lib/bookify/node/base.rb
 - lib/bookify/node/blockquote.rb
@@ -121,6 +122,8 @@ files:
 - lib/bookify/node/paragraph.rb
 - lib/bookify/node/table.rb
 - lib/bookify/renderer.rb
+- lib/bookify/sections.rb
+- lib/prawn_ext/font_metric_cache.rb
 homepage: https://github.com/joeyschoblaska/bookify
 licenses:
 - MIT
@@ -140,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Transform Markdown docs into two-column PDFs.