caracal 0.1.1 → 0.1.2

data/lib/caracal/core/styles.rb

@@ -37,7 +37,7 @@ module Caracal
           
           #============== ATTRIBUTES ==========================
           
-          def style(options = {}, &block)
+          def style(options={}, &block)
             model = Caracal::Core::Models::StyleModel.new(options, &block)
             
             if model.valid?

data/lib/caracal/core/tables.rb

@@ -16,8 +16,9 @@ module Caracal
           # Public Methods
           #-------------------------------------------------------------
           
-          def table(data, options = {}, &block)
-            options.merge!({ data: data })
+          def table(*args, &block)
+            options = Caracal::Utilities.extract_options!(args)
+            options.merge!({ data: args.first }) if args.first
             
             model = Caracal::Core::Models::TableModel.new(options, &block)
             if respond_to?(:page_width)

data/lib/caracal/core/text.rb

@@ -18,8 +18,9 @@ module Caracal
           
           #============== PARAGRAPHS ==========================
           
-          def p(text = nil, options = {}, &block)
-            options.merge!({ content: text }) if text
+          def p(*args, &block)
+            options = Caracal::Utilities.extract_options!(args)
+            options.merge!({ content: args.first }) if args.first
             
             model = Caracal::Core::Models::ParagraphModel.new(options, &block)
             if model.valid?
@@ -37,9 +38,10 @@ module Caracal
           # model with an explicitly set style class.
           #
           [:h1, :h2, :h3, :h4, :h5, :h6].each do |cmd|
-            define_method "#{ cmd }" do |text = nil, options = {}, &block|
+            define_method "#{ cmd }" do |*args, &block|
+              options = Caracal::Utilities.extract_options!(args)
               options.merge!({ style: style_id_for_header(cmd) })
-              p(text, options, &block)
+              p(args.first, options, &block)
             end
           end
           

data/lib/caracal/document.rb

@@ -59,16 +59,6 @@ module Caracal
     # Public Class Methods
     #-------------------------------------------------------------
     
-    #============ GETTERS ===================================
-    
-    # This method returns an array of models which constitute the 
-    # set of instructions for producing the document content.
-    #
-    def contents
-      @contents ||= []
-    end
-    
-    
     #============ OUTPUT ====================================
     
     # This method renders a new Word document and returns it as a
@@ -120,6 +110,16 @@ module Caracal
     end
     
     
+    #============ GETTERS ===================================
+    
+    # This method returns an array of models which constitute the 
+    # set of instructions for producing the document content.
+    #
+    def contents
+      @contents ||= []
+    end
+    
+    
     #============ RENDERING =================================
     
     # This method renders the word document instance into 

data/lib/caracal/renderers/document_renderer.rb

@@ -183,7 +183,7 @@ module Caracal
       
       def render_listitem(xml, model, list_num)
         ls      = document.find_list_style(model.list_item_type, model.list_item_level)
-        hanging = ls.style_left.to_i - ls.style_line.to_i - 1
+        hanging = ls.style_left.to_i - ls.style_indent.to_i - 1
         
         xml.send 'w:p', paragraph_options do
           xml.send 'w:pPr' do

data/lib/caracal/renderers/numbering_renderer.rb

@@ -28,11 +28,11 @@ module Caracal
                     xml.send 'w:lvl', { 'w:ilvl' => s.style_level } do
                       xml.send 'w:start',      { 'w:val' => s.style_start }
                       xml.send 'w:numFmt',     { 'w:val' => s.style_format }
-                      xml.send 'w:lvlRestart', { 'w:val' => s.formatted_restart }
+                      xml.send 'w:lvlRestart', { 'w:val' => s.style_restart }
                       xml.send 'w:lvlText',    { 'w:val' => s.style_value }
                       xml.send 'w:lvlJc',      { 'w:val' => s.style_align }
                       xml.send 'w:pPr' do
-                        xml.send 'w:ind', { 'w:left' => s.style_left, 'w:firstLine' => s.style_line }
+                        xml.send 'w:ind', { 'w:left' => s.style_left, 'w:firstLine' => s.style_indent }
                       end
                       xml.send 'w:rPr' do
                         xml.send 'w:u', { 'w:val' => 'none' }

data/lib/caracal/utilities.rb

@@ -0,0 +1,23 @@
+# We're using this strategy borrowed from ActiveSupport to
+# make command syntax a little more flexible. In a perfect 
+# world we'd just use the double splat feature of Ruby, but 
+# support for that is pretty limited at this point, so we're 
+# going the extra mile to be cool.
+#
+module Caracal
+  class Utilities
+    
+    #-------------------------------------------------------------
+    # Public Class Methods
+    #-------------------------------------------------------------
+    
+    def self.extract_options!(args)
+      if args.last.is_a?(Hash)
+        args.pop
+      else
+        {}
+      end
+    end
+    
+  end
+end

