caracal_the_curve 1.4.3 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6da04caa966ebd5e16ea4750f12f96ac92671bc5398040ffac7634c0ace0430
-  data.tar.gz: d22baa3abb96b9a569864e414542d5aacdcff42c42cf71586c95a5c4e855afd0
+  metadata.gz: 45e42709e5e6dd37c33347d099b56c90db0dfff8309539fe75da327279f34065
+  data.tar.gz: 9c6d77453283e2a10e66f9224606bf2f445307143cf20395fa815b5ab1da71a9
 SHA512:
-  metadata.gz: 700413b3717f24148a68d6d211a817f70dbf1991871942981c8eada98be9a63d629c88c281e8bdb55b328536bccdb1e1bbec23e64057c86648973630aaa9aad9
-  data.tar.gz: 742d487ca24ab7f5aba5a71b844fe9ac42a3a15bde8ba327d6d3b8b7a396dbba5e62036436e71541e1ac13baf5461096164b195b3688b8b685109bbb51d896ea
+  metadata.gz: 006140646a3c87366f118d25b3e62fc72386d849c57a9a5858253b4543b5a75e6978dda390d2ae547d1f3bfc4472c4e4fbf3f6364333ac96967bd628e1ff7c7a
+  data.tar.gz: cb58b0fecf147183b867ebae009e972a95583a76094a30716751833383d3c9e0388f300b8b97ecbffcb0c27afb35cf1f448718c6a9f5c0c91170bfb94a9fb5f4

data/lib/caracal/core/models/page_flip_model.rb

@@ -13,6 +13,11 @@ module Caracal
         # Configuration
         #-------------------------------------------------------------
 
+        # accessors
+        attr_reader :page_width
+        attr_reader :page_margin_left
+        attr_reader :page_margin_right
+
         # initialization
         def initialize(options={}, &block)
           super options, &block
@@ -21,6 +26,15 @@ module Caracal
         #-------------------------------------------------------------
         # Public Methods
         #-------------------------------------------------------------
+        
+        #========== SETTERS ===============================
+
+        # integers
+        [:width, :margin_left, :margin_right].each do |m|
+          define_method "#{ m }" do |value|
+            instance_variable_set("@page_#{ m }", value.to_i)
+          end
+        end
 
         #=============== DATA ACCESSORS =======================
 
@@ -35,6 +49,15 @@ module Caracal
         def valid?
           contents.size > 0
         end
+
+        #--------------------------------------------------
+        # Private Instance Methods
+        #--------------------------------------------------
+        private
+
+        def option_keys
+          [:width, :margin_left, :margin_right]
+        end
       end
     end
   end

data/lib/caracal/core/page_flips.rb

@@ -19,6 +19,15 @@ module Caracal
           def page_flip(*args, &block)
             options = Caracal::Utilities.extract_options!(args)
 
+            # Pass through the page dimensions from the parent document,
+            # using the page height as the page width, due to it using
+            # the inverse dimensions.
+            options.merge!({
+              width: page_height,
+              margin_left: page_margin_left,
+              margin_right: page_margin_right
+            })
+
             model = Caracal::Core::Models::PageFlipModel.new(options, &block)
             
             if model.valid?

data/lib/caracal/renderers/document_renderer.rb

@@ -331,6 +331,12 @@ module Caracal
         xml['w'].p paragraph_options do
           xml['w'].pPr do
             xml['w'].sectPr do
+              if rel = document.find_relationship('footer1.xml')
+                xml['w'].footerReference({ 'r:id' => rel.formatted_id, 'w:type' => 'default' })
+              end
+              if rel = document.find_relationship('header1.xml')
+                xml['w'].headerReference({ 'r:id' => rel.formatted_id, 'w:type' => 'default' })
+              end
               xml['w'].pgSz({
                 'w:w' => document.page_width,
                 'w:h' => document.page_height
@@ -345,6 +351,12 @@ module Caracal
         xml['w'].p paragraph_options do
           xml['w'].pPr do
             xml['w'].sectPr do
+              if rel = document.find_relationship('footer1.xml')
+                xml['w'].footerReference({ 'r:id' => rel.formatted_id, 'w:type' => 'default' })
+              end
+              if rel = document.find_relationship('header1.xml')
+                xml['w'].headerReference({ 'r:id' => rel.formatted_id, 'w:type' => 'default' })
+              end
               xml['w'].pgSz({
                 'w:w' => document.page_height,
                 'w:h' => document.page_width

data/lib/caracal/version.rb

@@ -1,3 +1,3 @@
 module Caracal
-  VERSION = '1.4.3'
+  VERSION = '1.4.5'
 end

data/spec/lib/caracal/core/tables_spec.rb

@@ -18,8 +18,21 @@ describe Caracal::Core::Tables do
       
       it { expect(subject.contents.size).to eq size + 1 }
       it { expect(subject.contents.last).to be_a(Caracal::Core::Models::TableModel) }
+      it { expect(subject.contents.last.table_width).to be(9360) }
+    end
+
+    describe '.table within a page-flip' do
+      let!(:size) { subject.contents.size }
+      
+      before do
+        subject.page_flip do |x|
+          x.table [['Sample Text']]
+        end
+      end
+      
+      it { expect(subject.contents.size).to eq size + 1 }
+      it { expect(subject.contents.last.contents.first).to be_a(Caracal::Core::Models::TableModel) }
+      it { expect(subject.contents.last.contents.first.table_width).to be(12960) }
     end
-    
   end
-  
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caracal_the_curve
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5
 platform: ruby
 authors:
 - Trade Infomatics