rodf 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.1.2. Cell span
 v0.1.1. Basic spreadsheet styling support
 v0.1.   First version with very basic support for spreadsheet generation
 

data/Manifest

@@ -1,22 +1,23 @@
-lib/odf/row.rb
-lib/odf/spreadsheet.rb
+CHANGELOG
+LICENSE.LGPL
+Manifest
+README.rdoc
+Rakefile
 lib/odf/cell.rb
 lib/odf/column.rb
-lib/odf/table.rb
+lib/odf/container.rb
 lib/odf/property.rb
-lib/odf/style.rb
+lib/odf/row.rb
 lib/odf/skeleton/manifest.xml
 lib/odf/skeleton/styles.xml
-lib/odf/container.rb
-CHANGELOG
-README.rdoc
-Rakefile
-LICENSE.LGPL
+lib/odf/spreadsheet.rb
+lib/odf/style.rb
+lib/odf/table.rb
+rodf.gemspec
 spec/cell_spec.rb
-spec/spreadsheet_spec.rb
-spec/spec_helper.rb
+spec/property_spec.rb
 spec/row_spec.rb
-spec/table_spec.rb
+spec/spec_helper.rb
+spec/spreadsheet_spec.rb
 spec/style_spec.rb
-spec/property_spec.rb
-Manifest
+spec/table_spec.rb

data/lib/odf/cell.rb

@@ -28,12 +28,16 @@ module ODF
       @value = value.to_s.strip unless value.instance_of? Hash
 
       @elem_attrs = make_element_attributes(@type, @value, opts)
+      @mutiply = (opts[:span] || 1).to_i
     end
 
     def xml
-      Builder::XmlMarkup.new.tag! 'table:table-cell', @elem_attrs do |xml|
+      markup = Builder::XmlMarkup.new
+      text = markup.tag! 'table:table-cell', @elem_attrs do |xml|
         xml.text(:p, @value) if contains_string?
       end
+      (@mutiply - 1).times {text = markup.tag! 'table:table-cell'}
+      text
     end
 
     def contains_string?
@@ -45,6 +49,7 @@ module ODF
       attrs['office:value'] = value unless contains_string?
       attrs['table:formula'] = opts[:formula] unless opts[:formula].nil?
       attrs['table:style-name'] = opts[:style] unless opts[:style].nil?
+      attrs['table:number-columns-spanned'] = opts[:span] unless opts[:span].nil?
       attrs['table:number-matrix-columns-spanned'] =
         attrs['table:number-matrix-rows-spanned'] = 1 if opts[:matrix_formula]
       attrs

data/lib/odf/property.rb

@@ -23,10 +23,11 @@ module ODF
     PROPERTY_NAMES = {:cell => 'style:table-cell-properties',
                       :text => 'style:text-properties',
                       :column => 'style:table-column-properties'}
+    TRANSLATED_SPECS = [:border_color, :border_style, :border_width]
 
     def initialize(type, specs={})
       @name = PROPERTY_NAMES[type]
-      @specs = specs.map { |k, v| [k.to_s, v] }
+      @specs = translate(specs).map { |k, v| [k.to_s, v] }
     end
 
     def xml
@@ -36,6 +37,37 @@ module ODF
       end
       Builder::XmlMarkup.new.tag! @name, specs
     end
+  private
+    def translate(specs)
+      result = specs.clone
+      tspecs = specs.select {|k, v| TRANSLATED_SPECS.include? k}
+      tspecs.map {|k, v| result.delete k}
+      tspecs = tspecs.inject({}) {|acc, e| acc.merge e.first => e.last}
+      if tspecs[:border_width] && tspecs[:border_style] && tspecs[:border_color] then
+        width = tspecs[:border_width].split
+        style = tspecs[:border_style].split
+        color = tspecs[:border_color].split
+        if width.length == 1 && style.length == 1 && color.length == 1 then
+          result[:border] = [width[0], style[0], color[0]].join(' ')
+        else
+          result['border-top'] = cascading_join(width, style, color, 0)
+          result['border-right'] = cascading_join(width, style, color, 1, 0)
+          result['border-bottom'] = cascading_join(width, style, color, 2, 0)
+          result['border-left'] = cascading_join(width, style, color, 3, 1, 0)
+        end
+      end
+      result
+    end
+
+    def cascading_join(width_parts, style_parts, color_parts, *prefs)
+      [ cascade(width_parts, prefs),
+        cascade(style_parts, prefs),
+        cascade(color_parts, prefs)].join(' ')
+    end
+
+    def cascade(list, prefs)
+      prefs.inject(nil) {|acc, i| acc || list[i]}
+    end
   end
 end
 

data/rodf.gemspec

@@ -2,26 +2,25 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rodf}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Arrais"]
-  s.date = %q{2008-12-02}
+  s.date = %q{2009-10-28}
   s.description = %q{ODF generation library for Ruby}
   s.email = %q{thiago.arrais@gmail.com}
-  s.extra_rdoc_files = ["lib/odf/row.rb", "lib/odf/spreadsheet.rb", "lib/odf/cell.rb", "lib/odf/column.rb", "lib/odf/table.rb", "lib/odf/property.rb", "lib/odf/style.rb", "lib/odf/skeleton/manifest.xml", "lib/odf/skeleton/styles.xml", "lib/odf/container.rb", "CHANGELOG", "README.rdoc", "LICENSE.LGPL"]
-  s.files = ["lib/odf/row.rb", "lib/odf/spreadsheet.rb", "lib/odf/cell.rb", "lib/odf/column.rb", "lib/odf/table.rb", "lib/odf/property.rb", "lib/odf/style.rb", "lib/odf/skeleton/manifest.xml", "lib/odf/skeleton/styles.xml", "lib/odf/container.rb", "CHANGELOG", "README.rdoc", "Rakefile", "LICENSE.LGPL", "spec/cell_spec.rb", "spec/spreadsheet_spec.rb", "spec/spec_helper.rb", "spec/row_spec.rb", "spec/table_spec.rb", "spec/style_spec.rb", "spec/property_spec.rb", "Manifest", "rodf.gemspec"]
-  s.has_rdoc = true
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE.LGPL", "README.rdoc", "lib/odf/cell.rb", "lib/odf/column.rb", "lib/odf/container.rb", "lib/odf/property.rb", "lib/odf/row.rb", "lib/odf/skeleton/manifest.xml", "lib/odf/skeleton/styles.xml", "lib/odf/spreadsheet.rb", "lib/odf/style.rb", "lib/odf/table.rb"]
+  s.files = ["CHANGELOG", "LICENSE.LGPL", "Manifest", "README.rdoc", "Rakefile", "lib/odf/cell.rb", "lib/odf/column.rb", "lib/odf/container.rb", "lib/odf/property.rb", "lib/odf/row.rb", "lib/odf/skeleton/manifest.xml", "lib/odf/skeleton/styles.xml", "lib/odf/spreadsheet.rb", "lib/odf/style.rb", "lib/odf/table.rb", "rodf.gemspec", "spec/cell_spec.rb", "spec/property_spec.rb", "spec/row_spec.rb", "spec/spec_helper.rb", "spec/spreadsheet_spec.rb", "spec/style_spec.rb", "spec/table_spec.rb"]
   s.homepage = %q{http://github.com/thiagoarrais/rodf/tree}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rodf", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rodf}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{ODF generation library for Ruby}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])

data/spec/cell_spec.rb

@@ -88,4 +88,11 @@ describe ODF::Cell do
     Hpricot(cell.xml).at('table:table-cell')['table:style-name'].
       should == 'left-column-cell'
   end
+
+  it "should span multiple cells when asked to" do
+    cell = ODF::Cell.new 'Spreadsheet title', :span => 4
+    doc = Hpricot(cell.xml)
+    doc.at('table:table-cell')['table:number-columns-spanned'].should == '4'
+    doc.search('table:table-cell').size.should == 4
+  end
 end

data/spec/property_spec.rb

@@ -35,5 +35,79 @@ describe ODF::Property do
     elem = Hpricot(property.xml).at('//style:table-column-properties')
     elem['style:column-width'].should == '2cm'
   end
+
+  it "should accept full perimeter border specs" do
+    property = ODF::Property.new :cell, :border => "0.025in solid #000000"
+
+    Hpricot(property.xml).at('//style:table-cell-properties')['fo:border'].
+      should == "0.025in solid #000000"
+  end
+
+  it "should accept splited full perimeter border specs" do
+    property = ODF::Property.new :cell, :border_width => '0.025in',
+                                        :border_color => '#000000',
+                                        :border_style => 'solid'
+
+    Hpricot(property.xml).at('//style:table-cell-properties')['fo:border'].
+      should == "0.025in solid #000000"
+  end
+
+  it "should use the first value for vertical and second for horizontal border side specs" do
+    property = ODF::Property.new :cell, :border_width => '0.025in 0.3in',
+                                        :border_color => '#ff0000 #0000ff',
+                                        :border_style => 'solid'
+
+    elem= Hpricot(property.xml).at('//style:table-cell-properties')
+    elem['fo:border-top'].should == "0.025in solid #ff0000"
+    elem['fo:border-right'].should == "0.3in solid #0000ff"
+    elem['fo:border-bottom'].should == "0.025in solid #ff0000"
+    elem['fo:border-left'].should == "0.3in solid #0000ff"
+  end
+
+  it "should use the third value for bottom border specs when present" do
+    property = ODF::Property.new :cell, :border_width => '0.025in 0.3in 0.4in',
+                                        :border_color => '#ff0000 #0000ff',
+                                        :border_style => 'dotted solid solid'
+
+    elem = Hpricot(property.xml).at('//style:table-cell-properties')
+    elem['fo:border-bottom'].should == "0.4in solid #ff0000"
+
+    property = ODF::Property.new :cell, :border_width => '0.025in',
+                                        :border_color => '#ff0000 #0000ff #00ff00',
+                                        :border_style => 'dotted solid'
+
+    elem = Hpricot(property.xml).at('//style:table-cell-properties')
+    elem['fo:border-bottom'].should == "0.025in dotted #00ff00"
+  end
+
+  it "should cascade left border specs from fourth to second to first" do
+    property = ODF::Property.new :cell, :border_width => '0.1in 0.2in 0.3in 0.4in',
+                                        :border_color => '#ff0000 #0000ff #00ff00',
+                                        :border_style => 'dotted solid'
+
+    elem = Hpricot(property.xml).at('//style:table-cell-properties')
+    elem['fo:border-left'].should == "0.4in solid #0000ff"
+
+    property = ODF::Property.new :cell, :border_width => '0.1in 0.2in 0.3in',
+                                        :border_color => '#ff0000 #0000ff',
+                                        :border_style => 'dotted'
+
+    elem = Hpricot(property.xml).at('//style:table-cell-properties')
+    elem['fo:border-left'].should == "0.2in dotted #0000ff"
+
+    property = ODF::Property.new :cell, :border_width => '0.1in 0.2in',
+                                        :border_color => '#ff0000',
+                                        :border_style => 'dotted solid dashed double'
+
+    elem = Hpricot(property.xml).at('//style:table-cell-properties')
+    elem['fo:border-left'].should == "0.2in double #ff0000"
+
+    property = ODF::Property.new :cell, :border_width => '0.1in',
+                                        :border_color => '#ff0000 #0000ff #00ff00 #ffff00',
+                                        :border_style => 'dotted solid dashed'
+
+    elem = Hpricot(property.xml).at('//style:table-cell-properties')
+    elem['fo:border-left'].should == "0.1in solid #ffff00"
+  end
 end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rodf
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Thiago Arrais
@@ -9,69 +14,92 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-02 00:00:00 -03:00
+date: 2009-10-28 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rubyzip
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 11
         version: 1.1.11
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec_hpricot_matchers
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 2
         version: 3.0.2
-    version: 
+  type: :development
+  version_requirements: *id006
 description: ODF generation library for Ruby
 email: thiago.arrais@gmail.com
 executables: []
@@ -79,45 +107,47 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- lib/odf/row.rb
-- lib/odf/spreadsheet.rb
+- CHANGELOG
+- LICENSE.LGPL
+- README.rdoc
 - lib/odf/cell.rb
 - lib/odf/column.rb
-- lib/odf/table.rb
+- lib/odf/container.rb
 - lib/odf/property.rb
-- lib/odf/style.rb
+- lib/odf/row.rb
 - lib/odf/skeleton/manifest.xml
 - lib/odf/skeleton/styles.xml
-- lib/odf/container.rb
+- lib/odf/spreadsheet.rb
+- lib/odf/style.rb
+- lib/odf/table.rb
+files: 
 - CHANGELOG
-- README.rdoc
 - LICENSE.LGPL
-files: 
-- lib/odf/row.rb
-- lib/odf/spreadsheet.rb
+- Manifest
+- README.rdoc
+- Rakefile
 - lib/odf/cell.rb
 - lib/odf/column.rb
-- lib/odf/table.rb
+- lib/odf/container.rb
 - lib/odf/property.rb
-- lib/odf/style.rb
+- lib/odf/row.rb
 - lib/odf/skeleton/manifest.xml
 - lib/odf/skeleton/styles.xml
-- lib/odf/container.rb
-- CHANGELOG
-- README.rdoc
-- Rakefile
-- LICENSE.LGPL
+- lib/odf/spreadsheet.rb
+- lib/odf/style.rb
+- lib/odf/table.rb
+- rodf.gemspec
 - spec/cell_spec.rb
-- spec/spreadsheet_spec.rb
-- spec/spec_helper.rb
+- spec/property_spec.rb
 - spec/row_spec.rb
-- spec/table_spec.rb
+- spec/spec_helper.rb
+- spec/spreadsheet_spec.rb
 - spec/style_spec.rb
-- spec/property_spec.rb
-- Manifest
-- rodf.gemspec
+- spec/table_spec.rb
 has_rdoc: true
 homepage: http://github.com/thiagoarrais/rodf/tree
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -132,20 +162,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: rodf
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ODF generation library for Ruby
 test_files: []