table_setting 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c40c25789795050dc7263feef891495355d4fa
-  data.tar.gz: c65c25bba4e6335aa6706387764a153553462472
+  metadata.gz: 45fb00aa69cdcb9a6fe02ec44574625f418e0a0d
+  data.tar.gz: c03067f432d44c205c434e3bbe46a136a07cb842
 SHA512:
-  metadata.gz: 5d5bc712d9a5e61aa1a6dcd3a4cba1255c89a12b46c604cadc0dd31f85e3813a402d9e25005a989a4450667e07ddfeac86ed24812d2e02a4147f9f919e59f168
-  data.tar.gz: adc6634d47602631a50b561c4d0358fe58520e3b22bfdc388bcaf62e985483b2f0bf50bff9d81622fdcee60af834b527eebe64d5e66c211070c3d2cbf1b10fff
+  metadata.gz: ac15d0b2d486f8c4c7778448ce709d1cdf646ed7c8b804ad0b5d1d1218f87c257ad6d3e92306f8f6a8dc804da0078c5baadf5042ddfe62fac7dfc2d1869abaef
+  data.tar.gz: f166ebb6509cbece553d00ca8e6fe7de51fb608d629c462bea16514be381debc8d22ff027efc56eeb225b795eb27f601e3aecf93d4637feaef899b0d4bd4628a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    table_setting (0.2.0)
+    table_setting (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/table_setting/cell.rb

@@ -1,5 +1,5 @@
 class TableSetting::Cell
-  attr_reader :row, :contents, :span, :style, :left_index
+  attr_reader :row, :contents, :span, :style, :left_index, :rowspan
     
   def initialize(row, contents, options = {})
     @row = row
@@ -7,12 +7,14 @@ class TableSetting::Cell
 
     @contents = contents
     @span     = options[:span] || 1
-
+    @rowspan  = options[:rowspan] || 1
+    
     @style = TableSetting::Style.new(self, options)
 
     @left_index = column_index
   end
 
+
   def set_style(options)
     style.update(options)
   end
@@ -56,8 +58,13 @@ class TableSetting::Cell
   end
 
   def to_html
+    if sheet.debug
+      cell_index = "#{left_index} :: "
+    else
+      cell_index = ''
+    end
     <<-HTML
-      <td #{html_classes} #{span_attribute}>#{contents.blank? ? '&nbsp;' : contents}</td>
+      <td #{html_classes} #{span_attributes}>#{cell_index}#{contents.blank? ? '&nbsp;' : contents}</td>
     HTML
   end
 
@@ -88,32 +95,29 @@ class TableSetting::Cell
     %Q{<Cell #{column_attribute} ss:StyleID="#{style.name}"><Data ss:Type="String">#{contents}</Data></Cell>\n}
   end
 
-  # def left_index
-  #   preceeding_cells.map{|c| c.span}.sum
-  # end
-
   private
 
     def html_classes
-      list = []
-      if bold?
-        list << 'bold'
-      end
-      list.push(style.name)
-      unless list.empty?
-        return %Q{class="#{list.join(' ')}"}
-      end
-      ''
+        return %Q{class="#{style.name}"} unless style.name.blank?
+    end
+
+    def span_attributes
+      %Q{#{rowspan_attribute} #{colspan_attribute}}.strip
+    end
+    
+    def rowspan_attribute
+      return '' unless rowspan and rowspan > 1
+      %Q{rowspan="#{rowspan}"}
     end
 
-    def span_attribute
-      span = 0
+    def colspan_attribute
+      span = 1
       if @span == 'all'
         span = sheet.num_columns
       elsif @span
         span = @span
       end
-      if span > 0
+      if span > 1
         return %Q{colspan="#{span}"}
       end
       ''

data/lib/table_setting/column.rb

@@ -1,14 +1,10 @@
 class TableSetting::Column
-  def initialize(title, method, options = {})
-    @title  = title
-    @method = method
-  end
+  attr_reader :title, :style_options, :method_token
 
-  def title
-    @title
+  def initialize(title, method_token, options = {})
+    @title  = title
+    @method_token = method_token
+    @style_options = options
   end
 
-  def method
-    @method
-  end
 end

data/lib/table_setting/row.rb

@@ -22,7 +22,20 @@ class TableSetting::Row
       end
       total_width += width
     end
-    total_width
+    total_width + num_inherited_columns
+  end
+
+  def num_inherited_columns
+    spanned_columns = 0
+    sheet.rows.each do |row|
+      row.cells.each do |cell|
+        next unless cell.rowspan > 1
+        if (sheet.rows.index(row) + (cell.rowspan - 1)) >= sheet.rows.index(self)
+          spanned_columns += cell.span
+        end
+      end
+    end
+    spanned_columns
   end
 
   def bold?
@@ -42,6 +55,7 @@ class TableSetting::Row
   end
 
   def to_html
+    fill
     <<-HTML
       <tr>
         #{cells.map(&:to_html).join("\n")}

data/lib/table_setting/sheet.rb

@@ -1,38 +1,32 @@
 class TableSetting::Sheet
-  attr_reader :stack
+  attr_reader :stack, :debug
   attr_accessor :name, :rows
 
   @@counter = 0
 
-  def initialize(parent_stack = TableSetting::Stack.new, options = {})
-    @stack = parent_stack
+  def initialize(parent_stack = nil, options = {})
+    @stack = parent_stack || TableSetting::Stack.new
     @stack.sheets.push(self)
     @rows = []
+    @debug = options[:debug]
 
     @@counter += 1
     @name = options[:name] || "Sheet#{@@counter}"
   end
 
   def cells
-    list = []
-    rows.each do |row|
-      list.concat(row.cells)
-    end
-    list
+    rows.map(&:cells).flatten
   end
 
   def num_columns
-    max = 0
-    rows.each do |row|
-      if row.num_columns > max
-        max = row.num_columns
-      end
-    end
-    max
+    rows.map{|row| row.num_columns}.sort.last
   end
 
   def style_column(number, options)
     rows.each do |row|
+      if options[:skip_row] and options[:skip_row] == rows.index(row) + 1
+        next
+      end
       row.fill
       row.cells.select{|c| c.in_column?(number)}.map{|c| c.set_style(options)}
     end
@@ -55,6 +49,10 @@ class TableSetting::Sheet
     csv_string
   end
 
+  def index
+    @index ||= sheet.rows.index(self)
+  end
+
   def to_html
     <<-HTML
       <style type="text/css">

data/lib/table_setting/version.rb

@@ -1,3 +1,3 @@
 module TableSetting
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_setting
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Todd Gehman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler