comma 3.2.4 → 4.0.0

data/lib/comma.rb

@@ -47,7 +47,15 @@ ActiveSupport.on_load(:action_controller) do
       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)
+      csv_options = options.slice(*CSV_HANDLER::DEFAULT_OPTIONS.merge(Comma::DEFAULT_OPTIONS).keys).each_with_object({}) do |(k, v), h|
+        # XXX: Convert string to boolean
+        h[k] = case k
+        when :write_headers
+          v = (v != 'false') if v.is_a?(String)
+        else
+          v
+        end
+      end
       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.2.4'
+  VERSION = '4.0.0'
 end

data/spec/controllers/users_controller_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 if defined?(Rails)
 
-  describe UsersController do
+  RSpec.describe UsersController, type: :controller do
 
     describe "rails setup" do
 
       it 'should capture the CSV renderer provided by Rails' do
         mock_users = [mock_model(User), mock_model(User)]
-        User.stub!(:all).and_return(mock_users)
+        allow(User).to receive(:all).and_return(mock_users)
 
         mock_users.should_receive(:to_comma).once
 

data/spec/rails_app/active_record/config.rb

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

data/spec/spec_helper.rb

@@ -5,14 +5,17 @@ $LOAD_PATH.unshift(File.expand_path(File.join(*%w{.. .. lib}), __FILE__))
 require 'coveralls'
 Coveralls.wear!
 
+require 'bundler/setup'
+Bundler.require
+
+require 'rspec/active_model/mocks'
+require 'rspec/its'
+
 begin
   require 'rails'
 rescue LoadError
 end
 
-require 'bundler/setup'
-Bundler.require
-
 %w{data_mapper mongoid active_record}.each do |orm|
   begin
     require orm

metadata

@@ -1,119 +1,132 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: comma
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 3
-  - 2
-  - 4
-  version: 3.2.4
+version: !ruby/object:Gem::Version
+  version: 4.0.0
 platform: ruby
-authors: 
+authors:
 - Marcus Crafter
 - Tom Meier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-04-08 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 2016-08-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
-  version_requirements: *id001
-  prerelease: false
-  name: activesupport
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 4
-        - 1
-        version: 0.4.1
-  type: :development
-  version_requirements: *id002
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
   name: appraisal
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
-  version_requirements: *id003
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.5.0
   type: :development
-  version_requirements: *id004
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.5.0
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 3
-        - 4
-        version: 1.3.4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec-activemodel-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  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'
+- !ruby/object:Gem::Dependency
   name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.11
 description: Ruby Comma Seperated Values generation library
-email: 
+email:
 - crafterm@redartisan.com
 - tom@venombytes.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .travis.yml
+files:
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - Gemfile.lock
@@ -121,34 +134,22 @@ files:
 - README.markdown
 - Rakefile
 - comma.gemspec
-- gemfiles/active3.0.20.gemfile
-- gemfiles/active3.0.20.gemfile.lock
-- gemfiles/active3.1.12.gemfile
-- gemfiles/active3.1.12.gemfile.lock
-- gemfiles/active3.2.20.gemfile
-- gemfiles/active3.2.20.gemfile.lock
 - gemfiles/active4.0.13.gemfile
 - gemfiles/active4.0.13.gemfile.lock
-- gemfiles/active4.1.10.gemfile
-- gemfiles/active4.1.10.gemfile.lock
-- gemfiles/active4.2.1.gemfile
-- gemfiles/active4.2.1.gemfile.lock
-- gemfiles/data_mapper1.2.0.gemfile
-- gemfiles/data_mapper1.2.0.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.20.gemfile
-- gemfiles/rails3.2.20.gemfile.lock
+- gemfiles/active4.1.16.gemfile
+- gemfiles/active4.1.16.gemfile.lock
+- gemfiles/active4.2.7.1.gemfile
+- gemfiles/active4.2.7.1.gemfile.lock
+- gemfiles/active5.0.0.1.gemfile
+- gemfiles/active5.0.0.1.gemfile.lock
 - gemfiles/rails4.0.13.gemfile
 - gemfiles/rails4.0.13.gemfile.lock
-- gemfiles/rails4.1.10.gemfile
-- gemfiles/rails4.1.10.gemfile.lock
-- gemfiles/rails4.2.1.gemfile
-- gemfiles/rails4.2.1.gemfile.lock
+- gemfiles/rails4.1.16.gemfile
+- gemfiles/rails4.1.16.gemfile.lock
+- gemfiles/rails4.2.7.1.gemfile
+- gemfiles/rails4.2.7.1.gemfile.lock
+- gemfiles/rails5.0.0.1.gemfile
+- gemfiles/rails5.0.0.1.gemfile.lock
 - init.rb
 - lib/comma.rb
 - lib/comma/array.rb
@@ -175,41 +176,31 @@ files:
 - 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.5.1
 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

data/gemfiles/active3.0.20.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "coveralls", :require=>false
-gem "fastercsv", :platforms=>:ruby_18
-gem "rest-client", "> 1.6.2", "< 1.7", :require=>false
-gem "activesupport", "3.0.20"
-gem "activerecord", "3.0.20"
-
-gemspec :path=>"../"

data/gemfiles/active3.0.20.gemfile.lock

@@ -1,75 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    comma (3.2.4)
-      activesupport (>= 3.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.20)
-    appraisal (0.4.1)
-      bundler
-      rake
-    arel (2.0.10)
-    builder (2.1.2)
-    colorize (0.7.5)
-    coveralls (0.5.8)
-      colorize
-      json
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    diff-lcs (1.1.3)
-    docile (1.1.5)
-    fastercsv (1.5.5)
-    i18n (0.5.0)
-    json (1.8.2)
-    mime-types (1.25.1)
-    multi_json (1.11.0)
-    rake (0.9.6)
-    rdoc (4.2.0)
-      json (~> 1.4)
-    rest-client (1.6.8)
-      mime-types (~> 1.16)
-      rdoc (>= 2.4.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.9.2)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
-    sqlite3 (1.3.8)
-    thor (0.19.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 3.0.20)
-  activesupport (= 3.0.20)
-  appraisal (~> 0.4.1)
-  comma!
-  coveralls
-  fastercsv
-  rake (~> 0.9.2)
-  rest-client (> 1.6.2, < 1.7)
-  rspec (~> 2.8.0)
-  sqlite3 (~> 1.3.4)