xmlss 0.4.1 → 1.0.0.rc.1

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: xmlss
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
+  hash: 15424055
+  prerelease: 6
   segments: 
+  - 1
+  - 0
   - 0
-  - 4
+  - rc
   - 1
-  version: 0.4.1
+  version: 1.0.0.rc.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -15,11 +17,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-02 00:00:00 Z
+date: 2012-03-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +31,11 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  version_requirements: *id001
   name: bundler
+  version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,26 +46,27 @@ dependencies:
         - 0
         - 6
         version: "0.6"
-  version_requirements: *id002
   name: assert
+  version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 2
         - 2
-        version: "2.2"
-  version_requirements: *id003
+        - 1
+        version: 2.2.1
   name: undies
+  version_requirements: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,8 +77,9 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  version_requirements: *id004
   name: enumeration
+  version_requirements: *id004
+  prerelease: false
 description: This gem provides an api for constructing spreadsheet data and then uses that data to generate xml that can be interpreted by MS Excel.  The xml conforms to the XML Spreadsheet spec (http://msdn.microsoft.com/en-us/library/aa140066(office.10).aspx).
 email: 
 - kelly@kelredd.com
@@ -106,9 +109,9 @@ files:
 - lib/xmlss.rb
 - lib/xmlss/element/cell.rb
 - lib/xmlss/element/column.rb
-- lib/xmlss/element/data.rb
 - lib/xmlss/element/row.rb
 - lib/xmlss/element/worksheet.rb
+- lib/xmlss/element_stack.rb
 - lib/xmlss/style/alignment.rb
 - lib/xmlss/style/base.rb
 - lib/xmlss/style/border.rb
@@ -116,14 +119,14 @@ files:
 - lib/xmlss/style/interior.rb
 - lib/xmlss/style/number_format.rb
 - lib/xmlss/style/protection.rb
-- lib/xmlss/undies_writer.rb
 - lib/xmlss/version.rb
 - lib/xmlss/workbook.rb
+- lib/xmlss/writer.rb
 - test/element/cell_test.rb
 - test/element/column_test.rb
-- test/element/data_test.rb
 - test/element/row_test.rb
 - test/element/worksheet_test.rb
+- test/element_stack_test.rb
 - test/helper.rb
 - test/irb.rb
 - test/style/alignment_test.rb
@@ -134,8 +137,8 @@ files:
 - test/style/number_format_test.rb
 - test/style/protection_test.rb
 - test/thing.rb
-- test/undies_writer_test.rb
 - test/workbook_test.rb
+- test/writer_test.rb
 - xmlss.gemspec
 homepage: http://github.com/kelredd/xmlss
 licenses: []
@@ -157,12 +160,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -173,9 +178,9 @@ summary: Generate spreadsheet docs for MS Excel using XML Spreedsheet
 test_files: 
 - test/element/cell_test.rb
 - test/element/column_test.rb
-- test/element/data_test.rb
 - test/element/row_test.rb
 - test/element/worksheet_test.rb
+- test/element_stack_test.rb
 - test/helper.rb
 - test/irb.rb
 - test/style/alignment_test.rb
@@ -186,5 +191,5 @@ test_files:
 - test/style/number_format_test.rb
 - test/style/protection_test.rb
 - test/thing.rb
-- test/undies_writer_test.rb
 - test/workbook_test.rb
+- test/writer_test.rb

data/lib/xmlss/element/data.rb

@@ -1,58 +0,0 @@
-require 'date'
-require 'enumeration'
-
-module Xmlss; end
-module Xmlss::Element
-  class Data
-
-    include Enumeration
-    enum :type, {
-      :number => "Number",
-      :date_time => "DateTime",
-      :boolean => "Boolean",
-      :string => "String",
-      :error => "Error"
-    }
-
-    attr_accessor :value
-
-    def initialize(value="", attrs={})
-      self.value = value
-      self.type = attrs[:type] if attrs[:type]
-    end
-
-    def value=(v)
-      if self.type.nil?
-        self.type = value_type(v)
-      end
-      @value = v
-    end
-
-    def xml_value
-      case self.value
-      when ::Date, ::Time, ::DateTime
-        self.value.strftime("%Y-%m-%dT%H:%M:%S")
-      else
-        self.value.to_s
-      end
-    end
-
-    private
-
-    def value_type(v)
-      case v
-      when ::Numeric
-        :number
-      when ::Date, ::Time
-        :date_time
-      when ::TrueClass, ::FalseClass
-        :boolean
-      when ::String, ::Symbol
-        :string
-      else
-        :string
-      end
-    end
-
-  end
-end

data/lib/xmlss/undies_writer.rb

@@ -1,175 +0,0 @@
-require 'undies'
-require 'stringio'
-
-module Xmlss
-  class UndiesWriter
-
-    XML_NS   = "xmlns"
-    SHEET_NS = "ss"
-    NS_URI   = "urn:schemas-microsoft-com:office:spreadsheet"
-    LB       = "
"
-
-    # The Undies writer is responsible for driving the Undies API to generate
-    # the xmlss xml markup for the workbook.
-    # Because order doesn't matter when defining style and worksheet elements,
-    # the writer has to buffer the style and worksheet markup separately,
-    # then put them together according to Xmlss spec to build the final
-    # workbook markup.
-
-    def self.attributes(thing, *attrs)
-      [*attrs].flatten.inject({}) do |xattrs, a|
-        xattrs.merge(if !(xv = self.coerce(thing.send(a))).nil?
-          {"#{SHEET_NS}:#{self.classify(a)}" => xv.to_s}
-        else
-          {}
-        end)
-      end
-    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 :style_markup, :element_markup
-
-    def initialize(output_opts={})
-      @opts = output_opts || {}
-
-      # buffer style markup and create a template to write to it
-      @style_markup = ""
-      styles_out = Undies::Output.new(StringIO.new(@style_markup), @opts.merge({
-        :pp_level => 2
-      }))
-      @styles_t = Undies::Template.new(styles_out)
-
-      # buffer worksheet markup and create a template to write to it
-      @element_markup = ""
-      worksheets_out = Undies::Output.new(StringIO.new(@element_markup), @opts.merge({
-        :pp_level => 1
-      }))
-      @worksheets_t = Undies::Template.new(worksheets_out)
-    end
-
-    def flush
-      Undies::Template.flush(@worksheets_t)
-      Undies::Template.flush(@styles_t)
-      self
-    end
-
-    # return the full workbook markup, combining the buffers to xmlss spec
-    def workbook
-      self.flush
-      "".tap do |markup|
-        Undies::Template.new(Undies::Source.new(Proc.new do
-          __ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-          _Workbook(XML_NS => NS_URI, "#{XML_NS}:#{SHEET_NS}" => NS_URI) {
-            _Styles {
-              ___ style_markup.to_s.strip
-            }
-            __ element_markup.to_s.strip
-          }
-        end), {
-          :style_markup => @style_markup,
-          :element_markup => @element_markup
-        }, Undies::Output.new(StringIO.new(markup), @opts))
-      end.strip
-    end
-
-    # workbook style markup directives
-
-    def alignment(alignment, &block)
-      @styles_t._Alignment(self.class.attributes(alignment, [
-        :horizontal, :vertical, :wrap_text, :rotate
-      ]))
-    end
-
-    def border(border, &block)
-      @styles_t._Border(self.class.attributes(border, [
-        :color, :position, :weight, :line_style
-      ]))
-    end
-
-    def borders(&block)
-      @styles_t._Borders(&block)
-    end
-
-    def font(font, &block)
-      @styles_t._Font(self.class.attributes(font, [
-        :bold, :color, :italic, :size, :shadow, :font_name,
-        :strike_through, :underline, :vertical_align
-      ]))
-    end
-
-    def interior(interior, &block)
-      @styles_t._Interior(self.class.attributes(interior, [
-        :color, :pattern, :pattern_color
-      ]))
-    end
-
-    def number_format(number_format, &block)
-      @styles_t._NumberFormat(self.class.attributes(number_format, [
-        :format
-      ]))
-    end
-
-    def protection(protection, &block)
-      @styles_t._Protection(self.class.attributes(protection, [
-        :protect
-      ]))
-    end
-
-    def style(style, &block)
-      @styles_t._Style(self.class.attributes(style, :i_d), &block)
-    end
-
-    # workbook element markup directives
-
-    def data(data, &block)
-      @worksheets_t._Data(self.class.attributes(data, :type)) {
-        @worksheets_t.__ Undies::Template.
-          escape_html(data.xml_value).
-          gsub(/(\r|\n)+/, LB)
-      }
-    end
-
-    def cell(cell, &block)
-      @worksheets_t._Cell(self.class.attributes(cell, [
-        :index, :style_i_d, :formula, :h_ref, :merge_across, :merge_down
-      ]), &block)
-    end
-
-    def row(row, &block)
-      @worksheets_t._Row(self.class.attributes(row, [
-        :style_i_d, :height, :auto_fit_height, :hidden
-      ]), &block)
-    end
-
-    def column(column, &block)
-      @worksheets_t._Column(self.class.attributes(column, [
-        :style_i_d, :width, :auto_fit_width, :hidden
-      ]))
-    end
-
-    def worksheet(worksheet, &block)
-      @worksheets_t._Worksheet(self.class.attributes(worksheet, :name)) {
-        @worksheets_t._Table(&block)
-      }
-    end
-
-  end
-end

data/test/element/data_test.rb

@@ -1,67 +0,0 @@
-require "assert"
-require 'enumeration/assert_macros'
-
-require 'xmlss/element/data'
-
-module Xmlss::Element
-  class DataTest < Assert::Context
-    include Enumeration::AssertMacros
-
-    desc "Xmlss::Data"
-    subject { Data.new }
-
-    should have_enum :type, {
-      :number => "Number",
-      :date_time => "DateTime",
-      :boolean => "Boolean",
-      :string => "String",
-      :error => "Error"
-    }
-
-    should have_accessor :value
-    should have_instance_method :xml_value
-
-    should "set it's defaults" do
-      assert_equal Data.type(:string), subject.type
-      assert_equal "", subject.value
-    end
-
-    should "generate it's xml value" do
-      assert_equal "12", Data.new(12).xml_value
-      assert_equal "string", Data.new("string").xml_value
-      assert_equal "2011-03-01T00:00:00", Data.new(DateTime.parse('2011/03/01')).xml_value
-      assert_equal "2011-03-01T00:00:00", Data.new(Date.parse('2011/03/01')).xml_value
-      time = Time.now
-      assert_equal time.strftime("%Y-%m-%dT%H:%M:%S"), Data.new(time).xml_value
-    end
-
-  end
-
-  class ExplicitDataTest < DataTest
-    desc "when using explicit type"
-    subject do
-      Data.new(12, {:type => :string})
-    end
-
-    should "should ignore the value type" do
-      assert_equal Data.type(:string), subject.type
-    end
-
-  end
-
-  class NoTypeDataTest < DataTest
-    desc "when no type is specified"
-
-    should "cast types for Number, DateTime, Boolean, String" do
-      assert_equal Data.type(:number), Data.new(12).type
-      assert_equal Data.type(:number), Data.new(123.45).type
-      assert_equal Data.type(:date_time), Data.new(Time.now).type
-      assert_equal Data.type(:boolean), Data.new(true).type
-      assert_equal Data.type(:boolean), Data.new(false).type
-      assert_equal Data.type(:string), Data.new("a string").type
-      assert_equal Data.type(:string), Data.new(:symbol).type
-    end
-
-  end
-
-end