comma 3.0.1 → 3.0.2

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 *~
 .bundle
 spec/rails_app/log
+spec/rails_app/db/development.sqlite3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    comma (3.0.1)
+    comma (3.0.2)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/active3.0.9.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/tom/Development/Projects/comma
   specs:
-    comma (3.0.0)
+    comma (3.0.2)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/active3.1.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/tom/Development/Projects/comma
   specs:
-    comma (3.0.0)
+    comma (3.0.2)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/active3.2.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/tom/Development/Projects/comma
   specs:
-    comma (3.0.0)
+    comma (3.0.2)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/rails3.0.9.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/tom/Development/Projects/comma
   specs:
-    comma (3.0.0)
+    comma (3.0.2)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/rails3.1.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/tom/Development/Projects/comma
   specs:
-    comma (3.0.0)
+    comma (3.0.2)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/rails3.2.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/tom/Development/Projects/comma
   specs:
-    comma (3.0.0)
+    comma (3.0.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/comma.rb

@@ -10,6 +10,13 @@ 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
 
+module Comma
+  DEFAULT_OPTIONS = {
+      :write_headers => true,
+      :style => :default
+    }
+end
+
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/module/delegation'
 require 'comma/relation' if defined?(ActiveRecord::Relation)
@@ -23,9 +30,8 @@ require 'comma/object'
 if defined?(ActionController::Renderers) && ActionController::Renderers.respond_to?(:add)
   ActionController::Renderers.add :csv do |obj, options|
     filename    = options[:filename] || 'data'
-    #Capture any CSV optional settings passed to comma
-    csv_options = options.slice(*CSV_HANDLER::DEFAULT_OPTIONS.merge(:write_headers => nil).keys)
-
+    #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::CSV, :disposition => "attachment; filename=#{filename}.csv"
   end
 end

data/lib/comma/generator.rb

@@ -9,7 +9,7 @@ module Comma
 
       if @style.is_a? Hash
         @options                  = @style.clone
-        @style                    = @options.delete(:style) || :default
+        @style                    = @options.delete(:style) || Comma::DEFAULT_OPTIONS[:style]
         @filename                 = @options.delete(:filename)
       end
     end

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/spec/controllers/users_controller_spec.rb

@@ -47,6 +47,25 @@ if defined?(ActionController) && defined?(Rails)
         response.body.should              == expected_content
       end
 
+      describe 'with comma options' do
+
+        it 'should allow the style to be chosen from the renderer' do
+          #Must be passed in same format (string/symbol) eg:
+          # format.csv  { render User.all, :style => :shortened }
+
+          get :with_custom_style, :format => :csv
+
+          expected_content =<<-CSV.gsub(/^\s+/,'')
+          First name,Last name
+          Fred,Flintstone
+          Wilma,Flintstone
+          CSV
+
+          response.body.should              == expected_content
+        end
+
+      end
+
       describe 'with custom options' do
 
         it 'should allow a filename to be set' do

data/spec/rails_app/app/controllers/users_controller.rb

@@ -14,4 +14,10 @@ class UsersController < ApplicationController
     end
   end
 
+  def with_custom_style
+    respond_to do |format|
+      format.csv  { render :csv => User.all, :style => :shortened }
+    end
+  end
+
 end

data/spec/rails_app/app/models/user.rb

@@ -5,7 +5,7 @@ class User < ActiveRecord::Base
     full_name "Name"
   end
 
-  comma :brief do
+  comma :shortened do
     first_name
     last_name
   end

data/spec/rails_app/config/routes.rb

@@ -3,6 +3,7 @@ Rails.application.routes.draw do
   resources :users, :only => [:index]
 
   match "with_custom_options", :to => "users#with_custom_options"
+  match "with_custom_style", :to => "users#with_custom_style"
 
   root :to => "users#index"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comma
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-02-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70233068053000 !ruby/object:Gem::Requirement
+  requirement: &70335467056500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70233068053000
+  version_requirements: *70335467056500
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70233068052360 !ruby/object:Gem::Requirement
+  requirement: &70335467054900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70233068052360
+  version_requirements: *70335467054900
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70233068051800 !ruby/object:Gem::Requirement
+  requirement: &70335467054140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *70233068051800
+  version_requirements: *70335467054140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70233068051240 !ruby/object:Gem::Requirement
+  requirement: &70335467053480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70233068051240
+  version_requirements: *70335467053480
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70233068050740 !ruby/object:Gem::Requirement
+  requirement: &70335467052920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233068050740
+  version_requirements: *70335467052920
 description: Ruby Comma Seperated Values generation library
 email:
 - crafterm@redartisan.com
@@ -133,7 +133,6 @@ files:
 - 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/development.sqlite3
 - spec/rails_app/db/migrate/20120224085510_create_tables.rb
 - spec/rails_app/db/schema.rb
 - spec/rails_app/public/404.html
@@ -157,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3572797252536909493
+      hash: -1006301303101993278
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3572797252536909493
+      hash: -1006301303101993278
 requirements: []
 rubyforge_project: comma
 rubygems_version: 1.8.10
@@ -199,7 +198,6 @@ test_files:
 - 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/development.sqlite3
 - spec/rails_app/db/migrate/20120224085510_create_tables.rb
 - spec/rails_app/db/schema.rb
 - spec/rails_app/public/404.html