gridion 0.0.13 → 0.0.14

data/lib/gridion/grid_helper.rb

@@ -89,23 +89,30 @@ module Gridion
             
           result =""
           result << "<tr id=\"#{klass.name}_#{object.id}\" class=\"#{options[:row_is_even] ? 'even' : 'odd'}\">"
+          aux_columns={}
+          aux_columns=options[:aux_columns].with_indifferent_access if options.has_key?(:aux_columns)
+          
           formats=(options[:formats]||{}).with_indifferent_access
           (options[:columns]||klass.column_names).each do |col|
-            value=object.send(col)
-            if formats.has_key?(col)
+            if aux_columns[col].present?
+              value=aux_columns[col].call(object, options)
+            else
+              value=object.send(col)
+              if formats.has_key?(col)
               
-              if formats[col]==:currency
-                value=number_to_currency(value) 
-              elsif formats[col].kind_of?(Hash)
-                if formats[col].has_key?(:date)
-                  value=value.try(:to_date).try(:to_s, formats[col][:date])
+                if formats[col]==:currency
+                  value=number_to_currency(value) 
+                elsif formats[col].kind_of?(Hash)
+                  if formats[col].has_key?(:date)
+                    value=value.try(:to_date).try(:to_s, formats[col][:date])
+                  end
+                elsif formats[col].kind_of?(Proc)
+                  # use hook
+                  value=formats[col].call(value)
                 end
-              elsif formats[col].kind_of?(Proc)
-                # use hook
-                value=formats[col].call(value)
-              end
               
             
+              end
             end
             result << "<td class=\"#{col}\">#{value}</td>"
           end

data/lib/gridion/version.rb

@@ -1,3 +1,3 @@
 module Gridion
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridion
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000Z
+date: 2011-11-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70271261098900 !ruby/object:Gem::Requirement
+  requirement: &70165481078540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271261098900
+  version_requirements: *70165481078540
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70271261097420 !ruby/object:Gem::Requirement
+  requirement: &70165481077540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271261097420
+  version_requirements: *70165481077540
 description: Simple grid helper for rails
 email:
 - william@tofugear.com
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3275739304269765784
+      hash: -2855026605102098361
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3275739304269765784
+      hash: -2855026605102098361
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10