osheet 0.9.0 → 0.9.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osheet (0.9.0)
+    osheet (0.9.1)
       enumeration (~> 1.2)
       xmlss (~> 0.2)
 

data/examples/formula.rb

@@ -0,0 +1,39 @@
+# To run:
+# $ bundle install
+# $ bundle exec ruby examples/formula.rb
+# $ open examples/formula.xls
+
+require 'rubygems'
+require 'osheet'
+
+
+# this will dump the above data to a single-sheet workbook w/ no styles
+
+Osheet::Workbook.new {
+  title "formula example"
+  worksheet {
+    name "Formula"
+    row {
+      cell { data 1 }
+      cell { data 2 }
+      # please note formulas use R1C1 notation
+      # check out for example http://www.bettersolutions.com/excel/EED883/YI416010881.htm
+      # this is absolute reference, ie. =$A$1+$B$1
+      cell { formula "=R1C1+R1C2" }
+    }
+  }
+  worksheet {
+    name "Refers to previous sheet"
+    row {
+      cell { data 3 }
+      cell { data 4 }
+      cell { 
+        # you can still refer to cells in other sheets through the name of the sheet and !
+        # this is also a relative reference, ie. =Formula!A1+B2
+        formula "=Formula!RC[-2]+RC[-1]"
+        # 6 will change into 5 when formula gets recalculated
+        data 6
+      } 
+    }
+  }
+}.to_file('examples/formula.xls')

data/lib/osheet/cell.rb

@@ -18,6 +18,7 @@ module Osheet
       set_ivar(:colspan, 1)
       set_ivar(:href, nil)
       set_ivar(:index, nil)
+      set_ivar(:formula, nil)
       if block_given?
         set_binding_ivars(block.binding)
         instance_exec(*args, &block)
@@ -43,6 +44,7 @@ module Osheet
     def colspan(value); set_ivar(:colspan, value); end
     def href(value); set_ivar(:href, value); end
     def index(value); set_ivar(:index, value); end
+    def formula(value); set_ivar(:formula, value); end
 
     def attributes
       {
@@ -52,7 +54,8 @@ module Osheet
         :colspan => get_ivar(:colspan),
         :rowspan => get_ivar(:rowspan),
         :href => get_ivar(:href),
-        :index => get_ivar(:index)
+        :index => get_ivar(:index),
+        :formula => get_ivar(:formula)
       }
     end
 

data/lib/osheet/version.rb

@@ -1,3 +1,3 @@
 module Osheet
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/osheet/xmlss_writer/elements.rb

@@ -56,7 +56,8 @@ module Osheet::XmlssWriter::Elements
       :index => ocell.attributes[:index],
       :merge_across => cell_merge(ocell.attributes[:colspan]),
       :merge_down => cell_merge(ocell.attributes[:rowspan]),
-      :data => data(ocell.attributes[:data])
+      :data => data(ocell.attributes[:data]),
+      :formula => ocell.attributes[:formula]
     })
   end
   def cell_merge(span)

data/test/cell_test.rb

@@ -21,6 +21,7 @@ module Osheet
       assert_equal 1,   subject.send(:get_ivar, "rowspan")
       assert_equal nil,   subject.send(:get_ivar, "href")
       assert_equal nil,   subject.send(:get_ivar, "index")
+      assert_equal nil,   subject.send(:get_ivar, "formuala")
     end
 
     should "type cast data strings/symbols" do
@@ -61,6 +62,7 @@ module Osheet
         colspan 4
         rowspan 2
         index 3
+        formula "=R1C1"
         href "http://www.google.com"
       end
     end
@@ -68,9 +70,10 @@ module Osheet
     should "should set them correctly" do
       assert_equal "Poo", subject.send(:get_ivar, "data")
       assert_kind_of Format::Number, subject.send(:get_ivar, "format")
-      assert_equal 4,     subject.send(:get_ivar, "colspan")
-      assert_equal 2,     subject.send(:get_ivar, "rowspan")
-      assert_equal 3,     subject.send(:get_ivar, "index")
+      assert_equal 4,       subject.send(:get_ivar, "colspan")
+      assert_equal 2,       subject.send(:get_ivar, "rowspan")
+      assert_equal 3,       subject.send(:get_ivar, "index")
+      assert_equal "=R1C1", subject.send(:get_ivar, "formula")
       assert_equal "http://www.google.com", subject.send(:get_ivar, "href")
     end
 
@@ -85,6 +88,7 @@ module Osheet
       assert_equal 4, subject.attributes[:colspan]
       assert_equal 2, subject.attributes[:rowspan]
       assert_equal 3, subject.attributes[:index]
+      assert_equal "=R1C1", subject.attributes[:formula]
       assert_equal "http://www.google.com", subject.attributes[:href]
     end
 

data/test/xmlss_writer/elements_test.rb

@@ -132,6 +132,7 @@ module Osheet
         rowspan 2
         colspan 5
         index 3
+        formula "=R1C1"
       end
       subject.workbook = Workbook.new {
         style('.awesome') {
@@ -154,6 +155,7 @@ module Osheet
       assert_equal ::Xmlss::Data.type(:number), @xmlss_cell.data.type
       assert_equal 'http://example.com', @xmlss_cell.href
       assert_equal 3, @xmlss_cell.index
+      assert_equal "=R1C1", @xmlss_cell.formula
     end
 
     should "handle rowspan and colspan" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: osheet
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 Z
+date: 2011-11-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -95,6 +95,7 @@ files:
 - examples/basic.rb
 - examples/basic_with_templates.rb
 - examples/formats.rb
+- examples/formula.rb
 - examples/styles.rb
 - examples/trivial.rb
 - lib/osheet.rb