xmlss 0.2.0 → 0.2.1

data/Gemfile

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

data/Gemfile.lock

@@ -1,31 +1,25 @@
 PATH
   remote: .
   specs:
-    xmlss (0.2.0)
-      enumeration (~> 1.1.0)
+    xmlss (0.2.1)
+      enumeration (~> 1.2)
       nokogiri (~> 1.4.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    enumeration (1.1.0)
-    json (1.5.1)
-    kelredd-useful (0.4.1)
-      json
-    leftright (0.9.0)
-    nokogiri (1.4.4)
-    shoulda (2.11.3)
-    test-belt (0.2.1)
-      kelredd-useful (~> 0.4.0)
-      leftright (~> 0.9.0)
-      shoulda (~> 2.11)
+    ansi (1.3.0)
+    assert (0.3.0)
+      ansi (~> 1.3)
+    enumeration (1.2.1)
+    nokogiri (1.4.7)
+    rake (0.9.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  assert (~> 0.3)
   bundler (~> 1.0)
-  enumeration (~> 1.1.0)
-  nokogiri (~> 1.4.0)
-  test-belt (= 0.2.1)
+  rake (~> 0.9.2)
   xmlss!

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/xmlss/version.rb

@@ -1,3 +1,3 @@
 module Xmlss
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/cell_test.rb

@@ -1,86 +1,89 @@
-require "test/helper"
+require "assert"
 require 'xmlss/cell'
 
 module Xmlss
-  class CellTest < Test::Unit::TestCase
+  class CellTest < Assert::Context
+    desc "Xmlss::Cell"
+    subject { Cell.new }
 
-    context "Xmlss::Cell" do
-      subject { Cell.new }
+    should have_accessor :index, :data
+    should have_accessor :formula, :href, :merge_across, :merge_down
+    should have_reader :h_ref
 
-      should_have_accessor :index, :data
-      should_have_accessor :formula, :href, :merge_across, :merge_down
-      should_have_reader :h_ref
+    should_have_style(Cell)
 
-      should_have_style(Cell)
-
-      should "set it's defaults" do
-        [:data, :formula, :href].each do |a|
-          assert_equal nil, subject.send(a)
-        end
-        assert_equal nil, subject.merge_across
-        assert_equal nil, subject.merge_down
+    should "set it's defaults" do
+      [:data, :formula, :href].each do |a|
+        assert_equal nil, subject.send(a)
       end
+      assert_equal nil, subject.merge_across
+      assert_equal nil, subject.merge_down
+    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 "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"})
-        end
-        assert_raises ArgumentError do
-          Cell.new({:index => 2.5})
-        end
-        assert_nothing_raised do
-          Cell.new({:index => 2})
-        end
+    should "bark when setting non Fixnum indices" do
+      assert_raises ArgumentError do
+        Cell.new({:index => "do it"})
       end
-
-      should "bark when setting non Fixnum merge attrs" do
-        assert_raises ArgumentError do
-          Cell.new({:merge_across => "do it"})
-        end
-        assert_raises ArgumentError do
-          Cell.new({:merge_down => 2.5})
-        end
-        assert_nothing_raised do
-          Cell.new({:merge_across => 2})
-        end
-        assert_nothing_raised do
-          Cell.new({:merge_down => 3})
-        end
+      assert_raises ArgumentError do
+        Cell.new({:index => 2.5})
       end
-
-      should "nil out merge/index values that are <= 0" do
-        [:index, :merge_across, :merge_down].each do |a|
-          assert_equal nil, Cell.new({a => -1}).send(a)
-          assert_equal nil, Cell.new({a => 0}).send(a)
-          assert_equal 1, Cell.new({a => 1}).send(a)
-        end
+      assert_nothing_raised do
+        Cell.new({:index => 2})
       end
+    end
 
-      context "when using cell data" do
-        subject do
-          Cell.new({
-            :data => Data.new(12, {:type => :number})
-          })
-        end
-
-        should "should build a data object" do
-          assert_kind_of Data, subject.data
-          assert_equal 12, subject.data.value
-        end
+    should "bark when setting non Fixnum merge attrs" do
+      assert_raises ArgumentError do
+        Cell.new({:merge_across => "do it"})
+      end
+      assert_raises ArgumentError do
+        Cell.new({:merge_down => 2.5})
+      end
+      assert_nothing_raised do
+        Cell.new({:merge_across => 2})
       end
+      assert_nothing_raised do
+        Cell.new({:merge_down => 3})
+      end
+    end
 
-      context "for generating XML" do
-        should_have_reader :xml
-        should_build_node
+    should "nil out merge/index values that are <= 0" do
+      [:index, :merge_across, :merge_down].each do |a|
+        assert_equal nil, Cell.new({a => -1}).send(a)
+        assert_equal nil, Cell.new({a => 0}).send(a)
+        assert_equal 1, Cell.new({a => 1}).send(a)
       end
+    end
+
+  end
+
+  class CellDataTest < Assert::Context
+    desc "when using cell data"
+    subject do
+      Cell.new({
+        :data => Data.new(12, {:type => :number})
+      })
+    end
 
+    should "should build a data object" do
+      assert_kind_of Data, subject.data
+      assert_equal 12, subject.data.value
     end
 
   end
+
+  class CellDataXmlTest < CellDataTest
+    desc "for generating XML"
+
+    should have_reader :xml
+    should_build_node
+
+  end
+
 end

data/test/column_test.rb

@@ -1,46 +1,47 @@
-require "test/helper"
+require "assert"
 require 'xmlss/column'
 
 module Xmlss
-  class ColumnTest < Test::Unit::TestCase
+  class ColumnTest < Assert::Context
+    desc "Xmlss::Column"
+    subject { Column.new }
 
-    context "Xmlss::Column" do
-      subject { Column.new }
+    should_have_style(Column)
+    should have_accessor :width, :auto_fit_width, :hidden
 
-      should_have_style(Column)
-      should_have_accessor :width, :auto_fit_width, :hidden
-
-      should "set it's defaults" do
-        assert_equal nil, subject.width
-        assert_equal false, subject.auto_fit_width
-        assert_equal false, subject.hidden
-      end
+    should "set it's defaults" do
+      assert_equal nil, subject.width
+      assert_equal false, subject.auto_fit_width
+      assert_equal false, subject.hidden
+    end
 
-      should "bark when setting non Numeric width" do
-        assert_raises ArgumentError do
-          Column.new({:width => "do it"})
-        end
-        assert_nothing_raised do
-          Column.new({:width => 2})
-        end
-        assert_nothing_raised do
-          Column.new({:width => 3.5})
-        end
+    should "bark when setting non Numeric width" do
+      assert_raises ArgumentError do
+        Column.new({:width => "do it"})
       end
-
-      should "nil out height values that are < 0" do
-        assert_equal nil, Column.new({:width => -1.2}).width
-        assert_equal nil, Column.new({:width => -1}).width
-        assert_equal 0, Column.new({:width => 0}).width
-        assert_equal 1.2, Column.new({:width => 1.2}).width
+      assert_nothing_raised do
+        Column.new({:width => 2})
       end
-
-      context "for generating XML" do
-        should_have_reader :xml
-        should_build_node
+      assert_nothing_raised do
+        Column.new({:width => 3.5})
       end
+    end
 
+    should "nil out height values that are < 0" do
+      assert_equal nil, Column.new({:width => -1.2}).width
+      assert_equal nil, Column.new({:width => -1}).width
+      assert_equal 0, Column.new({:width => 0}).width
+      assert_equal 1.2, Column.new({:width => 1.2}).width
     end
 
   end
+
+  class ColumnXmlTest < ColumnTest
+    desc "for generating XML"
+
+    should have_reader :xml
+    should_build_node
+
+  end
+
 end

data/test/data_test.rb

@@ -1,75 +1,82 @@
-require "test/helper"
+require "assert"
 require 'xmlss/data'
 
 module Xmlss
-  class DataTest < Test::Unit::TestCase
-
-    context "Xmlss::Data" do
-      subject { Data.new }
-
-      should_have_accessor :type, :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 "line#{Data::LB}break", Data.new("line\nbreak").xml_value
-        assert_equal "return#{Data::LB}break", Data.new("return\rbreak").xml_value
-        assert_equal "returnline#{Data::LB}break", Data.new("returnline\r\nbreak").xml_value
-        assert_equal "2011-03-01T00:00:00", Data.new(DateTime.parse('03/01/2011')).xml_value
-        assert_equal "2011-03-01T00:00:00", Data.new(Date.parse('03/01/2011')).xml_value
-        time = Time.now
-        assert_equal time.strftime("%Y-%m-%dT%H:%M:%S"), Data.new(time).xml_value
-      end
-
-      context "when using explicit type" do
-        subject do
-          Data.new(12, {:type => :string})
-        end
-
-        should "should ignore the value type" do
-          assert_equal Data.type(:string), subject.type
-        end
-      end
-
-      context "when no type is specified" do
-        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
-
-      context "dealing with line breaks and leading space" do
-        subject do
-          Data.new(%s{
+  class DataTest < Assert::Context
+    desc "Xmlss::Data"
+    subject { Data.new }
+
+    should have_accessor :type, :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 "line#{Data::LB}break", Data.new("line\nbreak").xml_value
+      assert_equal "return#{Data::LB}break", Data.new("return\rbreak").xml_value
+      assert_equal "returnline#{Data::LB}break", Data.new("returnline\r\nbreak").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
+
+  class WhitespaceDataTest < DataTest
+    desc "dealing with line breaks and leading space"
+    subject do
+      Data.new(%s{
 Should
   honor
     this
-          })
-        end
+      })
+    end
 
-        should "honor them when generating xml" do
-          reg = /#{Data::LB}Should#{Data::LB}\s{2}honor#{Data::LB}\s{4}this#{Data::LB}/
-          assert_match reg, subject.xml_value
-        end
-      end
+    should "honor them when generating xml" do
+      reg = /#{Data::LB}Should#{Data::LB}\s{2}honor#{Data::LB}\s{4}this#{Data::LB}/
+      assert_match reg, subject.xml_value
+    end
 
-      context "for generating XML" do
-        should_have_reader :xml
-        should_build_node
-      end
+  end
 
-    end
+  class XmlDataTest < DataTest
+    desc "for generating XML"
 
+    should have_reader :xml
+    should_build_node
   end
+
 end