xmlss 0.3.1 → 0.4.0

data/examples/simple.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet">
+  <Styles>
+  </Styles>
+  
+  <Worksheet ss:Name="1 row, 5 columns">
+    <Table>
+      <Column />
+      <Column />
+      <Column />
+      <Column />
+      <Column />
+      <Row>
+        <Cell>
+          <Data ss:Type="Number">1</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">text</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="Number">123.45</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">0001267</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">$45.23</Data>
+        </Cell>
+      </Row>
+    </Table>
+  </Worksheet>
+</Workbook>

data/examples/styles.rb

@@ -1,55 +1,54 @@
 require 'examples/example_workbook'
 
-class Styles < ExampleWorkbook
-  def name; "styles"; end
-  def build
+# $ bundle exec ruby examples/styles.rb
 
-    wksht = Xmlss::Worksheet.new('styles')
-    wksht.table.columns << Xmlss::Column.new
+ExampleWorkbook.new("styles") do
 
-    self.styles << Xmlss::Style::Base.new('centered') do
-      alignment(
-        :horizontal => :center,
-        :vertical => :center
-      )
+  worksheet 'styles' do
+    column
+
+    style 'centered' do
+      alignment(:horizontal => :center, :vertical => :center)
     end
-    wksht.table.rows << Xmlss::Row.new
-    wksht.table.rows[0].cells << Xmlss::Cell.new({
-      :style_id => "centered",
-      :data => Xmlss::Data.new("x")
-    })
 
-    self.styles << Xmlss::Style::Base.new('bordered') do
+    row {
+      cell(:style_id => "centered") { data "x" }
+    }
+
+    style 'bordered' do
       alignment(:wrap_text => true)
-      border(
-        :position => :top,
-        :weight => :hairline,
-        :line_style => :continuous
-      )
-      border(
-        :position => :right,
-        :weight => :medium,
-        :line_style => :continuous
-      )
-      border(
-        :position => :bottom,
-        :weight => :thick,
-        :line_style => :dash_dot,
-        :color => '#00FF00'
-      )
-      border(
-        :position => :left,
-        :weight => :thin,
-        :line_style => :dot
-      )
+      borders {
+        border(
+          :position => :top,
+          :weight => :hairline,
+          :line_style => :continuous
+        )
+        border(
+          :position => :right,
+          :weight => :medium,
+          :line_style => :continuous
+        )
+        border(
+          :position => :bottom,
+          :weight => :thick,
+          :line_style => :dash_dot,
+          :color => '#00FF00'
+        )
+        border(
+          :position => :left,
+          :weight => :thin,
+          :line_style => :dot
+        )
+      }
     end
-    wksht.table.rows << Xmlss::Row.new
-    wksht.table.rows[1].cells << Xmlss::Cell.new({
-      :style_id => "bordered",
-      :data => Xmlss::Data.new(%{blah blah blah blah blah\nblah blah blah blah\nblah blah blah blah})
-    })
 
-    self.styles << Xmlss::Style::Base.new('fonted') do
+    row {
+      cell(:style_id => "bordered") {
+        data %{blah blah blah blah blah\nblah blah blah blah\nblah blah blah blah}
+      }
+    }
+
+    style 'fonted' do
       font(
         :bold => true,
         :color => "#FF0000",
@@ -59,13 +58,12 @@ class Styles < ExampleWorkbook
         :underline => true
       )
     end
-    wksht.table.rows << Xmlss::Row.new
-    wksht.table.rows[2].cells << Xmlss::Cell.new({
-      :style_id => "fonted",
-      :data => Xmlss::Data.new("Cool Font Styles!!")
-    })
 
-    self.styles << Xmlss::Style::Base.new('interior') do
+    row {
+      cell(:style_id => "fonted") { data "Cool Font Styles!!" }
+    }
+
+    style 'interior' do
       interior(
         :color => "#FF0000",
         :pattern => :diag_cross,
@@ -73,13 +71,11 @@ class Styles < ExampleWorkbook
       )
       font(:color => "#FFFFFF")
     end
-    wksht.table.rows << Xmlss::Row.new
-    wksht.table.rows[3].cells << Xmlss::Cell.new({
-      :style_id => "interior",
-      :data => Xmlss::Data.new("Weird Styles Man...")
-    })
 
-    self.worksheets << wksht
+    row {
+      cell(:style_id => "interior") { data "Weird Styles Man..." }
+    }
+
   end
+
 end
-Styles.new.to_file(:format)

