RubyGems - table_fu - Versions diffs - 0.3.3 → 0.3.4 - Mend

table_fu 0.3.3 → 0.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/VERSION.yml CHANGED

@@ -1,5 +1,5 @@
 ---
 :minor: 3
 :build:
-:patch: 3
+:patch: 4
 :major: 0

data/index.html CHANGED

@@ -10,7 +10,7 @@
   <body>
     <a href="http://www.propublica.org" class="propublica">&nbsp;</a>
-    <h1>TableFu <small>&ndash; Version: 0.3.3</small></h1>
+    <h1>TableFu <small>&ndash; Version: 0.3.4</small></h1>
     <p><a href="http://github.com/propublica/table-fu">TableFu</a> is a ruby gem for spreadsheet-style handling of arrays (e.g. filtering, formatting, and sorting by "column" or "row"). In addition, it has the ability to <a href="#facet">facet</a> &mdash; or group &mdash; rows according to cell value. It was developed as a backend for its companion project <a href="http://www.github.com/propublica/table-setter">TableSetter</a>.</p>
     <p>For example, <strong>TableFu</strong> can consume a csv file and sort on a column:

data/lib/table_fu.rb CHANGED

@@ -276,8 +276,8 @@ class TableFu
     # And finally we return a empty string object or the value.
     #
     def to_s
-      ret = if macro_value
-              macro_value
+      ret = if macro?
+              macro_value.to_s
             elsif @spreadsheet.formatting && format_method = @spreadsheet.formatting[column_name]
               TableFu::Formatting.send(format_method, @datum) || ''
             else
@@ -287,10 +287,18 @@ class TableFu
       ret
     end
-    # Returns the macro'd format if there is one
+    # Returns whether there is a macro format for this datum
     #
     # Returns:
-    # The macro value if it exists, otherwise nil
+    # true if there is a macro format, false or nil otherwise
+    def macro?
+      @spreadsheet.formatting && @spreadsheet.formatting[@column_name].is_a?(Hash)
+    end
+    # Returns the macro'd format
+    #
+    # Returns:
+    # The macro value
     def macro_value
       # Grab the macro method first
       # Then get a array of the values in the columns listed as arguments
@@ -302,14 +310,12 @@ class TableFu
       #
       # in the above case we handle the AppendedColumn in this method
-      if @spreadsheet.formatting && @spreadsheet.formatting[@column_name].is_a?(Hash)
-        method = @spreadsheet.formatting[@column_name]['method']
-        arguments = @spreadsheet.formatting[@column_name]['arguments'].inject([]) do |arr,arg|
-          arr << @row.column_for(arg)
-          arr
-        end
-        TableFu::Formatting.send(method, *arguments)
+      method = @spreadsheet.formatting[@column_name]['method']
+      arguments = @spreadsheet.formatting[@column_name]['arguments'].inject([]) do |arr,arg|
+        arr << @row.column_for(arg)
+        arr
       end
+      TableFu::Formatting.send(method, *arguments)
     end
     # Returns the raw value of a datum

data/spec/table_fu_spec.rb CHANGED

@@ -184,6 +184,10 @@ describe TableFu, 'with macro columns' do
         "#{first}#{second}"
       end
+      def null(first)
+        nil
+      end
     end
   end
@@ -194,7 +198,8 @@ describe TableFu, 'with macro columns' do
     @spreadsheet = TableFu.new(csv)
     @spreadsheet.col_opts[:style] = {'Projects' => 'text-align:left;'}
     @spreadsheet.col_opts[:formatting] = {'Total Appropriation' => :currency,
-                                          'MacroColumn' => {'method' => 'append', 'arguments' => ['Projects','State']}}
+                                          'MacroColumn' => {'method' => 'append', 'arguments' => ['Projects','State']},
+                                          'NullColumn' => {'method' => 'null', 'arguments' => ['Projects']}}
     @spreadsheet.sorted_by = {'Projects' => {'order' => 'descending'}}
     @spreadsheet.col_opts[:columns] = ['State', 'Total Appropriation', 'Projects', 'MacroColumn']
   end
@@ -208,11 +213,14 @@ describe TableFu, 'with macro columns' do
     @spreadsheet.rows[1].column_for('Total Appropriation').to_s.should eql '$42,367,198'
   end
+  it "should allow macros that take arguments to return nil" do
+    @spreadsheet.rows[0].column_for('NullColumn').to_s.should eql ''
+  end
   it "should not barf if we try a bad formatter" do
     @spreadsheet.col_opts[:formatting] = {'Total Appropriation' => :bad_formatter }
     @spreadsheet.rows[1].column_for('Total Appropriation').to_s.should eql "bad_formatter not a valid formatter!"
   end
 end
 describe TableFu, 'with reordered columns' do

data/table_fu.gemspec CHANGED

@@ -5,7 +5,7 @@
 Gem::Specification.new do |s|
   s.name = %q{table_fu}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Percival", "Jeff Larson"]

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: table_fu
 version: !ruby/object:Gem::Version
-  hash: 21
+  hash: 27
   prerelease: false
   segments:
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors:
 - Mark Percival