xmlss 0.3.1 → 0.4.0

data/test/style/alignment_test.rb

@@ -1,46 +1,38 @@
 require "assert"
+require 'enumeration/assert_macros'
+
 require 'xmlss/style/alignment'
 
 module Xmlss::Style
   class AlignmentTest < Assert::Context
+    include Enumeration::AssertMacros
+
     desc "Xmlss::Style::Alignment"
     before { @a = Alignment.new }
     subject { @a }
 
-    should have_class_method :horizontal
-
-    {
+    should have_enum :horizontal, {
       :automatic => "Automatic",
       :left => "Left",
       :center => "Center",
       :right => "Right"
-    }.each do |horizontal, value|
-      should "provide the value for the '#{horizontal}' horizontal" do
-        assert_equal value, Alignment.horizontal(horizontal)
-      end
-    end
+    }
 
-    should have_class_method :vertical
-
-    {
+    should have_enum :vertical, {
       :automatic => "Automatic",
       :top => "Top",
       :center => "Center",
       :bottom => "Bottom"
-    }.each do |vertical, value|
-      should "provide the value for the '#{vertical}' vertical" do
-        assert_equal value, Alignment.vertical(vertical)
-      end
-    end
+    }
 
-    should have_accessors :horizontal, :vertical, :wrap_text, :rotate
+    should have_accessors :wrap_text, :rotate
     should have_instance_methods :wrap_text?
 
     should "set it's defaults" do
       assert_equal false, subject.wrap_text
-      assert_equal nil, subject.horizontal
-      assert_equal nil, subject.vertical
-      assert_equal nil, subject.rotate
+      assert_equal nil,   subject.horizontal
+      assert_equal nil,   subject.vertical
+      assert_equal nil,   subject.rotate
     end
 
     should "reject invalid rotate alignments" do
@@ -55,7 +47,7 @@ module Xmlss::Style
       assert_equal nil, Alignment.new({:rotate => :poo}).rotate
     end
 
-    should "should set them correctly" do
+    should "set build with values correctly" do
       attrs = {
         :wrap_text => true,
         :horizontal => :center,
@@ -71,30 +63,6 @@ module Xmlss::Style
       assert_equal Alignment.vertical(:bottom), alignment.vertical
     end
 
-    should "set attrs by key" do
-      subject.horizontal = :left
-      subject.vertical = :top
-
-      assert_equal Alignment.horizontal(:left), subject.horizontal
-      assert_equal Alignment.vertical(:top), subject.vertical
-    end
-
-    should "set attrs by value" do
-      subject.horizontal = Alignment.horizontal(:right)
-      subject.vertical = Alignment.vertical(:center)
-
-      assert_equal Alignment.horizontal(:right), subject.horizontal
-      assert_equal Alignment.vertical(:center), subject.vertical
-    end
-
-  end
-
-  class AlignmentXmlTest < AlignmentTest
-    desc "for generating XML"
-
-    should have_reader :xml
-    should_build_node
-    should_build_no_attributes_by_default(Alignment)
   end
 
 end

data/test/style/base_test.rb

@@ -8,9 +8,7 @@ module Xmlss::Style
     before { @bs = Base.new(:test) }
     subject { @bs }
 
-    should have_reader :id, :i_d, :border
-    should have_accessors :borders, :alignment, :font
-    should have_accessors :interior, :number_format, :protection
+    should have_reader :id, :i_d
 
     should "bark if you don't init with an id" do
       assert_raises ArgumentError do
@@ -26,111 +24,8 @@ module Xmlss::Style
 
     should "set it's defaults" do
       assert_equal 'test', subject.id
-      assert_equal [],  subject.borders
-      [ :alignment, :border, :font,
-        :interior, :number_format, :protection
-      ].each do |s|
-        assert_equal nil, subject.send(s)
-      end
-    end
-
-  end
-
-  class SetAlignmentTest < Assert::Context
-    desc "that sets alignment"
-    before do
-      @s = Base.new(:alignment) do
-        alignment(
-          :horizontal => :left,
-          :vertical => :center,
-          :wrap_text => true
-        )
-      end
-    end
-    subject { @s }
-
-    should "create an Alignment object" do
-      assert_kind_of Alignment, subject.alignment
-      assert_equal true, subject.alignment.wrap_text
-      assert_equal Alignment.horizontal(:left), subject.alignment.horizontal
-      assert_equal Alignment.vertical(:center), subject.alignment.vertical
-    end
-  end
-
-  class SetBorderTest < Assert::Context
-    desc "that sets borders"
-    before do
-      @s = Base.new(:borders) do
-        border(:position => :left)
-        border(:position => :right)
-      end
-    end
-    subject { @s }
-
-    should "create Border objects and add them to its borders" do
-      assert_equal 2, subject.borders.size
-      assert_kind_of Border, subject.borders.first
-      assert_equal Border.position(:left), subject.borders.first.position
-      assert_equal Border.position(:right), subject.borders.last.position
     end
 
-    should "error if manually setting borders to non ItemSet collection" do
-      assert_raises ::ArgumentError do
-        subject.borders = []
-      end
-    end
-  end
-
-  class SetFontTest < Assert::Context
-    desc "that sets font"
-    before { @s = Base.new(:font) { font(:bold => true) } }
-    subject { @s }
-
-    should "should create a Font object" do
-      assert_kind_of Font, subject.font
-      assert subject.font.bold?
-    end
-  end
-
-  class SetInteriorTest < Assert::Context
-    desc "that sets interior"
-    before { @s = Base.new(:interior) { interior(:color => "#000000") } }
-    subject { @s }
-
-    should "should create an Interior object" do
-      assert_kind_of Interior, subject.interior
-      assert_equal "#000000", subject.interior.color
-    end
-  end
-
-  class SetNumberFormatTest < Assert::Context
-    desc "that sets number format"
-    before { @s = Base.new(:number_format) { number_format(:format => "General") } }
-    subject { @s }
-
-    should "should create a NumberFormat object" do
-      assert_kind_of NumberFormat, subject.number_format
-      assert_equal "General", subject.number_format.format
-    end
-  end
-
-  class SetProtectionTest < Assert::Context
-    desc "that sets protection"
-    before { @s = Base.new(:protection) { protection(:protect => true) } }
-    subject { @s }
-
-    should "should create a Protection object" do
-      assert_kind_of Protection, subject.protection
-      assert subject.protection.protected?
-    end
-  end
-
-  class BaseXmlTest < BaseTest
-    desc "for generating XML"
-
-    should have_reader :xml
-    should_build_node
-    should_build_no_attributes_by_default(Xmlss::Style::Alignment)
   end
 
 end

data/test/style/border_test.rb

@@ -1,56 +1,43 @@
 require "assert"
+require 'enumeration/assert_macros'
+
 require 'xmlss/style/border'
 
 module Xmlss::Style
   class BorderTest < Assert::Context
+    include Enumeration::AssertMacros
+
     desc "Xmlss::Style::Border"
     before { @b = Xmlss::Style::Border.new }
     subject { @b }
 
-    should have_class_method :position
-
-    {
+    should have_enum :position, {
       :left => "Left",
       :top => "Top",
       :right => "Right",
       :bottom => "Bottom",
       :diagonal_left => "DiagonalLeft",
       :diagonal_right => "DiagonalRight"
-    }.each do |position, value|
-      should "provide the value for the '#{position}' position" do
-        assert_equal value, Border.position(position)
-      end
-    end
-
-    should have_class_method :weight
+    }
 
-    {
+    should have_enum :weight, {
       :hairline => 0,
       :thin => 1,
       :medium => 2,
       :thick => 3
-    }.each do |weight, value|
-      should "provide the value for the '#{weight}' weight" do
-        assert_equal value, Border.weight(weight)
-      end
-    end
+    }
 
-    should have_class_method :line_style
-
-    {
+    should have_enum :line_style, {
       :none => "None",
       :continuous => "Continuous",
       :dash => "Dash",
       :dot => "Dot",
       :dash_dot => "DashDot",
       :dash_dot_dot => "DashDotDot"
-    }.each do |style, value|
-      should "provide the value for the '#{style}' line_style" do
-        assert_equal value, Border.line_style(style)
-      end
-    end
+    }
+
 
-    should have_accessors :color, :position, :weight, :line_style
+    should have_accessors :color
 
     should "set it's defaults" do
       assert_equal nil, subject.color
@@ -98,11 +85,4 @@ module Xmlss::Style
 
   end
 
-  class BorderXmlTest < BorderTest
-    desc "for generating XML"
-    should have_reader :xml
-    should_build_node
-
-  end
-
 end

data/test/style/font_test.rb

@@ -1,40 +1,32 @@
 require "assert"
+require 'enumeration/assert_macros'
+
 require 'xmlss/style/font'
 
 module Xmlss::Style
   class FontTest < Assert::Context
+    include Enumeration::AssertMacros
+
     desc "Xmlss::Style::Font"
     before { @f = Font.new }
     subject { @f }
 
-    should have_class_method :underline
-
-    {
+    should have_enum :underline, {
       :single => 'Single',
       :double => 'Double',
       :single_accounting => 'SingleAccounting',
       :double_accounting => 'DoubleAccounting'
-    }.each do |underline, value|
-      should "provide the value for the '#{underline}' underline" do
-        assert_equal value, Xmlss::Style::Font.underline(underline)
-      end
-    end
+    }
 
-    should have_class_method :alignment
-
-    {
+    should have_enum :alignment, {
       :subscript => 'Subscript',
       :superscript => 'Superscript'
-    }.each do |alignment, value|
-      should "provide the value for the '#{alignment}' alignment" do
-        assert_equal value, Xmlss::Style::Font.alignment(alignment)
-      end
-    end
+    }
 
-    should have_accessors :bold, :color, :italic, :size, :strike_through, :shadow
-    should have_accessors :underline, :alignment, :name
-    should have_instance_methods :bold?, :italic?, :strike_through?, :shadow?
     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?
 
     should "set it's defaults" do
       assert_equal false, subject.bold
@@ -68,30 +60,6 @@ module Xmlss::Style
       assert_equal Font.alignment(:superscript), font.alignment
     end
 
-    should "set attrs by key" do
-      subject.underline = :double
-      subject.alignment = :subscript
-
-      assert_equal Font.underline(:double), subject.underline
-      assert_equal Font.alignment(:subscript), subject.alignment
-    end
-
-    should "set attrs by value" do
-      subject.underline = Xmlss::Style::Font.underline(:double)
-      subject.alignment = Xmlss::Style::Font.alignment(:subscript)
-
-      assert_equal Xmlss::Style::Font.underline(:double), subject.underline
-      assert_equal Xmlss::Style::Font.alignment(:subscript), subject.alignment
-    end
-
-  end
-
-  class FontXmlTest < FontTest
-    desc "for generating XML"
-
-    should have_reader :xml
-    should_build_node
-    should_build_no_attributes_by_default(Xmlss::Style::Font)
   end
 
 end

data/test/style/interior_test.rb

@@ -1,16 +1,18 @@
 require "assert"
+require 'enumeration/assert_macros'
+
 require 'xmlss/style/interior'
 
 module Xmlss::Style
 
   class InteriorTest < Assert::Context
+    include Enumeration::AssertMacros
+
     desc "Xmlss::Style::Interior"
     before { @i = Interior.new }
     subject { @i }
 
-    should have_class_method :pattern
-
-    {
+    should have_enum :pattern, {
       :none => "None",
       :solid => "Solid",
       :gray75 => "Gray75",
@@ -30,13 +32,9 @@ module Xmlss::Style
       :thin_diag_stripe => "ThineDiagStripe",
       :thin_horz_cross => "ThinHorzCross",
       :thin_diag_cross => "ThinDiagCross"
-    }.each do |pattern, value|
-      should "provide the value for the '#{pattern}' pattern" do
-        assert_equal value, Xmlss::Style::Interior.pattern(pattern)
-      end
-    end
+    }
 
-    should have_accessor :color, :pattern, :pattern_color
+    should have_accessor :color, :pattern_color
 
     should "set it's defaults" do
       assert_equal nil, subject.color
@@ -55,24 +53,6 @@ module Xmlss::Style
       assert_equal "#FF0000", i.pattern_color
     end
 
-    should "set attrs by key" do
-      subject.pattern = :solid
-      assert_equal "Solid", subject.pattern
-    end
-
-    should "set attrs by value" do
-      subject.pattern = "Solid"
-      assert_equal "Solid", subject.pattern
-    end
-
-  end
-
-  class InteriorXmlTest < InteriorTest
-    desc "for generating XML"
-
-    should have_reader :xml
-    should_build_node
-    should_build_no_attributes_by_default(Xmlss::Style::Alignment)
   end
 
 end

data/test/style/number_format_test.rb

@@ -1,8 +1,12 @@
 require "assert"
+require 'enumeration/assert_macros'
+
 require 'xmlss/style/number_format'
 
 module Xmlss::Style
   class NumberFormatTest < Assert::Context
+    include Enumeration::AssertMacros
+
     desc "Xmlss::Style::NumberFormat"
     before { @nf = NumberFormat.new }
     subject { @nf }
@@ -10,30 +14,10 @@ module Xmlss::Style
     should have_accessor :format
 
     should "set attributes at init" do
-      nf = Xmlss::Style::NumberFormat.new({
-        :format => "General"
-      })
+      nf = NumberFormat.new("General")
       assert_equal "General", nf.format
     end
 
-    should "set format by key" do
-      subject.format = "@"
-      assert_equal "@", subject.format
-    end
-
-    should "set format by value" do
-      subject.format = "True/False"
-      assert_equal "True/False", subject.format
-    end
-
-  end
-
-  class NumberFormatXmlTest < NumberFormatTest
-    desc "for generating XML"
-
-    should have_reader :xml
-    should_build_node
-    should_build_no_attributes_by_default(Xmlss::Style::Alignment)
   end
 
 end

data/test/style/protection_test.rb

@@ -1,4 +1,5 @@
 require "assert"
+
 require 'xmlss/style/protection'
 
 module Xmlss::Style
@@ -16,9 +17,7 @@ module Xmlss::Style
     end
 
     should "set attrs at init time" do
-      sp = Xmlss::Style::Protection.new({
-        :protect => true
-      })
+      sp = Xmlss::Style::Protection.new(true)
       assert sp.protected?
     end
 
@@ -29,13 +28,4 @@ module Xmlss::Style
 
   end
 
-  class ProtectionXmlTest < ProtectionTest
-    desc "for generating XML"
-
-    should have_reader :xml
-    should_build_node
-    should_build_no_attributes_by_default(Xmlss::Style::Alignment)
-
-  end
-
 end