spreadshoot 0.0.3 → 0.0.4

data/examples/basic.rb

@@ -9,7 +9,7 @@ spreadsheet = Spreadshoot.new do |s|
       @foo = r.cell 2
     end
     w.row do |r|
-      r.cell Date.today + 1
+      r.cell Time.now
       r.cell 'bar', :font => 'Times New Roman'
       @bar = r.cell 3
     end
@@ -80,6 +80,45 @@ spreadsheet = Spreadshoot.new do |s|
       end
     end
   end
+
+  s.worksheet('Relative positioned tables') do |w|
+    t1 = w.table do |t|
+      3.times do
+        t.row do |r|
+          4.times do
+            r.cell(1)
+          end
+        end
+      end
+    end
+    w.table(:next_to => t1) do |t|
+      5.times do
+        t.row do |r|
+          2.times do
+            r.cell(2)
+          end
+        end
+      end
+    end
+    t3 = w.table do |t|
+      4.times do
+        t.row do |r|
+          5.times do
+            r.cell(3)
+          end
+        end
+      end
+    end
+    w.table(:next_to => t3) do |t|
+      2.times do
+        t.row do |r|
+          2.times do
+            r.cell(4)
+          end
+        end
+      end
+    end
+  end
 end
 
 spreadsheet.dump

data/lib/spreadshoot/version.rb

@@ -1,3 +1,3 @@
-module Spreadshoot
-  VERSION = "0.0.3"
+class Spreadshoot
+  VERSION = "0.0.4"
 end

data/lib/spreadshoot.rb

@@ -248,6 +248,7 @@ class Spreadshoot
     end
   end
 
+  # Outputs XML describing spreadsheet styles.
   def styles
     Builder::XmlMarkup.new.styleSheet(:xmlns => "http://schemas.openxmlformats.org/spreadsheetml/2006/main") do |xs|
       xs.fonts do |xf|
@@ -320,6 +321,7 @@ class Spreadshoot
     end
   end
 
+  # Single worksheet containing one or more tables.
   class Worksheet
     # <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" >
     # 	<sheetData>
@@ -332,7 +334,9 @@ class Spreadshoot
     # </worksheet>
 
     attr_reader :title, :xml, :spreadsheet, :row_index, :col_index, :cells
-    def initialize spreadsheet, title, options = {}, &block
+
+    # Not intended to be called directly. Use Spreadshoot#worksheet to create a worksheet.
+    def initialize spreadsheet, title, options = {}
       @cells = {}
       @spreadsheet = spreadsheet
       @title = title
@@ -346,7 +350,7 @@ class Spreadshoot
       yield self
     end
 
-    # outputs the worksheet as OOXML
+    # Outputs the worksheet as OOXML
     def to_s
       @xml ||= Builder::XmlMarkup.new.worksheet(:xmlns => "http://schemas.openxmlformats.org/spreadsheetml/2006/main") do |ws|
         unless @column_widths.empty?
@@ -373,21 +377,34 @@ class Spreadshoot
       end
     end
 
+    # Creates a row within a worksheet.
+    #
+    # @param [Hash] options options to create a row with.
+    # @return created row
     def row options = {}, &block
       row = @current_table.row options, &block
       @row_index += 1
       row
     end
 
+    # Creates a table within a worksheet.
+    #
+    # @param [Hash] options Options to initialize table with.
+    # @option options [Symbol] :direction (:vertical) Orientation of the table (could be :horizontal or :vertical)
+    # @option options [Table] :next_to Optionally, place the table to the right of the already existing table
+    # @option options [Fixnum] :row_topleft Place the tables top left corner absolutely to a certain row
+    # @option options [Fixnum] :col_topleft Place the tables top left corner absolutely to a certain column
+    # @return [Table] created table
     def table options = {}
       @current_table = table = Table.new(self, options)
       yield table
-      @row_index += table.row_max
+      @row_index = [@row_index, table.row_topleft + table.row_max].max
       @col_index = 0
       @current_table = Table.new(self, @options) # preparing one in case row directly called next
       table
     end
 
+    # Not intended to be used directly.
     def set_col_width col, width
       @column_widths[col] = width
     end
@@ -397,7 +414,7 @@ class Spreadshoot
   # Allows you to group cells to a logical table within a worksheet. Makes putting several tables
   # to the same worksheet easier.
   class Table
-    attr_reader :worksheet, :direction, :col_max, :row_max, :col_index, :row_index
+    attr_reader :worksheet, :direction, :col_max, :row_max, :col_index, :row_index, :row_topleft, :col_topleft
 
     def initialize worksheet, options = {}
       @worksheet = worksheet
@@ -409,6 +426,11 @@ class Spreadshoot
       @col_max = 0
       @row_topleft = options[:row_topleft] || @worksheet.row_index
       @col_topleft = options[:col_topleft] || @worksheet.col_index
+
+      if tbl = options[:next_to]
+        @row_topleft = tbl.row_topleft
+        @col_topleft = tbl.col_topleft + tbl.col_max
+      end
     end
 
     def col_index= val
@@ -511,8 +533,10 @@ class Spreadshoot
         xn_parent.c(r) do |xc|
           xc.f(@options[:formula])
         end
-      when Date, Time
+      when Date
         xn_parent.c(r){|xc| xc.v((@value - Date.new(1899,12,30)).to_i)}
+      when Time
+        xn_parent.c(r){|xc| xc.v((@value - Time.new(1899,12,30)) / (24*60*60))}
       when nil
         xn_parent.c(r)
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spreadshoot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &83815620 !ruby/object:Gem::Requirement
+  requirement: &80585380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83815620
+  version_requirements: *80585380
 description: Create XLSX files from scratch using Ruby
 email:
 - jablan@radioni.ca
@@ -63,3 +63,4 @@ signing_key:
 specification_version: 3
 summary: Ruby DSL for creating Excel xlsx spreadsheets
 test_files: []
+has_rdoc: