rodf 0.1.5 → 0.1.7

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.1.6. Fix date handling
 v0.1.5. Bug fix
 v0.1.4. Allow the setting of an entire cell's content to a hyperlink (by Merul Patel)
 v0.1.3. Dependency fix (by Merul Patel)

data/Manifest

@@ -6,18 +6,22 @@ Rakefile
 lib/odf/cell.rb
 lib/odf/column.rb
 lib/odf/container.rb
+lib/odf/data_style.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/style_section.rb
 lib/odf/table.rb
 rodf.gemspec
 spec/cell_spec.rb
+spec/data_style_spec.rb
 spec/property_spec.rb
 spec/row_spec.rb
 spec/spec_helper.rb
 spec/spreadsheet_spec.rb
+spec/style_section_spec.rb
 spec/style_spec.rb
 spec/table_spec.rb

data/lib/odf/cell.rb

@@ -26,7 +26,13 @@ module ODF
 
       @url = opts[:url]
       @type = opts[:type] || :string
-      @value = value.to_s.strip unless value.instance_of? Hash
+      unless value.instance_of?(Hash)
+        if [Date, DateTime, Time].include? value.class
+          @value = value.strftime("%Y-%m-%d")
+        else
+          @value = value.to_s.strip
+        end
+      end
 
       @elem_attrs = make_element_attributes(@type, @value, opts)
       @mutiply = (opts[:span] || 1).to_i
@@ -35,10 +41,14 @@ module ODF
     def xml
       markup = Builder::XmlMarkup.new
       text = markup.tag! 'table:table-cell', @elem_attrs do |xml|
-        if contains_url?
-          xml.text(:p){|x| x.text(:a, @value, 'xlink:href' => @url)}
-        elsif contains_string?
-          xml.text(:p, @value)
+        if contains_string?
+          xml.text:p do |p|
+            if contains_url?
+              p.text:a, @value, 'xlink:href' => @url
+            else
+              p << @value
+            end
+          end
         end
       end
       (@mutiply - 1).times {text = markup.tag! 'table:table-cell'}
@@ -55,7 +65,8 @@ module ODF
 
     def make_element_attributes(type, value, opts)
       attrs = {'office:value-type' => type}
-      attrs['office:value'] = value unless contains_string?
+      attrs['office:date-value'] = value if :date == type
+      attrs['office:value'] = value if :float == type
       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?

data/lib/odf/container.rb

@@ -25,7 +25,7 @@ module ODF
     def self.contains(*stuffs_array)
       stuffs_array.map {|sym| sym.to_s}.each do |stuffs|
         stuff = stuffs.to_s.singularize
-        stuff_class = eval(stuff.capitalize)
+        stuff_class = eval(stuff.camelize)
 
         self.class_eval "
           def #{stuffs}

data/lib/odf/data_style.rb

@@ -0,0 +1,45 @@
+# Copyright (c) 2010 Thiago Arrais
+#
+# This file is part of rODF.
+#
+# rODF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+
+# rODF is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'rubygems'
+
+require 'builder'
+
+require 'odf/container'
+require 'odf/style_section'
+
+module ODF
+  class DataStyle < Container
+    contains :style_sections
+
+    alias section style_section
+
+    def initialize(name, type)
+      @type, @name = type, name
+    end
+
+    def xml
+      Builder::XmlMarkup.new.tag! "number:#{@type}-style", 'style:name' => @name do |xml|
+        xml << style_sections_xml
+      end
+    end
+
+    def method_missing(name, *args)
+      section(name, *args)
+    end
+  end
+end

data/lib/odf/skeleton/styles.xml

@@ -17,6 +17,13 @@
     <number:number-style style:name="integer-grouped">
       <number:number number:decimal-places="0" number:min-integer-digits="1" number:grouping="true" />
     </number:number-style>
+    <number:date-style style:name="year-to-day-long">
+      <number:year number:style="long"/>
+      <number:text>-</number:text>
+      <number:month number:style="long"/>
+      <number:text>-</number:text>
+      <number:day number:style="long"/>
+    </number:date-style>
   </office:styles>
 </office:document-styles>
 

