comma 4.0.1 → 4.1.0

data/lib/comma/version.rb

@@ -1,3 +1,3 @@
 module Comma
-  VERSION = '4.0.1'
+  VERSION = '4.1.0'
 end

data/spec/comma/comma_spec.rb

@@ -3,15 +3,15 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Comma do
 
   it 'should extend object to add a comma method' do
-    Object.should respond_to(:comma)
+    expect(Object).to respond_to(:comma)
   end
 
   it 'should extend object to have a to_comma method' do
-    Object.should respond_to(:to_comma)
+    expect(Object).to respond_to(:to_comma)
   end
 
   it 'should extend object to have a to_comma_headers method' do
-    Object.should respond_to(:to_comma_headers)
+    expect(Object).to respond_to(:to_comma_headers)
   end
 
   describe '.to_comma_header' do
@@ -29,7 +29,7 @@ describe Comma do
   end
 end
 
-describe Comma, 'generating CSV' do
+describe Comma, 'generating CSV' do # rubocop:disable Metrics/BlockLength
 
   before do
     @isbn = Isbn.new('123123123', '321321321')
@@ -40,15 +40,15 @@ describe Comma, 'generating CSV' do
   end
 
   it 'should extend Array to add a #to_comma method which will return CSV content for objects within the array' do
-    @books.to_comma.should == "Title,Description,Issuer,ISBN-10,ISBN-13\nSmalltalk-80,Language and Implementation,ISBN,123123123,321321321\n"
+    expect(@books.to_comma).to eq("Title,Description,Issuer,ISBN-10,ISBN-13\nSmalltalk-80,Language and Implementation,ISBN,123123123,321321321\n")
   end
 
   it 'should return an empty string when generating CSV from an empty array' do
-    Array.new.to_comma.should == ''
+    expect(Array.new.to_comma).to eq('')
   end
 
   it "should change the style when specified" do
-    @books.to_comma(:brief).should == "Name,Description\nSmalltalk-80,Language and Implementation\n"
+    expect(@books.to_comma(:brief)).to eq("Name,Description\nSmalltalk-80,Language and Implementation\n")
   end
 
   describe 'with :filename specified' do
@@ -56,27 +56,29 @@ describe Comma, 'generating CSV' do
 
     it "should write to the file" do
       @books.to_comma(:filename => 'comma.csv')
-      File.read('comma.csv').should == "Title,Description,Issuer,ISBN-10,ISBN-13\nSmalltalk-80,Language and Implementation,ISBN,123123123,321321321\n"
+      expect(File.read('comma.csv')).to eq("Title,Description,Issuer,ISBN-10,ISBN-13\nSmalltalk-80,Language and Implementation,ISBN,123123123,321321321\n")
     end
 
     it "should accept FasterCSV options" do
       @books.to_comma(:filename => 'comma.csv', :col_sep => ';', :force_quotes => true)
-      File.read('comma.csv').should == "\"Title\";\"Description\";\"Issuer\";\"ISBN-10\";\"ISBN-13\"\n\"Smalltalk-80\";\"Language and Implementation\";\"ISBN\";\"123123123\";\"321321321\"\n"
+      expect(File.read('comma.csv')).to eq("\"Title\";\"Description\";\"Issuer\";\"ISBN-10\";\"ISBN-13\"\n\"Smalltalk-80\";\"Language and Implementation\";\"ISBN\";\"123123123\";\"321321321\"\n")
     end
 
   end
 
   describe "with FasterCSV options" do
     it "should not change when options are empty" do
-      @books.to_comma({}).should == "Title,Description,Issuer,ISBN-10,ISBN-13\nSmalltalk-80,Language and Implementation,ISBN,123123123,321321321\n"
+      expect(@books.to_comma({})).to eq("Title,Description,Issuer,ISBN-10,ISBN-13\nSmalltalk-80,Language and Implementation,ISBN,123123123,321321321\n")
     end
 
     it 'should accept the options in #to_comma and generate the appropriate CSV' do
-      @books.to_comma(:col_sep => ';', :force_quotes => true).should == "\"Title\";\"Description\";\"Issuer\";\"ISBN-10\";\"ISBN-13\"\n\"Smalltalk-80\";\"Language and Implementation\";\"ISBN\";\"123123123\";\"321321321\"\n"
+      expect(@books.to_comma(:col_sep => ';', :force_quotes => true))
+        .to eq("\"Title\";\"Description\";\"Issuer\";\"ISBN-10\";\"ISBN-13\"\n\"Smalltalk-80\";\"Language and Implementation\";\"ISBN\";\"123123123\";\"321321321\"\n")
     end
 
     it "should change the style when specified" do
-      @books.to_comma(:style => :brief, :col_sep => ';', :force_quotes => true).should == "\"Name\";\"Description\"\n\"Smalltalk-80\";\"Language and Implementation\"\n"
+      expect(@books.to_comma(:style => :brief, :col_sep => ';', :force_quotes => true))
+        .to eq("\"Name\";\"Description\"\n\"Smalltalk-80\";\"Language and Implementation\"\n")
     end
   end
 end
@@ -92,8 +94,8 @@ describe Comma, 'defining CSV descriptions' do
     end
 
     it 'should name the current description :default if no name has been provided' do
-      Foo.comma_formats.should_not be_empty
-      Foo.comma_formats[:default].should_not be_nil
+      expect(Foo.comma_formats).not_to be_empty
+      expect(Foo.comma_formats[:default]).not_to be_nil
     end
   end
 
@@ -107,14 +109,14 @@ describe Comma, 'defining CSV descriptions' do
     end
 
     it 'should use the provided name to index the comma format' do
-      Bar.comma_formats.should_not be_empty
-      Bar.comma_formats[:default].should_not be_nil
-      Bar.comma_formats[:detailed].should_not be_nil
+      expect(Bar.comma_formats).not_to be_empty
+      expect(Bar.comma_formats[:default]).not_to be_nil
+      expect(Bar.comma_formats[:detailed]).not_to be_nil
     end
   end
 end
 
-describe Comma, 'to_comma data/headers object extensions' do
+describe Comma, 'to_comma data/headers object extensions' do # rubocop:disable Metrics/BlockLength
 
   describe 'with unnamed descriptions' do
 
@@ -132,15 +134,15 @@ describe Comma, 'to_comma data/headers object extensions' do
     end
 
     it 'should return and array of data content, using the :default CSV description if none requested' do
-      @foo.to_comma.should == %w(content)
+      expect(@foo.to_comma).to eq(%w[content])
     end
 
     it 'should return and array of header content, using the :default CSV description if none requested' do
-      @foo.to_comma_headers.should == %w(Content)
+      expect(@foo.to_comma_headers).to eq(%w[Content])
     end
 
     it 'should return the CSV representation including header and content when called on an array' do
-      Array(@foo).to_comma.should == "Content\ncontent\n"
+      expect(Array(@foo).to_comma).to eq("Content\ncontent\n")
     end
 
   end
@@ -161,26 +163,26 @@ describe Comma, 'to_comma data/headers object extensions' do
     end
 
     it 'should return and array of data content, using the :default CSV description if none requested' do
-      @foo.to_comma(:detailed).should == %w(content)
+      expect(@foo.to_comma(:detailed)).to eq(%w[content])
     end
 
     it 'should return and array of header content, using the :default CSV description if none requested' do
-      @foo.to_comma_headers(:detailed).should == %w(Content)
+      expect(@foo.to_comma_headers(:detailed)).to eq(%w[Content])
     end
 
     it 'should return the CSV representation including header and content when called on an array' do
-      Array(@foo).to_comma(:detailed).should == "Content\ncontent\n"
+      expect(Array(@foo).to_comma(:detailed)).to eq("Content\ncontent\n")
     end
 
     it 'should raise an error if the requested description is not avaliable' do
-      lambda { @foo.to_comma(:bad) }.should raise_error
-      lambda { @foo.to_comma_headers(:bad) }.should raise_error
-      lambda { Array(@foo).to_comma(:bad) }.should raise_error
+      expect { @foo.to_comma(:bad) }.to raise_error
+      expect { @foo.to_comma_headers(:bad) }.to raise_error
+      expect { Array(@foo).to_comma(:bad) }.to raise_error
     end
 
   end
 
-  describe 'with block' do
+  describe 'with block' do # rubocop:disable BlockLength
     before do
       class Foo
         attr_accessor :content, :created_at, :updated_at
@@ -206,23 +208,23 @@ describe Comma, 'to_comma data/headers object extensions' do
     end
 
     it 'should return yielded values by block' do
-      header, foo = Array(@foo).to_comma.split("\n")
-      foo.should == [@content, @content[0..10], @time.to_s(:db), @time.to_s(:db), @time.to_s(:short), @time.to_s(:short)].join(',')
+      _header, foo = Array(@foo).to_comma.split("\n")
+      expect(foo).to eq([@content, @content[0..10], @time.to_s(:db), @time.to_s(:db), @time.to_s(:short), @time.to_s(:short)].join(','))
     end
 
     it 'should return headers with custom labels from block' do
-      header, foo = Array(@foo).to_comma.split("\n")
-      header.should == ['Content', 'Truncated Content', 'Created at', 'Updated at', 'Created Custom Label', 'Updated at Custom Label'].join(',')
+      header, _foo = Array(@foo).to_comma.split("\n")
+      expect(header).to eq(['Content', 'Truncated Content', 'Created at', 'Updated at', 'Created Custom Label', 'Updated at Custom Label'].join(','))
     end
 
     it 'should put headers in place when forced' do
-      header, foo = Array(@foo).to_comma(:write_headers => true).split("\n")
-      header.should == ['Content', 'Truncated Content', 'Created at', 'Updated at', 'Created Custom Label', 'Updated at Custom Label'].join(',')
+      header, _foo = Array(@foo).to_comma(:write_headers => true).split("\n")
+      expect(header).to eq(['Content', 'Truncated Content', 'Created at', 'Updated at', 'Created Custom Label', 'Updated at Custom Label'].join(','))
     end
 
     it 'should not write headers if specified' do
-      header, foo = Array(@foo).to_comma(:write_headers => false).split("\n")
-      header.should == [@content, @content[0..10], @time.to_s(:db), @time.to_s(:db), @time.to_s(:short), @time.to_s(:short)].join(',')
+      header, _foo = Array(@foo).to_comma(:write_headers => false).split("\n")
+      expect(header).to eq([@content, @content[0..10], @time.to_s(:db), @time.to_s(:db), @time.to_s(:short), @time.to_s(:short)].join(','))
     end
 
   end
@@ -231,8 +233,8 @@ describe Comma, 'to_comma data/headers object extensions' do
   describe 'on an object with no comma declaration' do
 
     it 'should raise an error mentioning there is no comma description defined for that class' do
-      lambda { 'a string'.to_comma }.should raise_error('No comma format for class String defined for style default')
-      lambda { 'a string'.to_comma_headers }.should raise_error('No comma format for class String defined for style default')
+      expect { 'a string'.to_comma }.to raise_error('No comma format for class String defined for style default')
+      expect { 'a string'.to_comma_headers }.to raise_error('No comma format for class String defined for style default')
     end
 
   end
@@ -265,11 +267,11 @@ describe Comma, 'to_comma data/headers object extensions' do
     end
 
     it 'should return and array of data content, as defined in comma block in child class' do
-      @childComma.to_comma.should == %w(sub-content)
+      expect(@childComma.to_comma).to eq(%w[sub-content])
     end
 
     it 'should return and array of data content, as defined in comma block in super class, if not present in child' do
-      @childNoComma.to_comma.should == %w(super-content)
+      expect(@childNoComma.to_comma).to eq(%w[super-content])
     end
 
   end

data/spec/comma/data_extractor_spec.rb

@@ -8,7 +8,7 @@ require 'spec_helper'
 #   isbn :number_10 => 'ISBN-10', :number_13 => 'ISBN-13'
 # end
 
-describe Comma::DataExtractor do
+describe Comma::DataExtractor do # rubocop:disable Metrics/BlockLength
 
   before do
     @isbn = Isbn.new('123123123', '321321321')

data/spec/comma/header_extractor_spec.rb

@@ -8,7 +8,7 @@ require 'spec_helper'
 #   isbn :number_10 => 'ISBN-10', :number_13 => 'ISBN-13'
 # end
 
-describe Comma::HeaderExtractor do
+describe Comma::HeaderExtractor do # rubocop:disable Metcirs/BlockLength
 
   before do
     @isbn = Isbn.new('123123123', '321321321')

data/spec/comma/rails/active_record_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 if defined? ActiveRecord
 
-  describe Comma, 'generating CSV from an ActiveRecord object' do
+  describe Comma, 'generating CSV from an ActiveRecord object' do # rubocop:disable Metrics/BlockLength
 
     class Picture < ActiveRecord::Base
       belongs_to :imageable, :polymorphic => true
@@ -14,7 +14,7 @@ if defined? ActiveRecord
     end
 
     class Person < ActiveRecord::Base
-      scope :teenagers, lambda { where(:age => 13..19) }
+      scope(:teenagers, lambda { where(:age => 13..19) })
 
       comma do
         name
@@ -149,7 +149,7 @@ if defined? ActiveRecord
     end
   end
 
-  describe Comma, 'generating CSV from an ActiveRecord object using Single Table Inheritance' do
+  describe Comma, 'generating CSV from an ActiveRecord object using Single Table Inheritance' do # rubocop:disable Metrics/BlockLength
     class Animal < ActiveRecord::Base
       comma do
         name 'Name' do |name|
@@ -188,12 +188,12 @@ if defined? ActiveRecord
     end
 
     it 'should return and array of data content, as defined in comma block in child class' do
-      @dog.to_comma.should == %w(Dog-Rex)
+      @dog.to_comma.should == %w[Dog-Rex]
     end
 
     #FIXME: this one is failing - the comma block from Dog is executed instead of the one from the super class
     it 'should return and array of data content, as defined in comma block in super class, if not present in child' do
-      @cat.to_comma.should == %w(Super-Kitty)
+      @cat.to_comma.should == %w[Super-Kitty]
     end
 
     it 'should call definion in parent class' do

data/spec/comma/rails/data_mapper_collection_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 if defined? DataMapper
 
-  describe Comma, 'generating CSV from an DataMapper object' do
+  describe Comma, 'generating CSV from an DataMapper object' do # rubocop:disable Metrics/BlockLength
 
     class Person
       include DataMapper::Resource

data/spec/controllers/users_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 if defined?(Rails)
 
-  RSpec.describe UsersController, type: :controller do
+  RSpec.describe UsersController, type: :controller do # rubocop:disable Metrics/BlockLength
 
     describe "rails setup" do
 
@@ -17,7 +17,7 @@ if defined?(Rails)
 
     end
 
-    describe "controller" do
+    describe "controller" do # rubocop:disable Metrics/BlockLength
       before(:all) do
         @user_1 = User.create!(:first_name => 'Fred', :last_name => 'Flintstone')
         @user_2 = User.create!(:first_name => 'Wilma', :last_name => 'Flintstone')
@@ -26,16 +26,16 @@ if defined?(Rails)
       it 'should not affect html requested' do
         get :index
 
-        response.status.should        == 200
-        response.content_type.should  == 'text/html'
+        response.status.should eq 200
+        response.content_type.should eq 'text/html'
         response.body.should          == 'Users!'
       end
 
       it "should return a csv when requested" do
         get :index, :format => :csv
 
-        response.status.should            == 200
-        response.content_type.should      == 'text/csv'
+        response.status.should eq 200
+        response.content_type.should eq 'text/csv'
         response.header["Content-Disposition"].should include('filename="data.csv"')
 
         expected_content =<<-CSV.gsub(/^\s+/,'')
@@ -66,22 +66,33 @@ if defined?(Rails)
 
       end
 
-      describe 'with custom options' do
+      describe 'with custom options' do # rubocop:disable Metrics/BlockLength
+        def is_rails_4?
+          Rails::VERSION::STRING =~ /^4.*/
+        end
+
+        def get_(name, **args)
+          if is_rails_4? && args[:params]
+            args.merge!(args[:params])
+            args.delete(:params)
+          end
+          get name, **args
+        end
 
         it 'should allow a filename to be set' do
-          get :with_custom_options, :format => :csv, :custom_options => { :filename => 'my_custom_name' }
+          get_ :with_custom_options, :format => :csv, :params => { :custom_options => { :filename => 'my_custom_name' } }
 
