caracal 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 491450be9349f7528fa95e04b379b72f4807d395
-  data.tar.gz: 823708c706f984673a8f42c64d73e5d4fdc9be87
+  metadata.gz: 182b527fbc16b0c6a5ae6c5cc2b77c307dc65f7c
+  data.tar.gz: ac8bd74712cfc75f7c9ac786d33de2b6be4ed3ac
 SHA512:
-  metadata.gz: 575e505a4c78d7ffc05b87587d12fa94c436ce53c9d466762a84fa9fdeaca974843cec777698ca2cd1bf1ddea1c0727637275f6d3dcc0b3738a7226e29b93f30
-  data.tar.gz: a91c03e2d61d31db942c1c086b462e2528694533055616bb1ff9f30f0f2026c5a4c4b66262c308830c33abb47878dd97f42c9ba0c4994853edded97c1e2fd855
+  metadata.gz: a1e01da077541a289ff4b30e7dc0d6793f7cb7def0ddd8cca6b0480cdc80941fd52c04155d0f41d8572778d6425d09e765574b64f632d59212c7c36a7cac9411
+  data.tar.gz: 187ed9bfa2d8d5f182e7b4223506d69901756d8458c49868306d2033aee7c29ff49a6c4035ca12290ffd2ea965e767e3dc10e47a80d26c2441fec8aa49b04839

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 #### v1.0.5
 
+* Bug Fixes
+  * Changed Paragraph and Table Cell Models slightly to allow syntax flexibility with respect to options (@jdugan).
+
+
+#### v1.0.5
+
 * Enhancements
   * Added vertical alignment (@ykonovets).
 

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

@@ -30,7 +30,7 @@ module Caracal
         # initialization
         def initialize(options={}, &block)
           content = options.delete(:content) { "" }
-          text content, options.dup
+          text content, options.dup, &block
           super options, &block
         end
 

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

@@ -5,23 +5,23 @@ require 'caracal/core/models/margin_model'
 module Caracal
   module Core
     module Models
-      
-      # This class handles block options passed to tables via their data 
+
+      # This class handles block options passed to tables via their data
       # collections.
       #
       class TableCellModel < BaseModel
-        
+
         #-------------------------------------------------------------
         # Configuration
         #-------------------------------------------------------------
-        
+
         # constants
         const_set(:DEFAULT_CELL_BACKGROUND,       'ffffff')
         const_set(:DEFAULT_CELL_MARGINS,          Caracal::Core::Models::MarginModel.new({ top: 100, bottom: 100, left: 100, right: 100 }))
         const_set(:DEFAULT_CELL_VERTICAL_ALIGN,   :top)
 
         # accessors
-        attr_reader :cell_background 
+        attr_reader :cell_background
         attr_reader :cell_width
         attr_reader :cell_margins
         attr_reader :cell_vertical_align
@@ -33,29 +33,29 @@ module Caracal
           @cell_vertical_align  = DEFAULT_CELL_VERTICAL_ALIGN
 
           if content = options.delete(:content)
-            p content, options.dup
+            p content, options.dup, &block
           end
-          
+
           super options, &block
         end
-        
-        
+
+
         #-------------------------------------------------------------
         # Public Methods
         #-------------------------------------------------------------
-        
+
         #=============== DATA ACCESSORS =======================
-        
+
         def contents
           @contents ||= []
         end
-        
-        
+
+
         #=============== STYLES ===============================
-        
-        # This method allows styles to be applied to this cell 
+
+        # This method allows styles to be applied to this cell
         # from the table level.  It attempts to add the style
-        # first to the instance, and then to any sub-models that 
+        # first to the instance, and then to any sub-models that
         # respond to the method.
         #
         # In all cases, invalid options will simply be ignored.
@@ -64,21 +64,21 @@ module Caracal
           # make dup of options so we don't
           # harm args sent to sibling cells
           options = opts.dup
-          
+
           # first, try apply to self
           options.each do |(k,v)|
             send(k, v)  if respond_to?(k)
           end
-          
+
           # prevent top-level attrs from trickling down
-          options.delete_if { |(k,v)| option_keys.include?(k) }    
-          
+          options.delete_if { |(k,v)| option_keys.include?(k) }
+
           # then, try apply to contents
           contents.each do |model|
             options.each do |k,v|
               model.send(k, v) if model.respond_to?(k)
             end
