osheet 0.7.0 → 0.8.0

data/.gitignore

@@ -1,6 +1,8 @@
-/pkg/
-/doc/
-/coverage/
+pkg/*
+.bundle
+*.gem
 *.log
+.rvmrc
+.rbenv-version
 /tmp
 /examples/*.xls

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in osheet.gemspec
 gemspec
+
+gem 'rake', '~>0.9.2'

data/Gemfile.lock

@@ -1,52 +1,28 @@
 PATH
   remote: .
   specs:
-    osheet (0.7.0)
-      enumeration (~> 1.1.0)
-      xmlss (~> 0.2.0)
+    osheet (0.8.0)
+      enumeration (~> 1.2)
+      xmlss (~> 0.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    enumeration (1.1.0)
-    json (1.5.1)
-    kelredd-useful (0.4.1)
-      json
-    leftright (0.9.0)
-    mime-types (1.16)
-    nokogiri (1.4.4)
-    open4 (1.0.1)
-    rack (1.2.2)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rest-client (1.6.1)
-      mime-types (>= 1.16)
-    shoulda (2.11.3)
-    sinatra (1.2.1)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    test-belt (0.2.1)
-      kelredd-useful (~> 0.4.0)
-      leftright (~> 0.9.0)
-      shoulda (~> 2.11)
-    tilt (1.2.2)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
-    xmlss (0.2.0)
-      enumeration (~> 1.1.0)
+    ansi (1.3.0)
+    assert (0.3.0)
+      ansi (~> 1.3)
+    enumeration (1.2.1)
+    nokogiri (1.4.7)
+    rake (0.9.2)
+    xmlss (0.2.1)
+      enumeration (~> 1.2)
       nokogiri (~> 1.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  assert (~> 0.3)
   bundler (~> 1.0)
-  open4
   osheet!
-  rack-test (>= 0.5.3)
-  rest-client
-  sinatra (>= 0.9.4)
-  test-belt (= 0.2.1)
-  webrat (>= 0.6.0)
+  rake (~> 0.9.2)

data/Rakefile

@@ -1,7 +1,7 @@
+require 'assert/rake_tasks'
+include Assert::RakeTasks
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'test_belt/rake_tasks'
-TestBelt::RakeTasks.for :test
-
 task :default => :build

data/lib/osheet/format/numeric.rb

@@ -99,8 +99,6 @@ module Osheet::Format
       case @symbol
       when :dollar
         "\"$\"#{symbol_suffix}"
-      when :euro
-        "[$€-2]\ #{symbol_suffix}"
       when :none
         ''
       end

data/lib/osheet/instance.rb

@@ -24,9 +24,7 @@ module Osheet::Instance
     binding.eval('instance_variables').
     reject{|ivar| ivar =~ /^@#{OSHEET_IVAR_NS}/}.
     each do |ivar|
-      # puts "binding #{ivar}: "+binding.eval(ivar).object_id.to_s
-      instance_variable_set(ivar, binding.eval(ivar))
-      # puts "inst #{ivar}: "+ instance_variable_get(ivar).object_id.to_s
+      instance_variable_set(ivar, binding.eval(ivar.to_s))
     end
   end
 end

data/lib/osheet/version.rb

@@ -1,3 +1,3 @@
 module Osheet
-  VERSION = "0.7.0"
-end
+  VERSION = "0.8.0"
+end

data/osheet.gemspec

@@ -18,14 +18,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency("bundler", ["~> 1.0"])
-  s.add_development_dependency("test-belt", ["= 0.2.1"]) # locked to a specific version for test stability
-  s.add_development_dependency("sinatra", [">= 0.9.4"])
-  s.add_development_dependency("rack-test", [">= 0.5.3"])
-  s.add_development_dependency("webrat", [">= 0.6.0"])
-  s.add_development_dependency("open4")
-  s.add_development_dependency("rest-client")
-
-  s.add_dependency("enumeration", ["~>1.1.0"])
-  s.add_dependency("xmlss", "~>0.2.0")
+  s.add_development_dependency("assert", ["~> 0.3"])
+  s.add_dependency("enumeration", ["~> 1.2"])
+  s.add_dependency("xmlss", ["~> 0.2"])
 
 end

data/test/cell_test.rb

@@ -1,138 +1,130 @@
-require "test/helper"
+require "assert"
 require 'osheet/cell'
 
 module Osheet
 
-  class CellTest < Test::Unit::TestCase
-    context "Osheet::Cell" do
-      subject { Cell.new }
+  class CellTest < Assert::Context
+    desc "Osheet::Cell"
+    before { @c = Cell.new }
+    subject { @c }
 
-      should_be_a_styled_element(Cell)
-      should_be_a_worksheet_element(Cell)
-      should_be_a_workbook_element(Cell)
+    should_be_a_styled_element(Cell)
+    should_be_a_worksheet_element(Cell)
+    should_be_a_workbook_element(Cell)
 
-      should_have_instance_methods :data, :format, :colspan, :rowspan, :href, :index
-
-      should "set it's defaults" do
-        assert_equal nil, subject.send(:get_ivar, "data")
-        assert_kind_of Format::General, subject.send(:get_ivar, "format")
-        assert_equal 1,   subject.send(:get_ivar, "colspan")
-        assert_equal 1,   subject.send(:get_ivar, "rowspan")
-        assert_equal nil,   subject.send(:get_ivar, "href")
-        assert_equal nil,   subject.send(:get_ivar, "index")
-      end
+    should have_instance_methods :data, :format, :colspan, :rowspan, :href, :index
 
+    should "set it's defaults" do
+      assert_equal nil, subject.send(:get_ivar, "data")
+      assert_kind_of Format::General, subject.send(:get_ivar, "format")
+      assert_equal 1,   subject.send(:get_ivar, "colspan")
+      assert_equal 1,   subject.send(:get_ivar, "rowspan")
+      assert_equal nil,   subject.send(:get_ivar, "href")
+      assert_equal nil,   subject.send(:get_ivar, "index")
     end
-  end
 
-  class CellAttributeTest < Test::Unit::TestCase
-    context "a celll that has attributes" do
-      subject do
-        Cell.new do
-          style_class 'more poo'
-          data    "Poo"
-          format  :number
-          colspan 4
-          rowspan 2
-          index 3
-          href "http://www.google.com"
-        end
+    should "type cast data strings/symbols" do
+      ['a string', :symbol].each do |thing|
+        cell = Cell.new{data thing}
+        assert_kind_of ::String, cell.send(:get_ivar, "data")
       end
+    end
 
-      should "should set them correctly" do
-        assert_equal "Poo", subject.send(:get_ivar, "data")
-        assert_kind_of Format::Number, subject.send(:get_ivar, "format")
-        assert_equal 4,     subject.send(:get_ivar, "colspan")
-        assert_equal 2,     subject.send(:get_ivar, "rowspan")
-        assert_equal 3,     subject.send(:get_ivar, "index")
-        assert_equal "http://www.google.com", subject.send(:get_ivar, "href")
-      end
+    should "type cast data dates" do
+      cell = Cell.new{data Date.today}
+      assert_kind_of ::Date, cell.send(:get_ivar, "data")
+    end
 
-      should "know it's attribute(s)" do
-        [:style_class, :data, :format, :rowspan, :colspan, :index, :href].each do |a|
-          assert subject.attributes.has_key?(a)
-        end
-
-        assert_equal "more poo", subject.attributes[:style_class]
-        assert_equal "Poo", subject.attributes[:data]
-        assert_kind_of Format::Number, subject.attributes[:format]
-        assert_equal 4, subject.attributes[:colspan]
-        assert_equal 2, subject.attributes[:rowspan]
-        assert_equal 3, subject.attributes[:index]
-        assert_equal "http://www.google.com", subject.attributes[:href]
+    should "type cast data numerics" do
+      [1, 1.0].each do |thing|
+        cell = Cell.new{data thing}
+        assert_kind_of ::Numeric, cell.send(:get_ivar, "data")
       end
-
     end
-  end
-
-  class CellDataTest < Test::Unit::TestCase
-    context "A cell" do
-      subject { Cell.new }
 
-      should "type cast data strings/symbols" do
-        ['a string', :symbol].each do |thing|
-          cell = Cell.new{data thing}
-          assert_kind_of ::String, cell.send(:get_ivar, "data")
-        end
+    should "type cast all other data to string" do
+      [Osheet, [:a, 'Aye'], {:a => 'Aye'}].each do |thing|
+        cell = Cell.new{data thing}
+        assert_kind_of ::String, cell.send(:get_ivar, "data")
       end
+    end
 
-      should "type cast data dates" do
-        cell = Cell.new{data Date.today}
-        assert_kind_of ::Date, cell.send(:get_ivar, "data")
-      end
+  end
 
-      should "type cast data numerics" do
-        [1, 1.0].each do |thing|
-          cell = Cell.new{data thing}
-          assert_kind_of ::Numeric, cell.send(:get_ivar, "data")
-        end
+  class CellAttributeTest < CellTest
+    desc "a celll that has attributes"
+    before do
+      @c = Cell.new do
+        style_class 'more poo'
+        data    "Poo"
+        format  :number
+        colspan 4
+        rowspan 2
+        index 3
+        href "http://www.google.com"
       end
+    end
+
+    should "should set them correctly" do
+      assert_equal "Poo", subject.send(:get_ivar, "data")
+      assert_kind_of Format::Number, subject.send(:get_ivar, "format")
+      assert_equal 4,     subject.send(:get_ivar, "colspan")
+      assert_equal 2,     subject.send(:get_ivar, "rowspan")
+      assert_equal 3,     subject.send(:get_ivar, "index")
+      assert_equal "http://www.google.com", subject.send(:get_ivar, "href")
+    end
 
-      should "type cast all other data to string" do
-        [Osheet, [:a, 'Aye'], {:a => 'Aye'}].each do |thing|
-          cell = Cell.new{data thing}
-          assert_kind_of ::String, cell.send(:get_ivar, "data")
-        end
+    should "know it's attribute(s)" do
+      [:style_class, :data, :format, :rowspan, :colspan, :index, :href].each do |a|
+        assert subject.attributes.has_key?(a)
       end
 
+      assert_equal "more poo", subject.attributes[:style_class]
+      assert_equal "Poo", subject.attributes[:data]
+      assert_kind_of Format::Number, subject.attributes[:format]
+      assert_equal 4, subject.attributes[:colspan]
+      assert_equal 2, subject.attributes[:rowspan]
+      assert_equal 3, subject.attributes[:index]
+      assert_equal "http://www.google.com", subject.attributes[:href]
     end
+
   end
 
-  class CellPartialTest < Test::Unit::TestCase
-    context "A workbook that defines column partials" do
-      subject do
-        Workbook.new {
-          partial(:cell_stuff) {
-            style_class 'more poo'
-            data "Poo"
-          }
-
-          worksheet { row { cell {
-            add :cell_stuff
-          } } }
+  class CellPartialTest < Assert::Context
+    desc "A workbook that defines column partials"
+    before do
+      @wkbk = Workbook.new {
+        partial(:cell_stuff) {
+          style_class 'more poo'
+          data "Poo"
         }
-      end
 
-      should "add it's partials to it's markup" do
-        assert_equal 'more poo', subject.worksheets.first.rows.first.cells.first.attributes[:style_class]
-        assert_equal 'Poo', subject.worksheets.first.rows.first.cells.first.attributes[:data]
-      end
+        worksheet { row { cell {
+          add :cell_stuff
+        } } }
+      }
+    end
+    subject { @wkbk }
 
+    should "add it's partials to it's markup" do
+      assert_equal 'more poo', subject.worksheets.first.rows.first.cells.first.attributes[:style_class]
+      assert_equal 'Poo', subject.worksheets.first.rows.first.cells.first.attributes[:data]
     end
+
   end
 
-  class CellBindingTest < Test::Unit::TestCase
-    context "a cell defined w/ a block" do
-      should "access instance vars from that block's binding" do
-        @test = 'test'
-        @cell = Cell.new { data @test}
-
-        assert !@cell.send(:instance_variable_get, "@test").nil?
-        assert_equal @test, @cell.send(:instance_variable_get, "@test")
-        assert_equal @test.object_id, @cell.send(:instance_variable_get, "@test").object_id
-        assert_equal @test, @cell.attributes[:data]
-        assert_equal @test.object_id, @cell.attributes[:data].object_id
-      end
+  class CellBindingTest < Assert::Context
+    desc "a cell defined w/ a block"
+
+    should "access instance vars from that block's binding" do
+      @test = 'test'
+      @cell = Cell.new { data @test}
+
+      assert !@cell.send(:instance_variable_get, "@test").nil?
+      assert_equal @test, @cell.send(:instance_variable_get, "@test")
+      assert_equal @test.object_id, @cell.send(:instance_variable_get, "@test").object_id
+      assert_equal @test, @cell.attributes[:data]
+      assert_equal @test.object_id, @cell.attributes[:data].object_id
     end
   end
 

data/test/column_test.rb

@@ -1,128 +1,121 @@
-require "test/helper"
+require "assert"
 require "osheet/column"
 
 module Osheet
 
-  class ColumnTest < Test::Unit::TestCase
-    context "Osheet::Column" do
-      subject { Column.new }
+  class ColumnTest < Assert::Context
+    desc "Osheet::Column"
+    before { @c = Column.new }
+    subject { @c }
 
-      should_be_a_styled_element(Column)
-      should_be_a_worksheet_element(Column)
-      should_be_a_workbook_element(Column)
+    should_be_a_styled_element(Column)
+    should_be_a_worksheet_element(Column)
+    should_be_a_workbook_element(Column)
 
-      should_have_instance_method :width
-      should_have_instance_methods :autofit, :autofit?
-      should_have_instance_methods :hidden, :hidden?
-      should_have_instance_method :meta
+    should have_instance_method :width
+    should have_instance_methods :autofit, :autofit?
+    should have_instance_methods :hidden, :hidden?
+    should have_instance_method :meta
 
-      should "set it's defaults" do
-        assert_equal nil, subject.send(:get_ivar, "width")
-        assert_equal false, subject.send(:get_ivar, "autofit")
-        assert !subject.autofit?
-        assert_equal false, subject.send(:get_ivar, "hidden")
-        assert !subject.hidden?
+    should "set it's defaults" do
+      assert_equal nil, subject.send(:get_ivar, "width")
+      assert_equal false, subject.send(:get_ivar, "autofit")
+      assert !subject.autofit?
+      assert_equal false, subject.send(:get_ivar, "hidden")
+      assert !subject.hidden?
 
-        assert_equal nil, subject.meta
-      end
+      assert_equal nil, subject.meta
+    end
 
+    should "set it's width" do
+      subject.width(false)
+      assert_equal false, subject.width
+      subject.width(180)
+      assert_equal 180, subject.width
+      subject.width(nil)
+      assert_equal 180, subject.width
     end
-  end
 
-  class ColumnAttributesTest < Test::Unit::TestCase
-    context "that has attributes" do
-      subject do
-        Column.new do
-          style_class "more poo"
-          width  100
-          autofit true
-          hidden true
-          meta(
-            {}
-          )
-        end
-      end
+    should "cast autofit and hidden to bool" do
+      col = Column.new { autofit :true; hidden 'false'}
+      assert_kind_of ::TrueClass, col.send(:get_ivar, "autofit")
+      assert_kind_of ::TrueClass, col.send(:get_ivar, "hidden")
+    end
 
-      should "should set them correctly" do
-        assert_equal 100, subject.send(:get_ivar, "width")
-        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
+  end
 
-      should "know it's attribute(s)" do
-        [:style_class, :width, :autofit, :hidden].each do |a|
-          assert subject.attributes.has_key?(a)
-        end
-        assert_equal 'more poo', subject.attributes[:style_class]
-        assert_equal 100, subject.attributes[:width]
-        assert_equal true, subject.attributes[:autofit]
-        assert_equal true, subject.attributes[:hidden]
+  class ColumnAttributesTest < ColumnTest
+    desc "that has attributes"
+    before do
+      @c = Column.new do
+        style_class "more poo"
+        width  100
+        autofit true
+        hidden true
+        meta(
+          {}
+        )
       end
-
     end
-  end
 
-  class ColumnDataTest < Test::Unit::TestCase
-    context "A column" do
-      subject { Column.new }
-
-      should "set it's width" do
-        subject.width(false)
-        assert_equal false, subject.width
-        subject.width(180)
-        assert_equal 180, subject.width
-        subject.width(nil)
-        assert_equal 180, subject.width
-      end
+    should "should set them correctly" do
+      assert_equal 100, subject.send(:get_ivar, "width")
+      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
-        col = Column.new { autofit :true; hidden 'false'}
-        assert_kind_of ::TrueClass, col.send(:get_ivar, "autofit")
-        assert_kind_of ::TrueClass, col.send(:get_ivar, "hidden")
+    should "know it's attribute(s)" do
+      [:style_class, :width, :autofit, :hidden].each do |a|
+        assert subject.attributes.has_key?(a)
       end
-
+      assert_equal 'more poo', subject.attributes[:style_class]
+      assert_equal 100, subject.attributes[:width]
+      assert_equal true, subject.attributes[:autofit]
+      assert_equal true, subject.attributes[:hidden]
     end
+
   end
 
-  class ColumnPartialTest < Test::Unit::TestCase
-    context "A workbook that defines column partials" do
-      subject do
-        Workbook.new {
-          partial(:column_stuff) {
-            width 200
-            meta(:label => 'awesome')
-          }
-
-          worksheet { column {
-            add :column_stuff
-          } }
+  class ColumnPartialTest < Assert::Context
+    desc "A workbook that defines column partials"
+    before do
+      @wkbk = Workbook.new {
+        partial(:column_stuff) {
+          width 200
+          meta(:label => 'awesome')
         }
-      end
 
-      should "add it's partials to it's markup" do
-        assert_equal 200, subject.worksheets.first.columns.first.width
-        assert_equal({:label => 'awesome'}, subject.worksheets.first.columns.first.meta)
-      end
+        worksheet { column {
+          add :column_stuff
+        } }
+      }
+    end
+    subject { @wkbk }
 
+    should "add it's partials to it's markup" do
+      assert_equal 200, subject.worksheets.first.columns.first.width
+      assert_equal({:label => 'awesome'}, subject.worksheets.first.columns.first.meta)
     end
+
   end
 
-  class ColumnBindingTest < Test::Unit::TestCase
-    context "a column defined w/ a block" do
-      should "access instance vars from that block's binding" do
-        @test = 50
-        @col = Column.new { width @test }
-
-        assert !@col.send(:instance_variable_get, "@test").nil?
-        assert_equal @test, @col.send(:instance_variable_get, "@test")
-        assert_equal @test.object_id, @col.send(:instance_variable_get, "@test").object_id
-        assert_equal @test, @col.attributes[:width]
-        assert_equal @test.object_id, @col.attributes[:width].object_id
-      end
+  class ColumnBindingTest < Assert::Context
+    desc "a column defined w/ a block"
+
+    should "access instance vars from that block's binding" do
+      @test = 50
+      @col = Column.new { width @test }
+
+      assert !@col.send(:instance_variable_get, "@test").nil?
+      assert_equal @test, @col.send(:instance_variable_get, "@test")
+      assert_equal @test.object_id, @col.send(:instance_variable_get, "@test").object_id
+      assert_equal @test, @col.attributes[:width]
+      assert_equal @test.object_id, @col.attributes[:width].object_id
     end
+
   end
 
 end