-          response.status.should            == 200
-          response.content_type.should      == 'text/csv'
+          response.status.should eq 200
+          response.content_type.should eq 'text/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' }
+          get_ :with_custom_options, :format => :csv, :params => { :custom_options => { :filename => 'filename with a lot of spaces' } }
 
-          response.status.should            == 200
-          response.content_type.should      == 'text/csv'
+          response.status.should eq 200
+          response.content_type.should eq 'text/csv'
           response.header["Content-Disposition"].should include('filename="filename with a lot of spaces.csv"')
 
           filename_string = response.header["Content-Disposition"].split('=').last
@@ -90,26 +101,26 @@ if defined?(Rails)
         end
 
         it 'should allow a file extension to be set' do
-          get :with_custom_options, :format => :csv, :custom_options => { :extension => :txt }
+          get_ :with_custom_options, :format => :csv, :params => { :custom_options => { :extension => :txt } }
 
-          response.status.should            == 200
-          response.content_type.should      == 'text/csv'
+          response.status.should eq 200
+          response.content_type.should eq '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
+          get_ :with_custom_options, :format => :csv, :params => { :custom_options => { :mime_type => 'text/plain' } }
+          response.status.should eq 200
           response.content_type.should      == 'text/plain'
         end
 
         describe 'headers' do
 
           it 'should allow toggling on' do
-            get :with_custom_options, :format => :csv, :custom_options => { :write_headers => 'true' }
+            get_ :with_custom_options, :format => :csv, :params => { :custom_options => { :write_headers => 'true' } }
 
-            response.status.should            == 200
-            response.content_type.should      == 'text/csv'
+            response.status.should eq 200
+            response.content_type.should eq 'text/csv'
 
             expected_content =<<-CSV.gsub(/^\s+/,'')
             First name,Last name,Name
@@ -121,10 +132,10 @@ if defined?(Rails)
           end
 
           it 'should allow toggling off' do
-            get :with_custom_options, :format => :csv, :custom_options => {:write_headers => false}
+            get_ :with_custom_options, :format => :csv, :params => { :custom_options => {:write_headers => false} }
 
-            response.status.should            == 200
-            response.content_type.should      == 'text/csv'
+            response.status.should eq 200
+            response.content_type.should eq 'text/csv'
 
             expected_content =<<-CSV.gsub(/^\s+/,'')
             Fred,Flintstone,Fred Flintstone
@@ -137,10 +148,10 @@ if defined?(Rails)
         end
 
         it 'should allow forcing of quotes' do
-          get :with_custom_options, :format => :csv, :custom_options => { :force_quotes => true }
+          get_ :with_custom_options, :format => :csv, :params => { :custom_options => { :force_quotes => true } }
 
-          response.status.should            == 200
-          response.content_type.should      == 'text/csv'
+          response.status.should eq 200
+          response.content_type.should eq 'text/csv'
 
           expected_content =<<-CSV.gsub(/^\s+/,'')
           "First name","Last name","Name"
@@ -152,10 +163,10 @@ if defined?(Rails)
         end
 
         it 'should allow combinations of options' do
-          get :with_custom_options, :format => :csv, :custom_options => { :write_headers => false, :force_quotes => true, :col_sep => '||', :row_sep => "ENDOFLINE\n" }
+          get_ :with_custom_options, :format => :csv, :params => { :custom_options => { :write_headers => false, :force_quotes => true, :col_sep => '||', :row_sep => "ENDOFLINE\n" } }
 
-          response.status.should            == 200
-          response.content_type.should      == 'text/csv'
+          response.status.should eq 200
+          response.content_type.should eq 'text/csv'
 
           expected_content =<<-CSV.gsub(/^\s+/,'')
           "Fred"||"Flintstone"||"Fred Flintstone"ENDOFLINE

data/spec/rails_app/active_record/models.rb

@@ -28,7 +28,14 @@ class User < ActiveRecord::Base
   end
 end
 
-class CreateTables < ActiveRecord::Migration
+MIGRATION_CLASS =
+  if Rails::VERSION::STRING =~ /^5.*/
+    ActiveRecord::Migration[4.2]
+  else
+    ActiveRecord::Migration
+  end
+
+class CreateTables < MIGRATION_CLASS
   def self.up
     create_table :users do |t|
       t.string      :first_name