-            
+
             # finally, apply to runs. options do trickle down
             # because paragraph-level styles don't seem to
             # affect runs within tables. weirdsies.
@@ -91,46 +91,46 @@ module Caracal
             end
           end
         end
-        
+
         def calculate_width(default_width)
           width(default_width) unless cell_width.to_i > 0
-          
+
           container_width = cell_width - cell_margin_left - cell_margin_right
-          
+
           contents.each do |model|
             if model.respond_to?(:calculate_width)
               model.calculate_width(container_width)    # will always be a TableModel
             end
           end
         end
-        
-        
+
+
         #=============== GETTERS ==============================
-        
+
         # margin attrs
         [:top, :bottom, :left, :right].each do |m|
           define_method "cell_margin_#{ m }" do
             v = cell_margins ? cell_margins.send("margin_#{ m }") : 0
           end
         end
-        
-        
+
+
         #=============== SETTERS ==============================
-        
+
         # integers
         [:width].each do |m|
           define_method "#{ m }" do |value|
             instance_variable_set("@cell_#{ m }", value.to_i)
           end
         end
-        
+
         # models
         [:margins].each do |m|
           define_method "#{ m }" do |options = {}, &block|
             instance_variable_set("@cell_#{ m }", Caracal::Core::Models::MarginModel.new(options, &block))
           end
         end
-        
+
         # strings
         [:background].each do |m|
           define_method "#{ m }" do |value|
@@ -147,23 +147,23 @@ module Caracal
 
 
         #=============== VALIDATION ===========================
-        
+
         def valid?
           contents.size > 0
         end
-        
-        
+
+
         #-------------------------------------------------------------
         # Private Instance Methods
         #-------------------------------------------------------------
         private
-        
+
         def option_keys
           [:background, :margins, :width, :vertical_align]
         end
-        
+
       end
-      
+
     end
   end
 end

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

@@ -96,6 +96,17 @@ module Caracal
           [:content, :font, :color, :size, :bold, :italic, :underline, :bgcolor, :vertical_align]
         end
 
+        def method_missing(method, *args, &block)
+          # I'm on the fence with respect to this implementation. We're ignoring
+          # :method_missing errors to allow syntax flexibility for paragraph-type
+          # models.  The issue is the syntax format of those models--the way we pass
+          # the content value as a special argument--coupled with the model's
+          # ability to accept nested instructions.
+          #
+          # By ignoring method missing errors here, we can pass the entire paragraph
+          # block in the initial, built-in call to :text.
+        end
+
       end
 
     end

data/lib/caracal/version.rb

@@ -1,3 +1,3 @@
 module Caracal
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/spec/lib/caracal/core/models/link_model_spec.rb

@@ -3,15 +3,16 @@ require 'spec_helper'
 describe Caracal::Core::Models::LinkModel do
   subject do
     described_class.new do
-      content     'Link Text'
-      href        'http://www.google.com'
-      font        'Courier New'
-      color       '666666'
-      size        20
-      bold        false
-      italic      false
-      underline   true
-      bgcolor     'cccccc'
+      content         'Link Text'
+      href            'http://www.google.com'
+      font            'Courier New'
+      color           '666666'
+      size            20
+      bold            false
+      italic          false
+      underline       true
+      bgcolor         'cccccc'
+      vertical_align  :top
     end
   end
 
@@ -53,7 +54,7 @@ describe Caracal::Core::Models::LinkModel do
 
     # .run_attributes
     describe '.run_attributes' do
-      let(:expected) { { font: 'Courier New', color: '666666', size: 20, bold: false, italic: false, underline: true, bgcolor: 'cccccc' } }
+      let(:expected) { { font: 'Courier New', color: '666666', size: 20, bold: false, italic: false, underline: true, bgcolor: 'cccccc', vertical_align: :top } }
 
       it { expect(subject.run_attributes).to eq expected }
     end
@@ -142,7 +143,7 @@ describe Caracal::Core::Models::LinkModel do
     # .option_keys
     describe '.option_keys' do
       let(:actual)   { subject.send(:option_keys).sort }
-      let(:expected) { [:content, :href, :font, :color, :size, :bold, :italic, :underline, :bgcolor].sort }
+      let(:expected) { [:content, :href, :font, :color, :size, :bold, :italic, :underline, :bgcolor, :vertical_align].sort }
 
       it { expect(actual).to eq expected }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caracal
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Trade Infomatics
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri