comma 2.1.3 → 3.0.0

data/gemfiles/{rails2.3.15.gemfile → rails3.2.1.gemfile}

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

data/gemfiles/rails3.2.1.gemfile.lock

@@ -0,0 +1,108 @@
+PATH
+  remote: /Users/tom/Development/Projects/comma
+  specs:
+    comma (3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
+      mail (~> 2.4.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    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)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    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)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.1)
+    json (1.6.5)
+    mail (2.4.1)
+      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.4.1)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)
+      bundler (~> 1.0)
+      railties (= 3.2.1)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.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.1.2)
+      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.2.1)
+  rake (= 0.9.2)
+  rspec (~> 2.8.0)
+  sqlite3 (~> 1.3.4)

data/lib/comma.rb

@@ -3,42 +3,25 @@ if RUBY_VERSION >= '1.9'
   require 'csv'
   CSV_HANDLER = CSV
 else
-  begin
-    # try faster csv
-    require 'fastercsv'
-    CSV_HANDLER = FasterCSV
-  rescue Exception => e
-    fail_message = "FasterCSV not installed, please `gem install fastercsv` for faster processing"
-    if defined? Rails
-      Rails.logger.info fail_message
-    else
-      puts fail_message
-    end
-    require 'csv'
-    CSV_HANDLER = CSV
-  end
+  raise "Error - This Comma version only supports Ruby 1.9. Please use an older version."
 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'
-  require 'comma/named_scope'
+if defined? Rails and (Rails.version.split('.').map(&:to_i).first < 3)
+  raise "Error - This Comma version only supports Rails 3.x. Please use a 2.x version of Comma for use with earlier rails versions."
 end
 
+require 'active_support/core_ext/class/attribute'
+require 'comma/relation' if defined?(ActiveRecord::Relation)
+
 require 'comma/extractors'
 require 'comma/generator'
 require 'comma/array'
 require 'comma/object'
-require 'comma/render_as_csv'
 
-if defined?(RenderAsCSV) && defined?(ActionController)
-  ActionController::Base.send :include, RenderAsCSV
+#Load into Rails controllers
+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"
+  end
 end

data/lib/comma/object.rb

@@ -1,5 +1,5 @@
 class Object
-  class_inheritable_accessor :comma_formats
+  class_attribute :comma_formats
 
   def self.comma(style = :default, &block)
     (self.comma_formats ||= {})[style] = block

data/lib/comma/{named_scope.rb → relation.rb}

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

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = "2.1.3"
+  VERSION = "3.0.0"
 end

data/spec/comma/ar_spec.rb

@@ -3,14 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Comma, 'generating CSV from an ActiveRecord object' do
 
   class Person < ActiveRecord::Base
-    #TODO : Rails 2.3.x Deprecation
-    if defined?(ActiveRecord::Relation)
-      #Rails 3.x
-      scope :teenagers, lambda { {:conditions => { :age => 13..19 }} }
-    else
-      #Rails 2.x
-      named_scope :teenagers, :conditions => { :age => 13..19 }
-    end
+    scope :teenagers, lambda { {:conditions => { :age => 13..19 }} }
 
     comma do
       name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comma
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,43 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2012-02-19 00:00:00.000000000Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fastercsv
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70126322915060 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+  version_requirements: *70126322915060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70126322913740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,44 +33,29 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.4
+  version_requirements: *70126322913740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70126322912840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.7.0
+  version_requirements: *70126322912840
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70126322911980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+  version_requirements: *70126322911980
 description: Ruby Comma Seperated Values generation library
 email:
 - crafterm@redartisan.com
@@ -101,8 +65,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc.example
-- .travis.yml
+- .rvmrc
 - Appraisals
 - Gemfile
 - Gemfile.lock
@@ -110,39 +73,29 @@ files:
 - README.markdown
 - Rakefile
 - comma.gemspec
-- gemfiles/active2.3.14.gemfile
-- gemfiles/active2.3.14.gemfile.lock
-- gemfiles/active2.3.15.gemfile
-- gemfiles/active2.3.15.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/active3.0.9.gemfile
+- gemfiles/active3.0.9.gemfile.lock
+- gemfiles/active3.1.1.gemfile
+- 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/rails2.3.14.gemfile
-- gemfiles/rails2.3.14.gemfile.lock
-- gemfiles/rails2.3.15.gemfile
-- gemfiles/rails2.3.15.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
+- gemfiles/rails3.0.9.gemfile
+- gemfiles/rails3.0.9.gemfile.lock
+- gemfiles/rails3.1.1.gemfile
+- gemfiles/rails3.1.1.gemfile.lock
+- gemfiles/rails3.2.1.gemfile
+- gemfiles/rails3.2.1.gemfile.lock
 - init.rb
 - lib/comma.rb
 - lib/comma/array.rb
-- lib/comma/association_proxy.rb
 - lib/comma/extractors.rb
 - lib/comma/generator.rb
-- lib/comma/named_scope.rb
 - lib/comma/object.rb
-- lib/comma/render_as_csv.rb
+- lib/comma/relation.rb
 - lib/comma/version.rb
 - spec/comma/ar_spec.rb
 - spec/comma/comma_spec.rb
@@ -164,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3789187626327987822
+      hash: 4325782371584984549
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,10 +126,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3789187626327987822
+      hash: 4325782371584984549
 requirements: []
 rubyforge_project: comma
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby Comma Seperated Values generation library

data/.travis.yml

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

data/gemfiles/active2.3.14.gemfile

@@ -1,8 +0,0 @@
-# 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

@@ -1,39 +0,0 @@
-PATH
-  remote: /Users/tom/src/personal/comma
-  specs:
-    comma (2.1.3)
-      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.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)
-      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)