osheet 1.0.0.rc.3 → 1.0.0.rc.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osheet (1.0.0.rc.3)
+    osheet (1.0.0.rc.4)
       enumeration (~> 1.3)
 
 GEM

data/lib/osheet/version.rb

@@ -1,3 +1,3 @@
 module Osheet
-  VERSION = "1.0.0.rc.3"
+  VERSION = "1.0.0.rc.4"
 end

data/lib/osheet/workbook_api.rb

@@ -163,19 +163,21 @@ module Osheet::WorkbookApi
   # an elements style data and style_id.
 
   # used by: column, row, cell
-  def style_class(value)
+  def style_class(value=nil)
     current_class  = element_stack.current.style_class(value)  # for self referencing
-    if self.writer                                             # for writing
+    if value && self.writer                                    # for writing
       self.writer.style(current_class, element_stack.current.format)
     end
+    current_class
   end
 
   # used by: cell
   def format(*args)
-    current_format = element_stack.current.format(*args)  # for self referencing
-    if self.writer                                        # for writing
+    current_format = element_stack.current.format(*args)   # for self referencing
+    if !args.empty? && self.writer                         # for writing
       self.writer.style(element_stack.current.style_class, current_format)
     end
+    current_format
   end
 
   # used by: workbook_element
@@ -198,10 +200,10 @@ module Osheet::WorkbookApi
     :colspan,     # cell
   ].each do |meth|
     define_method(meth) do |*args|
-      element_stack.current.send(meth, *args)  # for self referencing
-      if self.writer                           # for writing
+      if !args.empty? && self.writer             # for writing
         self.writer.send(meth, *args)
       end
+      element_stack.current.send(meth, *args)    # for self referencing
     end
   end
 

data/test/fixtures/test_writer.rb

@@ -61,7 +61,7 @@ class TestWriter
   ].each do |meth|
     define_method(meth) do |*args|
       # cool story bro (don't do anything, just allow)
-      return *args
+      return args
     end
   end
 

data/test/workbook_test.rb

@@ -161,7 +161,7 @@ module Osheet
         }
         worksheet {
           name "two"
-          meta :some_meta
+          meta :val => 'some meta', :wksht_name => self.name
         }
       }
     end
@@ -174,7 +174,7 @@ module Osheet
       assert_equal 2, subject.worksheets.size
       assert_equal "one", subject.worksheets.first.name
       assert_equal "two", subject.worksheets.last.name
-      assert_equal :some_meta, subject.worksheets.last.meta
+      assert_equal({:val => 'some meta', :wksht_name => 'two'}, subject.worksheets.last.meta)
     end
 
     should "return the last worksheet added if called with no args" do
@@ -202,11 +202,13 @@ module Osheet
           }
           row(120) {
             cell {
-              data 12234
+              style_class 'too awesome'
+              data self.style_class.to_s
               format :currency
             }
             cell(Time.now) {
               format :datetime, 'mm/dd/yyyy'
+              data self.format.key
             }
 
           }
@@ -232,10 +234,11 @@ module Osheet
 
     should "access the cells of its last row" do
       assert_equal 2, subject.cells.size
-      assert_equal 12234, subject.cells.first.data
+      assert_equal 'too awesome', subject.cells.first.data
+      assert_equal 'datetime_mm/dd/yyyy', subject.cells.last.data
 
-      assert_equal 4, subject.writer.cells.size
       assert_equal subject.cells.last, subject.writer.rows.last.cells.last
+      assert_equal 4, subject.writer.cells.size
     end
 
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: osheet
 version: !ruby/object:Gem::Version 
-  hash: 15424051
+  hash: 15424061
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - rc
-  - 3
-  version: 1.0.0.rc.3
+  - 4
+  version: 1.0.0.rc.4
 platform: ruby
 authors: 
 - Kelly Redding
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-18 00:00:00 Z
+date: 2012-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development