osheet 1.0.0.rc.4 → 1.0.0

data/lib/osheet/workbook_element.rb

@@ -3,7 +3,6 @@ require 'osheet/worksheet'
 
 module Osheet
 
-
   class WorkbookElement
 
     # This 'WorkbookElement' class handles all workbook state.  It is setup
@@ -60,8 +59,6 @@ module Osheet
 
   end
 
-
-
   class WorkbookElement::PartialSet
 
     # this class is a Hash that behaves kinda like a set.  I want to
@@ -116,8 +113,6 @@ module Osheet
 
   end
 
-
-
   class WorkbookElement::TemplateSet < WorkbookElement::PartialSet
 
     # this class is a PartialSet that keys off of the template element
@@ -166,8 +161,6 @@ module Osheet
 
   end
 
-
-
   class WorkbookElement::StyleSet < ::Array
 
     # this class is an Array with some helper methods.  I want to
@@ -201,8 +194,6 @@ module Osheet
 
   end
 
-
-
   class WorkbookElement::WorksheetSet < ::Array
 
     # this class is just a wrapper to Array.  I want to push worksheets
@@ -230,5 +221,4 @@ module Osheet
 
   end
 
-
 end

data/osheet.gemspec

@@ -1,23 +1,25 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "osheet/version"
 
-Gem::Specification.new do |s|
-  s.name        = "osheet"
-  s.version     = Osheet::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Kelly Redding"]
-  s.email       = ["kelly@kellyredding.com"]
-  s.homepage    = "http://github.com/kellyredding/osheet"
-  s.summary     = %q{A DSL for specifying and generating spreadsheets using Ruby}
-  s.description = %q{A DSL for specifying and generating spreadsheets using Ruby}
+Gem::Specification.new do |gem|
+  gem.name        = "osheet"
+  gem.version     = Osheet::VERSION
+  gem.authors     = ["Kelly Redding"]
+  gem.email       = ["kelly@kellyredding.com"]
+  gem.summary     = %q{A DSL for specifying and generating spreadsheets using Ruby}
+  gem.description = %q{A DSL for specifying and generating spreadsheets using Ruby}
+  gem.homepage    = "http://github.com/kellyredding/osheet"
+  gem.license     = 'MIT'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 
-  s.add_development_dependency("assert", ["~> 0.3"])
-  s.add_dependency("enumeration", ["~> 1.3"])
+  gem.add_development_dependency("assert", ["~> 2.0"])
+
+  gem.add_dependency("enumeration", ["~> 1.3"])
 
 end

data/test/helper.rb

@@ -1,8 +1,12 @@
-# this file is automatically required in when you require 'assert' in your tests
+# this file is automatically required when you run `assert`
+# put any test helpers here
 
-# add root dir to the load path
+# add the root dir to the load path
 $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
+# require pry for debugging (`binding.pry`)
+require 'pry'
+
 class Assert::Context
 
   # Macros

data/test/{cell_test.rb → unit/cell_tests.rb}

@@ -1,12 +1,15 @@
 require "assert"
 require 'osheet/cell'
 
-module Osheet
+require 'osheet/format/general'
+require 'osheet/format/datetime'
 
-  class CellTests < Assert::Context
-    desc "a Cell"
-    before { @c = Cell.new }
-    subject { @c }
+class Osheet::Cell
+
+  class UnitTests < Assert::Context
+    desc "Osheet::Cell"
+    before{ @c = Osheet::Cell.new }
+    subject{ @c }
 
     should be_a_styled_element
     should be_a_meta_element
@@ -21,32 +24,32 @@ module Osheet
       assert_equal nil, subject.href
       assert_equal nil, subject.index
       assert_equal nil, subject.formula
-      assert_kind_of Format::General, subject.format
+      assert_kind_of Osheet::Format::General, subject.format
     end
 
     should "set its data from an init arg" do
-      assert_equal "something", Cell.new("something").data
+      assert_equal "something", Osheet::Cell.new("something").data
     end
 
     should "type cast data strings/symbols" do
       ['a string', :symbol].each do |thing|
         subject.data thing
         assert_kind_of ::String, subject.data
-        assert_kind_of ::String, Cell.new(thing).data
+        assert_kind_of ::String, Osheet::Cell.new(thing).data
       end
     end
 
     should "type cast data dates" do
       subject.data Date.today
       assert_kind_of ::Date, subject.data
-      assert_kind_of ::Date, Cell.new(Date.today).data
+      assert_kind_of ::Date, Osheet::Cell.new(Date.today).data
     end
 
     should "type cast data numerics" do
       [1, 1.0].each do |thing|
         subject.data thing
         assert_kind_of ::Numeric, subject.data
-        assert_kind_of ::Numeric, Cell.new(thing).data
+        assert_kind_of ::Numeric, Osheet::Cell.new(thing).data
       end
     end
 
@@ -54,7 +57,7 @@ module Osheet
       [Osheet, [:a, 'Aye'], {:a => 'Aye'}].each do |thing|
         subject.data thing
         assert_kind_of ::String, subject.data
-        assert_kind_of ::String, Cell.new(thing).data
+        assert_kind_of ::String, Osheet::Cell.new(thing).data
       end
     end
 
@@ -62,7 +65,7 @@ module Osheet
       subject.data Time.now
       subject.format :datetime, 'mm/dd/yyyy'
 
-      assert_kind_of Format::Datetime, subject.format
+      assert_kind_of Osheet::Format::Datetime, subject.format
     end
 
   end

data/test/{column_test.rb → unit/column_tests.rb}

@@ -1,13 +1,14 @@
 require "assert"
-
 require "osheet/column"
 
-module Osheet
+require 'osheet/format/general'
+
+class Osheet::Column
 
-  class ColumnTests < Assert::Context
-    desc "a Column"
-    before { @c = Column.new }
-    subject { @c }
+  class UnitTests < Assert::Context
+    desc "Osheet::Column"
+    before{ @c = Osheet::Column.new }
+    subject{ @c }
 
     should be_a_styled_element
     should be_a_meta_element
@@ -23,7 +24,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
@@ -36,11 +37,11 @@ module Osheet
       subject.width(nil)
       assert_equal 180, subject.width
 
-      assert_equal 200, Column.new(200).width
+      assert_equal 200, Osheet::Column.new(200).width
     end
 
     should "cast autofit and hidden to bool" do
-      col = Column.new
+      col = Osheet::Column.new
       col.autofit :true
       col.hidden 'false'
 

data/test/{format/accounting_test.rb → unit/format/accounting_tests.rb}

@@ -1,26 +1,26 @@
 require "assert"
 require 'osheet/format/accounting'
 
-module Osheet::Format
+class Osheet::Format::Accounting
 
-  class AccountingTest < Assert::Context
-    desc "Accounting format"
-    before { @f = Accounting.new }
-    subject { @f }
+  class UnitTests < Assert::Context
+    desc "Osheet::Format::Accounting format"
+    before{ @f = Osheet::Format::Accounting.new }
+    subject{ @f }
 
     should have_accessors :decimal_places, :symbol, :comma_separator, :negative_numbers
 
     should "provide symbol options" do
-      assert_equal 3, Accounting.symbol_set.size
+      assert_equal 3, Osheet::Format::Accounting.symbol_set.size
       [:none, :dollar, :euro].each do |a|
-        assert Accounting.symbol_set.include?(a)
+        assert Osheet::Format::Accounting.symbol_set.include?(a)
       end
     end
 
     should "provide negative numbers options" do
-      assert_equal 4, Accounting.negative_numbers_set.size
+      assert_equal 4, Osheet::Format::Accounting.negative_numbers_set.size
       [:black, :black_parenth, :red, :red_parenth].each do |a|
-        assert Accounting.negative_numbers_set.include?(a)
+        assert Osheet::Format::Accounting.negative_numbers_set.include?(a)
       end
     end
 
@@ -33,27 +33,31 @@ module Osheet::Format
 
     should "only allow Fixnum decimal places between 0 and 30" do
       assert_raises ArgumentError do
-        Accounting.new({:decimal_places => -1})
+        Osheet::Format::Accounting.new({:decimal_places => -1})
       end
+
       assert_raises ArgumentError do
-        Accounting.new({:decimal_places => 31})
+        Osheet::Format::Accounting.new({:decimal_places => 31})
       end
+
       assert_raises ArgumentError do
-        Accounting.new({:decimal_places => 'poo'})
+        Osheet::Format::Accounting.new({:decimal_places => 'poo'})
       end
+
       assert_nothing_raised do
-        Accounting.new({:decimal_places => 1})
+        Osheet::Format::Accounting.new({:decimal_places => 1})
       end
     end
 
     should "generate decimal place style strings" do
-      assert_equal "0", Accounting.new({
+      assert_equal "0", Osheet::Format::Accounting.new({
         :decimal_places => 0,
         :comma_separator => false,
         :symbol => :none
       }).style
+
       (1..5).each do |n|
-        assert_equal "0.#{'0'*n}", Accounting.new({
+        assert_equal "0.#{'0'*n}", Osheet::Format::Accounting.new({
           :decimal_places => n,
           :comma_separator => false,
           :symbol => :none
@@ -62,12 +66,13 @@ module Osheet::Format
     end
 
     should "generate comma separator style strings" do
-      assert_equal "0", Accounting.new({
+      assert_equal "0", Osheet::Format::Accounting.new({
         :comma_separator => false,
         :decimal_places => 0,
         :symbol => :none
       }).style
-      assert_equal "#,##0", Accounting.new({
+
+      assert_equal "#,##0", Osheet::Format::Accounting.new({
         :comma_separator => true,
         :decimal_places => 0,
         :symbol => :none
@@ -75,13 +80,14 @@ module Osheet::Format
     end
 
     should "generate parenth negative numbers style strings" do
-      assert_equal "0", Accounting.new({
+      assert_equal "0", Osheet::Format::Accounting.new({
         :negative_numbers => :black,
         :decimal_places => 0,
         :comma_separator => false,
         :symbol => :none
       }).style
-      assert_equal "0_);\(0\)", Accounting.new({
+
+      assert_equal "0_);\(0\)", Osheet::Format::Accounting.new({
         :negative_numbers => :black_parenth,
         :decimal_places => 0,
         :comma_separator => false,
@@ -90,13 +96,14 @@ module Osheet::Format
     end
 
     should "generate red negative numbers style strings" do
-      assert_equal "0;[Red]0", Accounting.new({
+      assert_equal "0;[Red]0", Osheet::Format::Accounting.new({
         :negative_numbers => :red,
         :decimal_places => 0,
         :comma_separator => false,
         :symbol => :none
       }).style
-      assert_equal "0_);[Red]\(0\)", Accounting.new({
+
+      assert_equal "0_);[Red]\(0\)", Osheet::Format::Accounting.new({
         :negative_numbers => :red_parenth,
         :decimal_places => 0,
         :comma_separator => false,
@@ -105,12 +112,13 @@ module Osheet::Format
     end
 
     should "generate symbol style strings" do
-      assert_equal "0", Accounting.new({
+      assert_equal "0", Osheet::Format::Accounting.new({
         :decimal_places => 0,
         :comma_separator => false,
         :symbol => :none
       }).style
-      assert_equal "\"$\"* 0", Accounting.new({
+
+      assert_equal "\"$\"* 0", Osheet::Format::Accounting.new({
         :decimal_places => 0,
         :comma_separator => false,
         :symbol => :dollar
@@ -118,7 +126,7 @@ module Osheet::Format
     end
 
     should "generate complex style string" do
-      assert_equal("\"$\"* 0.00_);\(\"$\"* 0.00\)", Accounting.new({
+      assert_equal("\"$\"* 0.00_);\(\"$\"* 0.00\)", Osheet::Format::Accounting.new({
         :symbol => :dollar,
         :decimal_places => 2,
         :negative_numbers => :black_parenth,
@@ -127,12 +135,13 @@ module Osheet::Format
     end
 
     should "provide unique format keys" do
-      assert_equal("accounting_dollar_2_nocomma_blackparenth", Accounting.new({
+      assert_equal("accounting_dollar_2_nocomma_blackparenth", Osheet::Format::Accounting.new({
         :decimal_places => 2,
         :negative_numbers => :black_parenth,
         :comma_separator => false
       }).key)
-      assert_equal("accounting_none_4_comma_redparenth", Accounting.new({
+
+      assert_equal("accounting_none_4_comma_redparenth", Osheet::Format::Accounting.new({
         :symbol => :none,
         :decimal_places => 4,
         :negative_numbers => :red_parenth,

data/test/{format/currency_test.rb → unit/format/currency_tests.rb}

@@ -1,26 +1,26 @@
 require "assert"
 require 'osheet/format/currency'
 
-module Osheet::Format
+class Osheet::Format::Currency
 
-  class CurrencyTest < Assert::Context
-    desc "Currency format"
-    before { @f = Currency.new }
-    subject { @f }
+  class UnitTests < Assert::Context
+    desc "Osheet::Format::Currency format"
+    before{ @f = Osheet::Format::Currency.new }
+    subject{ @f }
 
     should have_accessors :decimal_places, :symbol, :comma_separator, :negative_numbers
 
     should "provide symbol options" do
-      assert_equal 3, Currency.symbol_set.size
+      assert_equal 3, Osheet::Format::Currency.symbol_set.size
       [:none, :dollar, :euro].each do |a|
-        assert Currency.symbol_set.include?(a)
+        assert Osheet::Format::Currency.symbol_set.include?(a)
       end
     end
 
     should "provide negative numbers options" do
-      assert_equal 4, Currency.negative_numbers_set.size
+      assert_equal 4, Osheet::Format::Currency.negative_numbers_set.size
       [:black, :black_parenth, :red, :red_parenth].each do |a|
-        assert Currency.negative_numbers_set.include?(a)
+        assert Osheet::Format::Currency.negative_numbers_set.include?(a)
       end
     end
 
@@ -33,27 +33,31 @@ module Osheet::Format
 
     should "only allow Fixnum decimal places between 0 and 30" do
       assert_raises ArgumentError do
-        Currency.new({:decimal_places => -1})
+        Osheet::Format::Currency.new({:decimal_places => -1})
       end
+
       assert_raises ArgumentError do
-        Currency.new({:decimal_places => 31})
+        Osheet::Format::Currency.new({:decimal_places => 31})
       end
+
       assert_raises ArgumentError do
-        Currency.new({:decimal_places => 'poo'})
+        Osheet::Format::Currency.new({:decimal_places => 'poo'})
       end
+
       assert_nothing_raised do
-        Currency.new({:decimal_places => 1})
+        Osheet::Format::Currency.new({:decimal_places => 1})
       end
     end
 
     should "generate decimal place style strings" do
-      assert_equal "0", Currency.new({
+      assert_equal "0", Osheet::Format::Currency.new({
         :decimal_places => 0,
         :comma_separator => false,
         :symbol => :none
       }).style
       (1..5).each do |n|
-        assert_equal "0.#{'0'*n}", Currency.new({
+
+        assert_equal "0.#{'0'*n}", Osheet::Format::Currency.new({
           :decimal_places => n,
           :comma_separator => false,
           :symbol => :none
@@ -62,12 +66,13 @@ module Osheet::Format
     end
 
     should "generate comma separator style strings" do
-      assert_equal "0", Currency.new({
+      assert_equal "0", Osheet::Format::Currency.new({
         :comma_separator => false,
         :decimal_places => 0,
         :symbol => :none
       }).style
-      assert_equal "#,##0", Currency.new({
+
+      assert_equal "#,##0", Osheet::Format::Currency.new({
         :comma_separator => true,
         :decimal_places => 0,
         :symbol => :none
@@ -75,13 +80,14 @@ module Osheet::Format
     end
 
     should "generate parenth negative numbers style strings" do
-      assert_equal "0", Currency.new({
+      assert_equal "0", Osheet::Format::Currency.new({
         :negative_numbers => :black,
         :decimal_places => 0,
         :comma_separator => false,
         :symbol => :none
       }).style
-      assert_equal "0_);\(0\)", Currency.new({
+
+      assert_equal "0_);\(0\)", Osheet::Format::Currency.new({
         :negative_numbers => :black_parenth,
         :decimal_places => 0,
         :comma_separator => false,
@@ -90,13 +96,14 @@ module Osheet::Format
     end
 
     should "generate red negative numbers style strings" do
-      assert_equal "0;[Red]0", Currency.new({
+      assert_equal "0;[Red]0", Osheet::Format::Currency.new({
         :negative_numbers => :red,
         :decimal_places => 0,
         :comma_separator => false,
         :symbol => :none
       }).style
-      assert_equal "0_);[Red]\(0\)", Currency.new({
+
+      assert_equal "0_);[Red]\(0\)", Osheet::Format::Currency.new({
         :negative_numbers => :red_parenth,
         :decimal_places => 0,
         :comma_separator => false,
@@ -105,12 +112,13 @@ module Osheet::Format
     end
 
     should "generate symbol style strings" do
-      assert_equal "0", Currency.new({
+      assert_equal "0", Osheet::Format::Currency.new({
         :decimal_places => 0,
         :comma_separator => false,
         :symbol => :none
       }).style
-      assert_equal "\"$\"0", Currency.new({
+
+      assert_equal "\"$\"0", Osheet::Format::Currency.new({
         :decimal_places => 0,
         :comma_separator => false,
         :symbol => :dollar
@@ -118,7 +126,7 @@ module Osheet::Format
     end
 
     should "generate complex style string" do
-      assert_equal("\"$\"0.00_);\(\"$\"0.00\)", Currency.new({
+      assert_equal("\"$\"0.00_);\(\"$\"0.00\)", Osheet::Format::Currency.new({
         :symbol => :dollar,
         :decimal_places => 2,
         :negative_numbers => :black_parenth,
@@ -127,12 +135,13 @@ module Osheet::Format
     end
 
     should "provide unique format keys" do
-      assert_equal("currency_dollar_2_nocomma_blackparenth", Currency.new({
+      assert_equal("currency_dollar_2_nocomma_blackparenth", Osheet::Format::Currency.new({
         :decimal_places => 2,
         :negative_numbers => :black_parenth,
         :comma_separator => false
       }).key)
-      assert_equal("currency_none_4_comma_redparenth", Currency.new({
+
+      assert_equal("currency_none_4_comma_redparenth", Osheet::Format::Currency.new({
         :symbol => :none,
         :decimal_places => 4,
         :negative_numbers => :red_parenth,