caracal_the_curve 1.4.4 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 600531d46b2480547a2b7aac3996e0120798923c08dded9877ca689efb14b1f9
-  data.tar.gz: a7d3df9f734a6d6da8625f0905ca6d3fdda622c7f0f938e44cbbb3adea8b4c4f
+  metadata.gz: be5e510b64445fef7d21d07decb6cbcce17afb2d45b001471f86c86087fc1386
+  data.tar.gz: a3f91062398df71f4f7a3b73e083a653819c5fcbab81b1aac09e05d20609e5b2
 SHA512:
-  metadata.gz: b91eac309b0ee55811d30448da5e297979d321ac4543263f2d96a4276b22674862b7b638f03d30753c685ac1d979c302b16c6598698ff1cf2cd52ff6bb14b469
-  data.tar.gz: 43d6d97a9e3ff4ae85f810555e9f1e9138b90e4d85798a3db8bf6360cc10147934f4d0455bec7169e2ac36346aeda094c2b40df8b8c28c0be92f279ccacc0a5e
+  metadata.gz: 733cd04f8b4c531dce1c8684c70dd95edd111d9bf4cd0eedc0a46fb918dc05abbe89df84bb2f5dd319a283b8388ba00d14a9b9cc4d162b0381bef4dbdee8770b
+  data.tar.gz: d9f69d624e35438e004cd3e783c5af62aa9b6ad8d5bbd06f4f888c4ea171a89e8530e201d9a95739c12e4d1c006296de0f5499da276efad3d44477238e7e614c

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

@@ -367,17 +367,7 @@ module Caracal
       end
 
       def render_pagebreak(xml, model)
-        if model.page_break_wrap
-          xml['w'].p paragraph_options do
-            xml['w'].r run_options do
-              xml['w'].br({ 'w:type' => 'page' })
-            end
-          end
-        else
-          xml['w'].r run_options do
-            xml['w'].br({ 'w:type' => 'page' })
-          end
-        end
+        @pagebreak_on_next_paragraph = true
       end
 
       def render_paragraph(xml, model)
@@ -389,6 +379,10 @@ module Caracal
             xml['w'].contextualSpacing({ 'w:val' => '0' })
             xml['w'].jc({ 'w:val' => model.paragraph_align })  unless model.paragraph_align.nil?
             render_run_attributes(xml, model, true)
+            if @pagebreak_on_next_paragraph
+              xml['w'].pageBreakBefore
+              @pagebreak_on_next_paragraph = false
+            end
           end
           model.runs.each do |run|
             method = render_method_for_model(run)

data/lib/caracal/version.rb

@@ -1,3 +1,3 @@
 module Caracal
-  VERSION = '1.4.4'
+  VERSION = '1.4.6'
 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.4
+  version: 1.4.6
 platform: ruby
 authors:
 - Trade Infomatics
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-07 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri