caracal 0.1.0 → 0.1.1

data/Rakefile

@@ -1,2 +1,7 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
 

data/caracal.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rubyzip',  '~> 1.1'
   spec.add_dependency 'tilt',     '~> 1.4'
   
-  spec.add_development_dependency 'bundler',  '~> 1.6'
+  spec.add_development_dependency 'bundler',  '~> 1.3'
+  spec.add_development_dependency 'rake',     '~> 10.0'
   spec.add_development_dependency 'rspec',    '~> 3.0'
 end

data/lib/caracal/core/images.rb

@@ -16,9 +16,8 @@ module Caracal
           # Public Methods
           #-------------------------------------------------------------
           
-          def img(*text, **options, &block)
-            text.flatten!            
-            options.merge!( { url: text[0] })  unless text[0].nil?
+          def img(url = nil, options={}, &block)
+            options.merge!({ url: url }) if url
             
             model = Caracal::Core::Models::ImageModel.new(options, &block)
             if model.valid?

data/lib/caracal/core/list_styles.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'caracal/core/models/list_style_model'
 require 'caracal/errors'
 
@@ -47,7 +48,7 @@ module Caracal
           
           #============== ATTRIBUTES ==========================
           
-          def list_style(**options, &block)
+          def list_style(options = {}, &block)
             model = Caracal::Core::Models::ListStyleModel.new(options, &block)
             
             if model.valid?

data/lib/caracal/core/lists.rb

@@ -18,7 +18,7 @@ module Caracal
           
           #============== ATTRIBUTES ==========================
           
-          def ol(**options, &block)
+          def ol(options = {}, &block)
             options.merge!({ type: :ordered, level: 0 })
             
             model = Caracal::Core::Models::ListModel.new(options, &block)
@@ -30,7 +30,7 @@ module Caracal
             model
           end
           
-          def ul(**options, &block)
+          def ul(options = {}, &block)
             options.merge!({ type: :unordered, level: 0 })
             
             model = Caracal::Core::Models::ListModel.new(options, &block)

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

@@ -12,7 +12,7 @@ module Caracal
         #-------------------------------------------------------------
     
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           options.keep_if { |k,v| option_keys.include? k }
           options.each do |(key, value)|
             send(key, value)

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

@@ -29,7 +29,7 @@ module Caracal
         attr_reader :border_type
         
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           @border_color   = DEFAULT_BORDER_COLOR
           @border_line    = DEFAULT_BORDER_LINE
           @border_size    = DEFAULT_BORDER_SIZE

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

@@ -34,7 +34,7 @@ module Caracal
         
         
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           @image_width  = DEFAULT_IMAGE_WIDTH
           @image_height = DEFAULT_IMAGE_HEIGHT
           @image_align  = DEFAULT_IMAGE_ALIGN

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

@@ -56,7 +56,7 @@ module Caracal
         #=============== SUB-METHODS ===========================
         
         # .ol
-        def ol(**options, &block)
+        def ol(options = {}, &block)
           options.merge!({ type: :ordered, level: list_item_level + 1 })
           
           model = Caracal::Core::Models::ListModel.new(options, &block)
@@ -68,7 +68,7 @@ module Caracal
         end
         
         # .ul
-        def ul(**options, &block)
+        def ul(options = {}, &block)
           options.merge!({ type: :unordered, level: list_item_level + 1 })
           
           model = Caracal::Core::Models::ListModel.new(options, &block)

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

@@ -26,7 +26,7 @@ module Caracal
         
         
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           @list_type  = DEFAULT_LIST_TYPE
           @list_level = DEFAULT_LIST_LEVEL
           
@@ -91,8 +91,8 @@ module Caracal
         #=============== SUB-METHODS ===========================
         
         # .li
-        def li(*args, **options, &block)
-          options.merge!({ content: args[0]    }) unless args[0].nil?
+        def li(content = nil, options = {}, &block)
+          options.merge!({ content: content }) if content
           options.merge!({ type:    list_type  })
           options.merge!({ level:   list_level })
           

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

@@ -32,7 +32,7 @@ module Caracal
         
         
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           @style_align   = DEFAULT_STYLE_ALIGN
           @style_left    = DEFAULT_STYLE_LEFT
           @style_line    = DEFAULT_STYLE_LINE

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

@@ -28,7 +28,7 @@ module Caracal
         
         
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           @margin_top    = DEFAULT_MARGIN_TOP
           @margin_bottom = DEFAULT_MARGIN_BOTTOM
           @margin_left   = DEFAULT_MARGIN_LEFT

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

@@ -23,7 +23,7 @@ module Caracal
         attr_reader :page_number_show
         
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           @page_number_show  = DEFAULT_PAGE_NUMBER_SHOW
           @page_number_align = DEFAULT_PAGE_NUMBER_ALIGN
           

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

@@ -23,7 +23,7 @@ module Caracal
         attr_reader :page_height
         
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           @page_width  = DEFAULT_PAGE_WIDTH
           @page_height = DEFAULT_PAGE_HEIGHT
           

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

@@ -27,7 +27,7 @@ module Caracal
         attr_reader :paragraph_underline
         
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           if content = options.delete(:content)
             text content, options.dup
           end
@@ -93,9 +93,9 @@ module Caracal
         #=============== SUB-METHODS ===========================
         
         # .link
-        def link(*args, **options, &block)
-          options.merge!({ content: args[0] }) unless args[0].nil?
-          options.merge!({ href:    args[1] }) unless args[1].nil?
+        def link(content = nil, href = nil, options = {}, &block)
+          options.merge!({ content: content }) if content
+          options.merge!({ href:    href    }) if href
           
           model = Caracal::Core::Models::LinkModel.new(options, &block)
           if model.valid?
@@ -106,8 +106,8 @@ module Caracal
         end
         
         # .text
-        def text(*args, **options, &block)
-          options.merge!({ content: args[0] }) unless args[0].nil?
+        def text(content = nil, options = {}, &block)
+          options.merge!({ content: content }) if content
           
           model = Caracal::Core::Models::TextModel.new(options, &block)
           if model.valid?

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

@@ -46,7 +46,7 @@ module Caracal
     
         
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           @style_default = false
           @style_base    = DEFAULT_STYLE_BASE
           @style_next    = DEFAULT_STYLE_NEXT

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

@@ -25,7 +25,7 @@ module Caracal
         attr_reader :cell_margins
         
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           @cell_background = DEFAULT_CELL_BACKGROUND
           @cell_margins    = DEFAULT_CELL_MARGINS
           
@@ -57,7 +57,11 @@ module Caracal
         #
         # In all cases, invalid options will simply be ignored.
         #
-        def apply_styles(**options)
+        def apply_styles(opts = {})
+          # make dup of options so we don't
+          # harm any siblings
+          options = opts.dup
+          
           # first, try apply to self
           options.each do |(k,v)|
             send(k, v)  if respond_to?(k)
@@ -119,7 +123,7 @@ module Caracal
         
         # models
         [:margins].each do |m|
-          define_method "#{ m }" do |**options, &block|
+          define_method "#{ m }" do |options = {}, &block|
             instance_variable_set("@cell_#{ m }", Caracal::Core::Models::MarginModel.new(options, &block))
           end
         end

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

@@ -38,7 +38,7 @@ module Caracal
         attr_reader :table_border_vertical    # returns border model
         
         # initialization
-        def initialize(**options, &block)
+        def initialize(options = {}, &block)
           @table_align          = DEFAULT_TABLE_ALIGN
           @table_border_color   = DEFAULT_TABLE_BORDER_COLOR
           @table_border_line    = DEFAULT_TABLE_BORDER_LINE
@@ -94,7 +94,7 @@ module Caracal
         #   t.cell_style t.rows[0], background: '3366cc', color: 'ffffff', bold: true
         # end
         #
-        def cell_style(models, **options)
+        def cell_style(models, options = {})
           [models].flatten.each do |m|
             m.apply_styles(options)
           end  
@@ -129,7 +129,7 @@ module Caracal
         
         # models
         [:top, :bottom, :left, :right, :horizontal, :vertical].each do |m|
-          define_method "border_#{ m }" do |**options, &block|
+          define_method "border_#{ m }" do |options = {}, &block|
             options.merge!({ type: m })
             instance_variable_set("@table_border_#{ m }", Caracal::Core::Models::BorderModel.new(options, &block))
           end

data/lib/caracal/core/page_numbers.rb

@@ -31,7 +31,7 @@ module Caracal
           # This method controls whether and how page numbers are displayed
           # on the document.
           #
-          def page_numbers(show = nil, **options, &block)
+          def page_numbers(show = nil, options = {}, &block)
             options.merge!({ show: !!show })
             model = Caracal::Core::Models::PageNumberModel.new(options, &block)
             

data/lib/caracal/core/page_settings.rb

@@ -33,7 +33,7 @@ module Caracal
           # This method controls the physical margins of the printed page. Defaults 
           # to 1in on each side.
           #
-          def page_margins(**options, &block)
+          def page_margins(options = {}, &block)
             model = Caracal::Core::Models::MarginModel.new(options, &block)
 
             if model.valid?
@@ -53,7 +53,7 @@ module Caracal
           # This method controls the physical width and height of the printed page. Defaults 
           # to US standard A4 portrait size.
           #
-          def page_size(**options, &block)
+          def page_size(options = {}, &block)
             model = Caracal::Core::Models::PageSizeModel.new(options, &block)
             
             if model.valid?

data/lib/caracal/core/relationships.rb

@@ -40,7 +40,7 @@ module Caracal
           
           #============== ATTRIBUTES ==========================
           
-          def relationship(**options, &block)
+          def relationship(options = {}, &block)
             id = relationship_counter.to_i + 1
             options.merge!({ id: id })
 

data/lib/caracal/core/rules.rb

@@ -16,7 +16,7 @@ module Caracal
           # Public Methods
           #-------------------------------------------------------------
           
-          def hr(**options, &block)
+          def hr(options = {}, &block)
             model = Caracal::Core::Models::RuleModel.new(options, &block)
             
             if model.valid?

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,7 +16,7 @@ module Caracal
           # Public Methods
           #-------------------------------------------------------------
           
-          def table(data, **options, &block)
+          def table(data, options = {}, &block)
             options.merge!({ data: data })
             
             model = Caracal::Core::Models::TableModel.new(options, &block)

data/lib/caracal/core/text.rb

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

data/lib/caracal/renderers/document_renderer.rb

@@ -66,20 +66,24 @@ module Caracal
       # This method renders a standard node of run properties based on the 
       # model's attributes.
       #
-      def render_run_attributes(xml, model)
+      def render_run_attributes(xml, model, paragraph_level=false)
         if model.respond_to? :run_attributes
           attrs = model.run_attributes.delete_if { |k, v| v.nil? } 
-        
-          xml.send 'w:rPr' do
-            unless attrs.empty?
-              xml.send 'w:rStyle', { 'w:val' => attrs[:style] }                            unless attrs[:style].nil?
-              xml.send 'w:color',  { 'w:val' => attrs[:color] }                            unless attrs[:color].nil?
-              xml.send 'w:sz',     { 'w:val' => attrs[:size]  }                            unless attrs[:size].nil?
-              xml.send 'w:b',      { 'w:val' => (attrs[:bold] ? '1' : '0') }               unless attrs[:bold].nil?
-              xml.send 'w:i',      { 'w:val' => (attrs[:italic] ? '1' : '0') }             unless attrs[:italic].nil?
-              xml.send 'w:u',      { 'w:val' => (attrs[:underline] ? 'single' : 'none') }  unless attrs[:underline].nil?
+          
+          if paragraph_level && attrs.empty?
+            # skip
+          else
+            xml.send 'w:rPr' do
+              unless attrs.empty?
+                xml.send 'w:rStyle', { 'w:val' => attrs[:style] }                            unless attrs[:style].nil?
+                xml.send 'w:color',  { 'w:val' => attrs[:color] }                            unless attrs[:color].nil?
+                xml.send 'w:sz',     { 'w:val' => attrs[:size]  }                            unless attrs[:size].nil?
+                xml.send 'w:b',      { 'w:val' => (attrs[:bold] ? '1' : '0') }               unless attrs[:bold].nil?
+                xml.send 'w:i',      { 'w:val' => (attrs[:italic] ? '1' : '0') }             unless attrs[:italic].nil?
+                xml.send 'w:u',      { 'w:val' => (attrs[:underline] ? 'single' : 'none') }  unless attrs[:underline].nil?
+              end
+              xml.send 'w:rtl',    { 'w:val' => '0' }
             end
-            xml.send 'w:rtl',    { 'w:val' => '0' }
           end
         end
       end
@@ -160,7 +164,7 @@ module Caracal
         
         xml.send 'w:hyperlink', { 'r:id' => rel.formatted_id } do
           xml.send 'w:r', run_options do
-            render_run_attributes(xml, model)
+            render_run_attributes(xml, model, false)
             xml.send 'w:t', { 'xml:space' => 'preserve' }, model.link_content
           end
         end
@@ -216,7 +220,7 @@ module Caracal
             xml.send 'w:pStyle',            { 'w:val' => model.paragraph_style }  unless model.paragraph_style.nil?
             xml.send 'w:contextualSpacing', { 'w:val' => '0' }
             xml.send 'w:jc',                { 'w:val' => model.paragraph_align }  unless model.paragraph_align.nil?
-            render_run_attributes(xml, model)
+            render_run_attributes(xml, model, true)
           end
           model.runs.each do |run|
             method = render_method_for_model(run)
@@ -239,12 +243,16 @@ module Caracal
       
       def render_text(xml, model)
         xml.send 'w:r', run_options do
-          render_run_attributes(xml, model)
+          render_run_attributes(xml, model, false)
           xml.send 'w:t', { 'xml:space' => 'preserve' }, model.text_content
         end
       end
       
       def render_table(xml, model)
+        borders = %w(top left bottom right horizontal vertical).select do |m|
+          model.send("table_border_#{ m }_size") > 0
+        end
+        
         xml.send 'w:tbl' do
           xml.send 'w:tblPr' do
             xml.send 'w:tblStyle',   { 'w:val' => 'DefaultTable' }
@@ -252,14 +260,13 @@ module Caracal
             xml.send 'w:tblW',       { 'w:w'   => model.table_width.to_f, 'w:type' => 'dxa' }
             xml.send 'w:tblInd',     { 'w:w'   => '0.0', 'w:type' => 'dxa' }
             xml.send 'w:jc',         { 'w:val' => model.table_align }
-            xml.send 'w:tblBorders' do
-              %w(top left bottom right horizontal vertical).each do |m|
-                size = model.send("table_border_#{ m }_size")
-                if size > 0
+            unless borders.empty?
+              xml.send 'w:tblBorders' do
+                borders.each do |m|
                   options = {
                     'w:color' => model.send("table_border_#{ m }_color"),
                     'w:val'   => model.send("table_border_#{ m }_line"),
-                    'w:sz'    => size,
+                    'w:sz'    => model.send("table_border_#{ m }_size"),
                     'w:space' => model.send("table_border_#{ m }_spacing")
                   }
                   xml.send "w:#{ Caracal::Core::Models::BorderModel.formatted_type(m) }", options
@@ -302,6 +309,10 @@ module Caracal
             end
           end
         end
+        
+        # don't know why this is needed, but it prevents a 
+        # rendering error.
+        render_linebreak(xml, Caracal::Core::Models::LineBreakModel.new)
       end