osheet 1.0.0.rc.4 → 1.0.0

data/test/{format/special_test.rb → unit/format/special_tests.rb}

@@ -1,19 +1,19 @@
 require "assert"
 require 'osheet/format/special'
 
-module Osheet::Format
+class Osheet::Format::Special
 
-  class SpecialTest < Assert::Context
-    desc "Special format"
-    before { @sp = Special.new }
-    subject { @sp }
+  class UnitTests < Assert::Context
+    desc "Osheet::Format::Special"
+    before{ @sp = Osheet::Format::Special.new }
+    subject{ @sp }
 
     should have_accessors :type
 
     should "provide options for type" do
-      assert_equal 4, Special.type_set.size
+      assert_equal 4, Osheet::Format::Special.type_set.size
       [ :zip_code, :zip_code_plus_4, :phone_number, :social_security_number].each do |a|
-        assert Special.type_set.include?(a)
+        assert Osheet::Format::Special.type_set.include?(a)
       end
     end
 
@@ -23,25 +23,25 @@ module Osheet::Format
     end
 
     should "generate a zip_code type style strings and key" do
-      f = Special.new(:type => :zip_code)
+      f = Osheet::Format::Special.new(:type => :zip_code)
       assert_equal "00000", f.style
       assert_equal "special_zipcode", f.key
     end
 
     should "generate a zip_code_plus_4 type style strings and key" do
-      f = Special.new(:type => :zip_code_plus_4)
+      f = Osheet::Format::Special.new(:type => :zip_code_plus_4)
       assert_equal "00000-0000", f.style
       assert_equal "special_zipcodeplus4", f.key
     end
 
     should "generate a phone_number type style strings and key" do
-      f = Special.new(:type => :phone_number)
+      f = Osheet::Format::Special.new(:type => :phone_number)
       assert_equal "[<=9999999]###-####;(###) ###-####", f.style
       assert_equal "special_phonenumber", f.key
     end
 
     should "generate a social_security_number type style strings and key" do
-      f = Special.new(:type => :social_security_number)
+      f = Osheet::Format::Special.new(:type => :social_security_number)
       assert_equal "000-00-0000", f.style
       assert_equal "special_socialsecuritynumber", f.key
     end

data/test/{format/text_test.rb → unit/format/text_tests.rb}

@@ -1,12 +1,12 @@
 require "assert"
 require 'osheet/format/text'
 
-module Osheet::Format
+class Osheet::Format::Text
 
-  class TextTest < Assert::Context
+  class UnitTests < Assert::Context
     desc "Text format"
-    before { @txt = Text.new }
-    subject { @txt }
+    before{ @txt = Osheet::Format::Text.new }
+    subject{ @txt }
 
     should "generate a style strings and key" do
       assert_equal "@", subject.style

data/test/{format_test.rb → unit/format_tests.rb}

@@ -1,12 +1,12 @@
 require "assert"
 require 'osheet/format'
 
-module Osheet
+module Osheet::Format
 
-  class FormatTests < Assert::Context
-    desc "a Format"
+  class UnitTests < Assert::Context
+    desc "Osheet::Format"
     before do
-      @f = Format.new(:number, {
+      @f = Osheet::Format.new(:number, {
         :decimal_places => 4,
         :comma_separator => true,
         :negative_numbers => :black_parenth
@@ -15,7 +15,7 @@ module Osheet
     subject { @f }
 
     should "build format class instances" do
-      assert_kind_of Format::Number, subject
+      assert_kind_of Osheet::Format::Number, subject
       assert_equal 4, subject.decimal_places
       assert_equal true, subject.comma_separator
       assert_equal 'black_parenth', subject.negative_numbers
@@ -23,10 +23,11 @@ module Osheet
 
     should "error for invalid format types" do
       assert_raises ArgumentError do
-        Format.new(:awesome, {})
+        Osheet::Format.new(:awesome, {})
       end
+
       assert_nothing_raised do
-        Format.new(:general)
+        Osheet::Format.new(:general)
       end
     end
 

data/test/{mixin_test.rb → unit/mixin_tests.rb}

@@ -1,10 +1,11 @@
 require "assert"
-require "test/fixtures/mixins"
-require 'osheet/workbook'
+require 'osheet/mixin'
 
-module Osheet
+require "test/support/mixins"
 
-  class MixinTests < Assert::Context
+module Osheet::Mixin
+
+  class UnitTests < Assert::Context
     desc "a mixin"
     subject { DefaultMixin }
 
@@ -18,11 +19,11 @@ module Osheet
     end
   end
 
-  class MixinArgsTests < MixinTests
+  class MixinArgsTests < UnitTests
     desc "args class"
     before do
       @build_block = Proc.new {}
-      @ma = Mixin::Args.new('some', 'args', 'here', &@build_block)
+      @ma = Osheet::Mixin::Args.new('some', 'args', 'here', &@build_block)
     end
     subject { @ma }
 
@@ -37,7 +38,7 @@ module Osheet
     end
 
     should "default with empty args and an empty Proc build" do
-      default = Mixin::Args.new
+      default = Osheet::Mixin::Args.new
 
       assert_empty default.args
       assert_kind_of Proc, default.build
@@ -51,7 +52,7 @@ module Osheet
 
     should "have it's styles defined" do
       assert_equal 2, subject.styles.size
-      assert_kind_of Mixin::Args, subject.styles.first
+      assert_kind_of Osheet::Mixin::Args, subject.styles.first
     end
   end
 
@@ -62,7 +63,7 @@ module Osheet
     should "have it's templates defined" do
       assert subject.templates
       assert_equal 3, subject.templates.size
-      assert_kind_of Mixin::Args, subject.templates.first
+      assert_kind_of Osheet::Mixin::Args, subject.templates.first
     end
   end
 
@@ -73,7 +74,7 @@ module Osheet
     should "have it's partials defined" do
       assert subject.partials
       assert_equal 2, subject.partials.size
-      assert_kind_of Mixin::Args, subject.partials.first
+      assert_kind_of Osheet::Mixin::Args, subject.partials.first
     end
   end
 

data/test/{partial_test.rb → unit/partial_tests.rb}

@@ -1,12 +1,12 @@
 require "assert"
-
 require "osheet/partial"
 
-module Osheet
-  class PartialTest < Assert::Context
-    desc "a Partial"
-    before { @p = Partial.new(:thing) {} }
-    subject { @p }
+class Osheet::Partial
+
+  class UnitTests < Assert::Context
+    desc "Osheet::Partial"
+    before{ @p = Osheet::Partial.new(:thing) {} }
+    subject{ @p }
 
     should "be a Proc" do
       assert_kind_of ::Proc, subject
@@ -23,16 +23,19 @@ module Osheet
 
     should "verify the name argument" do
       assert_raises ArgumentError do
-        Partial.new([]) {}
+        Osheet::Partial.new([]) {}
       end
+
       assert_raises ArgumentError do
-        Partial.new(1) {}
+        Osheet::Partial.new(1) {}
       end
+
       assert_nothing_raised do
-        Partial.new(:poo) {}
+        Osheet::Partial.new(:poo) {}
       end
+
       assert_nothing_raised do
-        Partial.new('poo') {}
+        Osheet::Partial.new('poo') {}
       end
     end
 

data/test/{row_test.rb → unit/row_tests.rb}

@@ -1,13 +1,14 @@
 require "assert"
+require 'osheet/row'
 
 require 'osheet/cell'
-require 'osheet/row'
+require 'osheet/format/general'
 
-module Osheet
+class Osheet::Row
 
-  class RowTests < Assert::Context
-    desc "a Row"
-    before { @rw = Row.new }
+  class UnitTests < Assert::Context
+    desc "Osheet::Row"
+    before { @rw = Osheet::Row.new }
     subject { @rw }
 
     should be_a_styled_element
@@ -25,7 +26,7 @@ module Osheet
       assert !subject.autofit?
       assert_equal false, subject.hidden
       assert !subject.hidden?
-      assert_kind_of Format::General, subject.format
+      assert_kind_of Osheet::Format::General, subject.format
     end
 
     should "set it's width" do
@@ -38,11 +39,11 @@ module Osheet
       subject.height(nil)
       assert_equal 180, subject.height
 
-      assert_equal 200, Row.new(200).height
+      assert_equal 200, Osheet::Row.new(200).height
     end
 
     should "cast autofit and hidden to bool" do
-      row = Row.new
+      row = Osheet::Row.new
       row.autofit :true
       row.hidden 'false'
 
@@ -52,10 +53,10 @@ module Osheet
 
   end
 
-  class RowCellTests < RowTests
+  class RowCellTests < UnitTests
     desc "with cells"
     before {
-      @cell = Cell.new
+      @cell = Osheet::Cell.new
       @rw.cell(@cell)
     }
 

data/test/{style_test.rb → unit/style_tests.rb}

@@ -1,12 +1,11 @@
 require "assert"
-
 require "osheet/style"
 
-module Osheet
+class Osheet::Style
 
-  class StyleTest < Assert::Context
-    desc "a Style"
-    before { @st = Style.new('.test') }
+  class UnitTests < Assert::Context
+    desc "Osheet::Style"
+    before { @st = Osheet::Style.new('.test') }
     subject { @st }
 
     should have_reader :selectors, :build
@@ -28,7 +27,7 @@ module Osheet
     should "complain about bad selectors" do
       ['poo', '#poo', 'poo poo', 'poo > poo', :poo, 123].each do |s|
         assert_raises ArgumentError do
-          Style.new(s)
+          Osheet::Style.new(s)
         end
       end
     end
@@ -36,7 +35,7 @@ module Osheet
     should "not complain about good selectors" do
       ['.poo', '.poo.poo', '.poo-poo', '.poo_poo'].each do |s|
         assert_nothing_raised do
-          Style.new(s)
+          Osheet::Style.new(s)
         end
       end
     end
@@ -60,13 +59,13 @@ module Osheet
     end
 
     should "match on style class strings" do
-      a = Style.new('.awesome') {}
-      at = Style.new('.awesome.thing') {}
-      b = Style.new('.boring') {}
-      bt = Style.new('.boring.thing') {}
-      a_b = Style.new('.awesome', '.boring') {}
-      t = Style.new('.thing') {}
-      s = Style.new('.stupid') {}
+      a   = Osheet::Style.new('.awesome') {}
+      at  = Osheet::Style.new('.awesome.thing') {}
+      b   = Osheet::Style.new('.boring') {}
+      bt  = Osheet::Style.new('.boring.thing') {}
+      a_b = Osheet::Style.new('.awesome', '.boring') {}
+      t   = Osheet::Style.new('.thing') {}
+      s   = Osheet::Style.new('.stupid') {}
 
       { 'awesome' => [a, a_b],
         'boring' => [b, a_b],

data/test/{template_test.rb → unit/template_tests.rb}

@@ -1,22 +1,23 @@
 require "assert"
-
 require "osheet/template"
 
-module Osheet
+require 'osheet/partial'
+
+class Osheet::Template
 
-  class TemplateTests < Assert::Context
-    desc "a Template"
+  class UnitTests < Assert::Context
+    desc "Osheet::Template"
     before do
-      @tmpl = Template.new('column', :thing) {}
+      @tmpl = Osheet::Template.new('column', :thing) {}
     end
     subject { @tmpl }
 
     should "define what elements it is valid for" do
-      assert_equal ['worksheet', 'column', 'row', 'cell'], Template::ELEMENTS
+      assert_equal ['worksheet', 'column', 'row', 'cell'], Osheet::Template::ELEMENTS
     end
 
     should "be a Partial" do
-      assert_kind_of Partial, subject
+      assert_kind_of Osheet::Partial, subject
     end
 
     should "convert the element ars to string and store off" do
@@ -25,19 +26,21 @@ module Osheet
 
   end
 
-  class TemplateElementTest < TemplateTests
+  class TemplateElementTest < UnitTests
     desc "a template"
 
     should "verify the element argument" do
       assert_raises ArgumentError do
-        Template.new({}, :poo) {}
+        Osheet::Template.new({}, :poo) {}
       end
+
       assert_raises ArgumentError do
-        Template.new('workbook', :poo) {}
+        Osheet::Template.new('workbook', :poo) {}
       end
-      Template::ELEMENTS.each do |elem|
+
+      Osheet::Template::ELEMENTS.each do |elem|
         assert_nothing_raised do
-          Template.new(elem, :poo) {}
+          Osheet::Template.new(elem, :poo) {}
         end
       end
     end

data/test/{workbook_element_test.rb → unit/workbook_element_tests.rb}

@@ -1,16 +1,19 @@
 require "assert"
-
 require 'osheet/workbook_element'
 
-module Osheet
+require 'osheet/partial'
+require 'osheet/template'
+require 'osheet/style'
+require 'osheet/worksheet'
 
+class Osheet::WorkbookElement
 
-  class WorkbookElementTests < Assert::Context
-    desc "a WorkbookElement object"
+  class UnitTests < Assert::Context
+    desc "Osheet::WorkbookElement"
     before do
-      @wd = WorkbookElement.new
+      @wd = Osheet::WorkbookElement.new
     end
-    subject { @wd }
+    subject{ @wd }
 
     should have_reader :title
     should have_readers :templates, :partials, :styles, :worksheets
@@ -18,19 +21,17 @@ module Osheet
 
     should "set it's defaults" do
       assert_nil subject.title
-      assert_equal WorkbookElement::TemplateSet.new,  subject.templates
-      assert_equal WorkbookElement::PartialSet.new,   subject.partials
-      assert_equal WorkbookElement::StyleSet.new,     subject.styles
-      assert_equal WorkbookElement::WorksheetSet.new, subject.worksheets
+      assert_equal Osheet::WorkbookElement::TemplateSet.new,  subject.templates
+      assert_equal Osheet::WorkbookElement::PartialSet.new,   subject.partials
+      assert_equal Osheet::WorkbookElement::StyleSet.new,     subject.styles
+      assert_equal Osheet::WorkbookElement::WorksheetSet.new, subject.worksheets
     end
 
   end
 
-
-
   class PartialSetTests < Assert::Context
     desc "a PartialSet"
-    before { @ps = WorkbookElement::PartialSet.new }
+    before { @ps = Osheet::WorkbookElement::PartialSet.new }
     subject { @ps }
 
     should "be a Hash" do
@@ -45,7 +46,7 @@ module Osheet
         subject.send(:verify, {})
       end
       assert_nothing_raised do
-        subject.send(:verify, Partial.new(:poo) {})
+        subject.send(:verify, Osheet::Partial.new(:poo) {})
       end
     end
 
@@ -54,30 +55,30 @@ module Osheet
     end
 
     should "key on partial objs" do
-      assert_equal 'poo', subject.send(:partial_key, Partial.new(:poo) {})
+      assert_equal 'poo', subject.send(:partial_key, Osheet::Partial.new(:poo) {})
     end
 
     should "init the key in the set when verifying" do
-      key = subject.send(:verify, Partial.new(:thing) {})
+      key = subject.send(:verify, Osheet::Partial.new(:thing) {})
       assert_equal 'thing', key
       assert_equal({'thing' => nil}, subject)
     end
 
     should "push partials onto the set" do
       assert_nothing_raised do
-        subject << Partial.new(:poo) {}
-        subject << Partial.new(:not_poo) {}
-        subject << Partial.new(:awesome) {}
-        subject << Partial.new(:poo) {}
+        subject << Osheet::Partial.new(:poo) {}
+        subject << Osheet::Partial.new(:not_poo) {}
+        subject << Osheet::Partial.new(:awesome) {}
+        subject << Osheet::Partial.new(:poo) {}
       end
 
       assert_equal 3, subject.keys.size
       assert subject["poo"]
-      assert_kind_of Partial, subject["poo"]
+      assert_kind_of Osheet::Partial, subject["poo"]
     end
 
     should "lookup a partial by name" do
-      p = Partial.new(:poo) {}
+      p = Osheet::Partial.new(:poo) {}
       subject << p
       assert_equal p, subject.get(:poo)
       assert_equal p, subject.get('poo')
@@ -86,15 +87,13 @@ module Osheet
 
   end
 
-
-
   class TemplateSetTests < Assert::Context
     desc "a TemplateSet"
-    before { @set = WorkbookElement::TemplateSet.new }
+    before { @set = Osheet::WorkbookElement::TemplateSet.new }
     subject { @set }
 
     should "be a PartialSet" do
-      assert_kind_of WorkbookElement::PartialSet, subject
+      assert_kind_of Osheet::WorkbookElement::PartialSet, subject
     end
 
     should "verify set objs are templates" do
@@ -102,7 +101,7 @@ module Osheet
         subject.send(:verify, {})
       end
       assert_nothing_raised do
-        subject.send(:verify, Template.new(:row, :poo) {})
+        subject.send(:verify, Osheet::Template.new(:row, :poo) {})
       end
     end
 
@@ -111,11 +110,11 @@ module Osheet
     end
 
     should "key on templates objs" do
-      assert_equal ['row', 'poo'], subject.send(:template_key, Template.new(:row, :poo) {})
+      assert_equal ['row', 'poo'], subject.send(:template_key, Osheet::Template.new(:row, :poo) {})
     end
 
     should "init the key in the set when verifying" do
-      key = subject.send(:verify, Template.new(:row, :poo) {})
+      key = subject.send(:verify, Osheet::Template.new(:row, :poo) {})
       assert_equal ['row', 'poo'], key
       assert_equal({
         key.first => { key.last => nil }
@@ -124,29 +123,29 @@ module Osheet
 
     should "push templates onto the set" do
       assert_nothing_raised do
-        subject << Template.new(:row, :poo) {}
-        subject << Template.new(:row, :not_poo) {}
-        subject << Template.new(:column, :awesome) {}
-        subject << Template.new(:column, :not_awesome) {}
+        subject << Osheet::Template.new(:row, :poo) {}
+        subject << Osheet::Template.new(:row, :not_poo) {}
+        subject << Osheet::Template.new(:column, :awesome) {}
+        subject << Osheet::Template.new(:column, :not_awesome) {}
       end
 
       assert_equal 2, subject.keys.size
       assert subject["row"]
       assert_equal 2, subject["row"].keys.size
       assert subject["row"]["poo"]
-      assert_kind_of Template, subject["row"]["poo"]
+      assert_kind_of Osheet::Template, subject["row"]["poo"]
       assert subject["row"]["not_poo"]
-      assert_kind_of Template, subject["row"]["not_poo"]
+      assert_kind_of Osheet::Template, subject["row"]["not_poo"]
       assert subject["column"]
       assert_equal 2, subject["column"].keys.size
       assert subject["column"]["awesome"]
-      assert_kind_of Template, subject["column"]["awesome"]
+      assert_kind_of Osheet::Template, subject["column"]["awesome"]
       assert subject["column"]["not_awesome"]
-      assert_kind_of Template, subject["column"]["not_awesome"]
+      assert_kind_of Osheet::Template, subject["column"]["not_awesome"]
     end
 
     should "lookup a template by element, name" do
-      t = Template.new(:row, :poo) {}
+      t = Osheet::Template.new(:row, :poo) {}
       subject << t
       assert_equal t, subject.get(:row, :poo)
       assert_equal t, subject.get('row', 'poo')
@@ -157,11 +156,9 @@ module Osheet
 
   end
 
-
-
   class StyleSetTests < Assert::Context
     desc "a StyleSet"
-    before { @set = WorkbookElement::StyleSet.new }
+    before { @set = Osheet::WorkbookElement::StyleSet.new }
     subject { @set }
 
     should "be an Array" do
@@ -175,18 +172,18 @@ module Osheet
         subject.send(:verify, {})
       end
       assert_nothing_raised do
-        subject.send(:verify, Style.new('.awesome') {})
+        subject.send(:verify, Osheet::Style.new('.awesome') {})
       end
     end
 
     should "be able to lookup styles by class" do
-      subject << (a = Style.new('.awesome') {})
-      subject << (at = Style.new('.awesome.thing') {})
-      subject << (b = Style.new('.boring') {})
-      subject << (bt = Style.new('.boring.thing') {})
-      subject << (a_b = Style.new('.awesome', '.boring') {})
-      subject << (t = Style.new('.thing') {})
-      subject << (s = Style.new('.stupid') {})
+      subject << (a   = Osheet::Style.new('.awesome') {})
+      subject << (at  = Osheet::Style.new('.awesome.thing') {})
+      subject << (b   = Osheet::Style.new('.boring') {})
+      subject << (bt  = Osheet::Style.new('.boring.thing') {})
+      subject << (a_b = Osheet::Style.new('.awesome', '.boring') {})
+      subject << (t   = Osheet::Style.new('.thing') {})
+      subject << (s   = Osheet::Style.new('.stupid') {})
 
       { 'awesome' => [a, a_b],
         'boring' => [b, a_b],
@@ -205,11 +202,9 @@ module Osheet
 
   end
 
-
-
   class WorksheetSetTests < Assert::Context
     desc "a WorksheetSet"
-    before { @set = WorkbookElement::WorksheetSet.new }
+    before { @set = Osheet::WorkbookElement::WorksheetSet.new }
     subject { @set }
 
     should "be an Array" do
@@ -221,11 +216,10 @@ module Osheet
         subject.send(:verify, {})
       end
       assert_nothing_raised do
-        subject.send(:verify, Worksheet.new {})
+        subject.send(:verify, Osheet::Worksheet.new {})
       end
     end
 
   end
 
-
 end