thousand_island 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d124ef3c8f6577e2ab646f29822113bb3993a6c1
-  data.tar.gz: eb39fc513e7ca696213a9987e2a47190e8225064
+  metadata.gz: 73dfa3ef74fa1effeae7c2223f5d11a4675aed04
+  data.tar.gz: fa7d1b129d45ddf925fe661ba8e0ccd7d39851d4
 SHA512:
-  metadata.gz: 985e04d2c2c3536e4c4c7c3564203237be097c636ad94d74567e71455aab8461aa31aad66d3fb4e32889c9bbc09e5a31c860c9c21491330e420b90690c737602
-  data.tar.gz: b0689c82fa6ba39c03f1816dd6e6c25a8be7ced2e6f39ac4d1cbb4b81bb58a87998d2732fff767483bee2abae0d3ceb336840aa4cdc0723ba8e4d9631eac6122
+  metadata.gz: 5fe42d5cb6fbf9e90c2d86ffda051a3abd78344555b6592861247220de39607e8e21b18445d4cfb9f164d9b37fc0b09a81cd5708f2172c2afa61974262e78444
+  data.tar.gz: 6d9751ac454a5d1c3db76b16b8289cd9913bf59886d22b1804ad874b7c79093151844c6d943a943a9eb2fdba5523d7a66f7be13a559ec0766ab00e16e978fab0

data/README.md

@@ -305,7 +305,7 @@ A PrawnTable is very configurable. The goal of the Table component of **Thousand
 ### Table Settings
 You can use the defaults, or create your own <code>TableSettings</code> class as below:
 ```ruby
-  class MyTableSettings
+  class MyTableSettings < ThousandIsland::TableSettings
     def table_options
       {...}
     end

data/lib/thousand_island/components/base.rb

@@ -15,6 +15,11 @@ module ThousandIsland
         else
           render &block
         end
+        after_render
+      end
+
+      def after_render
+        nil
       end
 
       def render_all(&block)

data/lib/thousand_island/components/footer.rb

@@ -14,10 +14,14 @@ module ThousandIsland
         pdf.bounding_box([0, box_height], width: pdf.bounds.width, height: box_height) do
           col1
           col2(&block)
-          col3
+          # col3
         end
       end
 
+      def after_render
+        col3
+      end
+
       def col1_width
         pdf.bounds.width * 0.15
       end

data/lib/thousand_island/table_settings.rb

@@ -16,7 +16,7 @@ module ThousandIsland
     end
 
     def settings
-      default_options.merge(table_settings.merge(overrides))
+      deep_merger.merge_options(overrides, table_settings, default_options)
     end
 
     def default_options
@@ -53,6 +53,11 @@ module ThousandIsland
       }
     end
 
+    private
+
+    def deep_merger
+      @deep_merger ||= Utilities::DeepMerge::TableOptions
+    end
 
   end
 end

data/lib/thousand_island/version.rb

@@ -1,3 +1,3 @@
 module ThousandIsland
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/thousand_island/components/footer_spec.rb

@@ -42,7 +42,7 @@ module ThousandIsland
 
         it 'renders the page numbers' do
           expect(prawn_doc).to receive(:number_pages).with(footer.numbering_string, footer.options[:numbering_options])
-          footer.render
+          footer.after_render
         end
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thousand_island
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Colin Weight
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn