comma 3.0.3 → 3.0.4

data/.gitignore

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

data/.travis.yml

@@ -4,5 +4,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - rbx-18mode
 
 script: "bundle exec rake appraisal:install && bundle exec rake appraisal spec"

data/Appraisals

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

data/Gemfile.lock

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

data/README.markdown

@@ -5,7 +5,9 @@ http://github.com/crafterm/comma
 ##COMPATIBILITY
 The mainline of this project builds gems to the 3.x version series, and is compatible and tested with :
 
-* Ruby 1.8.7, REE 1.8.7, 1.9.2, 1.9.3
+* Ruby 1.8.7, 1.9.2, 1.9.3
+* REE 1.8.7
+* RBX 1.8
 * Rails 3.x (all versions)
 
 [![Build Status](https://secure.travis-ci.org/crafterm/comma.png)](http://travis-ci.org/crafterm/comma)
@@ -257,6 +259,22 @@ You can specify which output format you would like to use by specifying a style
 
 ```
 
+You can also specify a different file extension ('csv' by default)
+
+```Ruby
+
+class BooksController < ApplicationController
+
+  def index
+    respond_to do |format|
+      format.csv { render :csv => Book.limited(50), :extension => 'txt' }
+    end
+  end
+
+end
+
+```
+
 With the Rails renderer you can supply any of the regular parameters that you would use with to_comma such as :filename,
 :write_headers, :force_quotes, etc. The parameters just need to be supplied after you specify the collection for the csv as demonstrated
 above.
@@ -293,8 +311,8 @@ To run the test suite across multiple gem file sets, we're using [Appraisal](htt
 ```Bash
 
 bundle install
-bundle exec rake appraisals:install
-bundle exec rake appraisals spec
+bundle exec rake appraisal:install
+bundle exec rake appraisal spec
 
 ```
 

data/gemfiles/active3.0.9.gemfile.lock

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

data/gemfiles/active3.1.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/tom/Development/Projects/comma
+  remote: /Users/tom/development/projects/current/comma
   specs:
-    comma (3.0.2)
+    comma (3.0.3)
 
 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.2)
+    comma (3.0.3)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/active3.2.8.gemfile

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

data/gemfiles/active3.2.8.gemfile.lock

@@ -0,0 +1,57 @@
+PATH
+  remote: /Users/tom/development/projects/current/comma
+  specs:
+    comma (3.0.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    diff-lcs (1.1.3)
+    fastercsv (1.5.5)
+    i18n (0.6.1)
+    multi_json (1.3.7)
+    rake (0.9.2.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)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3 (1.3.6)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.2.8)
+  activesupport (~> 3.2.8)
+  appraisal (~> 0.4.1)
+  comma!
+  fastercsv
+  rake (~> 0.9.2)
+  rspec (~> 2.8.0)
+  simplecov
+  sqlite3 (~> 1.3.4)

data/gemfiles/rails3.0.9.gemfile.lock

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

data/gemfiles/rails3.1.1.gemfile.lock

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

data/gemfiles/{rails3.2.1.gemfile → rails3.2.8.gemfile}

@@ -3,7 +3,7 @@
 source "http://rubygems.org"
 
 gem "fastercsv", :platforms=>:ruby_18
-gem "rails", "~>3.2.1"
+gem "rails", "~>3.2.8"
 gem "rspec-rails"
 
 gemspec :path=>"../"

data/gemfiles/{rails3.2.1.gemfile.lock → rails3.2.8.gemfile.lock}

@@ -1,79 +1,79 @@
 PATH
-  remote: /Users/tom/Development/Projects/comma
+  remote: /Users/tom/development/projects/current/comma
   specs:
-    comma (3.0.2)
+    comma (3.0.3)
 
 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)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     appraisal (0.4.1)
       bundler
       rake
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    fastercsv (1.5.4)
+    fastercsv (1.5.5)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.6.5)
-    mail (2.4.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.19)
+    multi_json (1.3.7)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       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)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
       bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -90,21 +90,21 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    simplecov (0.6.1)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sprockets (2.1.2)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.14.6)
+    sqlite3 (1.3.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -113,7 +113,7 @@ DEPENDENCIES
   appraisal (~> 0.4.1)
   comma!
   fastercsv
-  rails (~> 3.2.1)
+  rails (~> 3.2.8)
   rake (~> 0.9.2)
   rspec (~> 2.8.0)
   rspec-rails

data/lib/comma.rb

@@ -36,9 +36,11 @@ 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'
+    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::CSV, :disposition => "attachment; filename=#{filename}.csv"
+    send_data obj.to_comma(csv_options), :type => mime_type, :disposition => "attachment; filename=#{filename}.#{extension}"
   end
 end

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

data/spec/controllers/users_controller_spec.rb

@@ -76,6 +76,20 @@ if defined?(ActionController) && defined?(Rails)
           response.header["Content-Disposition"].should include('filename=my_custom_name.csv')
         end
 
+        it 'should allow a file extension to be set' do
+          get :with_custom_options, :format => :csv, :custom_options => { :extension => :txt }
+
+          response.status.should            == 200
+          response.content_type.should      == 'text/csv'
+          response.header["Content-Disposition"].should include('filename=data.txt')
+        end
+
+        it 'should allow mime type to be set' do
+          get :with_custom_options, :format => :csv, :custom_options => { :mime_type => Mime::TEXT }
+          response.status.should            == 200
+          response.content_type.should      == 'text/plain'
+        end
+
         describe 'headers' do
 
           it 'should allow toggling on' do
@@ -143,4 +157,4 @@ if defined?(ActionController) && defined?(Rails)
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comma
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70136624134040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,15 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70136624134040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70136624133540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70136624133540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70136624133060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +54,15 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *70136624133060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70136619239900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +70,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70136619239900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70136619239520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +86,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70136619239520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby Comma Seperated Values generation library
 email:
 - crafterm@redartisan.com
@@ -91,12 +116,14 @@ files:
 - gemfiles/active3.1.1.gemfile.lock
 - gemfiles/active3.2.1.gemfile
 - gemfiles/active3.2.1.gemfile.lock
+- gemfiles/active3.2.8.gemfile
+- gemfiles/active3.2.8.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
+- gemfiles/rails3.2.8.gemfile
+- gemfiles/rails3.2.8.gemfile.lock
 - init.rb
 - lib/comma.rb
 - lib/comma/array.rb
@@ -153,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1069179881687132397
+      hash: -692163950360334906
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,10 +189,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1069179881687132397
+      hash: -692163950360334906
 requirements: []
 rubyforge_project: comma
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby Comma Seperated Values generation library