data/lib/caracal/version.rb

@@ -1,3 +1,3 @@
 module Caracal
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

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

@@ -20,6 +20,12 @@ describe Caracal::Core::Models::LinkModel do
 
   describe 'configuration tests' do
     
+    # constants
+    describe 'constants' do
+      it { expect(described_class::DEFAULT_LINK_COLOR).to     eq '1155cc' }
+      it { expect(described_class::DEFAULT_LINK_UNDERLINE).to eq true }
+    end
+    
     # accessors
     describe 'accessors' do
       it { expect(subject.link_content).to eq 'Link Text' }

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

@@ -9,9 +9,9 @@ describe Caracal::Core::Models::ListStyleModel do
       value   '%3.'
       align   :right
       left    800
-      line    400
+      indent  400
       start   2
-      restart false
+      restart 2
     end
   end
   
@@ -23,11 +23,11 @@ describe Caracal::Core::Models::ListStyleModel do
     
     # constants
     describe 'constants' do
-      it { expect(described_class::DEFAULT_STYLE_ALIGN).to eq :left  }
-      it { expect(described_class::DEFAULT_STYLE_LEFT).to  eq 720    }
-      it { expect(described_class::DEFAULT_STYLE_LINE).to  eq 360    }
-      it { expect(described_class::DEFAULT_STYLE_START).to eq 1      }
-      it { expect(described_class::DEFAULT_STYLE_RESTART).to eq true }
+      it { expect(described_class::DEFAULT_STYLE_ALIGN).to   eq :left  }
+      it { expect(described_class::DEFAULT_STYLE_LEFT).to    eq 720    }
+      it { expect(described_class::DEFAULT_STYLE_INDENT).to  eq 360    }
+      it { expect(described_class::DEFAULT_STYLE_START).to   eq 1      }
+      it { expect(described_class::DEFAULT_STYLE_RESTART).to eq 1 }
     end
     
     # accessors
@@ -38,9 +38,9 @@ describe Caracal::Core::Models::ListStyleModel do
       it { expect(subject.style_value).to   eq '%3.'      }
       it { expect(subject.style_align).to   eq :right     }
       it { expect(subject.style_left).to    eq 800        }
-      it { expect(subject.style_line).to    eq 400        }
+      it { expect(subject.style_indent).to  eq 400        }
       it { expect(subject.style_start).to   eq 2          }
-      it { expect(subject.style_restart).to eq false      }
+      it { expect(subject.style_restart).to eq 2          }
     end
     
   end
@@ -85,28 +85,14 @@ describe Caracal::Core::Models::ListStyleModel do
       end
     end
     
-    # .formatted_restart
-    describe '.formatted_restart' do
-      describe 'when restart true' do
-        before { allow(subject).to receive(:style_restart).and_return(true) }
-        
-        it { expect(subject.formatted_restart).to eq '1' }
-      end
-      describe 'when unordered list' do
-        before { allow(subject).to receive(:style_restart).and_return(false) }
-        
-        it { expect(subject.formatted_restart).to eq '0' }
-      end
-    end
-    
     
     #=============== SETTERS ==========================
     
     # booleans
     describe '.restart' do
-      before { subject.restart(false) }
+      before { subject.restart(3) }
       
-      it { expect(subject.style_restart).to eq false }
+      it { expect(subject.style_restart).to eq 3 }
     end
     
     # integers
@@ -120,10 +106,10 @@ describe Caracal::Core::Models::ListStyleModel do
       
       it { expect(subject.style_left).to eq 800 }
     end
-    describe '.line' do
-      before { subject.line(400) }
+    describe '.indent' do
+      before { subject.indent(400) }
       
-      it { expect(subject.style_line).to eq 400 }
+      it { expect(subject.style_indent).to eq 400 }
     end
     describe '.start' do
       before { subject.start(2) }
@@ -202,7 +188,7 @@ describe Caracal::Core::Models::ListStyleModel do
     # .option_keys
     describe '.option_keys' do
       let(:actual)   { subject.send(:option_keys).sort }
-      let(:expected) { [:type, :level, :format, :value, :align, :left, :line, :start].sort }
+      let(:expected) { [:type, :level, :format, :value, :align, :left, :indent, :start].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: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Trade Infomatics
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -159,6 +159,7 @@ files:
 - lib/caracal/renderers/settings_renderer.rb
 - lib/caracal/renderers/styles_renderer.rb
 - lib/caracal/renderers/xml_renderer.rb
+- lib/caracal/utilities.rb
 - lib/caracal/version.rb
 - lib/tilt/caracal.rb
 - spec/lib/caracal/core/file_name_spec.rb