tabular 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c908df1467372314b8f4df918f660907f6783762
-  data.tar.gz: 9c63253c7add9585952dc55cd2fe4e79701f1901
+  metadata.gz: decef6ce8a30ee4c9008445e52db1d8c6c7634da
+  data.tar.gz: 51165df09dc13e1c8f18c46eb2027f5755276490
 SHA512:
-  metadata.gz: 9d4c2d9a66f85c6bbe76a045fad990565ebfab721df204a9a818e181794d55b86a272748766e61e82cdae2ed6ca93f3571cb8757639cc9ba3b05300ae5cd81d1
-  data.tar.gz: 542cb560461e295a94adfe5f6864d185ae023874dd3d8c4905c65ad992c042a0c0296f5ea0c9e3c78a143aa106c20d128e8027010bb7ed2a03f791c248c0adda
+  metadata.gz: faecd2bb8ddaee2e4f9776645c37407265fdf173484d8435d9796987f0d99c13fcd0ae80aa566320f790c6aea2dd69c20bf142cbb0c767f1db0ae633b34c3524
+  data.tar.gz: c26ddf3fcd83c9f7fda952d108e2d68547551580ea7ed655d1874a9800da37655c689aeb81d765e90188ab5c4487cedcff82bfbd25ca577dda30528b5210f645

data/lib/tabular/table.rb

@@ -76,15 +76,15 @@ module Tabular
     def rows
       @rows ||= []
     end
-    
+
     # Set table rows. Calls row <<, which creates columns and links the source rows to Row#source.
     def rows=(source_rows = [])
       return [] unless source_rows
-      
+
       source_rows.each do |row|
         self.<< row
       end
-      
+
       rows
     end
 
@@ -94,7 +94,7 @@ module Tabular
     end
 
     # Add row to end of table. Create missing columns and link the source row to Row#source.
-    # To control how source data is added to the Table, use Table#mapper= to set a class that 
+    # To control how source data is added to the Table, use Table#mapper= to set a class that
     # implements map(row) and returns a Hash.
     def <<(row)
       if row_mapper
@@ -126,24 +126,22 @@ module Tabular
     end
 
     # Remove all columns that only contain a blank string, zero, or nil
-    def delete_blank_columns!
-      columns.map(&:key).each do |key|
+    def delete_blank_columns!(*_options)
+      exceptions = extract_exceptions(_options)
+
+      (columns.map(&:key) - exceptions).each do |key|
         if rows.all? { |row| is_blank?(row[key]) || is_zero?(row[key]) }
           delete_column key
         end
       end
     end
-    
+
     # Remove all columns that contain the same value in all rows
     def delete_homogenous_columns!(*_options)
       return if rows.size < 2
-      
-      if _options.first && _options.first[:except]
-        exceptions = _options.first[:except]
-      else
-        exceptions = []
-      end
-      
+
+      exceptions = extract_exceptions(_options)
+
       (columns.map(&:key) - exceptions).each do |key|
         value = rows.first[key]
         if rows.all? { |row| row[key] == value }
@@ -151,7 +149,7 @@ module Tabular
         end
       end
     end
-    
+
     # Remove preceding and trailing whitespace from all cells. By default, Table does not
     # strip whitespace from cells.
     def strip!
@@ -164,7 +162,7 @@ module Tabular
         end
       end
     end
-    
+
     def delete_column(key)
       rows.each do |row|
         row.delete key
@@ -181,7 +179,7 @@ module Tabular
     def renderers
       columns.renderers
     end
-    
+
     # Last-resort storage for client code data
     def metadata
       @metadata ||= {}
@@ -216,5 +214,13 @@ module Tabular
         end
       end
     end
+
+    def extract_exceptions(options)
+      if options.first && options.first[:except]
+        options.first[:except]
+      else
+        []
+      end
+    end
   end
 end

data/lib/tabular/version.rb

@@ -1,3 +1,3 @@
 module Tabular
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabular
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Scott Willson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole