comma 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a41ecd8c05f23d5a0cdded2eccc399525d54526f
-  data.tar.gz: 9ea499094bd3469e2b731e646118bb56f9d6924b
-SHA512:
-  metadata.gz: 57cd52eada9c08da15d212f49bcb457d664ab56d01f88767f7574c0fc9d2e30c4bd7ce241b175553648d0c0810cad641ffee2e5aeebd27727a7dd1c5f2e30b33
-  data.tar.gz: 85657ca9f963219a41ad8b8e8cf47faee67bc8aaa5f4b7f700fcd44832874d4570af9d6c6ba556f0c4da0da8ee65d91203394a5a9150f9ca969a8c3592a5f14c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2Q5ZWFkMjgwMjk0OGYzNTg3MTkyMzE0NmZkYmExNjMyN2RhNzYyNw==
+  data.tar.gz: !binary |-
+    MmYzZWQyMDhhNmFjNzUzZTVlZDJiMTg3YTk3ODg5MWNjZjZlNWY4Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NTE2ZjcwNjA4YjY2YTIzNjFmNDkzOGRiMDkzMjgwMGM5Y2NiZmFmNTE5ZGI3
+    MjljMTExMDk3OGIyZjk3YzI1NDRlNzVhZGUxZDhjMjJjOWMxMjhiZTRlYzBl
+    ODE4N2ZkY2JhZWQ0YjU1MGQ5ZmIxN2IwYzMwODUwMDliMWUwMTA=
+  data.tar.gz: !binary |-
+    ZWNmYTk1MDgzODBmMGE4ZDk3NjVlYjFjZDdkZGY3NjQ4NGFjNDVjOWU3Mjg0
+    NzkxNmRkYTU5OTk1ZTk2OTQyZTI4ZTk0YzQ3NmU4OTc4ZGJlN2Y3NTE1M2Iy
+    ZTEzYjQxM2ZlNmMzZmViYTRkZDZkMThmODc2MTM3YjBlOGQ2ZWY=

data/.travis.yml

@@ -1,3 +1,5 @@
+services: mongodb
+
 language: ruby
 rvm:
   - 'ree'

data/Appraisals

@@ -12,3 +12,9 @@
     gem "activerecord", version_number
   end
 end
+
+if RUBY_VERSION >= '1.9.3'
+  appraise 'mongoid3.1.4' do
+    gem 'mongoid', '3.1.4'
+  end
+end

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    comma (3.1.0)
+    comma (3.1.1)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     appraisal (0.4.1)
       bundler
       rake
     diff-lcs (1.1.3)
     fastercsv (1.5.4)
-    i18n (0.6.1)
+    i18n (0.6.5)
     multi_json (1.1.0)
     rake (0.9.2.2)
     rspec (2.8.0)

data/README.markdown

@@ -12,7 +12,7 @@ The mainline of this project builds gems to the 3.x version series, and is compa
 * RBX 1.8 mode, 1.9 mode
 * Rails 3.x (all versions, with ActiveRecord and Mongoid support)
 
