osheet 0.10.0 → 1.0.0.rc.1

data/test/fixtures/test_writer.rb

@@ -0,0 +1,68 @@
+class TestWriter
+
+  attr_accessor :styles, :worksheets, :columns, :rows, :cells
+
+  def initialize
+    @styles = []
+    @worksheets = []
+    @columns = []
+    @rows = []
+    @cells = []
+  end
+
+  def bind(workbook)
+    workbook
+  end
+
+  def style(obj, &block)
+    @styles << obj
+    block.call if !block.nil?
+  end
+
+  def worksheet(obj, &block)
+    @worksheets << obj
+    block.call if !block.nil?
+  end
+
+  def column(obj, &block)
+    @columns << obj
+    block.call if !block.nil?
+  end
+
+  def row(obj, &block)
+    @rows << obj
+    block.call if !block.nil?
+  end
+
+  def cell(obj, &block)
+    @cells << obj
+    block.call if !block.nil?
+  end
+
+  def style(*args)
+    return *args
+  end
+
+  [ :title,       # workbook_element
+    :name,        # worksheet
+    :meta,        # worksheet, column, row, cell
+    :width,       # column
+    :height,      # row
+    :autofit,     # column, row
+    :autofit?,    # column, row
+    :hidden,      # column, row
+    :hidden?,     # column, row
+    :data,        # cell
+    :href,        # cell
+    :formula,     # cell
+    :index,       # cell
+    :rowspan,     # cell
+    :colspan,     # cell
+  ].each do |meth|
+    define_method(meth) do |*args|
+      # cool story bro (don't do anything, just allow)
+      return *args
+    end
+  end
+
+end

data/test/format_test.rb

@@ -3,8 +3,8 @@ require 'osheet/format'
 
 module Osheet
 
-  class FormatTest < Assert::Context
-    desc "Osheet::Format"
+  class FormatTests < Assert::Context
+    desc "a Format"
     before do
       @f = Format.new(:number, {
         :decimal_places => 4,

data/test/helper.rb

@@ -3,104 +3,70 @@
 # add root dir to the load path
 $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
-require 'osheet'
-
 class Assert::Context
 
-  def xstyle_markup(xworkbook)
-    xworkbook.instance_variable_get("@__xmlss_undies_writer").flush.style_markup
+  def xmlss_style_markup(writer)
+    Xmlss::Workbook.writer(writer.xmlss_workbook).styles_markup.flush.to_s
   end
 
-  def xelement_markup(xworkbook)
-    xworkbook.instance_variable_get("@__xmlss_undies_writer").flush.element_markup
+  def xmlss_element_markup(writer)
+    Xmlss::Workbook.writer(writer.xmlss_workbook).worksheets_markup.flush.to_s
   end
 
-  class << self
-
+  # Macros
 
-    def should_be_a_workbook_element(klass)
-      should have_instance_methods :workbook, :styles, :templates
+  def self.be_a_meta_element(*args)
+    called_from = caller.first
+    macro_name =  "be a meta element"
 
-      should "be able to read the workbook and it's styles/templates" do
-        wkbk = Osheet::Workbook.new {
-          template(:column, :thing) {}
-          template(:row, :empty) {}
-          style('.title') {
-            font 14
-          }
-          style('.title', '.header') {
-            font :bold
-          }
-        }
-        klass = klass.new(wkbk)
+    Assert::Macro.new(macro_name) do
+      should have_instance_method :meta, [called_from]
 
-        assert_equal wkbk, klass.workbook
-        assert_equal wkbk.styles, klass.styles
-        assert_equal wkbk.templates, klass.templates
+      should "default an empty meta value", called_from do
+        assert_equal nil, subject.class.new.meta
       end
-    end
-
-    def should_be_a_worksheet_element(klass)
-      should have_instance_methods :worksheet, :columns
 
-      should "be able to read the worksheet and it's columns" do
-        wksht = Osheet::Worksheet.new {
-          column {}
-          column {}
-          column {}
-        }
-        klass = klass.new(nil, wksht)
+      should "set meta info", called_from do
+        meta_elem = subject.class.new
 
-        assert_equal wksht, klass.worksheet
-        assert_equal wksht.columns, klass.columns
+        meta_elem.meta({:key => "value"})
+        assert_equal({:key => "value"}, meta_elem.meta)
       end
     end
+  end
+
+  def self.be_a_styled_element(*args)
+    called_from = caller.first
+    macro_name =  "be a styled element"
 
-    def should_be_a_styled_element(klass)
-      should have_instance_methods :style_class
+    Assert::Macro.new(macro_name) do
+      should have_instance_method :style_class, [called_from]
 
-      should "default an empty style class" do
-        default = klass.new
-        assert_equal nil, default.send(:get_ivar, "style_class")
+      should "default an empty style class", called_from do
+        assert_equal nil, subject.class.new.style_class
       end
 
-      should "set a style class" do
-        styled = klass.new{ style_class "awesome thing" }
-        assert_equal "awesome thing", styled.send(:get_ivar, "style_class")
+      should "set a style class", called_from do
+        styled = subject.class.new
+        styled.style_class("awesome thing")
+        assert_equal "awesome thing", styled.style_class
       end
 
-      should "verify the style class string" do
+      should "validate the style class string", called_from do
         ['.thing', 'thing.thing', 'thing .thing > thing', 'thin>g'].each do |s|
           assert_raises ArgumentError do
-            klass.new { style_class s }
+            subject.class.new.style_class(s)
           end
         end
+
         ['thing', '#thing 123', 'thing-one thing_one'].each do |s|
           assert_nothing_raised do
-            klass.new { style_class s }
+            subject.class.new.style_class(s)
           end
         end
       end
-    end
-
-    def should_hm(klass, collection, item_klass)
-      should have_reader collection
-      should have_instance_method collection.to_s.sub(/s$/, '')
-
-      should "should initialize #{collection} and add them to it's collection" do
-        singular = collection.to_s.sub(/s$/, '')
-        thing = klass.new do
-          self.send(singular) {}
-        end
-
-        items = thing.send(:get_ivar, collection)
-        assert_equal items, thing.send(collection)
-        assert !items.empty?
-        assert_equal 1, items.size
-        assert_kind_of item_klass, items.first
-      end
 
     end
-
   end
+
 end

data/test/mixin_test.rb

@@ -1,10 +1,11 @@
 require "assert"
-require "test/mixins"
+require "test/fixtures/mixins"
+require 'osheet/workbook'
 
 module Osheet
 
-  class MixinBaseTest < Assert::Context
-    desc "Osheet::Mixin thing"
+  class MixinTests < Assert::Context
+    desc "a mixin"
     subject { DefaultMixin }
 
     should have_readers :styles, :templates, :partials
@@ -17,70 +18,63 @@ module Osheet
     end
   end
 
-  class MixinStyleTest < Assert::Context
+  class MixinArgsTests < MixinTests
+    desc "args class"
+    before do
+      @build_block = Proc.new {}
+      @ma = Mixin::Args.new('some', 'args', 'here', &@build_block)
+    end
+    subject { @ma }
+
+    should have_readers :args, :build
+
+    should "collect arguments" do
+      assert_equal ['some', 'args', 'here'], subject.args
+    end
+
+    should "store a build block" do
+      assert_same @build_block, subject.build
+    end
+
+    should "default with empty args and an empty Proc build" do
+      default = Mixin::Args.new
+
+      assert_empty default.args
+      assert_kind_of Proc, default.build
+    end
+
+  end
+
+  class MixinStyleTests < Assert::Context
     desc "that defines styles"
     subject { StyledMixin }
 
     should "have it's styles defined" do
       assert_equal 2, subject.styles.size
-      assert_equal 1, subject.styles.first.selectors.size
-      assert_equal '.test', subject.styles.first.selectors.first
-      assert_equal 1, subject.styles.last.selectors.size
-      assert_equal '.test.awesome', subject.styles.last.selectors.first
+      assert_kind_of Mixin::Args, subject.styles.first
     end
   end
 
-  class MixinTemplateTest < Assert::Context
+  class MixinTemplateTests < Assert::Context
     desc "that defines templates"
     subject { TemplatedMixin }
 
     should "have it's templates defined" do
       assert subject.templates
       assert_equal 3, subject.templates.size
-      assert_kind_of Template, subject.templates.first
+      assert_kind_of Mixin::Args, subject.templates.first
     end
   end
 
-  class MixinPartialTest < Assert::Context
+  class MixinPartialTests < Assert::Context
     desc "that defines partials"
     subject { PartialedMixin }
 
     should "have it's partials defined" do
       assert subject.partials
       assert_equal 2, subject.partials.size
-      assert_kind_of Partial, subject.partials.first
-    end
-  end
-
-  class MixinUseTest < Assert::Context
-    desc "A workbook that uses mixins"
-    setup do
-      @workbook = Osheet::Workbook.new do
-        use PartialedMixin
-        use TemplatedMixin
-        use StyledMixin
-      end
-    end
-    subject { @workbook }
-
-    should "have mixin partials" do
-      workbook_partials = @workbook.partials.values
-      PartialedMixin.partials.each do |partial|
-        assert workbook_partials.include?(partial)
-      end
+      assert_kind_of Mixin::Args, subject.partials.first
     end
-
-    should "have mixin templates" do
-      workbook_templates = @workbook.templates.values.collect{ |t| t.values.first }
-      TemplatedMixin.templates.each do |template|
-        assert workbook_templates.include?(template)
-      end
-    end
-
-    should "have mixin styles" do
-      assert_equal StyledMixin.styles, @workbook.styles
-    end
-
   end
 
 end

data/test/partial_test.rb

@@ -1,20 +1,19 @@
 require "assert"
+
 require "osheet/partial"
 
 module Osheet
   class PartialTest < Assert::Context
-    desc "Osheet::Partial"
+    desc "a Partial"
     before { @p = Partial.new(:thing) {} }
     subject { @p }
 
-    should have_accessor :name
-
     should "be a Proc" do
       assert_kind_of ::Proc, subject
     end
 
     should "convert the name arg to a string and store off" do
-      assert_equal 'thing', subject.name
+      assert_equal 'thing', subject.instance_variable_get("@name")
     end
 
   end
@@ -39,26 +38,4 @@ module Osheet
 
   end
 
-  class PartialBindingTest < Assert::Context
-    desc "a partial defined w/ a block"
-
-    should "access instance vars from that block's binding" do
-      @test = 'test thing'
-      @workbook = Workbook.new {
-        partial(:stuff) {
-          worksheet(:thing) { name @test }
-        }
-
-        add(:stuff)
-      }
-
-      assert !@workbook.worksheets.first.send(:instance_variable_get, "@test").nil?
-      assert_equal @test, @workbook.worksheets.first.send(:instance_variable_get, "@test")
-      assert_equal @test.object_id, @workbook.worksheets.first.send(:instance_variable_get, "@test").object_id
-      assert_equal @test, @workbook.worksheets.first.attributes[:name]
-      assert_equal @test.object_id, @workbook.worksheets.first.attributes[:name].object_id
-    end
-
-  end
-
 end

data/test/row_test.rb

@@ -1,124 +1,71 @@
 require "assert"
+
+require 'osheet/cell'
 require 'osheet/row'
 
 module Osheet
 
-  class RowTest < Assert::Context
-    desc "Osheet::Row"
+  class RowTests < Assert::Context
+    desc "a Row"
     before { @rw = Row.new }
     subject { @rw }
 
-    should_be_a_styled_element(Row)
-    should_be_a_worksheet_element(Row)
-    should_be_a_workbook_element(Row)
+    should be_a_styled_element
+    should be_a_meta_element
 
-    should have_instance_method :height
+    should have_reader :format
+    should have_instance_methods :height
     should have_instance_methods :autofit, :autofit?
     should have_instance_methods :hidden, :hidden?
-    should have_instance_method :meta
-
-    should_hm(Row, :cells, Cell)
+    should have_instance_methods :cells, :cell
 
     should "set it's defaults" do
-      assert_equal nil, subject.send(:get_ivar, "height")
-      assert_equal false, subject.send(:get_ivar, "autofit")
+      assert_equal nil, subject.height
+      assert_equal false, subject.autofit
       assert !subject.autofit?
-      assert_equal false, subject.send(:get_ivar, "hidden")
+      assert_equal false, subject.hidden
       assert !subject.hidden?
-
-      assert_equal [], subject.cells
-      assert_equal nil, subject.meta
+      assert_kind_of Format::General, subject.format
     end
 
-    should "set it's height" do
+    should "set it's width" do
       subject.height(false)
       assert_equal false, subject.height
+
       subject.height(180)
       assert_equal 180, subject.height
+
       subject.height(nil)
       assert_equal 180, subject.height
-    end
-
-    should "cast autofit and hidden to bool" do
-      rw = Row.new { autofit :true; hidden 'false'}
-      assert_kind_of ::TrueClass, rw.send(:get_ivar, "autofit")
-      assert_kind_of ::TrueClass, rw.send(:get_ivar, "hidden")
-    end
 
-  end
-
-  class RowAttributeTest < RowTest
-    desc "a row that has attributes"
-    before do
-      @rw = Row.new do
-        style_class "poo"
-        height  100
-        autofit true
-        hidden true
-        meta(
-          {}
-        )
-      end
+      assert_equal 200, Row.new(200).height
     end
 
-    should "should set them correctly" do
-      assert_equal 100, subject.send(:get_ivar, "height")
-      assert_equal true, subject.send(:get_ivar, "autofit")
-      assert subject.autofit?
-      assert_equal true, subject.send(:get_ivar, "hidden")
-      assert subject.hidden?
-      assert_equal({}, subject.meta)
-    end
+    should "cast autofit and hidden to bool" do
+      row = Row.new
+      row.autofit :true
+      row.hidden 'false'
 
-    should "know it's attribute(s)" do
-      [:style_class, :height, :autofit, :hidden].each do |a|
-        assert subject.attributes.has_key?(a)
-      end
-      assert_equal 'poo', subject.attributes[:style_class]
-      assert_equal 100, subject.attributes[:height]
-      assert_equal true, subject.attributes[:autofit]
-      assert_equal true, subject.attributes[:hidden]
+      assert_equal true, row.autofit
+      assert_equal true, row.hidden
     end
 
   end
 
-  class RowPartialTest < Assert::Context
-    desc "A workbook that defines column partials"
-    before do
-      @wkbk = Workbook.new {
-        partial(:row_stuff) {
-          height 200
-          meta 'awesome'
-        }
-
-        worksheet { row {
-          add :row_stuff
-        } }
-      }
-    end
-    subject { @wkbk }
+  class RowCellTests < RowTests
+    desc "with cells"
+    before {
+      @cell = Cell.new
+      @rw.cell(@cell)
+    }
 
-    should "add it's partials to it's markup" do
-      assert_equal 200, subject.worksheets.first.rows.first.height
-      assert_equal 'awesome', subject.worksheets.first.rows.first.meta
+    should "know its cells" do
+      assert_equal 1, subject.cells.size
+      assert_same @cell, subject.cells.first
     end
 
   end
 
-  class RowBindingTest < Assert::Context
-    desc "a row defined w/ a block"
 
-    should "access instance vars from that block's binding" do
-      @test = 50
-      @row = Row.new { height @test }
-
-      assert !@row.send(:instance_variable_get, "@test").nil?
-      assert_equal @test, @row.send(:instance_variable_get, "@test")
-      assert_equal @test.object_id, @row.send(:instance_variable_get, "@test").object_id
-      assert_equal @test, @row.attributes[:height]
-      assert_equal @test.object_id, @row.attributes[:height].object_id
-    end
-
-  end
 
 end

data/test/style_test.rb

@@ -1,16 +1,18 @@
 require "assert"
+
 require "osheet/style"
 
 module Osheet
 
   class StyleTest < Assert::Context
-    desc "Osheet::Style"
+    desc "a Style"
     before { @st = Style.new('.test') }
     subject { @st }
 
-    should have_reader :selectors
-    should have_instance_methods :align, :font, :bg
-    should have_instance_methods :border, :border_left, :border_top, :border_right, :border_bottom
+    should have_reader :selectors, :build
+    should have_instance_methods :align, :font, :bg, :border
+    should have_instance_methods :border_left, :border_top
+    should have_instance_methods :border_right, :border_bottom
     should have_instance_method :match?
 
     should "set it's defaults" do
@@ -19,15 +21,7 @@ module Osheet
       [ :align, :font, :bg,
         :border_left, :border_top, :border_right, :border_bottom
       ].each do |a|
-        assert_equal [], subject.send(:get_ivar, a)
-      end
-    end
-
-    should "know it's attribute(s)" do
-      [ :align, :font, :bg,
-        :border_left, :border_top, :border_right, :border_bottom
-      ].each do |a|
-        assert subject.attributes.has_key?(a)
+        assert_equal [], subject.send(a)
       end
     end
 
@@ -53,7 +47,7 @@ module Osheet
       should "collect styles for #{a}" do
         args = [1, "#FF0000", "Verdana", :love, 1.2]
         subject.send(a, *args)
-        assert_equal args, subject.send(:get_ivar, a)
+        assert_equal args, subject.send(a)
       end
     end
 
@@ -61,7 +55,7 @@ module Osheet
       args = [:thick, '#FF00FF', :dot]
       subject.border *args
       [ :border_left, :border_top, :border_right, :border_bottom].each do |a|
-        assert_equal args, subject.send(:get_ivar, a)
+        assert_equal args, subject.send(a)
       end
     end
 
@@ -88,17 +82,6 @@ module Osheet
       assert_equal false, a.match?('stupid')
     end
 
-    should "access instance vars from that block's binding" do
-      @test = 20
-      @style = Style.new('.test') { font @test }
-
-      assert !@style.send(:instance_variable_get, "@test").nil?
-      assert_equal @test, @style.send(:instance_variable_get, "@test")
-      assert_equal @test.object_id, @style.send(:instance_variable_get, "@test").object_id
-      assert_equal @test, @style.attributes[:font].first
-      assert_equal @test.object_id, @style.attributes[:font].first.object_id
-    end
-
   end
 
 end

data/test/template_test.rb

@@ -1,10 +1,11 @@
 require "assert"
+
 require "osheet/template"
 
 module Osheet
 
-  class TemplateTest < Assert::Context
-    desc "Osheet::Template"
+  class TemplateTests < Assert::Context
+    desc "a Template"
     before do
       @tmpl = Template.new('column', :thing) {}
     end
@@ -14,19 +15,17 @@ module Osheet
       assert_equal ['worksheet', 'column', 'row', 'cell'], Template::ELEMENTS
     end
 
-    should have_accessor :element
-
     should "be a Partial" do
       assert_kind_of Partial, subject
     end
 
     should "convert the element ars to string and store off" do
-      assert_equal 'column', subject.element
+      assert_equal 'column', subject.instance_variable_get("@element")
     end
 
   end
 
-  class TemplateElementTest < TemplateTest
+  class TemplateElementTest < TemplateTests
     desc "a template"
 
     should "verify the element argument" do