comma 3.2.0 → 3.2.1

data/lib/comma.rb

@@ -48,7 +48,7 @@ ActiveSupport.on_load(:action_controller) do
       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}"
+      send_data obj.to_comma(csv_options), :type => mime_type, :disposition => "attachment; filename=\"#{filename}.#{extension}\""
     end
   end
 end

data/lib/comma/header_extractor.rb

@@ -40,9 +40,11 @@ module Comma
 
     private
 
-    def get_association_class(model_class, association)
-      model_class.respond_to?(:reflect_on_association) ?
-        model_class.reflect_on_association(association).klass : nil
+    def get_association_class(model_class, association)      
+      if model_class.respond_to?(:reflect_on_association)
+        association = model_class.reflect_on_association(association)
+        association.klass rescue nil
+      end      
     end
   end
 end

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/spec/comma/rails/active_record_spec.rb

@@ -5,6 +5,14 @@ if defined? ActiveRecord
 
   describe Comma, 'generating CSV from an ActiveRecord object' do
 
+    class Picture < ActiveRecord::Base
+      belongs_to :imageable, :polymorphic => true
+
+      comma :pr_83 do
+        imageable :name => 'Picture'
+      end
+    end
+
     class Person < ActiveRecord::Base
       scope :teenagers, lambda { where(:age => 13..19) }
 
@@ -18,14 +26,40 @@ if defined? ActiveRecord
       comma :issue_75 do
         job :title
       end
+
+      has_many :pictures, :as => :imageable
     end
 
     class Job < ActiveRecord::Base
       belongs_to :person
+
+      comma do
+        person_formatter :name => 'Name'
+      end
+
+      def person_formatter
+        @person_formatter ||= PersonFormatter.new(self.person)
+      end
+    end
+
+    class PersonFormatter
+      def initialize(persor)
+        @person = persor
+      end
+
+      def name
+        @person.name
+      end
     end
 
     before(:all) do
       #Setup AR model in memory
+      ActiveRecord::Base.connection.create_table :pictures, :force => true do |table|
+        table.column :name, :string
+        table.column :imageable_id, :integer
+        table.column :imageable_type, :string
+      end
+
       ActiveRecord::Base.connection.create_table :people, :force => true do |table|
         table.column :name, :string
         table.column :age, :integer
@@ -39,7 +73,9 @@ if defined? ActiveRecord
       Job.reset_column_information
 
       @person = Person.new(:age => 18, :name => 'Junior')
+      @person.build_job(:title => 'Nice job')
       @person.save!
+      Picture.create(:name => 'photo.jpg', :imageable_id => @person.id, :imageable_type => 'Person')
     end
 
     describe "case" do
@@ -85,6 +121,18 @@ if defined? ActiveRecord
         lambda { Person.all.to_comma(:issue_75) }.should_not raise_error
       end
     end
+
+    describe 'with accessor' do
+      it 'should not raise exception' do
+        Job.all.to_comma.should eq("Name\nJunior\n")
+      end
+    end
+
+    describe 'github pull-request 83' do
+      it 'should not raise NameError' do
+        lambda { Picture.all.to_comma(:pr_83) }.should_not raise_exception(NameError)
+      end
+    end
   end
 
 end

data/spec/controllers/users_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-if defined?(ActionController) && defined?(Rails)
+if defined?(Rails)
 
   describe UsersController do
 
@@ -36,7 +36,7 @@ if defined?(ActionController) && defined?(Rails)
 
         response.status.should            == 200
         response.content_type.should      == 'text/csv'
-        response.header["Content-Disposition"].should include('filename=data.csv')
+        response.header["Content-Disposition"].should include('filename="data.csv"')
 
         expected_content =<<-CSV.gsub(/^\s+/,'')
         First name,Last name,Name
@@ -73,7 +73,20 @@ if defined?(ActionController) && defined?(Rails)
 
           response.status.should            == 200
           response.content_type.should      == 'text/csv'
-          response.header["Content-Disposition"].should include('filename=my_custom_name.csv')
+          response.header["Content-Disposition"].should include('filename="my_custom_name.csv"')
+        end
+
+        it "should allow a custom filename with spaces" do
+          require 'shellwords'
+          get :with_custom_options, :format => :csv, :custom_options => { :filename => 'filename with a lot of spaces' }
+
+          response.status.should            == 200
+          response.content_type.should      == 'text/csv'
+          response.header["Content-Disposition"].should include('filename="filename with a lot of spaces.csv"')
+
+          filename_string = response.header["Content-Disposition"].split('=').last
+          # shellsplit honors quoted strings
+          filename_string.shellsplit.length.should == 1
         end
 
         it 'should allow a file extension to be set' do
@@ -81,7 +94,7 @@ if defined?(ActionController) && defined?(Rails)
 
           response.status.should            == 200
           response.content_type.should      == 'text/csv'
-          response.header["Content-Disposition"].should include('filename=data.txt')
+          response.header["Content-Disposition"].should include('filename="data.txt"')
         end
 
         it 'should allow mime type to be set' do

data/spec/rails_app/active_record/config.rb

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+ActiveRecord::Base.establish_connection('test')

data/spec/rails_app/active_record/models.rb

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+
+class Post < ActiveRecord::Base
+  has_one :user
+
+  comma do
+    title
+    description
+
+    user :full_name
+  end
+end
+
+class User < ActiveRecord::Base
+  comma do
+    first_name
+    last_name
+    full_name "Name"
+  end
+
+  comma :shortened do
+    first_name
+    last_name
+  end
+
+  def full_name
+    "#{first_name} #{last_name}".strip
+  end
+end
+
+class CreateTables < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string      :first_name
+      t.string      :last_name
+      t.timestamps
+    end
+
+    create_table :posts do |t|
+      t.references :user
+      t.string :title
+      t.string :description
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :posts
+    drop_table :users
+  end
+end
+ActiveRecord::Migration.verbose = false
+CreateTables.up

data/spec/rails_app/data_mapper/config.rb

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+DataMapper.setup(:default, 'sqlite::memory:')

data/spec/rails_app/mongoid/config.rb

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+Mongoid.configure do |config|
+  config.sessions = {
+    :default => {
+      :hosts => ['localhost:27017'], :database => 'comma_test'
+    }
+  }
+end

data/spec/rails_app/rails_app.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'action_controller/railtie'
+require 'action_view/railtie'
+
+# orm configs
+require 'rails_app/active_record/config' if defined?(ActiveRecord)
+
+app = Class.new(Rails::Application)
+app.config.secret_token = '6f6acf0443f74fd0aa8ff07a7c2fbe0a'
+app.config.session_store :cookie_store, :key => '_rails_app_session'
+app.config.active_support.deprecation = :log
+app.config.eager_load = false
+app.config.root = File.dirname(__FILE__)
+Rails.backtrace_cleaner.remove_silencers!
+app.initialize!
+
+app.routes.draw do
+  resources :users, :only => [:index]
+  get 'with_custom_options', :to => 'users#with_custom_options'
+  get 'with_custom_style', :to => 'users#with_custom_style'
+  root :to => 'users#index'
+end
+
+# models
+require 'rails_app/active_record/models' if defined?(ActiveRecord)
+
+# controllers
+class ApplicationController < ActionController::Base; end
+class UsersController < ApplicationController
+  def index
+    respond_to do |format|
+      format.html { render :text => 'Users!' }
+      format.csv  { render :csv => User.all  }
+    end
+  end
+
+  def with_custom_options
+    render_options = {:csv => User.all}.update(params[:custom_options].symbolize_keys)
+
+    respond_to do |format|
+      format.csv  { render render_options }
+    end
+  end
+
+  def with_custom_style
+    respond_to do |format|
+      format.csv  { render :csv => User.all, :style => :shortened }
+    end
+  end
+
+end
+
+# helpers
+Object.const_set(:ApplicationHelper, Module.new)

data/spec/spec_helper.rb

@@ -2,61 +2,31 @@
 require 'rubygems'
 $LOAD_PATH.unshift(File.expand_path(File.join(*%w{.. .. lib}), __FILE__))
 
+require 'bundler/setup'
+Bundler.require
+
 begin
   require 'rails'
 rescue LoadError
 end
 
-require 'simplecov'
-SimpleCov.start do
-  add_filter  "spec"
-  use_merging true
-  merge_timeout 600
+%w{data_mapper mongoid active_record}.each do |orm|
+  begin
+    require orm
+    break
+  rescue LoadError
+  end
 end
 
-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 'rails_app/rails_app'
   require 'rspec/rails'
-  ENV["RAILS_ENV"] = "test"
-
-  SimpleCov.command_name 'rspec:with_rails'
-
-  # Requires supporting ruby files with custom matchers and macros, etc,
-  # in spec/support/ and its subdirectories.
-  Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|file| require file }
-
-  load_schema = lambda {
-    load "#{Rails.root.to_s}/db/schema.rb" # use db agnostic schema by default
-    # ActiveRecord::Migrator.up('db/migrate') # use migrations
-  }
-  silence_stream(STDOUT, &load_schema)
-
-  RSpec.configure do |config|
-    config.use_transactional_fixtures = true
-  end
-
 else
-  # Normal tests : Basic active record + support only calls
-  SimpleCov.command_name 'rspec:without_rails'
-
-  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
-
-  begin
-    require 'mongoid'
-    Mongoid.configure do |mconfig|
-      mconfig.sessions = {:default => {:hosts => ['localhost:27017'], :database => 'comma_test'}}
-    end
-  rescue LoadError
-  end
+  require 'rails_app/data_mapper/config' if defined?(DataMapper)
+  require 'rails_app/mongoid/config' if defined?(Mongoid)
+  require 'rails_app/active_record/config' if defined?(ActiveRecord)
 end
 
+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |file| require file }
+
 require File.expand_path('../../spec/non_rails_app/ruby_classes' , __FILE__)

metadata

@@ -1,131 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: comma
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
-  segments: 
-  - 3
-  - 2
-  - 0
-  version: 3.2.0
+version: !ruby/object:Gem::Version
+  version: 3.2.1
 platform: ruby
-authors: 
+authors:
 - Marcus Crafter
 - Tom Meier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-16 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-05-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 3
-        - 4
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.3.4
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: appraisal
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 4
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.4.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby Comma Seperated Values generation library
-email: 
+email:
 - crafterm@redartisan.com
 - tom@venombytes.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - Gemfile.lock
@@ -137,22 +117,26 @@ files:
 - gemfiles/active3.0.20.gemfile.lock
 - gemfiles/active3.1.12.gemfile
 - gemfiles/active3.1.12.gemfile.lock
-- gemfiles/active3.2.14.gemfile
-- gemfiles/active3.2.14.gemfile.lock
-- gemfiles/active4.0.0.gemfile
-- gemfiles/active4.0.0.gemfile.lock
+- gemfiles/active3.2.17.gemfile
+- gemfiles/active3.2.17.gemfile.lock
+- gemfiles/active4.0.4.gemfile
+- gemfiles/active4.0.4.gemfile.lock
+- gemfiles/active4.1.1.gemfile
+- gemfiles/active4.1.1.gemfile.lock
 - gemfiles/data_mapper1.2.0.gemfile
 - gemfiles/data_mapper1.2.0.gemfile.lock
-- gemfiles/mongoid3.1.4.gemfile
-- gemfiles/mongoid3.1.4.gemfile.lock
+- gemfiles/mongoid3.1.6.gemfile
+- gemfiles/mongoid3.1.6.gemfile.lock
 - gemfiles/rails3.0.20.gemfile
 - gemfiles/rails3.0.20.gemfile.lock
 - gemfiles/rails3.1.12.gemfile
 - gemfiles/rails3.1.12.gemfile.lock
-- gemfiles/rails3.2.14.gemfile
-- gemfiles/rails3.2.14.gemfile.lock
-- gemfiles/rails4.0.0.gemfile
-- gemfiles/rails4.0.0.gemfile.lock
+- gemfiles/rails3.2.17.gemfile
+- gemfiles/rails3.2.17.gemfile.lock
+- gemfiles/rails4.0.4.gemfile
+- gemfiles/rails4.0.4.gemfile.lock
+- gemfiles/rails4.1.1.gemfile
+- gemfiles/rails4.1.1.gemfile.lock
 - init.rb
 - lib/comma.rb
 - lib/comma/array.rb
@@ -173,70 +157,37 @@ files:
 - spec/comma/rails/mongoid_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/non_rails_app/ruby_classes.rb
-- spec/rails_app/Rakefile
-- spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/app/controllers/users_controller.rb
-- spec/rails_app/app/helpers/application_helper.rb
-- spec/rails_app/app/models/post.rb
-- spec/rails_app/app/models/user.rb
-- spec/rails_app/app/views/layouts/application.html.erb
-- spec/rails_app/app/views/users/index.html.erb
-- spec/rails_app/config.ru
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/boot.rb
-- spec/rails_app/config/database.yml
-- spec/rails_app/config/environment.rb
-- spec/rails_app/config/environments/development.rb
-- spec/rails_app/config/environments/production.rb
-- spec/rails_app/config/environments/test.rb
-- spec/rails_app/config/initializers/backtrace_silencers.rb
-- spec/rails_app/config/initializers/inflections.rb
-- spec/rails_app/config/initializers/secret_token.rb
-- spec/rails_app/config/routes.rb
-- spec/rails_app/db/migrate/20120224085510_create_tables.rb
-- spec/rails_app/db/schema.rb
-- spec/rails_app/public/404.html
-- spec/rails_app/public/422.html
-- spec/rails_app/public/500.html
-- spec/rails_app/public/favicon.ico
-- spec/rails_app/script/rails
-- spec/spec.opts
+- spec/rails_app/active_record/config.rb
+- spec/rails_app/active_record/models.rb
+- spec/rails_app/data_mapper/config.rb
+- spec/rails_app/mongoid/config.rb
+- spec/rails_app/rails_app.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/crafterm/comma
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: comma
-rubygems_version: 1.6.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby Comma Seperated Values generation library
-test_files: 
+test_files:
 - spec/comma/comma_spec.rb
 - spec/comma/data_extractor_spec.rb
 - spec/comma/header_extractor_spec.rb
@@ -245,32 +196,9 @@ test_files:
 - spec/comma/rails/mongoid_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/non_rails_app/ruby_classes.rb
-- spec/rails_app/Rakefile
-- spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/app/controllers/users_controller.rb
-- spec/rails_app/app/helpers/application_helper.rb
-- spec/rails_app/app/models/post.rb
-- spec/rails_app/app/models/user.rb
-- spec/rails_app/app/views/layouts/application.html.erb
-- spec/rails_app/app/views/users/index.html.erb
-- spec/rails_app/config.ru
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/boot.rb
-- spec/rails_app/config/database.yml
-- spec/rails_app/config/environment.rb
-- spec/rails_app/config/environments/development.rb
-- spec/rails_app/config/environments/production.rb
-- spec/rails_app/config/environments/test.rb
-- spec/rails_app/config/initializers/backtrace_silencers.rb
-- spec/rails_app/config/initializers/inflections.rb
-- spec/rails_app/config/initializers/secret_token.rb
-- spec/rails_app/config/routes.rb
-- spec/rails_app/db/migrate/20120224085510_create_tables.rb
-- spec/rails_app/db/schema.rb
-- spec/rails_app/public/404.html
-- spec/rails_app/public/422.html
-- spec/rails_app/public/500.html
-- spec/rails_app/public/favicon.ico
-- spec/rails_app/script/rails
-- spec/spec.opts
+- spec/rails_app/active_record/config.rb
+- spec/rails_app/active_record/models.rb
+- spec/rails_app/data_mapper/config.rb
+- spec/rails_app/mongoid/config.rb
+- spec/rails_app/rails_app.rb
 - spec/spec_helper.rb