data/examples/styles.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet">
+  <Styles>
+    <Style ss:ID="centered">
+      <Alignment ss:Horizontal="Center" ss:Vertical="Center" />
+    </Style>
+    <Style ss:ID="bordered">
+      <Alignment ss:WrapText="1" />
+      <Borders>
+        <Border ss:LineStyle="Continuous" ss:Position="Top" ss:Weight="0" />
+        <Border ss:LineStyle="Continuous" ss:Position="Right" ss:Weight="2" />
+        <Border ss:Color="#00FF00" ss:LineStyle="DashDot" ss:Position="Bottom" ss:Weight="3" />
+        <Border ss:LineStyle="Dot" ss:Position="Left" ss:Weight="1" />
+      </Borders>
+    </Style>
+    <Style ss:ID="fonted">
+      <Font ss:Bold="1" ss:Color="#FF0000" ss:Italic="1" ss:Size="18" ss:StrikeThrough="1" />
+    </Style>
+    <Style ss:ID="interior">
+      <Interior ss:Color="#FF0000" ss:Pattern="DiagCross" ss:PatternColor="#00FFFF" />
+      <Font ss:Color="#FFFFFF" />
+    </Style>
+  </Styles>
+  
+  <Worksheet ss:Name="styles">
+    <Table>
+      <Column />
+      <Row>
+        <Cell ss:StyleID="centered">
+          <Data ss:Type="String">x</Data>
+        </Cell>
+      </Row>
+      <Row>
+        <Cell ss:StyleID="bordered">
+          <Data ss:Type="String">blah blah blah blah blah&#13;&#10;blah blah blah blah&#13;&#10;blah blah blah blah</Data>
+        </Cell>
+      </Row>
+      <Row>
+        <Cell ss:StyleID="fonted">
+          <Data ss:Type="String">Cool Font Styles!!</Data>
+        </Cell>
+      </Row>
+      <Row>
+        <Cell ss:StyleID="interior">
+          <Data ss:Type="String">Weird Styles Man...</Data>
+        </Cell>
+      </Row>
+    </Table>
+  </Worksheet>
+</Workbook>

data/examples/text.rb

@@ -1,36 +1,26 @@
 require 'examples/example_workbook'
 
-class Text < ExampleWorkbook
-  def name; "text"; end
-  def build
+# $ bundle exec ruby examples/text.rb
 
-    # add in general text style
-    self.styles << Xmlss::Style::Base.new('general_text') do
-      alignment(
-        :horizontal => :left,
-        :vertical => :top,
-        :wrap_text => true
-      )
-      number_format(
-        :format => "@"  # set format to text explicitly
-      )
-    end
+ExampleWorkbook.new("text") do
 
-    # add single cell with text data and specify general text style
-    wksht = Xmlss::Worksheet.new('text')
-    wksht.table.columns << Xmlss::Column.new
-    row1 = Xmlss::Row.new
-    row1.cells << Xmlss::Cell.new({
-      :style_id => "general_text",
-      :data => Xmlss::Data.new(%{
+  style 'general_text' do
+    alignment(:horizontal => :left, :vertical => :top, :wrap_text => true)
+    # set format to text explicitly
+    number_format("@")
+  end
+
+  worksheet('text') do
+    column
+
+    row {
+      cell(:style_id => "general_text") {
+        data %{
 A blob of text
 with line breaks
-  and leading space
-      })
-    })
-    wksht.table.rows << row1
-    self.worksheets << wksht
-
+  and leading space}
+      }
+    }
   end
+
 end
-Text.new.to_file(:format)

data/examples/text.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet">
+  <Styles>
+    <Style ss:ID="general_text">
+      <Alignment ss:Horizontal="Left" ss:Vertical="Top" ss:WrapText="1" />
+      <NumberFormat ss:Format="@" />
+    </Style>
+  </Styles>
+  
+  <Worksheet ss:Name="text">
+    <Table>
+      <Column />
+      <Row>
+        <Cell ss:StyleID="general_text">
+          <Data ss:Type="String">&#13;&#10;A blob of text&#13;&#10;with line breaks&#13;&#10;  and leading space</Data>
+        </Cell>
+      </Row>
+    </Table>
+  </Worksheet>
+</Workbook>

data/lib/xmlss/{cell.rb → element/cell.rb}

@@ -1,28 +1,18 @@
-require 'xmlss/data'
-
-module Xmlss
+module Xmlss; end
+module Xmlss::Element
   class Cell
 
-    include Xmlss::Xml
-    def xml
-      { :node => :cell,
-        :attributes => [:index, :style_i_d, :formula, :h_ref, :merge_across, :merge_down],
-        :children => [:data] }
-    end
-
-    attr_accessor :style_id, :formula, :href, :merge_across, :merge_down
-    attr_accessor :index, :data
+    attr_accessor :index, :style_id, :formula, :href, :merge_across, :merge_down
     alias_method :style_i_d, :style_id
     alias_method :h_ref, :href
 
-    def initialize(attrs={})
+    def initialize(attrs={}, &build)
       self.index = attrs[:index]
       self.style_id = attrs[:style_id]
       self.formula = attrs[:formula]
       self.href = attrs[:href]
       self.merge_across = attrs[:merge_across] || 0
       self.merge_down = attrs[:merge_down] || 0
-      self.data = attrs[:data]
     end
 
     [:index, :merge_across, :merge_down].each do |meth|

data/lib/xmlss/{column.rb → element/column.rb}

@@ -1,12 +1,7 @@
-module Xmlss
+module Xmlss; end
+module Xmlss::Element
   class Column
 
-    include Xmlss::Xml
-    def xml
-      { :node => :column,
-        :attributes => [:style_i_d, :width, :auto_fit_width, :hidden] }
-    end
-
     attr_accessor :style_id, :width, :auto_fit_width, :hidden
     alias_method :style_i_d, :style_id
 

data/lib/xmlss/{data.rb → element/data.rb}

@@ -1,17 +1,12 @@
 require 'date'
+require 'enumeration'
 
-module Xmlss
+module Xmlss; end
+module Xmlss::Element
   class Data
 
     LB = "
"
 
-    include Xmlss::Xml
-    def xml
-      { :node => :data,
-        :attributes => [:type],
-        :value => :xml_value }
-    end
-
     include Enumeration
     enum :type, {
       :number => "Number",
@@ -36,13 +31,13 @@ module Xmlss
     end
 
     def xml_value
-      case value
+      case self.value
       when ::Date, ::Time, ::DateTime
-        value.strftime("%Y-%m-%dT%H:%M:%S")
+        self.value.strftime("%Y-%m-%dT%H:%M:%S")
       when ::String, ::Symbol
-        value.to_s.gsub(/(\r|\n)+/, LB)
+        self.value.to_s.gsub(/(\r|\n)+/, LB)
       else
-        value.to_s
+        self.value.to_s
       end
     end
 

data/lib/xmlss/{row.rb → element/row.rb}

@@ -1,18 +1,8 @@
-require 'xmlss/item_set'
-require 'xmlss/cell'
-
-module Xmlss
+module Xmlss; end
+module Xmlss::Element
   class Row
 
-    include Xmlss::Xml
-    def xml
-      { :node => :row,
-        :attributes => [:style_i_d, :height, :auto_fit_height, :hidden],
-        :children => [:cells] }
-    end
-
     attr_accessor :style_id, :height, :auto_fit_height, :hidden
-    attr_accessor :cells
     alias_method :style_i_d, :style_id
 
     def initialize(attrs={})
@@ -20,7 +10,6 @@ module Xmlss
       self.height = attrs[:height]
       self.auto_fit_height = attrs[:auto_fit_height] || false
       self.hidden = attrs[:hidden] || false
-      self.cells = Xmlss::ItemSet.new(nil, attrs[:cells] || [])
     end
 
     def height=(value)

data/lib/xmlss/{worksheet.rb → element/worksheet.rb}

@@ -1,20 +1,16 @@
-require 'xmlss/table'
+require 'xmlss/element/column'
+require 'xmlss/element/row'
+require 'xmlss/element/cell'
+require 'xmlss/element/data'
 
-module Xmlss
+module Xmlss; end
+module Xmlss::Element
   class Worksheet
 
-    include Xmlss::Xml
-    def xml
-      { :node => :worksheet,
-        :attributes => [:name],
-        :children => [:table] }
-    end
-
-    attr_accessor :name, :table
+    attr_accessor :name
 
     def initialize(name, attrs={})
       self.name = name
-      self.table = attrs[:table] || Table.new
     end
 
     def name=(value)
@@ -24,13 +20,6 @@ module Xmlss
       @name = sanitized_name(value.to_s)
     end
 
-    def table=(value)
-      if value.nil? || !value.kind_of?(Table)
-        raise ArgumentError, "you must set table to an actual Table object"
-      end
-      @table = value
-    end
-
     private
 
     def sanitized_name(name)

data/lib/xmlss/style/alignment.rb

@@ -1,10 +1,7 @@
+require 'xmlss/style/base'
+
 module Xmlss::Style
   class Alignment
-    include Xmlss::Xml
-    def xml
-      { :node => :alignment,
-        :attributes => [:horizontal, :vertical, :wrap_text, :rotate] }
-    end
 
     include Enumeration
     enum :horizontal, {
@@ -33,11 +30,7 @@ module Xmlss::Style
 
     def rotate=(value)
       @rotate = if value.kind_of?(::Numeric)
-        if value <= 90 && value >= -90
-          value.round
-        else
-          nil
-        end
+        value <= 90 && value >= -90 ? value.round : nil
       else
         nil
       end

data/lib/xmlss/style/base.rb

@@ -1,4 +1,7 @@
-require 'xmlss/item_set'
+module Xmlss;end
+module Xmlss::Style; end
+
+require 'enumeration'
 require 'xmlss/style/alignment'
 require 'xmlss/style/border'
 require 'xmlss/style/font'
@@ -8,56 +11,14 @@ require 'xmlss/style/protection'
 
 module Xmlss::Style
   class Base
-    include Xmlss::Xml
-    def xml
-      { :node => :style,
-        :attributes => [:i_d],
-        :children => [
-          :alignment, :borders, :font, :interior, :number_format, :protection
-        ]}
-    end
 
-    attr_reader :id, :borders
+    attr_reader :id
     alias_method :i_d, :id
-    attr_writer :alignment, :font, :interior, :number_format, :protection
 
-    def initialize(id, &block)
+    def initialize(id)
       raise ArgumentError, "please choose an id for the style" if id.nil?
       @id = id.to_s
-      self.borders = Xmlss::ItemSet.new(:borders)
-      instance_eval(&block) if block
-    end
-
-    def borders=(value)
-      if !value.kind_of? Xmlss::ItemSet
-        raise ArgumentError, "must set borders to an Xmlss::ItemSet value"
-      end
-      @borders = value
-    end
-
-    def border(opts = nil)
-      valid_attrs?(opts) do |attrs|
-        @borders << Border.new(attrs)
-      end
     end
 
-    [:alignment, :font, :interior, :number_format, :protection].each do |meth|
-      define_method(meth) do |*args|
-        valid_attrs?(args.first) do |attrs|
-          instance_variable_set("@#{meth}", klass(meth).new(attrs))
-        end
-        instance_variable_get("@#{meth}")
-      end
-    end
-
-    protected
-
-    def valid_attrs?(attrs)
-      yield attrs if block_given? && attrs && attrs.kind_of?(::Hash)
-    end
-
-    def klass(method_name)
-      Xmlss::Style.const_get(Xmlss.classify(method_name))
-    end
   end
 end

data/lib/xmlss/style/border.rb

@@ -1,12 +1,10 @@
+require 'xmlss/style/base'
+
 module Xmlss::Style
   class Border
-    include Xmlss::Xml
-    def xml
-      { :node => :border,
-        :attributes => [:color, :position, :weight, :line_style] }
-    end
 
     include Enumeration
+
     enum :position, {
       :left => "Left",
       :top => "Top",
@@ -15,12 +13,14 @@ module Xmlss::Style
       :diagonal_left => "DiagonalLeft",
       :diagonal_right => "DiagonalRight"
     }
+
     enum :weight, {
       :hairline => 0,
       :thin => 1,
       :medium => 2,
       :thick => 3
     }
+
     enum :line_style, {
       :none => "None",
       :continuous => "Continuous",

data/lib/xmlss/style/font.rb

@@ -1,14 +1,7 @@
+require 'xmlss/style/base'
+
 module Xmlss::Style
   class Font
-    include Xmlss::Xml
-    def xml
-      { :node => :font,
-        :attributes => [
-          :bold, :color, :italic, :size, :shadow,
-          :strike_through, :underline, :vertical_align,
-          :font_name
-        ] }
-    end
 
     include Enumeration
     enum :underline, {

data/lib/xmlss/style/interior.rb

@@ -1,10 +1,7 @@
+require 'xmlss/style/base'
+
 module Xmlss::Style
   class Interior
-    include Xmlss::Xml
-    def xml
-      { :node => :interior,
-        :attributes => [:color, :pattern, :pattern_color] }
-    end
 
     include Enumeration
     enum :pattern, {

data/lib/xmlss/style/number_format.rb

@@ -1,15 +1,12 @@
+require 'xmlss/style/base'
+
 module Xmlss::Style
   class NumberFormat
-    include Xmlss::Xml
-    def xml
-      { :node => :number_format,
-        :attributes => [:format] }
-    end
 
     attr_accessor :format
 
-    def initialize(attrs={})
-      self.format = attrs[:format]
+    def initialize(format=nil)
+      self.format = format
     end
 
     def format=(value)

data/lib/xmlss/style/protection.rb

@@ -1,15 +1,12 @@
+require 'xmlss/style/base'
+
 module Xmlss::Style
   class Protection
-    include Xmlss::Xml
-    def xml
-      { :node => :protection,
-        :attributes => [:protect] }
-    end
 
     attr_accessor :protect
 
-    def initialize(attrs={})
-      self.protect = attrs[:protect] || false
+    def initialize(value=nil)
+      self.protect = value
     end
 
     def protected?; !!self.protect; end