comma-heaven 0.4.0 → 0.4.1

data/lib/comma-heaven/active_record/to_comma_heaven.rb

@@ -21,8 +21,14 @@ module CommaHeaven
           headers = columns.sql_as
           
           find(:all, :limit => options[:limit], :joins => columns.joins, :select => columns.select).each do |resource|
-            fields = columns.sql_as.inject([]) do |a, f|
-              a << options[:converter].call(resource.send(f))
+            fields = columns.sql_as.inject([]) do |acc, field|
+              value = resource.send(field)
+              
+              if options[:format]
+                value = value.to_time.strftime(options[:format][:datetime]) if value =~ %r{(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)} && options[:format][:datetime]
+              end
+              
+              acc << options[:converter].call(value)
             end
             
             table << FasterCSV::Row.new(headers, fields)

data/spec/active_record/to_comma_heaven_spec.rb

@@ -2,8 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "CommaHeaven" do
   before(:each) do
-    alice = Gardener.create(:name => 'Alice')
-    bob   = Gardener.create(:name => 'Bob')
+    alice = Gardener.create(:name => 'Alice', :birthdate => 6.years.ago)
+    bob   = Gardener.create(:name => 'Bob', :birthdate => 8.years.ago)
     
     olmo = Tree.create(:name => 'Olmo', :age => 100, :gardener => alice)
     olmo.leafs.create(:position => 'top')
@@ -192,4 +192,13 @@ Ulivo,150
 Ulivo Grande,""
 EOS
   end
+
+  it "should allow custom formats on dates and times" do
+    Tree.to_comma_heaven(:format => {:datetime => '%d/%m/%Y %H:%M'}, :export => {:name => {0 => {}}, :gardener => {1 => {:export => {:name => {1 => {}}, :surname => {2 => {}}, :birthdate => {3 => {}}}}}}).to_csv.should == <<-EOS
+tree_name,gardener_name,gardener_surname,gardener_birthdate
+Olmo,Alice,,#{Gardener.find_by_name('Alice').birthdate.strftime('%d/%m/%Y %H:%M')}
+Ulivo,Bob,,#{Gardener.find_by_name('Bob').birthdate.strftime('%d/%m/%Y %H:%M')}
+EOS
+  end
+
 end

data/spec/spec_helper.rb

@@ -27,6 +27,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :gardeners do |t|
     t.string :name
     t.string :surname
+    t.datetime :birthdate
   end
   
   create_table :gardener_clones do |t|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comma-heaven
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Silvano Stralla
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +01:00
+date: 2011-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency