flexy-odf-report 0.1.4 → 0.1.5

data/lib/odf-report/table.rb

@@ -11,42 +11,20 @@ class Table
     @collection       = opts[:collection]
     @header           = opts[:header] || false
 
+    @skip_empty_rows  = opts[:skip_empty_rows] || false
+
     @fields = {}
     @rows = []
     @data = []
   end
 
-  #
-  # Old version
-  #
   def add_column(name, field=nil, &block)
-    add_column_if(true, name, field, &block)
-  end
-
-  #
-  # New version
-  #
-  # Adds column only if condition is not evaluated to false.
-
-  # If condition equals :skip_blank_fields and both, field
-  # is nil and no block is given then nothing is done (no
-  # column is added).
-  #
-  def add_column_if(condition, name, field=nil, &block)
-    if condition
-      block_result = yield if block_given?
-
-      # Only render the column if condition holds true...
-      if condition == :skip_blank_fields &&
-              (field.nil? || field.strip.blank?) && (block.nil? || block_result.nil?)
-        # Do nothing!
-      elsif field
-        @fields[name] = lambda { |item| item.send(field)}
-      elsif block_given?
-        @fields[name] = block
-      else
-        @fields[name] = lambda { |item| item.send(name)}
-      end
+    if field
+      @fields[name] = lambda { |item| item.send(field) }
+    elsif block_given?
+      @fields[name] = block
+    else
+      @fields[name] = lambda { |item| item.send(name) }
     end
   end
 
@@ -55,9 +33,10 @@ class Table
     collection.each do |item|
       row = {}
       @fields.each do |field_name, block1|
-        row[field_name] = block1.call(item) || ''
+        cell = block1.call(item) || ''
+        row[field_name] = cell unless (cell.nil? || cell.strip.blank?) && @skip_empty_rows
       end
-      ret << row
+      ret << row unless row.empty? && @skip_empty_rows
     end
     ret
   end

data/odf-report.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flexy-odf-report}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sandro Duarte", "Mark von Zeschau"]

metadata

@@ -2,7 +2,7 @@
 name: flexy-odf-report
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Sandro Duarte