comma 2.1.3 → 3.0.0

data/{.rvmrc.example → .rvmrc}

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

data/Appraisals

@@ -1,4 +1,4 @@
-['2.3.2', '2.3.5', '2.3.7', '2.3.14', '2.3.15' ].each do |version_number|
+['3.0.9', '3.1.1', '~>3.2.1' ].each do |version_number|
   clean_number = version_number.gsub(/[<>~=]*/, '')
 
   appraise "rails#{ clean_number }" do
@@ -9,4 +9,4 @@
     gem "activesupport", version_number
     gem "activerecord", version_number
   end
-end
+end

data/Gemfile.lock

@@ -1,34 +1,32 @@
 PATH
   remote: .
   specs:
-    comma (2.1.3)
-      fastercsv (~> 1.5.4)
+    comma (3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    appraisal (0.4.0)
+    appraisal (0.4.1)
       bundler
       rake
     diff-lcs (1.1.3)
-    fastercsv (1.5.5)
-    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)
+    rake (0.9.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
+    rspec-mocks (2.8.0)
     sqlite3 (1.3.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (>= 0.4.0)
+  appraisal (~> 0.4.1)
   comma!
-  rake (= 0.8.7)
-  rspec (~> 2.7.0)
+  rake (= 0.9.2)
+  rspec (~> 2.8.0)
   sqlite3 (~> 1.3.4)

data/README.markdown

@@ -3,12 +3,13 @@
 http://github.com/crafterm/comma
 
 ##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
+  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
 
-##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)
+##LOOKING FOR RAILS 2? Ruby 1.8.7?
+*   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
 
@@ -17,16 +18,15 @@ Comma is distributed as a gem, best installed via Bundler.
 Include the gem in your Gemfile:
 
 ```Ruby
-  gem "comma", "~> 2.0"
+  gem "comma", "~> 3.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'
+  gem "comma",  :git => "git://github.com/crafterm/comma.git"
 ```
 
-
 ##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.
@@ -300,8 +300,8 @@ To run the test suite across multiple gem file sets, we're using [Appraisal](htt
 ```Bash
 
 bundle install
-bundle exec rake appraisal:install
-bundle exec rake appraisal spec
+bundle exec rake appraisals:install
+bundle exec rake appraisals spec
 
 ```
 

data/comma.gemspec

@@ -18,11 +18,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.4"])
-
-  s.add_development_dependency(%q<rake>, ["0.8.7"])
+  s.add_development_dependency(%q<rake>, ["0.9.2"])
   s.add_development_dependency('sqlite3', '~> 1.3.4')
-  s.add_development_dependency(%q<rspec>, ["~> 2.7.0"])
-  s.add_development_dependency(%q<appraisal>, [">= 0.4.0"])
+  s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+  s.add_development_dependency(%q<appraisal>, ["~> 0.4.1"])
 
 end

data/gemfiles/active3.0.9.gemfile

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

data/gemfiles/active3.0.9.gemfile.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.9)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.3)
+    i18n (0.5.0)
+    rake (0.9.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    sqlite3 (1.3.5)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 3.0.9)
+  activesupport (= 3.0.9)
+  appraisal (~> 0.4.1)
+  comma!
+  rake (= 0.9.2)
+  rspec (~> 2.8.0)
+  sqlite3 (~> 1.3.4)

data/gemfiles/active3.1.1.gemfile

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

data/gemfiles/active3.1.1.gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (2.2.1)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    multi_json (1.1.0)
+    rake (0.9.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    sqlite3 (1.3.5)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 3.1.1)
+  activesupport (= 3.1.1)
+  appraisal (~> 0.4.1)
+  comma!
+  rake (= 0.9.2)
+  rspec (~> 2.8.0)
+  sqlite3 (~> 1.3.4)

data/gemfiles/active3.2.1.gemfile

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

data/gemfiles/active3.2.1.gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (3.0.0)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    multi_json (1.1.0)
+    rake (0.9.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    sqlite3 (1.3.5)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.2.1)
+  activesupport (~> 3.2.1)
+  appraisal (~> 0.4.1)
+  comma!
+  rake (= 0.9.2)
+  rspec (~> 2.8.0)
+  sqlite3 (~> 1.3.4)

data/gemfiles/{rails2.3.7.gemfile → rails3.0.9.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "2.3.7"
+gem "rails", "3.0.9"
 
 gemspec :path=>"../"

data/gemfiles/rails3.0.9.gemfile.lock

@@ -0,0 +1,99 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    json (1.6.5)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    polyglot (0.3.3)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
+      bundler (~> 1.0)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    sqlite3 (1.3.5)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.1)
+  comma!
+  rails (= 3.0.9)
+  rake (= 0.9.2)
+  rspec (~> 2.8.0)
+  sqlite3 (~> 1.3.4)

data/gemfiles/{rails2.3.2.gemfile → rails3.1.1.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "2.3.2"
+gem "rails", "3.1.1"
 
 gemspec :path=>"../"

data/gemfiles/rails3.1.1.gemfile.lock

@@ -0,0 +1,110 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
+      mail (~> 2.3.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (2.2.1)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.5)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.1.0)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
+      bundler (~> 1.0)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.1)
+  comma!
+  rails (= 3.1.1)
+  rake (= 0.9.2)
+  rspec (~> 2.8.0)
+  sqlite3 (~> 1.3.4)