-[![Build Status](https://travis-ci.org/comma-csv/comma.png?branch=master)](https://travis-ci.org/comma-csv/comma)
+[![Build Status](https://travis-ci.org/comma-csv/comma.png?branch=master)](https://travis-ci.org/comma-csv/comma) [![Code Climate](https://codeclimate.com/github/comma-csv/comma.png)](https://codeclimate.com/github/comma-csv/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/comma-csv/comma/tree/rails2).
@@ -24,7 +24,7 @@ Comma is distributed as a gem, best installed via Bundler.
 Include the gem in your Gemfile:
 
 ```Ruby
-  gem "comma", "~> 3.0.5"
+  gem "comma", "~> 3.1.0"
 ```
 
 Or, if you want to live life on the edge, you can get master from the main comma repository:

data/gemfiles/mongoid3.1.4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "fastercsv", :platforms=>:ruby_18
+gem "mongoid", "3.1.4"
+
+gemspec :path=>"../"

data/gemfiles/mongoid3.1.4.gemfile.lock

@@ -0,0 +1,58 @@
+PATH
+  remote: /Users/tom/src/personal/comma
+  specs:
+    comma (3.1.0)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
+      builder (~> 3.0.0)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    appraisal (0.4.1)
+      bundler
+      rake
+    builder (3.0.4)
+    diff-lcs (1.1.3)
+    fastercsv (1.5.5)
+    i18n (0.6.5)
+    mongoid (3.1.4)
+      activemodel (~> 3.2)
+      moped (~> 1.4)
+      origin (~> 1.0)
+      tzinfo (~> 0.3.22)
+    moped (1.5.1)
+    multi_json (1.7.9)
+    origin (1.1.0)
+    rake (0.9.6)
+    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)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3 (1.3.8)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.1)
+  comma!
+  fastercsv
+  mongoid (= 3.1.4)
+  rake (~> 0.9.2)
+  rspec (~> 2.8.0)
+  simplecov
+  sqlite3 (~> 1.3.4)

data/lib/comma.rb

@@ -24,10 +24,13 @@ module Comma
     }
 end
 
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/module/delegation'
-require 'comma/relation' if defined?(ActiveRecord::Relation)
-require 'comma/mongoid'
+require 'active_support/lazy_load_hooks'
+ActiveSupport.on_load(:active_record) do
+  require 'comma/relation' if defined?(ActiveRecord::Relation)
+end
+ActiveSupport.on_load(:mongoid) do
+  require 'comma/mongoid'
+end
 
 require 'comma/extractors'
 require 'comma/generator'
@@ -35,13 +38,15 @@ require 'comma/array'
 require 'comma/object'
 
 #Load into Rails controllers
-if defined?(ActionController::Renderers) && ActionController::Renderers.respond_to?(:add)
-  ActionController::Renderers.add :csv do |obj, options|
-    filename    = options[:filename]  || 'data'
-    extension   = options[:extension] || 'csv'
-    mime_type   = options[:mime_type] || Mime::CSV
-    #Capture any CSV optional settings passed to comma or comma specific options
-    csv_options = options.slice(*CSV_HANDLER::DEFAULT_OPTIONS.merge(Comma::DEFAULT_OPTIONS).keys)
-    send_data obj.to_comma(csv_options), :type => mime_type, :disposition => "attachment; filename=#{filename}.#{extension}"
+ActiveSupport.on_load(:action_controller) do
+  if defined?(ActionController::Renderers) && ActionController::Renderers.respond_to?(:add)
+    ActionController::Renderers.add :csv do |obj, options|
+      filename    = options[:filename]  || 'data'
+      extension   = options[:extension] || 'csv'
+      mime_type   = options[:mime_type] || Mime::CSV
+      #Capture any CSV optional settings passed to comma or comma specific options
+      csv_options = options.slice(*CSV_HANDLER::DEFAULT_OPTIONS.merge(Comma::DEFAULT_OPTIONS).keys)
+      send_data obj.to_comma(csv_options), :type => mime_type, :disposition => "attachment; filename=#{filename}.#{extension}"
+    end
   end
 end

data/lib/comma/extractors.rb

@@ -69,7 +69,7 @@ module Comma
 
     def get_association_class(model_class, association)
       model_class.respond_to?(:reflect_on_association) ?
-        model_class.reflect_on_association(arg).klass : nil
+        model_class.reflect_on_association(association).klass : nil
     end
   end
 

data/lib/comma/object.rb

@@ -6,12 +6,21 @@ class Object
   end
 
   def to_comma(style = :default)
-    raise "No comma format for class #{self.class} defined for style #{style}" unless self.comma_formats and self.comma_formats[style]
-    Comma::DataExtractor.new(self, style, self.class.comma_formats).results
+    extract_with(Comma::DataExtractor, style)
   end
 
   def to_comma_headers(style = :default)
-    raise "No comma format for class #{self.class} defined for style #{style}" unless self.comma_formats and self.comma_formats[style]
-    Comma::HeaderExtractor.new(self, style, self.class.comma_formats).results
+    extract_with(Comma::HeaderExtractor, style)
+  end
+
+  private
+
+  def extract_with(extractor_class, style = :default)
+    raise_unless_style_exists(style)
+    extractor_class.new(self, style, self.class.comma_formats).results
+  end
+
+  def raise_unless_style_exists(style)
+    raise "No comma format for class #{self.class} defined for style #{style}" unless self.comma_formats && self.comma_formats[style]
   end
 end

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

data/spec/comma/rails/active_record_spec.rb

@@ -1,69 +1,90 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe Comma, 'generating CSV from an ActiveRecord object' do
+if defined? ActiveRecord
 
-  class Person < ActiveRecord::Base
-    scope :teenagers, lambda { where(:age => 13..19) }
+  describe Comma, 'generating CSV from an ActiveRecord object' do
 
-    comma do
-      name
-      age
-    end
+    class Person < ActiveRecord::Base
+      scope :teenagers, lambda { where(:age => 13..19) }
 
-  end
+      comma do
+        name
+        age
+      end
+
+      has_one :job
 
-  before(:all) do
-    #Setup AR model in memory
-    ActiveRecord::Base.connection.create_table :people, :force => true do |table|
-      table.column :name, :string
-      table.column :age, :integer
+      comma :issue_75 do
+        job :title
+      end
+    end
+
+    class Job < ActiveRecord::Base
+      belongs_to :person
     end
-    Person.reset_column_information
-  end
 
-  describe "case" do
-    before do
+    before(:all) do
+      #Setup AR model in memory
+      ActiveRecord::Base.connection.create_table :people, :force => true do |table|
+        table.column :name, :string
+        table.column :age, :integer
+      end
+      Person.reset_column_information
+
+      ActiveRecord::Base.connection.create_table :jobs, :force => true do |table|
+        table.column :person_id, :integer
+        table.column :title, :string
+      end
+      Job.reset_column_information
+
       @person = Person.new(:age => 18, :name => 'Junior')
       @person.save!
     end
 
-    it 'should extend ActiveRecord::NamedScope::Scope to add a #to_comma method which will return CSV content for objects within the scope' do
-      Person.teenagers.to_comma.should == "Name,Age\nJunior,18\n"
-    end
+    describe "case" do
+      it 'should extend ActiveRecord::NamedScope::Scope to add a #to_comma method which will return CSV content for objects within the scope' do
+        Person.teenagers.to_comma.should == "Name,Age\nJunior,18\n"
+      end
 
-    it 'should find in batches' do
-      Person.teenagers.to_comma
+      it 'should find in batches' do
+        Person.teenagers.to_comma
+      end
     end
-  end
 
-  describe 'with custom value_humanizer' do
-    before do
-      Comma::HeaderExtractor.value_humanizer =
-        lambda do |value, model_class|
-          if model_class.respond_to?(:human_attribute_name)
-            model_class.human_attribute_name(value)
-          else
-            value.is_a?(String) ? value : value.to_s.humanize
+    describe 'with custom value_humanizer' do
+      before do
+        Comma::HeaderExtractor.value_humanizer =
+          lambda do |value, model_class|
+            if model_class.respond_to?(:human_attribute_name)
+              model_class.human_attribute_name(value)
+            else
+              value.is_a?(String) ? value : value.to_s.humanize
+            end
           end
-        end
 
-      I18n.config.backend.store_translations(:ja, {:activerecord => {:attributes => {:person => {:age => '年齢', :name => '名前'}}}})
-      @original_locale = I18n.locale
-      I18n.locale = :ja
+        I18n.config.backend.store_translations(:ja, {:activerecord => {:attributes => {:person => {:age => '年齢', :name => '名前'}}}})
+        @original_locale = I18n.locale
+        I18n.locale = :ja
+      end
 
-      Person.create(:age => 19, :name => 'John')
-    end
+      after do
+        I18n.locale = @original_locale
 
-    after do
-      I18n.locale = @original_locale
+        Comma::HeaderExtractor.value_humanizer =
+          Comma::HeaderExtractor::DEFAULT_VALUE_HUMANIZER
+      end
 
-      Comma::HeaderExtractor.value_humanizer =
-        Comma::HeaderExtractor::DEFAULT_VALUE_HUMANIZER
+      it 'should i18n-ize header values' do
+        Person.teenagers.to_comma.should match(/^名前,年齢/)
+      end
     end
 
-    it 'should i18n-ize header values' do
-      Person.teenagers.to_comma.should match(/^名前,年齢/)
+    describe 'github issue 75' do
+      it 'should find association' do
+        lambda { Person.all.to_comma(:issue_75) }.should_not raise_error
+      end
     end
   end
+
 end

data/spec/comma/rails/mongoid_spec.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+if defined? Mongoid
+
+  describe Comma, 'generating CSV from an Mongoid object' do
+
+    class Person
+      include Mongoid::Document
+
+      field :name, :type => String
+      field :age, :type => Integer
+
+      scope :teenagers, between(:age => 13..19)
+
+      comma do
+        name
+        age
+      end
+    end
+
+    after(:all) do
+      Mongoid.purge!
+    end
+
+    describe "case" do
+      before do
+        @person = Person.new(:age => 18, :name => 'Junior')
+        @person.save
+      end
+
+      it 'should extend ActiveRecord::NamedScope::Scope to add a #to_comma method which will return CSV content for objects within the scope' do
+        Person.teenagers.to_comma.should == "Name,Age\nJunior,18\n"
+      end
+
+      it 'should find in batches' do
+        Person.teenagers.to_comma
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,14 +1,23 @@
+# -*- coding: utf-8 -*-
 require 'rubygems'
-require 'rspec'
-require 'simplecov'
+$LOAD_PATH.unshift(File.expand_path(File.join(*%w{.. .. lib}), __FILE__))
+
+begin
+  require 'rails'
+rescue LoadError
+end
 
+require 'simplecov'
 SimpleCov.start do
   add_filter  "spec"
   use_merging true
   merge_timeout 600
 end
 
-begin
+require 'bundler/setup'
+Bundler.require
+
+if defined? Rails
   #Conditionally load rails app for controller tests if rspec-rails gem is installed
   require "rails_app/config/environment"
   require 'rspec/rails'
@@ -30,18 +39,24 @@ begin
     config.use_transactional_fixtures = true
   end
 
-rescue LoadError => e
+else
   # Normal tests : Basic active record + support only calls
   SimpleCov.command_name 'rspec:without_rails'
 
-  require 'active_record'
+  begin
+    require 'active_record'
+    config = YAML::load(IO.read(File.dirname(__FILE__) + '/rails_app/config/database.yml'))
+    ActiveRecord::Base.establish_connection(config['test'])
+  rescue LoadError
+  end
 
-  config = YAML::load(IO.read(File.dirname(__FILE__) + '/rails_app/config/database.yml'))
-  ActiveRecord::Base.establish_connection(config['test'])
+  begin
+    require 'mongoid'
+    Mongoid.configure do |mconfig|
+      mconfig.sessions = {:default => {:hosts => ['localhost:27017'], :database => 'comma_test'}}
+    end
+  rescue LoadError
+  end
 end
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'comma'
-
-require File.expand_path('../../spec/non_rails_app/ruby_classes' , __FILE__)
+require File.expand_path('../../spec/non_rails_app/ruby_classes' , __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comma
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Marcus Crafter
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -85,14 +85,14 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby Comma Seperated Values generation library
@@ -122,6 +122,8 @@ files:
 - gemfiles/active3.2.11.gemfile.lock
 - gemfiles/active4.0.0.gemfile
 - gemfiles/active4.0.0.gemfile.lock
+- gemfiles/mongoid3.1.4.gemfile
+- gemfiles/mongoid3.1.4.gemfile.lock
 - gemfiles/rails3.0.9.gemfile
 - gemfiles/rails3.0.9.gemfile.lock
 - gemfiles/rails3.1.1.gemfile
@@ -144,6 +146,7 @@ files:
 - spec/comma/comma_spec.rb
 - spec/comma/extractors_spec.rb
 - spec/comma/rails/active_record_spec.rb
+- spec/comma/rails/mongoid_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/non_rails_app/ruby_classes.rb
 - spec/rails_app/Rakefile
@@ -185,17 +188,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: comma
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Ruby Comma Seperated Values generation library
@@ -203,6 +206,7 @@ test_files:
 - spec/comma/comma_spec.rb
 - spec/comma/extractors_spec.rb
 - spec/comma/rails/active_record_spec.rb
+- spec/comma/rails/mongoid_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/non_rails_app/ruby_classes.rb
 - spec/rails_app/Rakefile