comma 3.0.2 → 3.0.3

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - ree
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+
+script: "bundle exec rake appraisal:install && bundle exec rake appraisal spec"

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
+gem "fastercsv", :platforms => :ruby_18
+
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    comma (3.0.2)
+    comma (3.0.3)
 
 GEM
   remote: http://rubygems.org/
@@ -10,7 +10,8 @@ GEM
       bundler
       rake
     diff-lcs (1.1.3)
-    multi_json (1.0.4)
+    fastercsv (1.5.4)
+    multi_json (1.1.0)
     rake (0.9.2.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -20,8 +21,8 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     sqlite3 (1.3.5)
@@ -32,6 +33,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 0.4.1)
   comma!
+  fastercsv
   rake (~> 0.9.2)
   rspec (~> 2.8.0)
   simplecov

data/README.markdown

@@ -3,13 +3,15 @@
 http://github.com/crafterm/comma
 
 ##COMPATIBILITY
-  The mainline of this project builds gems to the 3.x version series, and is compatible and tested with :
-    - Ruby 1.9.2
-    - Rails 3.x
+The mainline of this project builds gems to the 3.x version series, and is compatible and tested with :
 
-##LOOKING FOR RAILS 2? Ruby 1.8.7?
+* Ruby 1.8.7, REE 1.8.7, 1.9.2, 1.9.3
+* Rails 3.x (all versions)
+
+[![Build Status](https://secure.travis-ci.org/crafterm/comma.png)](http://travis-ci.org/crafterm/comma)
+
+###LOOKING FOR RAILS 2?
 *   Rails 2 is supported in the 'rails2' branch of this project, and versioned in the 2.x version of this gem. (https://github.com/crafterm/comma/tree/rails2).
-*   Ruby 1.8.7 has been deprecated in favour of Ruby 1.9+. If you would like to use Ruby 1.8.7 please let me know or use the last compatible version that could be used with Rails 2+3 and Ruby 1.8.7 and Ruby 1.9.2 (Comma version : 0.5.2)
 
 ##INSTALLATION
 
@@ -153,7 +155,7 @@ You can specify which output format you would like to use via an optional parame
 
 Specifying no description name to to_comma is equivalent to specifying :default as the description name.
 
-You can pass options for FasterCSV, e.g.
+You can pass all options for the CSV renderer (see : http://ruby-doc.org/stdlib-1.9.2/libdoc/csv/rdoc/CSV.html ), e.g.
 
 ```Ruby
  Book.limited(10).to_comma(:style        => :brief,
@@ -239,7 +241,7 @@ When used with Rails (ie. add 'comma' as a gem dependency), Comma automatically
 
 ```
 
-You can specify which output format you would like to use by specifying a style parameter:
+You can specify which output format you would like to use by specifying a style parameter or adding any available CSV option:
 
 ```Ruby
 
@@ -259,12 +261,12 @@ With the Rails renderer you can supply any of the regular parameters that you wo
 :write_headers, :force_quotes, etc. The parameters just need to be supplied after you specify the collection for the csv as demonstrated
 above.
 
-When used with Rails 2.3.*, Comma also adds support for exporting named scopes:
+When used with Rails 3.+, Comma also adds support for exporting scopes:
 
 ```Ruby
 
  class Book < ActiveRecord::Base
-   named_scope :recent,
+   scope :recent,
                lambda { { :conditions => ['created_at > ?', 1.month.ago] } }
 
    # ...
@@ -272,7 +274,7 @@ When used with Rails 2.3.*, Comma also adds support for exporting named scopes:
 
 ```
 
-Calling the to_comma method on the named scope will internally use Rails' find_each method, instantiating only 1,000 ActiveRecord objects at a time:
+Calling the to_comma method on the scope will internally use Rails' find_each method, instantiating only 1,000 ActiveRecord objects at a time:
 
 ```Ruby
 
@@ -282,19 +284,10 @@ Calling the to_comma method on the named scope will internally use Rails' find_e
 
 ##DEPENDENCIES
 
-If you're on Ruby 1.8.*, the FasterCSV gem is recommended for performance reasons.
-
- gem install fastercsv
-
 If you have any questions or suggestions for Comma, please feel free to contact me at tom@venombytes.com, all feedback welcome!
 
 ##TESTING
 
-This gem has been tested on :
-Ruby 1.8.7, 1.9.2
-
-And on multiple Rails 2.x projects.
-
 To run the test suite across multiple gem file sets, we're using [Appraisal](https://github.com/thoughtbot/appraisal), use the following commands :
 
 ```Bash

data/gemfiles/active3.0.9.gemfile

@@ -2,6 +2,7 @@
 
 source "http://rubygems.org"
 
+gem "fastercsv", :platforms=>:ruby_18
 gem "activesupport", "3.0.9"
 gem "activerecord", "3.0.9"
 

data/gemfiles/active3.0.9.gemfile.lock

@@ -22,9 +22,10 @@ GEM
     arel (2.0.10)
     builder (2.1.2)
     diff-lcs (1.1.3)
+    fastercsv (1.5.4)
     i18n (0.5.0)
-    multi_json (1.0.4)
-    rake (0.9.2)
+    multi_json (1.1.0)
+    rake (0.9.2.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -33,8 +34,8 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     sqlite3 (1.3.5)
@@ -48,6 +49,7 @@ DEPENDENCIES
   activesupport (= 3.0.9)
   appraisal (~> 0.4.1)
   comma!
+  fastercsv
   rake (~> 0.9.2)
   rspec (~> 2.8.0)
   simplecov

data/gemfiles/active3.1.1.gemfile

@@ -2,6 +2,7 @@
 
 source "http://rubygems.org"
 
+gem "fastercsv", :platforms=>:ruby_18
 gem "activesupport", "3.1.1"
 gem "activerecord", "3.1.1"
 

data/gemfiles/active3.1.1.gemfile.lock

@@ -20,12 +20,13 @@ GEM
     appraisal (0.4.1)
       bundler
       rake
-    arel (2.2.1)
+    arel (2.2.3)
     builder (3.0.0)
     diff-lcs (1.1.3)
+    fastercsv (1.5.4)
     i18n (0.6.0)
     multi_json (1.1.0)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -34,9 +35,10 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    simplecov (0.4.2)
-      simplecov-html (~> 0.4.4)
-    simplecov-html (0.4.5)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sqlite3 (1.3.5)
     tzinfo (0.3.31)
 
@@ -48,6 +50,7 @@ DEPENDENCIES
   activesupport (= 3.1.1)
   appraisal (~> 0.4.1)
   comma!
+  fastercsv
   rake (~> 0.9.2)
   rspec (~> 2.8.0)
   simplecov

data/gemfiles/active3.2.1.gemfile

@@ -2,6 +2,7 @@
 
 source "http://rubygems.org"
 
+gem "fastercsv", :platforms=>:ruby_18
 gem "activesupport", "~>3.2.1"
 gem "activerecord", "~>3.2.1"
 

data/gemfiles/active3.2.1.gemfile.lock

@@ -20,12 +20,13 @@ GEM
     appraisal (0.4.1)
       bundler
       rake
-    arel (3.0.0)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
+    fastercsv (1.5.4)
     i18n (0.6.0)
     multi_json (1.1.0)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -34,9 +35,10 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    simplecov (0.4.2)
-      simplecov-html (~> 0.4.4)
-    simplecov-html (0.4.5)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sqlite3 (1.3.5)
     tzinfo (0.3.31)
 
@@ -48,6 +50,7 @@ DEPENDENCIES
   activesupport (~> 3.2.1)
   appraisal (~> 0.4.1)
   comma!
+  fastercsv
   rake (~> 0.9.2)
   rspec (~> 2.8.0)
   simplecov

data/gemfiles/rails3.0.9.gemfile

@@ -2,6 +2,7 @@
 
 source "http://rubygems.org"
 
+gem "fastercsv", :platforms=>:ruby_18
 gem "rails", "3.0.9"
 gem "rspec-rails"
 

data/gemfiles/rails3.0.9.gemfile.lock

@@ -41,6 +41,7 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    fastercsv (1.5.4)
     i18n (0.5.0)
     json (1.6.5)
     mail (2.2.19)
@@ -49,7 +50,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     polyglot (0.3.3)
     rack (1.2.5)
     rack-mount (0.6.14)
@@ -70,7 +71,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -86,8 +87,8 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     sqlite3 (1.3.5)
@@ -103,6 +104,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 0.4.1)
   comma!
+  fastercsv
   rails (= 3.0.9)
   rake (~> 0.9.2)
   rspec (~> 2.8.0)

data/gemfiles/rails3.1.1.gemfile

@@ -2,6 +2,7 @@
 
 source "http://rubygems.org"
 
+gem "fastercsv", :platforms=>:ruby_18
 gem "rails", "3.1.1"
 gem "rspec-rails"
 

data/gemfiles/rails3.1.1.gemfile.lock

@@ -37,10 +37,11 @@ GEM
     appraisal (0.4.1)
       bundler
       rake
-    arel (2.2.1)
+    arel (2.2.3)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    fastercsv (1.5.4)
     hike (1.2.1)
     i18n (0.6.0)
     json (1.6.5)
@@ -75,7 +76,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -91,9 +92,10 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    simplecov (0.4.2)
-      simplecov-html (~> 0.4.4)
-    simplecov-html (0.4.5)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -112,6 +114,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 0.4.1)
   comma!
+  fastercsv
   rails (= 3.1.1)
   rake (~> 0.9.2)
   rspec (~> 2.8.0)

data/gemfiles/rails3.2.1.gemfile

@@ -2,6 +2,7 @@
 
 source "http://rubygems.org"
 
+gem "fastercsv", :platforms=>:ruby_18
 gem "rails", "~>3.2.1"
 gem "rspec-rails"
 

data/gemfiles/rails3.2.1.gemfile.lock

@@ -36,13 +36,14 @@ GEM
     appraisal (0.4.1)
       bundler
       rake
-    arel (3.0.0)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    fastercsv (1.5.4)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.1)
+    journey (1.0.3)
     json (1.6.5)
     mail (2.4.1)
       i18n (>= 0.4.0)
@@ -73,7 +74,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -89,9 +90,10 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    simplecov (0.4.2)
-      simplecov-html (~> 0.4.4)
-    simplecov-html (0.4.5)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -110,6 +112,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 0.4.1)
   comma!
+  fastercsv
   rails (~> 3.2.1)
   rake (~> 0.9.2)
   rspec (~> 2.8.0)

data/lib/comma.rb

@@ -3,7 +3,14 @@ if RUBY_VERSION >= '1.9'
   require 'csv'
   CSV_HANDLER = CSV
 else
-  raise "Error - This Comma version only supports Ruby 1.9. Please use an older version."
+  begin
+    gem 'fastercsv'
+    require 'fastercsv'
+
+    CSV_HANDLER = FasterCSV
+  rescue LoadError => e
+    raise "Error : FasterCSV not installed, please `gem install fastercsv` for faster processing on <Ruby 1.9"
+  end
 end
 
 if defined? Rails and (Rails.version.split('.').map(&:to_i).first < 3)

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comma
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000Z
+date: 2012-03-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70335467056500 !ruby/object:Gem::Requirement
+  requirement: &70136624134040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70335467056500
+  version_requirements: *70136624134040
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70335467054900 !ruby/object:Gem::Requirement
+  requirement: &70136624133540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70335467054900
+  version_requirements: *70136624133540
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70335467054140 !ruby/object:Gem::Requirement
+  requirement: &70136624133060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *70335467054140
+  version_requirements: *70136624133060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70335467053480 !ruby/object:Gem::Requirement
+  requirement: &70136619239900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70335467053480
+  version_requirements: *70136619239900
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70335467052920 !ruby/object:Gem::Requirement
+  requirement: &70136619239520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335467052920
+  version_requirements: *70136619239520
 description: Ruby Comma Seperated Values generation library
 email:
 - crafterm@redartisan.com
@@ -77,6 +77,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Appraisals
 - Gemfile
 - Gemfile.lock
@@ -90,10 +91,6 @@ files:
 - gemfiles/active3.1.1.gemfile.lock
 - gemfiles/active3.2.1.gemfile
 - gemfiles/active3.2.1.gemfile.lock
-- gemfiles/activesupport2.gemfile
-- gemfiles/activesupport2.gemfile.lock
-- gemfiles/activesupport3.gemfile
-- gemfiles/activesupport3.gemfile.lock
 - gemfiles/rails3.0.9.gemfile
 - gemfiles/rails3.0.9.gemfile.lock
 - gemfiles/rails3.1.1.gemfile
@@ -156,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1006301303101993278
+      hash: 1069179881687132397
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,10 +162,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1006301303101993278
+      hash: 1069179881687132397
 requirements: []
 rubyforge_project: comma
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Ruby Comma Seperated Values generation library

data/gemfiles/activesupport2.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "activesupport", "<3"
-gem "activerecord", "<3"
-
-gemspec :path=>"../"

data/gemfiles/activesupport2.gemfile.lock

@@ -1,39 +0,0 @@
-PATH
-  remote: /Users/tom/Development/Projects/comma
-  specs:
-    comma (0.4.2)
-      fastercsv (= 1.5.4)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    appraisal (0.4.0)
-      bundler
-      rake
-    diff-lcs (1.1.3)
-    fastercsv (1.5.4)
-    rake (0.8.7)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    sqlite3 (1.3.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (< 3)
-  activesupport (< 3)
-  appraisal (>= 0.4.0)
-  comma!
-  rake (= 0.8.7)
-  rspec (~> 2.7.0)
-  sqlite3 (~> 1.3.4)

data/gemfiles/activesupport3.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "activesupport", ">3"
-gem "activerecord", ">3"
-
-gemspec :path=>"../"

data/gemfiles/activesupport3.gemfile.lock

@@ -1,52 +0,0 @@
-PATH
-  remote: /Users/tom/Development/Projects/comma
-  specs:
-    comma (0.4.2)
-      fastercsv (= 1.5.4)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.3)
-      multi_json (~> 1.0)
-    appraisal (0.4.0)
-      bundler
-      rake
-    arel (2.2.1)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    fastercsv (1.5.4)
-    i18n (0.6.0)
-    multi_json (1.0.4)
-    rake (0.8.7)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    sqlite3 (1.3.5)
-    tzinfo (0.3.31)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (> 3)
-  activesupport (> 3)
-  appraisal (>= 0.4.0)
-  comma!
-  rake (= 0.8.7)
-  rspec (~> 2.7.0)
-  sqlite3 (~> 1.3.4)