xmlss 1.0.0.rc.1 → 1.0.0.rc.2

data/Gemfile

@@ -3,5 +3,7 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in xmlss.gemspec
 gemspec
 
+gem 'bundler', '~>1.1'
 gem 'rake', '~>0.9.2'
+gem "whysoslow", "~> 0.0"
 gem 'ruby-prof'

data/Gemfile.lock

@@ -1,30 +1,33 @@
 PATH
   remote: .
   specs:
-    xmlss (1.0.0.rc.1)
+    xmlss (1.0.0.rc.2)
       enumeration (~> 1.3)
-      undies (~> 2.2.1)
+      undies (~> 3.0.0.rc.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ansi (1.4.1)
+    ansi (1.4.2)
     assert (0.7.3)
       assert-view (~> 0.5)
-    assert-view (0.5.0)
+    assert-view (0.6.0)
       ansi (~> 1.3)
-      undies (~> 2.0)
     enumeration (1.3.1)
     rake (0.9.2)
     ruby-prof (0.10.8)
-    undies (2.2.1)
+    undies (3.0.0.rc.1)
+    whysoslow (0.0.2)
+      ansi (~> 1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  assert (~> 0.6)
-  bundler (~> 1.0)
+  assert (~> 0.7.3)
+  assert-view (~> 0.6)
+  bundler (~> 1.1)
   rake (~> 0.9.2)
   ruby-prof
+  whysoslow (~> 0.0)
   xmlss!

data/Rakefile

@@ -4,27 +4,46 @@ include Assert::RakeTasks
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-task :default => :run_all
-
-desc "Run the example workbook builds."
-task :run_examples do
-  require 'examples/simple'
-  require 'examples/layout'
-  require 'examples/text'
-  require 'examples/styles'
-end
+task :default => :build
+
+namespace :bench do
+
+  desc "Run the bench script."
+  task :run do
+    require 'bench/bench_runner'
+    XmlssBenchRunner.new(1000).run
+  end
+
+  desc "Run the profiler on 1000 rows."
+  task :profiler do
+    require 'bench/profiler_runner'
 
-desc "Run the profiler on 1000 rows."
-task :run_profiler do
-  require 'bench/profiler_runner'
+    runner = XmlssProfilerRunner.new(1000)
+    runner.print_flat(STDOUT, :min_percent => 1)
+  end
+
+  desc "Run the example workbook builds."
+  task :examples do
+    require 'examples/simple'
+    require 'examples/layout'
+    require 'examples/text'
+    require 'examples/styles'
+  end
+
+  desc "Run all the tests, then the profiler, then the bench."
+  task :all do
+    Rake::Task['test'].invoke
+    puts
+    Rake::Task['bench:profiler'].invoke
+    puts
+    Rake::Task['bench:run'].invoke
+    puts
+    Rake::Task['bench:examples'].invoke
+  end
 
-  runner = XmlssProfilerRunner.new(1000)
-  runner.print_flat(STDOUT, :min_percent => 3)
 end
 
-desc "Run all the tests, then the example builds, then the profiler."
-task :run_all do
-  Rake::Task['test'].invoke
-  Rake::Task['run_examples'].invoke
-  Rake::Task['run_profiler'].invoke
+task :bench do
+  Rake::Task['bench:run'].invoke
 end
+

data/bench/bench_runner.rb

@@ -0,0 +1,42 @@
+require 'whysoslow'
+require 'xmlss'
+
+class XmlssBenchRunner
+
+  attr_reader :result
+
+  def initialize(n)
+    @build = Proc.new do
+      Xmlss::Workbook.new(Xmlss::Writer.new(:pp => 2), &Proc.new do
+        worksheet("5 columns, #{n} rows") {
+          column
+          column
+          column
+          column
+          column
+
+          n.times do |i|
+            row {
+              # put data into the row (infer type)
+              [1, "text", 123.45, "0001267", "$45.23"].each do |data_value|
+                cell { data data_value }
+              end
+            }
+          end
+        }
+      end).to_file("./bench/profiler_#{n}.xml")
+    end
+
+    @printer = Whysoslow::DefaultPrinter.new({
+      :title => "#{n} rows",
+      :verbose => true
+    })
+
+    @runner = Whysoslow::Runner.new(@printer)
+  end
+
+  def run
+    @runner.run &@build
+  end
+
+end

data/examples/layout.xml

@@ -1,7 +1,6 @@
 <?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="first">
     <Table>

data/examples/simple.xml

@@ -1,7 +1,6 @@
 <?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>

data/lib/xmlss/element/cell.rb

@@ -7,8 +7,6 @@ module Xmlss::Element
     def self.writer; :cell; end
 
     attr_accessor :index, :style_id, :formula, :href, :merge_across, :merge_down
-    alias_method :style_i_d, :style_id
-    alias_method :h_ref, :href
 
     attr_accessor :data
 
@@ -21,18 +19,14 @@ module Xmlss::Element
       :error => "Error"
     }
 
-    def initialize(*args, &build)
+    def initialize(*args)
       attrs = args.last.kind_of?(::Hash) ? args.pop : {}
 
-      self.data = args.last.nil? ? (attrs[:data] || "") : args.last
-      self.type = attrs[:type] unless attrs[:type].nil?
+      self.data = [args.last, attrs.delete(:data), ''].reject{|v| v.nil?}.first
+      self.merge_across = attrs.delete(:merge_across) || 0
+      self.merge_down = attrs.delete(:merge_down) || 0
 
-      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
+      attrs.keys.each { |k| self.send("#{k}=", attrs[k]) }
     end
 
     def data=(v)
@@ -49,27 +43,38 @@ module Xmlss::Element
       end
     end
 
-    [:index, :merge_across, :merge_down].each do |meth|
-      define_method("#{meth}=") do |value|
-        if value && !value.kind_of?(::Fixnum)
-          raise ArgumentError, "must specify #{meth} as a Fixnum"
-        end
-        instance_variable_set("@#{meth}", value && value <= 0 ? nil : value)
+    def index=(value)
+      if value && !value.kind_of?(::Fixnum)
+        raise ArgumentError, "must specify `index` as a Fixnum"
       end
+      @index = (value && value <= 0 ? nil : value)
+    end
+
+    def merge_across=(value)
+      if value && !value.kind_of?(::Fixnum)
+        raise ArgumentError, "must specify `merge_across` as a Fixnum"
+      end
+      @merge_across = (value && value <= 0 ? nil : value)
+    end
+
+    def merge_down=(value)
+      if value && !value.kind_of?(::Fixnum)
+        raise ArgumentError, "must specify `merge_down` as a Fixnum"
+      end
+      @merge_down = (value && value <= 0 ? nil : value)
     end
 
     private
 
     def data_type(v)
-      case v
-      when ::Numeric
+      if v.kind_of?(::String) || v.kind_of?(::Symbol)
+        :string
+      elsif v.kind_of?(::Numeric)
         :number
-      when ::Date, ::Time
+      elsif v.kind_of?(::Date) || v.kind_of?(::Time)
         :date_time
-      when ::TrueClass, ::FalseClass
+      elsif v.kind_of?(::TrueClass) || v.kind_of?(::FalseClass)
         :boolean
-      when ::String, ::Symbol
-        :string
       else
         :string
       end

data/lib/xmlss/element/column.rb

@@ -5,7 +5,6 @@ module Xmlss::Element
     def self.writer; :column; end
 
     attr_accessor :style_id, :width, :auto_fit_width, :hidden
-    alias_method :style_i_d, :style_id
 
     def initialize(attrs={})
       self.style_id = attrs[:style_id]

data/lib/xmlss/element/row.rb

@@ -5,7 +5,6 @@ module Xmlss::Element
     def self.writer; :row; end
 
     attr_accessor :style_id, :height, :auto_fit_height, :hidden
-    alias_method :style_i_d, :style_id
 
     def initialize(attrs={})
       self.style_id = attrs[:style_id]

data/lib/xmlss/element/worksheet.rb

@@ -24,7 +24,7 @@ module Xmlss::Element
       @name = if !value.nil? && !value.to_s.empty?
         sanitized_name(value.to_s)
       else
-        ""  # TODO: make sure you don't write a worksheet with no sanitized_name
+        ""
       end
     end
 

data/lib/xmlss/element_stack.rb

@@ -12,7 +12,7 @@ module Xmlss
     def initialize(writer, markup_type)
       @stack = []
       @writer = writer
-      @markup_type = markup_type
+      @markup_type = markup_type.to_s
       @written_level = 0
     end
 
@@ -24,44 +24,38 @@ module Xmlss
     alias_method :current, :last
     alias_method :level, :size
 
+    def using(element, &block)
+      push(element)
+      (block || Proc.new {}).call
+      pop
+    end
+
     def push(element)
       if @written_level < level
-        open(current)
+        write(current)
+        @writer.push(@markup_type)
+        @written_level += 1
       end
       @stack.push(element)
     end
 
     def pop
       if !empty?
-        if @written_level < level
-          @stack.pop.tap { |elem| write(elem) }
-        else
-          @stack.pop.tap { |elem| close(elem) }
-        end
+        @written_level < level ? write(@stack.pop) : close(@stack.pop)
       end
     end
 
-    def using(element, &block)
-      push(element)
-      (block || Proc.new {}).call
-      pop
-    end
-
     private
 
-    def open(element)
-      write(element)
-      @writer.push(@markup_type)
-      @written_level += 1
-    end
-
     def close(element)
       @writer.pop(@markup_type)
       @written_level -= 1
+      element
     end
 
     def write(element)
       @writer.write(element)
+      element
     end
 
   end

data/lib/xmlss/style/base.rb

@@ -15,7 +15,6 @@ module Xmlss::Style
     def self.writer; :style; end
 
     attr_reader :id
-    alias_method :i_d, :id
 
     def initialize(id)
       raise ArgumentError, "please choose an id for the style" if id.nil?

data/lib/xmlss/style/font.rb

@@ -16,10 +16,8 @@ module Xmlss::Style
       :subscript => 'Subscript',
       :superscript => 'Superscript'
     }
-    alias_method :vertical_align, :alignment
 
     attr_accessor :bold, :color, :italic, :size, :strike_through, :shadow, :name
-    alias :font_name :name
 
     def initialize(attrs={})
       self.bold = attrs[:bold] || false

data/lib/xmlss/version.rb

@@ -1,3 +1,3 @@
 module Xmlss
-  VERSION = "1.0.0.rc.1"
+  VERSION = "1.0.0.rc.2"
 end

data/lib/xmlss/workbook.rb

@@ -101,26 +101,60 @@ module Xmlss
 
     # Workbook element attributes API
 
-    [ :data,            # cell
-      :type,            # cell
-      :index,           # cell
-      :style_id,        # cell, row, :column
-      :formula,         # cell
-      :href,            # cell
-      :merge_across,    # cell
-      :merge_down,      # cell
-      :height,          # row
-      :auto_fit_height, # row
-      :hidden,          # row, column
-      :width,           # column
-      :auto_fit_width,  # column
-      :name             # worksheet
-    ].each do |a|
-      define_method(a) do |value|
-        if (current_element = self.class.worksheets_stack(self).current)
-          current_element.send("#{a}=", value)
-        end
-      end
+    def data(value)  # cell
+      self.class.worksheets_stack(self).current.data = value
+    end
+
+    def type(value)  # cell
+      self.class.worksheets_stack(self).current.type = value
+    end
+
+    def index(value)  # cell
+      self.class.worksheets_stack(self).current.index = value
+    end
+
+    def style_id(value)  # cell, row, column
+      self.class.worksheets_stack(self).current.style_id = value
+    end
+
+    def formula(value)  # cell
+      self.class.worksheets_stack(self).current.formula = value
+    end
+
+    def href(value)  # cell
+      self.class.worksheets_stack(self).current.href = value
+    end
+
+    def merge_across(value)  # cell
+      self.class.worksheets_stack(self).current.merge_across = value
+    end
+
+    def merge_down(value)  # cell
+      self.class.worksheets_stack(self).current.merge_down = value
+    end
+
+    def height(value)  # row
+      self.class.worksheets_stack(self).current.height = value
+    end
+
+    def auto_fit_height(value)  # row
+      self.class.worksheets_stack(self).current.auto_fit_height = value
+    end
+
+    def hidden(value)  # row, column
+      self.class.worksheets_stack(self).current.hidden = value
+    end
+
+    def width(value)  # column
+      self.class.worksheets_stack(self).current.height = value
+    end
+
+    def auto_fit_width(value)  # column
+      self.class.worksheets_stack(self).current.auto_fit_width = value
+    end
+
+    def name(value)  # worksheet
+      self.class.worksheets_stack(self).current.name = value
     end
 
     # overriding to make less noisy

data/lib/xmlss/writer.rb

@@ -5,6 +5,7 @@ module Xmlss
   class Writer
 
     class Markup; end
+    class AttrsHash; end
 
     # Xmlss uses Undies to stream its xml markup
     # The Undies writer is responsible for driving the Undies API to generate
@@ -19,47 +20,14 @@ module Xmlss
     NS_URI   = "urn:schemas-microsoft-com:office:spreadsheet"
     LB       = "
"
 
-    def self.attributes(thing, *attrs)
-      [*attrs].flatten.inject({}) do |xattrs, a|
-        xattrs.merge(if !(xv = self.coerce(thing.send(a))).nil?
-          {xmlss_attribute_name(a) => xv.to_s}
-        else
-          {}
-        end)
-      end
-    end
-
-    def self.xmlss_attribute_name(attr_name)
-      "#{SHEET_NS}:#{self.classify(attr_name)}"
-    end
-
-    def self.classify(underscored_string)
-      underscored_string.
-        to_s.downcase.
-        split("_").
-        collect{|part| part.capitalize}.
-        join('')
-    end
-
-    def self.coerce(value)
-      if value == true
-        1
-      elsif ["",false].include?(value)
-        # don't include false or empty string values
-        nil
-      else
-        value
-      end
-    end
-
     attr_reader :styles_markup
     attr_reader :worksheets_markup
 
     def initialize(output_opts={})
       @opts = output_opts || {}
 
-      @styles_markup     = Markup.new(@opts.merge(:pp_level => 2))
-      @worksheets_markup = Markup.new(@opts.merge(:pp_level => 1))
+      @styles_markup     = Markup.new(@opts.merge(:level => 2))
+      @worksheets_markup = Markup.new(@opts.merge(:level => 1))
     end
 
     def write(element)
@@ -87,103 +55,128 @@ module Xmlss
       self.flush
       "".tap do |markup|
         Undies::Template.new(Undies::Source.new(Proc.new do
-          __ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-          _Workbook(XML_NS => NS_URI, "#{XML_NS}:#{SHEET_NS}" => NS_URI) {
-            _Styles {
-              __partial styles
+          _ raw("<?xml version=\"1.0\" encoding=\"UTF-8\"?>")
+          __open_element("Workbook", XML_NS => NS_URI, "#{XML_NS}:#{SHEET_NS}" => NS_URI) {
+            __open_element("Styles") {
+              __partial @styles
             }
-            __partial worksheets
+            __partial @worksheets
           }
         end), {
           :styles => styles_markup.to_s,
           :worksheets => worksheets_markup.to_s
-        }, Undies::Output.new(StringIO.new(markup), @opts))
+        }, Undies::IO.new(markup, @opts))
       end.strip
     end
 
     # workbook style markup directives
 
     def alignment(alignment)
-      styles_markup.template._Alignment(self.class.attributes(alignment, [
-        :horizontal, :vertical, :wrap_text, :rotate
-      ]))
+      styles_markup.inline_element("Alignment", AttrsHash.new.
+        value("Horizontal", alignment.horizontal).
+        value("Vertical",   alignment.vertical).
+        value("Rotate",     alignment.rotate).
+        bool( "WrapText",   alignment.wrap_text).
+        raw
+      )
     end
 
     def border(border)
-      styles_markup.template._Border(self.class.attributes(border, [
-        :color, :position, :weight, :line_style
-      ]))
+      styles_markup.inline_element("Border", AttrsHash.new.
+        value("Color",     border.color).
+        value("Position",  border.position).
+        value("Weight",    border.weight).
+        value("LineStyle", border.line_style).
+        raw
+      )
     end
 
     def borders(borders)
-      styles_markup.template._Borders
+      styles_markup.element("Borders", nil, {})
     end
 
     def font(font)
-      styles_markup.template._Font(self.class.attributes(font, [
-        :bold, :color, :italic, :size, :shadow, :font_name,
-        :strike_through, :underline, :vertical_align
-      ]))
+      styles_markup.inline_element("Font", AttrsHash.new.
+        bool( "Bold",          font.bold).
+        value("Color",         font.color).
+        bool( "Italic",        font.italic).
+        value("Size",          font.size).
+        bool( "Shadow",        font.shadow).
+        value("FontName",      font.name).
+        bool( "StrikeThrough", font.strike_through).
+        value("Underline",     font.underline).
+        value("VerticalAlign", font.alignment).
+        raw
+      )
     end
 
     def interior(interior)
-      styles_markup.template._Interior(self.class.attributes(interior, [
-        :color, :pattern, :pattern_color
-      ]))
+      styles_markup.inline_element("Interior", AttrsHash.new.
+        value("Color",        interior.color).
+        value("Pattern",      interior.pattern).
+        value("PatternColor", interior.pattern_color).
+        raw
+      )
     end
 
     def number_format(number_format)
-      styles_markup.template._NumberFormat(self.class.attributes(number_format, [
-        :format
-      ]))
+      a = AttrsHash.new.value("Format", number_format.format).raw
+      styles_markup.inline_element("NumberFormat", a)
     end
 
     def protection(protection)
-      styles_markup.template._Protection(self.class.attributes(protection, [
-        :protect
-      ]))
+      a = AttrsHash.new.bool("Protect", protection.protect).raw
+      styles_markup.inline_element("Protection", a)
     end
 
     def style(style)
-      styles_markup.template._Style(self.class.attributes(style, [
-        :i_d
-      ]))
+      a = AttrsHash.new.value("ID", style.id).raw
+      styles_markup.element("Style", nil, a)
     end
 
     # workbook element markup directives
 
     def cell(cell)
       # write the cell markup and push
-      worksheets_markup.template._Cell(self.class.attributes(cell, [
-        [:index, :style_i_d, :formula, :h_ref, :merge_across, :merge_down]
-      ]))
+      worksheets_markup.element("Cell", nil, AttrsHash.new.
+        value("Index",       cell.index).
+        value("StyleID",     cell.style_id).
+        value("Formula",     cell.formula).
+        value("HRef",        cell.href).
+        value("MergeAcross", cell.merge_across).
+        value("MergeDown",   cell.merge_down).
+        raw
+      )
       push(:worksheets)
 
       # write nested data markup and push
-      worksheets_markup.template._Data(self.class.attributes(cell, [
-        [:type]
-      ]))
-      push(:worksheets)
-
-      # write data value
-      worksheets_markup.template.__ Undies::Template.
-        escape_html(cell.data_xml_value).
-        gsub(/(\r|\n)+/, LB)
+      worksheets_markup.element(
+        "Data",
+        worksheets_markup.raw(cell.data_xml_value),
+        AttrsHash.new.value("Type", cell.type).raw
+      )
 
       pop(:worksheets)
-      pop(:worksheets)
     end
 
     def row(row)
-      worksheets_markup.template._Row(self.class.attributes(row, [
-        [:style_i_d, :height, :auto_fit_height, :hidden]
-      ]))
+      worksheets_markup.element("Row", nil, AttrsHash.new.
+        value("StyleID",       row.style_id).
+        value("Height",        row.height).
+        bool( "AutoFitHeight", row.auto_fit_height).
+        bool( "Hidden",        row.hidden).
+        raw
+      )
     end
 
     def column(column)
-      worksheets_markup.template._Column(self.class.attributes(column, [
-        [:style_i_d, :width, :auto_fit_width, :hidden]
-      ]))
+      worksheets_markup.inline_element("Column", AttrsHash.new.
+        value("StyleID",      column.style_id).
+        value("Width",        column.width).
+        bool( "AutoFitWidth", column.auto_fit_width).
+        bool( "Hidden",       column.hidden).
+        raw
+      )
     end
 
     def worksheet(worksheet)
@@ -191,30 +184,65 @@ module Xmlss
       worksheets_markup.flush
 
       # write the worksheet markup and push
-      worksheets_markup.template._Worksheet(self.class.attributes(worksheet, [
-        [:name]
-      ]))
+      a = AttrsHash.new.value("Name", worksheet.name).raw
+      worksheets_markup.element("Worksheet", nil, a)
       push(:worksheets)
 
       # write the table container
-      worksheets_markup.template._Table
+      worksheets_markup.element("Table", nil, {})
     end
 
   end
 
 
 
+  class Writer::AttrsHash
+
+    attr_reader :raw
+
+    def initialize
+      @raw = Hash.new
+    end
+
+    def value(k, v)
+      # ignore any nil-value or empty string attrs
+      @raw["#{Xmlss::Writer::SHEET_NS}:#{k}"] = v if v && v != ''
+      self
+    end
+
+    def bool(k, v)
+      # write truthy values as '1', otherwise ignore
+      @raw["#{Xmlss::Writer::SHEET_NS}:#{k}"] = 1 if v
+      self
+    end
+
+  end
+
   class Writer::Markup
 
     attr_reader :template, :push_count, :pop_count
 
     def initialize(opts={})
       @markup = ""
-      @template = Undies::Template.new(Undies::Output.new(StringIO.new(@markup), opts))
+      @template = Undies::Template.new(Undies::IO.new(@markup, opts))
       @push_count = 0
       @pop_count  = 0
     end
 
+    def raw(markup)
+      @template.raw(
+        Undies::Template.escape_html(markup).gsub(/(\r|\n)+/, Xmlss::Writer::LB)
+      )
+    end
+
+    def element(name, data, attrs)
+      @template.__open_element(name, data, attrs)
+    end
+
+    def inline_element(name, attrs)
+      @template.__closed_element(name, attrs)
+    end
+
     def push
       @push_count += 1
       @template.__push
@@ -236,7 +264,7 @@ module Xmlss
     def empty?; @markup.empty?; end
 
     def to_s
-      @markup.to_s.strip
+      @markup.to_s
     end
 
   end

data/test/element/cell_test.rb

@@ -15,7 +15,6 @@ module Xmlss::Element
     should be_styled
     should have_class_method :writer
     should have_accessor :index, :formula, :href, :merge_across, :merge_down
-    should have_reader :h_ref
 
     should have_enum :type, {
       :number => "Number",
@@ -42,12 +41,6 @@ module Xmlss::Element
       assert_equal "", subject.data
     end
 
-    should "provide alias for :href" do
-      c = Cell.new({:href => "http://www.google.com"})
-      assert_equal "http://www.google.com", c.href
-      assert_equal "http://www.google.com", c.h_ref
-    end
-
     should "bark when setting non Fixnum indices" do
       assert_raises ArgumentError do
         Cell.new({:index => "do it"})

data/test/helper.rb

@@ -6,26 +6,15 @@ $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
 class Assert::Context
 
-  class << self
+  def self.be_styled
+    called_from = caller.first
+    Assert::Macro.new("have style attributes") do
+      should have_accessor :style_id
 
-    def be_styled
-      called_from = caller.first
-      Assert::Macro.new("have style attributes") do
-        should have_accessor :style_id
-        should have_reader :style_i_d
-
-        should "set the style default" do
-          assert_equal nil, subject.class.new.style_id
-        end
-
-        should "provide aliases for style_id" do
-          c = subject.class.new({:style_id => :poo})
-          assert_equal :poo, c.style_id
-          assert_equal :poo, c.style_i_d
-        end
+      should "set the style default" do
+        assert_equal nil, subject.class.new.style_id
       end
     end
-
   end
 
 end

data/test/style/base_test.rb

@@ -9,7 +9,7 @@ module Xmlss::Style
     subject { @bs }
 
     should have_class_method :writer
-    should have_reader :id, :i_d
+    should have_reader :id
 
     should "know its writer" do
       assert_equal :style, subject.class.writer

data/test/style/font_test.rb

@@ -24,7 +24,6 @@ module Xmlss::Style
     }
 
     should have_class_method :writer
-    should have_reader :vertical_align
     should have_accessors :bold, :color, :italic, :size, :strike_through
     should have_accessors :shadow, :underline, :alignment, :name
     should have_instance_methods :bold?, :italic?, :strike_through?, :shadow?

data/test/workbook_test.rb

@@ -39,13 +39,6 @@ module Xmlss::Worbook
       assert_kind_of Xmlss::Style::Protection, subject.protection
     end
 
-    should "not complain if setting an attribute when there's no current element" do
-      # it should just do nothing and go on
-      assert_nothing_raised do
-        subject.index(1)
-      end
-    end
-
     should "return workbook markup string" do
       assert_match /<Workbook /, subject.to_s
     end
@@ -83,7 +76,7 @@ module Xmlss::Worbook
       end
 
       assert_equal(
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Workbook xmlns=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:ss=\"urn:schemas-microsoft-com:office:spreadsheet\"><Styles><Style ss:ID=\"test\"><Alignment /><Borders><Border ss:LineStyle=\"Continuous\" ss:Weight=\"1\" /></Borders><Font /><Interior /><NumberFormat /><Protection /></Style></Styles><Worksheet ss:Name=\"test\"><Table><Column /><Row><Cell><Data ss:Type=\"Number\">#{wkbk.object_id}</Data></Cell></Row></Table></Worksheet></Workbook>",
+        "<?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=\"test\"><Alignment /><Borders><Border ss:LineStyle=\"Continuous\" ss:Weight=\"1\" /></Borders><Font /><Interior /><NumberFormat /><Protection /></Style></Styles><Worksheet ss:Name=\"test\"><Table><Column /><Row><Cell><Data ss:Type=\"Number\">#{wkbk.object_id}</Data></Cell></Row></Table></Worksheet></Workbook>",
         wkbk.to_s
       )
     end
@@ -118,7 +111,7 @@ module Xmlss::Worbook
         worksheet worksheet_name
       end
       assert_equal(
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Workbook xmlns=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:ss=\"urn:schemas-microsoft-com:office:spreadsheet\"><Styles></Styles><Worksheet ss:Name=\"awesome\"><Table /></Worksheet></Workbook>",
+        "<?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=\"awesome\"><Table></Table></Worksheet></Workbook>",
         wkbk.to_s
       )
     end

data/test/writer_test.rb

@@ -14,7 +14,6 @@ module Xmlss
     end
     subject { @w }
 
-    should have_class_methods :attributes, :classify, :coerce
     should have_readers :styles_markup, :worksheets_markup
     should have_instance_methods :write, :push, :pop, :flush, :workbook
 
@@ -36,44 +35,35 @@ module Xmlss
 
 
 
-  class HelpersTests < BasicTests
+  class AttrsHashTests < BasicTests
+    desc "AttrsHash"
+    before do
+      @a = Writer::AttrsHash.new
+    end
+    subject { @a }
+
+    should have_reader :raw
+    should have_instance_methods :value, :bool
+
+    should "by default have an empty raw hash" do
+      assert_equal({}, subject.raw)
+    end
+
+    should "apply values to a raw hash with the writer namespace" do
+      assert_equal({"#{Writer::SHEET_NS}:a" => 'b'}, subject.value('a', 'b').raw)
+    end
 
-    should "coerce certain values for xml output" do
-      assert_equal 1, Writer.coerce(true)
-      assert_nil   Writer.coerce(false)
-      assert_nil   Writer.coerce("")
-      assert_equal "hi", Writer.coerce("hi")
-      assert_equal 1, Writer.coerce(1)
+    should "ignore nil values" do
+      assert_equal({}, subject.value('a', nil).raw)
     end
 
-    should "classify underscored string" do
-      assert_equal "Hi", Writer.classify("Hi")
-      assert_equal "Hi", Writer.classify("hi")
-      assert_equal "Hithere", Writer.classify("HiThere")
-      assert_equal "Hithere", Writer.classify("hithere")
-      assert_equal "HiThere", Writer.classify("Hi_There")
-      assert_equal "HiThere", Writer.classify("Hi_there")
-      assert_equal "HiThere", Writer.classify("hi_there")
+    should "ignore empty string values" do
+      assert_equal({}, subject.value('a', '').raw)
     end
 
-    should "convert a list of attributes for xml output" do
-      class Thing
-        def keys; [:thing, :other, 'some', 'hi', :hi_there]; end
-
-        def thing;    true;   end
-        def other;    false;  end
-        def some;     "";     end
-        def hi;       :there; end
-        def hi_there; "you";  end
-      end
-      thing = Thing.new
-      exp = {
-        "ss:Hi" => "there",
-        "ss:HiThere" => "you",
-        "ss:Thing" => "1"
-      }
-
-      assert_equal exp, Writer.attributes(thing, thing.keys)
+    should "apply booleans as '1' and otherwise ignore" do
+      assert_equal({}, subject.bool('a', false).raw)
+      assert_equal({"#{Writer::SHEET_NS}:a" => 1}, subject.bool('a', true).raw)
     end
 
   end
@@ -392,7 +382,7 @@ Should
     should "return workbook markup" do
       build_workbook(subject)
       assert_equal(
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Workbook xmlns=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:ss=\"urn:schemas-microsoft-com:office:spreadsheet\"><Styles><Style ss:ID=\"some_font\"><Font ss:Bold=\"1\" /></Style><Style ss:ID=\"some_numformat\"><NumberFormat ss:Format=\"General\" /></Style></Styles><Worksheet ss:Name=\"test1\"><Table><Row ss:Hidden=\"1\"><Cell ss:Index=\"2\"><Data ss:Type=\"String\">some data</Data></Cell></Row></Table></Worksheet><Worksheet ss:Name=\"test2\"><Table><Row ss:Hidden=\"1\"><Cell ss:Index=\"2\"><Data ss:Type=\"String\">some data</Data></Cell></Row></Table></Worksheet></Workbook>",
+        "<?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=\"some_font\"><Font ss:Bold=\"1\" /></Style><Style ss:ID=\"some_numformat\"><NumberFormat ss:Format=\"General\" /></Style></Styles><Worksheet ss:Name=\"test1\"><Table><Row ss:Hidden=\"1\"><Cell ss:Index=\"2\"><Data ss:Type=\"String\">some data</Data></Cell></Row></Table></Worksheet><Worksheet ss:Name=\"test2\"><Table><Row ss:Hidden=\"1\"><Cell ss:Index=\"2\"><Data ss:Type=\"String\">some data</Data></Cell></Row></Table></Worksheet></Workbook>",
         subject.workbook
       )
     end

data/xmlss.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency("bundler", ["~> 1.0"])
-  s.add_development_dependency("assert", ["~> 0.6"])
-  s.add_dependency("undies", ["~> 2.2.1"])
+  s.add_development_dependency("assert", ["~> 0.7.3"])
+  s.add_development_dependency("assert-view", ["~> 0.6"])
+  s.add_dependency("undies", ["~> 3.0.0.rc.1"])
   s.add_dependency("enumeration", ["~> 1.3"])
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: xmlss
 version: !ruby/object:Gem::Version 
-  hash: 15424055
+  hash: 15424049
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - rc
-  - 1
-  version: 1.0.0.rc.1
+  - 2
+  version: 1.0.0.rc.2
 platform: ruby
 authors: 
 - Kelly Redding
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 Z
+date: 2012-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -26,12 +26,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 5
         segments: 
-        - 1
         - 0
-        version: "1.0"
-  name: bundler
+        - 7
+        - 3
+        version: 0.7.3
+  name: assert
   version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -46,7 +47,7 @@ dependencies:
         - 0
         - 6
         version: "0.6"
-  name: assert
+  name: assert-view
   version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -56,12 +57,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 15424119
         segments: 
-        - 2
-        - 2
+        - 3
+        - 0
+        - 0
+        - rc
         - 1
-        version: 2.2.1
+        version: 3.0.0.rc.1
   name: undies
   version_requirements: *id003
   prerelease: false
@@ -95,6 +98,7 @@ files:
 - Gemfile.lock
 - README.rdoc
 - Rakefile
+- bench/bench_runner.rb
 - bench/profiler.rb
 - bench/profiler_runner.rb
 - examples/example_workbook.rb