comma 0.5.2 → 2.0

data/.rvmrc

@@ -1,4 +1,4 @@
-rvm 1.9.2-p290@comma --create
+rvm 1.8.7-p352@comma --create
 
 if ! command -v bundle ; then
   gem install bundler

data/Appraisals

@@ -1,9 +1,12 @@
-appraise "activesupport2" do
-  gem "activesupport", "<3"
-  gem "activerecord", "<3"
-end
+['2.3.2', '2.3.5', '2.3.7', '~>2.3.14' ].each do |version_number|
+  clean_number = version_number.gsub(/[<>~=]*/, '')
+
+  appraise "rails#{ clean_number }" do
+    gem "rails", version_number
+  end
 
-appraise "activesupport3" do
-  gem "activesupport", ">3"
-  gem "activerecord", ">3"
-end
+  appraise "active#{ clean_number }" do
+    gem "activesupport", version_number
+    gem "activerecord", version_number
+  end
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    comma (0.5.2)
+    comma (2.0)
       fastercsv (= 1.5.4)
 
 GEM

data/{README.rdoc → README.markdown}

@@ -1,10 +1,35 @@
-= COMMA
+#COMMA
 
 http://github.com/crafterm/comma
 
-== DESCRIPTION:
+##COMPATIBILITY
+  This branch of the project builds gems to the 2.x version series, and is compatible and tested with :
+    - Ruby 1.8.7, 1.9.2
+    - Rails 2.x
 
-Comma is a CSV (ie. comma separated values) generation extension for Ruby objects, that lets you seamlessly define a CSV output format via a small DSL. Comma works well on pure Ruby objects with attributes, as well as complex ones such as ActiveRecord objects with associations, extensions, etc. It doesn't distinguish between attributes, methods, associations, extensions, etc. - they all are considered equal and invoked identically via the Comma DSL description. Multiple different CSV output descriptions can also be defined.
+##LOOKING FOR RAILS 3?
+  Rails 3 is supported in the main branch of this project, and versioned in the 3.x version of this gem. (http://github.com/crafterm/comma)
+
+##INSTALLATION
+
+Comma is distributed as a gem, best installed via Bundler.
+
+Include the gem in your Gemfile:
+
+```Ruby
+  gem "comma", "~> 2.0"
+```
+
+Or, if you want to live life on the edge, you can get master from the main comma repository:
+
+```Ruby
+  gem "comma",  :git => "git://github.com/crafterm/comma.git", :branch => 'rails2'
+```
+
+
+##DESCRIPTION:
+
+Comma is a CSV (i.e. comma separated values) generation extension for Ruby objects, that lets you seamlessly define a CSV output format via a small DSL. Comma works well on pure Ruby objects with attributes, as well as complex ones such as ActiveRecord objects with associations, extensions, etc. It doesn't distinguish between attributes, methods, associations, extensions, etc. - they all are considered equal and invoked identically via the Comma DSL description. Multiple different CSV output descriptions can also be defined.
 
 When multiple objects in an Array are converted to CSV, the output includes generation of a header row reflected from names of the properties requested, or specified via the DSL.
 
@@ -12,6 +37,8 @@ CSV can be a bit of a boring format - the motivation behind Comma was to have a
 
 An example Comma CSV enabled ActiveRecord class:
 
+```Ruby
+
  class Book < ActiveRecord::Base
 
    # ================
@@ -38,8 +65,11 @@ An example Comma CSV enabled ActiveRecord class:
 
  end
 
+```
+
 Annotated, the comma description is as follows:
 
+```Ruby
  # starts a Comma description block, generating 2 methods #to_comma and
  # #to_comma_headers for this class.
  comma do
@@ -67,14 +97,18 @@ Annotated, the comma description is as follows:
 
  end
 
+```
+
 In the above example, any of the declarations (name, description, pages, publisher, isbn, blurb, etc), could be methods, attributes, associations, etc - no distinction during configuration is required, as everything is invoked via Ruby's #send method.
 
 You can get the CSV representation of any object by calling the to_comma method, optionally providing a CSV description name to use.
 
-Object values are automatically converted to strings via to_s allowing you to reuse any existing to_s methods on your objects (instead of having to call particular properties or define CSV specific output methods). Header names are also automatically humanized when reflected (eg. Replacing _ characters with whitespace). The 'isbn' example above shows how multiple values can be added to the CSV output.
+Object values are automatically converted to strings via to_s allowing you to reuse any existing to_s methods on your objects (instead of having to call particular properties or define CSV specific output methods). Header names are also automatically humanised when reflected (eg. Replacing _ characters with whitespace). The 'isbn' example above shows how multiple values can be added to the CSV output.
 
 Multiple CSV descriptions can also be specified for the same class, eg:
 
+```Ruby
+
  class Book < ActiveRecord::Base
 
    # ================
@@ -109,30 +143,42 @@ Multiple CSV descriptions can also be specified for the same class, eg:
 
  end
 
+```
+
 You can specify which output format you would like to use via an optional parameter to to_comma:
 
+```Ruby
  Book.limited(10).to_comma(:brief)
+```
 
 Specifying no description name to to_comma is equivalent to specifying :default as the description name.
 
 You can pass options for FasterCSV, e.g.
 
+```Ruby
  Book.limited(10).to_comma(:style        => :brief,
                            :col_sep      => ';',
                            :force_quotes => true)
+```
 
 You can pass the :filename option and have Comma writes the CSV output to this file:
 
+```Ruby
  Book.limited(10).to_comma(:filename => 'books.csv')
+```
 
 You also can pass the :write_header option to hide the header line (true is default):
 
+```Ruby
  Book.limited(10).to_comma(:write_headers => false)
+```
 
-== Using blocks
+##Using blocks
 
 For more complex relationships you can pass blocks for calculated values, or related values. Following the previous example here is a comma set using blocks (both with and without labels for your CSV headings):
 
+```Ruby
+
  class Publisher < ActiveRecord::Base
    # ================
    # = Associations =
@@ -168,15 +214,19 @@ For more complex relationships you can pass blocks for calculated values, or rel
 
  end
 
+```
 
 In the preceding example, the 2 new fields added (both based on the publisher relationship) mean that the following will be added:
-  - the first example 'publishers_contact' is loaded straight as a block. The value returned by the lambda is displayed with a header value of 'Publisher'
-  - the second example 'total_publishers_users' is sent via a hash and a custom label is set, if used in the first examples method the header would be 'Publisher', but sent as a hash the header is 'Number of publisher users'.
 
-=== USING WITH RAILS
+*   the first example 'publishers_contact' is loaded straight as a block. The value returned by the lambda is displayed with a header value of 'Publisher'
+*   the second example 'total_publishers_users' is sent via a hash and a custom label is set, if used in the first examples method the header would be 'Publisher', but sent as a hash the header is 'Number of publisher users'.
+
+###USING WITH RAILS
 
 When used with Rails (ie. add 'comma' as a gem dependency), Comma automatically adds support for rendering CSV output in your controllers:
 
+```Ruby
+
  class BooksController < ApplicationController
 
    def index
@@ -187,7 +237,12 @@ When used with Rails (ie. add 'comma' as a gem dependency), Comma automatically
 
  end
 
+```
+
 You can specify which output format you would like to use by specifying a style parameter:
+
+```Ruby
+
  class BooksController < ApplicationController
 
    def index
@@ -198,12 +253,16 @@ You can specify which output format you would like to use by specifying a style
 
  end
 
+```
+
 With the Rails renderer you can supply any of the regular parameters that you would use with to_comma such as :filename,
 :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:
 
+```Ruby
+
  class Book < ActiveRecord::Base
    named_scope :recent,
                lambda { { :conditions => ['created_at > ?', 1.month.ago] } }
@@ -211,30 +270,38 @@ When used with Rails 2.3.*, Comma also adds support for exporting named scopes:
    # ...
  end
 
+```
+
 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:
 
+```Ruby
+
  Book.recent.to_comma
 
-== DEPENDENCIES
+```
+
+##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 crafterm@redartisan.com, all feedback welcome!
+If you have any questions or suggestions for Comma, please feel free to contact me at tom@venombytes.com, all feedback welcome!
 
-== TESTING
+##TESTING
 
 This gem has been tested on :
 Ruby 1.8.7, 1.9.2
 
-And on Rails 2.x and 3.x.
+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
+
 bundle install
 bundle exec rake appraisals:install
 bundle exec rake appraisals spec
+
 ```
 

data/gemfiles/active2.3.14.gemfile

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

data/gemfiles/active2.3.14.gemfile.lock

@@ -0,0 +1,39 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (2.0)
+      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.1)
+      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 (~> 2.3.14)
+  activesupport (~> 2.3.14)
+  appraisal (>= 0.4.0)
+  comma!
+  rake (= 0.8.7)
+  rspec (~> 2.7.0)
+  sqlite3 (~> 1.3.4)

data/gemfiles/active2.3.2.gemfile

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

data/gemfiles/active2.3.2.gemfile.lock

@@ -0,0 +1,39 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (2.0)
+      fastercsv (= 1.5.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.2)
+      activesupport (= 2.3.2)
+    activesupport (2.3.2)
+    appraisal (0.4.1)
+      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 (= 2.3.2)
+  activesupport (= 2.3.2)
+  appraisal (>= 0.4.0)
+  comma!
+  rake (= 0.8.7)
+  rspec (~> 2.7.0)
+  sqlite3 (~> 1.3.4)

data/gemfiles/active2.3.5.gemfile

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

data/gemfiles/active2.3.5.gemfile.lock

@@ -0,0 +1,39 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (2.0)
+      fastercsv (= 1.5.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.5)
+      activesupport (= 2.3.5)
+    activesupport (2.3.5)
+    appraisal (0.4.1)
+      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 (= 2.3.5)
+  activesupport (= 2.3.5)
+  appraisal (>= 0.4.0)
+  comma!
+  rake (= 0.8.7)
+  rspec (~> 2.7.0)
+  sqlite3 (~> 1.3.4)

data/gemfiles/active2.3.7.gemfile

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

data/gemfiles/active2.3.7.gemfile.lock

@@ -0,0 +1,39 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (2.0)
+      fastercsv (= 1.5.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.7)
+      activesupport (= 2.3.7)
+    activesupport (2.3.7)
+    appraisal (0.4.1)
+      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 (= 2.3.7)
+  activesupport (= 2.3.7)
+  appraisal (>= 0.4.0)
+  comma!
+  rake (= 0.8.7)
+  rspec (~> 2.7.0)
+  sqlite3 (~> 1.3.4)

data/gemfiles/rails2.3.14.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~>2.3.14"
+
+gemspec :path=>"../"

data/gemfiles/rails2.3.14.gemfile.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (2.0)
+      fastercsv (= 1.5.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.14)
+      actionpack (= 2.3.14)
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
+      rack (~> 1.1.0)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activeresource (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    appraisal (0.4.1)
+      bundler
+      rake
+    diff-lcs (1.1.3)
+    fastercsv (1.5.4)
+    rack (1.1.3)
+    rails (2.3.14)
+      actionmailer (= 2.3.14)
+      actionpack (= 2.3.14)
+      activerecord (= 2.3.14)
+      activeresource (= 2.3.14)
+      activesupport (= 2.3.14)
+      rake (>= 0.8.3)
+    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
+  appraisal (>= 0.4.0)
+  comma!
+  rails (~> 2.3.14)
+  rake (= 0.8.7)
+  rspec (~> 2.7.0)
+  sqlite3 (~> 1.3.4)

data/gemfiles/rails2.3.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "2.3.2"
+
+gemspec :path=>"../"

data/gemfiles/rails2.3.2.gemfile.lock

@@ -0,0 +1,51 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (2.0)
+      fastercsv (= 1.5.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.2)
+      actionpack (= 2.3.2)
+    actionpack (2.3.2)
+      activesupport (= 2.3.2)
+    activerecord (2.3.2)
+      activesupport (= 2.3.2)
+    activeresource (2.3.2)
+      activesupport (= 2.3.2)
+    activesupport (2.3.2)
+    appraisal (0.4.1)
+      bundler
+      rake
+    diff-lcs (1.1.3)
+    fastercsv (1.5.4)
+    rails (2.3.2)
+      actionmailer (= 2.3.2)
+      actionpack (= 2.3.2)
+      activerecord (= 2.3.2)
+      activeresource (= 2.3.2)
+      activesupport (= 2.3.2)
+      rake (>= 0.8.3)
+    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
+  appraisal (>= 0.4.0)
+  comma!
+  rails (= 2.3.2)
+  rake (= 0.8.7)
+  rspec (~> 2.7.0)
+  sqlite3 (~> 1.3.4)

data/gemfiles/rails2.3.5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "2.3.5"
+
+gemspec :path=>"../"

data/gemfiles/rails2.3.5.gemfile.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (2.0)
+      fastercsv (= 1.5.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.5)
+      actionpack (= 2.3.5)
+    actionpack (2.3.5)
+      activesupport (= 2.3.5)
+      rack (~> 1.0.0)
+    activerecord (2.3.5)
+      activesupport (= 2.3.5)
+    activeresource (2.3.5)
+      activesupport (= 2.3.5)
+    activesupport (2.3.5)
+    appraisal (0.4.1)
+      bundler
+      rake
+    diff-lcs (1.1.3)
+    fastercsv (1.5.4)
+    rack (1.0.1)
+    rails (2.3.5)
+      actionmailer (= 2.3.5)
+      actionpack (= 2.3.5)
+      activerecord (= 2.3.5)
+      activeresource (= 2.3.5)
+      activesupport (= 2.3.5)
+      rake (>= 0.8.3)
+    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
+  appraisal (>= 0.4.0)
+  comma!
+  rails (= 2.3.5)
+  rake (= 0.8.7)
+  rspec (~> 2.7.0)
+  sqlite3 (~> 1.3.4)

data/gemfiles/rails2.3.7.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "2.3.7"
+
+gemspec :path=>"../"

data/gemfiles/rails2.3.7.gemfile.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (2.0)
+      fastercsv (= 1.5.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.7)
+      actionpack (= 2.3.7)
+    actionpack (2.3.7)
+      activesupport (= 2.3.7)
+      rack (~> 1.1.0)
+    activerecord (2.3.7)
+      activesupport (= 2.3.7)
+    activeresource (2.3.7)
+      activesupport (= 2.3.7)
+    activesupport (2.3.7)
+    appraisal (0.4.1)
+      bundler
+      rake
+    diff-lcs (1.1.3)
+    fastercsv (1.5.4)
+    rack (1.1.3)
+    rails (2.3.7)
+      actionmailer (= 2.3.7)
+      actionpack (= 2.3.7)
+      activerecord (= 2.3.7)
+      activeresource (= 2.3.7)
+      activesupport (= 2.3.7)
+      rake (>= 0.8.3)
+    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
+  appraisal (>= 0.4.0)
+  comma!
+  rails (= 2.3.7)
+  rake (= 0.8.7)
+  rspec (~> 2.7.0)
+  sqlite3 (~> 1.3.4)

data/lib/comma.rb

@@ -19,26 +19,18 @@ else
   end
 end
 
-#TODO : Rails 2.3.x Deprecation
-# conditional loading of activesupport
-if defined? Rails and (Rails.version.split('.').map(&:to_i) <=> [2,3,5]) < 0
-  require 'activesupport'
-else
-  require 'active_support/core_ext/class/inheritable_attributes'
-end
+#Enable class_attribute_accessor
+require 'active_support/core_ext/class/inheritable_attributes'
+
+# begin
+#   require 'action_controller'
+# rescue Exception => e
+#   #Force load rails for specs until controller specs completed
+# end
 
 if defined?(ActiveRecord)
   require 'comma/association_proxy'
-
-  #TODO : Rails 2.3.x Deprecation
-  if defined?(ActiveRecord::Relation)
-    #Rails 3.x relations
-    require 'comma/relation'
-  elsif defined?(ActiveRecord::NamedScope::Scope)
-    #Rails 2.x scoping
-    require 'comma/named_scope'
-  end
-
+  require 'comma/named_scope'
 end
 
 require 'comma/extractors'

data/lib/comma/association_proxy.rb

@@ -1,4 +1,3 @@
-#TODO : Rails 2.3.x Deprecation
 class ActiveRecord::Associations::AssociationProxy
   def to_comma(style = :default)
     #Bug in Rails 2.3.5, this is a workaround as association_proxy.rb doesn't pass the &block in the send method so it silently fails

data/lib/comma/named_scope.rb

@@ -1,4 +1,3 @@
-#TODO : Rails 2.3.x Deprecations
 class ActiveRecord::NamedScope::Scope
   def to_comma(style = :default)
     Comma::Generator.new(self, style).run(:find_each)

data/lib/comma/object.rb

@@ -1,11 +1,5 @@
 class Object
-  if Class.respond_to?(:class_attribute)
-    class_attribute :comma_formats
-  else
-    #TODO : Rails 2.3.x Deprecation
-    #Deprecated method for class accessors - Maintained for those still on Rails 2.3.x
-    class_inheritable_accessor :comma_formats
-  end
+  class_inheritable_accessor :comma_formats
 
   def self.comma(style = :default, &block)
     (self.comma_formats ||= {})[style] = block

data/lib/comma/render_as_csv.rb

@@ -1,58 +1,49 @@
-if defined?(ActionController::Renderers) && ActionController::Renderers.respond_to?(:add)
-  ActionController::Renderers.add :csv do |obj, options|
-    filename = options[:filename] || 'data'
-    send_data obj.to_comma, :type => Mime::CSV, :disposition => "attachment; filename=#{filename}.csv"
+module RenderAsCSV
+  def self.included(base)
+    base.alias_method_chain :render, :csv
   end
-else
-  module RenderAsCSV
-    def self.included(base)
-      base.alias_method_chain :render, :csv
-    end
 
-    def render_with_csv(options = nil, extra_options = {}, &block)
-      return render_without_csv(options, extra_options, &block) unless options.is_a?(Hash) and options[:csv].present?
+  def render_with_csv(options = nil, extra_options = {}, &block)
+    return render_without_csv(options, extra_options, &block) unless options.is_a?(Hash) and options[:csv].present?
 
-      content  = options.delete(:csv)
-      style    = options.delete(:style) || :default
-      filename = options.delete(:filename)
+    content  = options.delete(:csv)
+    style    = options.delete(:style) || :default
+    filename = options.delete(:filename)
 
-      headers.merge!(
-        'Content-Transfer-Encoding' => 'binary',
-        'Content-Type'              => 'text/csv; charset=utf-8'
-      )
-      filename_header_value = "attachment"
-      filename_header_value += "; filename=\"#{filename}\"" if filename.present?
-      headers.merge!('Content-Disposition' => filename_header_value)
+    headers.merge!(
+      'Content-Transfer-Encoding' => 'binary',
+      'Content-Type'              => 'text/csv; charset=utf-8'
+    )
+    filename_header_value = "attachment"
+    filename_header_value += "; filename=\"#{filename}\"" if filename.present?
+    headers.merge!('Content-Disposition' => filename_header_value)
 
-      @performed_render = false
+    @performed_render = false
 
-      render_stream :status => 200,
-                    :content => Array(content),
-                    :style => style
-    end
+    render_stream :status => 200,
+                  :content => Array(content),
+                  :style => style
+  end
 
-    protected
-
-    #TODO : Rails 2.3.x Deprecation
-    def render_stream(options)
-      status  = options[:status]
-      content = options[:content]
-      style   = options[:style]
-
-      # If Rails 2.x
-      if defined? Rails and (Rails.version.split('.').map(&:to_i) <=> [2,3,5]) < 0
-        render :status => status, :text => Proc.new { |response, output|
-          output.write CSV_HANDLER.generate_line(content.first.to_comma_headers(style))
-          content.each { |line| output.write CSV_HANDLER.generate_line(line.to_comma(style)) }
-        }
-      else # If Rails 3.x
-        self.status = status
-        self.response_body = proc { |response, output|
-          output.write CSV_HANDLER.generate_line(content.first.to_comma_headers(style))
-          content.each { |line| output.write CSV_HANDLER.generate_line(line.to_comma(style)) }
-        }
-      end
+  protected
+
+  def render_stream(options)
+    status  = options[:status]
+    content = options[:content]
+    style   = options[:style]
+
+    if defined? Rails and (Rails.version.split('.').map(&:to_i) <=> [2,3,5]) < 0
+      render :status => status, :text => Proc.new { |response, output|
+        output.write CSV_HANDLER.generate_line(content.first.to_comma_headers(style))
+        content.each { |line| output.write CSV_HANDLER.generate_line(line.to_comma(style)) }
+      }
+    else
+      self.status = status
+      self.response_body = proc { |response, output|
+        output.write CSV_HANDLER.generate_line(content.first.to_comma_headers(style))
+        content.each { |line| output.write CSV_HANDLER.generate_line(line.to_comma(style)) }
+      }
     end
   end
-  #credit : http://ramblingsonrails.com/download-a-large-amount-of-data-in-csv-from-rails
 end
+#credit : http://ramblingsonrails.com/download-a-large-amount-of-data-in-csv-from-rails

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = "0.5.2"
+  VERSION = "2.0"
 end

metadata

@@ -1,117 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: comma
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 2
-  version: 0.5.2
+version: !ruby/object:Gem::Version
+  version: '2.0'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Marcus Crafter
 - Tom Meier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-18 00:00:00 +11:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 4
-        version: 1.5.4
-  requirement: *id001
+date: 2012-02-19 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fastercsv
-  prerelease: false
+  requirement: &70144148616020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.5.4
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  requirement: *id002
-  name: rake
   prerelease: false
+  version_requirements: *70144148616020
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70144148615060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: *70144148615060
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70144148614600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.3.4
-  requirement: *id003
-  name: sqlite3
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: *70144148614600
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70144148614120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.7.0
-  requirement: *id004
-  name: rspec
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
-  requirement: *id005
-  name: appraisal
   prerelease: false
+  version_requirements: *70144148614120
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &70144148613640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :development
+  prerelease: false
+  version_requirements: *70144148613640
 description: Ruby Comma Seperated Values generation library
-email: 
+email:
 - crafterm@redartisan.com
 - tom@venombytes.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Appraisals
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
-- README.rdoc
+- README.markdown
 - Rakefile
 - comma.gemspec
+- gemfiles/active2.3.14.gemfile
+- gemfiles/active2.3.14.gemfile.lock
+- gemfiles/active2.3.2.gemfile
+- gemfiles/active2.3.2.gemfile.lock
+- gemfiles/active2.3.5.gemfile
+- gemfiles/active2.3.5.gemfile.lock
+- gemfiles/active2.3.7.gemfile
+- gemfiles/active2.3.7.gemfile.lock
 - gemfiles/activesupport2.gemfile
 - gemfiles/activesupport2.gemfile.lock
 - gemfiles/activesupport3.gemfile
 - gemfiles/activesupport3.gemfile.lock
+- gemfiles/rails2.3.14.gemfile
+- gemfiles/rails2.3.14.gemfile.lock
+- gemfiles/rails2.3.2.gemfile
+- gemfiles/rails2.3.2.gemfile.lock
+- gemfiles/rails2.3.5.gemfile
+- gemfiles/rails2.3.5.gemfile.lock
+- gemfiles/rails2.3.7.gemfile
+- gemfiles/rails2.3.7.gemfile.lock
 - init.rb
 - lib/comma.rb
 - lib/comma/array.rb
@@ -120,7 +112,6 @@ files:
 - lib/comma/generator.rb
 - lib/comma/named_scope.rb
 - lib/comma/object.rb
-- lib/comma/relation.rb
 - lib/comma/render_as_csv.rb
 - lib/comma/version.rb
 - spec/comma/ar_spec.rb
@@ -129,37 +120,37 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/database.yml
-has_rdoc: true
 homepage: http://github.com/crafterm/comma
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+      hash: 1438170047706309440
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1438170047706309440
 requirements: []
-
 rubyforge_project: comma
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby Comma Seperated Values generation library
-test_files: 
+test_files:
 - spec/comma/ar_spec.rb
 - spec/comma/comma_spec.rb
 - spec/comma/extractors_spec.rb

data/lib/comma/relation.rb

@@ -1,5 +0,0 @@
-class ActiveRecord::Relation
-  def to_comma(style = :default)
-    Comma::Generator.new(self, style).run(:find_each)
-  end
-end