data/lib/odf/spreadsheet.rb

@@ -21,12 +21,13 @@ require 'builder'
 require 'zip/zip'
 
 require 'odf/container'
+require 'odf/data_style'
 require 'odf/style'
 require 'odf/table'
 
 module ODF
   class SpreadSheet < Container
-    contains :tables, :styles
+    contains :tables, :styles, :data_styles
 
     def self.file(ods_file_name)
       ods_file = Zip::ZipFile.open(ods_file_name, Zip::ZipFile::CREATE)
@@ -50,11 +51,13 @@ module ODF
                                         'xmlns:oooc' => "http://openoffice.org/2004/calc",
                                         'xmlns:style' => "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
                                         'xmlns:fo' => "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
+                                        'xmlns:number' => "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0",
                                         'xmlns:xlink' => "http://www.w3.org/1999/xlink" do
       |xml|
         xml.tag! 'office:automatic-styles' do
           xml << styles_xml
-        end unless styles.empty?
+          xml << data_styles_xml
+        end unless styles.empty? && data_styles.empty?
         xml.office:body do
           xml.office:spreadsheet do
             xml << tables_xml

data/lib/odf/style_section.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2010 Thiago Arrais
+#
+# This file is part of rODF.
+#
+# rODF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+
+# rODF is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'rubygems'
+
+require 'builder'
+
+module ODF
+  class StyleSection
+    def initialize(type, second = {})
+      @type = type
+      if second.instance_of?(Hash)
+        @elem_attrs = make_element_attributes(second)
+      else
+        @content, @elem_attrs = second, {}
+      end
+    end
+
+    def xml
+      Builder::XmlMarkup.new.number @type, @content, @elem_attrs
+    end
+
+    def make_element_attributes(opts)
+      {'number:style' => opts[:style], 'number:textual' => opts[:textual]}
+    end
+  end
+end
+

data/rodf.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rodf}
-  s.version = "0.1.5"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Thiago Arrais", "Merul Patel"]
-  s.date = %q{2010-04-08}
+  s.authors = ["Thiago Arrais"]
+  s.date = %q{2010-04-19}
   s.description = %q{ODF generation library for Ruby}
   s.email = %q{thiago.arrais@gmail.com}
-  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.extra_rdoc_files = ["CHANGELOG", "LICENSE.LGPL", "README.rdoc", "lib/odf/cell.rb", "lib/odf/column.rb", "lib/odf/container.rb", "lib/odf/data_style.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_section.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/data_style.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_section.rb", "lib/odf/style.rb", "lib/odf/table.rb", "rodf.gemspec", "spec/cell_spec.rb", "spec/data_style_spec.rb", "spec/property_spec.rb", "spec/row_spec.rb", "spec/spec_helper.rb", "spec/spreadsheet_spec.rb", "spec/style_section_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"]

data/spec/cell_spec.rb

@@ -102,10 +102,26 @@ describe ODF::Cell do
     doc.at('text:a')['xlink:href'].should == 'http://www.example.org'
   end
 
-  it "should have the URL set correctly when requested on a float" do
+  it "should ignore the URL requested on anything other than a string" do
     cell = ODF::Cell.new(47.1, :type => :float, :url => 'http://www.example.org')
-    doc = Hpricot(cell.xml)
-    doc.at('text:a')['xlink:href'].should == 'http://www.example.org'
-    doc.at('text:a').innerHTML.should == '47.1'
+    cell.xml.should_not have_tag('text:p')
+    cell.xml.should_not have_tag('text:a')
+
+    cell = ODF::Cell.new(Date.parse('15 Apr 2010'), :type => :date, :url => 'http://www.example.org')
+    cell.xml.should_not have_tag('text:p')
+    cell.xml.should_not have_tag('text:a')
+  end
+
+  it "should have the date set correctly" do
+    cell = Hpricot(ODF::Cell.new(Date.parse('15 Apr 2010'), :type => :date).xml).
+      at('table:table-cell')
+    cell['office:value-type'].should == 'date'
+    cell['office:date-value'].should == '2010-04-15'
+    cell['office:value'].should be_nil
+  end
+
+  it "should also accept strings as date values" do
+    Hpricot(ODF::Cell.new(Date.parse('16 Apr 2010'), :type => :date).xml).
+      at('table:table-cell')['office:date-value'] = '2010-04-16'
   end
 end

data/spec/data_style_spec.rb

@@ -0,0 +1,50 @@
+# Copyright (c) 2010 Thiago Arrais
+#
+# This file is part of rODF.
+#
+# rODF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+
+# rODF is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
+
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'odf/data_style'
+
+describe ODF::DataStyle do
+  it "should have sections" do
+    output = ODF::DataStyle.create 'year-to-day', :date do |s|
+      s.section :year, :style => 'long'
+      s.section :month, :style => 'long'
+      s.section :day
+    end
+
+    output.should have_tag('number:date-style')
+    output.should have_tag('number:year')
+    output.should have_tag('number:month')
+    output.should have_tag('number:day')
+
+    Hpricot(output).at('number:date-style')['style:name'].should == 'year-to-day'
+  end
+
+  it "should allow short section names" do
+    output = ODF::DataStyle.create 'year-to-day', :date do |number|
+      number.year :style => 'long'
+      number.month :style => 'long'
+      number.day
+    end
+
+    output.should have_tag('number:year')
+    output.should have_tag('number:month')
+    output.should have_tag('number:day')
+  end
+end
+

data/spec/spreadsheet_spec.rb

@@ -68,6 +68,14 @@ describe ODF::SpreadSheet do
     output.should have_tag('//style:style')
     Hpricot(output).at('//style:style')['style:name'].should == 'even-row-cell'
     Hpricot(output).at('//style:style')['style:family'].should == 'table-cell'
+  end
+
+  it "should have data styles" do
+    output = ODF::SpreadSheet.create do |ss|
+      ss.data_style 'year-to-day-long', :date
+    end
+    output.should have_tag('//office:automatic-styles/*', :count => 1)
+    output.should have_tag('//number:date-style')
   end
 end
 

data/spec/style_section_spec.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2010 Thiago Arrais
+#
+# This file is part of rODF.
+#
+# rODF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+
+# rODF is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
+
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'odf/style_section'
+
+describe ODF::StyleSection do
+  it "should allow style attribute" do
+    output = ODF::StyleSection.new(:year, :style => 'long').xml
+    output.should have_tag('number:year')
+    Hpricot(output).at('number:year')['number:style'].should == 'long'
+  end
+
+  it "should allow textual flag" do
+    output = ODF::StyleSection.new(:month, :textual => true).xml
+    Hpricot(output).at('number:month')['number:textual'].should == 'true'
+  end
+
+  it "should allow text to be inserted" do
+    Hpricot(ODF::StyleSection.new(:text, 'content').xml).
+      at('number:text').innerHTML.should == 'content'
+
+    Hpricot(ODF::StyleSection.new(:day).xml).
+      at('number:day').innerHTML.should == ''
+  end
+end
+

metadata

@@ -5,17 +5,16 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Thiago Arrais
-- Merul Patel
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -03:00
+date: 2010-04-19 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,11 +113,13 @@ extra_rdoc_files:
 - lib/odf/cell.rb
 - lib/odf/column.rb
 - lib/odf/container.rb
+- lib/odf/data_style.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_section.rb
 - lib/odf/style.rb
 - lib/odf/table.rb
 files: 
@@ -130,19 +131,23 @@ files:
 - lib/odf/cell.rb
 - lib/odf/column.rb
 - lib/odf/container.rb
+- lib/odf/data_style.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_section.rb
 - lib/odf/style.rb
 - lib/odf/table.rb
 - rodf.gemspec
 - spec/cell_spec.rb
+- spec/data_style_spec.rb
 - spec/property_spec.rb
 - spec/row_spec.rb
 - spec/spec_helper.rb
 - spec/spreadsheet_spec.rb
+- spec/style_section_spec.rb
 - spec/style_spec.rb
 - spec/table_spec.rb
 has_rdoc: true