bookify 2.5.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e07bd5f6f7148fa8711de2c1cf860236e3e3da1dd4fd411246c11b15958ac49
-  data.tar.gz: 2995c7ec5a3fef4fee1d8a837d77d253b99998d7bfb2e6a2465e067b142e9da1
+  metadata.gz: e7cb3fcf20cf4c0d52a7db2745e1c060fc112aff2e7602cc2dce29c9323d1e97
+  data.tar.gz: 4b853cfb351be5194482a3b3dd9ce8301c320bd947b85e3c0b7296e56fc302dc
 SHA512:
-  metadata.gz: 44b913b44ff68a55071a0fbe5f88f7d8195872b6bc0deb39382d9b095b3a767d8c0b4cc183b80a9e32e001845bb421f5004b63a7189380981a8244ce8b07debe
-  data.tar.gz: ecb58a77471a62ad08a749bef069ae9642b9b318bcd2bb0c232326ec352d33bec34a952abfba672304fc712f0c6a41c27c506caa6cc40e898440892d086c7f81
+  metadata.gz: 86cb9d453def89f8471704d3d540a297a034ddcf9d23fbae9ed290cd30c6a29ed9c40333e25ba6332ae0f1b80c3208f33777b53f5c4dd9fdc86ee497fdf647cb
+  data.tar.gz: '08455d449f42a2f3df014b8e411f5024b4f93528a4ddd44192db5634273520d2f315697524a0ec3d6e748368995ab794a2a657b549aab877cbfcaea4586d7e51'

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: 13, style: :bold],
+      h3: ["Book Antiqua", size: 12, style: :bold],
+      h4: ["Book Antiqua", size: 11, style: :bold],
       primary: ["Book Antiqua", size: 10]
     }
 
@@ -42,5 +42,9 @@ module Bookify::Node
     def break_if_close_to_bottom(tolerance = 125)
       bounds.move_past_bottom if pdf.y <= tolerance
     end
+
+    def page_top
+      pdf.bounds.parent.height + 50
+    end
   end
 end

data/lib/bookify/node/h1.rb

@@ -4,7 +4,7 @@ module Bookify::Node
   class H1 < Base
     def render
       break_if_close_to_bottom(250)
-      move_down 20 unless pdf.y == page_top
+      move_down 30 unless pdf.y == page_top
 
       html = decode_html(node.inner_html.strip)
       dest = dest_xyz(0, pdf.y, nil, pdf.page)
@@ -16,11 +16,7 @@ module Bookify::Node
         text html, align: :center
       end
 
-      move_down 10
-    end
-
-    def page_top
-      pdf.bounds.parent.height + 50
+      move_down 30
     end
   end
 end

data/lib/bookify/node/h2.rb

@@ -3,7 +3,7 @@ require_relative "base"
 module Bookify::Node
   class H2 < Base
     def render
-      move_down 5
+      move_down 15 unless pdf.y == page_top
       break_if_close_to_bottom
 
       html = decode_html(node.inner_html.strip)
@@ -14,8 +14,9 @@ module Bookify::Node
       add_dest(html, dest)
       add_dest("#{parent_h1}/#{html}", dest) if parent_h1
 
-      font :h2
-      text html
+      font :h2 do
+        text html
+      end
 
       move_down 1
       stroke { horizontal_rule }

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
+      move_down 10 unless pdf.y == page_top
       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

@@ -3,11 +3,14 @@ require_relative "base"
 module Bookify::Node
   class H4 < Base
     def render
-      move_down 5
+      move_down 10 unless pdf.y == page_top
       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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookify
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Joey Schoblaska
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake