comma 4.2.0 → 4.5.0

data/spec/non_rails_app/ruby_classes.rb

@@ -1,17 +1,21 @@
+# frozen_string_literal: true
+
 class Book
   attr_accessor :name, :description, :isbn
 
   def initialize(name, description, isbn)
-    @name, @description, @isbn = name, description, isbn
+    @name = name
+    @description = description
+    @isbn = isbn
   end
 
   comma do
     name 'Title'
     description
 
-    isbn :authority => :issuer
-    isbn :number_10 => 'ISBN-10'
-    isbn :number_13 => 'ISBN-13'
+    isbn authority: :issuer
+    isbn number_10: 'ISBN-10'
+    isbn number_13: 'ISBN-13'
   end
 
   comma :brief do
@@ -24,8 +28,11 @@ class Isbn
   attr_accessor :number_10, :number_13
 
   def initialize(isbn_10, isbn_13)
-    @number_10, @number_13 = isbn_10, isbn_13
+    @number_10 = isbn_10
+    @number_13 = isbn_13
   end
 
-  def authority; 'ISBN'; end
+  def authority
+    'ISBN'
+  end
 end

data/spec/rails_app/active_record/config.rb

@@ -1,2 +1,4 @@
-ActiveRecord::Base.configurations = {'test' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
+# frozen_string_literal: true
+
+ActiveRecord::Base.configurations = { 'test' => { 'adapter' => 'sqlite3', 'database' => ':memory:' } }
 ActiveRecord::Base.establish_connection(:test)

data/spec/rails_app/active_record/models.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Post < ActiveRecord::Base
   has_one :user
 
@@ -13,7 +15,7 @@ class User < ActiveRecord::Base
   comma do
     first_name
     last_name
-    full_name "Name"
+    full_name 'Name'
   end
 
   comma :shortened do
@@ -27,7 +29,7 @@ class User < ActiveRecord::Base
 end
 
 MIGRATION_CLASS =
-  if Rails::VERSION::STRING =~ /^5.*/
+  if Rails::VERSION::STRING =~ /^[56].*/
     ActiveRecord::Migration[4.2]
   else
     ActiveRecord::Migration

data/spec/rails_app/data_mapper/config.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 DataMapper.setup(:default, 'sqlite::memory:')

data/spec/rails_app/mongoid/config.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 Mongoid.configure do |config|
   config.sessions = {
-    :default => {
-      :hosts => ['localhost:27017'], :database => 'comma_test'
+    default: {
+      hosts: ['localhost:27017'], database: 'comma_test'
     }
   }
 end

data/spec/rails_app/rails_app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'action_controller/railtie'
 require 'action_view/railtie'
 
@@ -6,7 +8,7 @@ require 'rails_app/active_record/config' if defined?(ActiveRecord)
 
 app = CommaTestApp = Class.new(Rails::Application)
 app.config.secret_token = '6f6acf0443f74fd0aa8ff07a7c2fbe0a'
-app.config.session_store :cookie_store, :key => '_rails_app_session'
+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__)
@@ -14,10 +16,10 @@ 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'
+  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
@@ -48,17 +50,17 @@ class UsersController < ApplicationController
     respond_to do |format|
       format.html do
         if is_rails_4?
-          render :text => 'Users!'
+          render text: 'Users!'
         else
-          render :plain => 'Users!'
+          render plain: 'Users!'
         end
       end
-      format.csv  { render :csv => User.all }
+      format.csv  { render csv: User.all }
     end
   end
 
   def with_custom_options
-    render_options = {:csv => User.all}.update(symbolize_param_keys(params[:custom_options]))
+    render_options = { csv: User.all }.update(symbolize_param_keys(params[:custom_options]))
 
     respond_to do |format|
       format.csv  { render render_options }
@@ -67,10 +69,9 @@ class UsersController < ApplicationController
 
   def with_custom_style
     respond_to do |format|
-      format.csv  { render :csv => User.all, :style => :shortened }
+      format.csv  { render csv: User.all, style: :shortened }
     end
   end
-
 end
 
 # helpers

data/spec/spec_helper.rb

@@ -1,8 +1,23 @@
+# frozen_string_literal: true
+
 require 'rubygems'
-$LOAD_PATH.unshift(File.expand_path(File.join(*%w{.. .. lib}), __FILE__))
+$LOAD_PATH.unshift(File.expand_path(File.join('..', '..', 'lib'), __FILE__))
 
+require 'simplecov'
 require 'coveralls'
-Coveralls.wear!
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+if defined? Rails
+  SimpleCov.start('rails') do
+    add_filter %r{^/spec/comma/rails/data_mapper_collection_spec\.rb$}
+    add_filter %r{^/spec/comma/rails/mongoid_spec\.rb$}
+  end
+else
+  SimpleCov.start do
+    add_filter %r{^/spec/comma/rails/data_mapper_collection_spec\.rb}
+    add_filter %r{^/spec/comma/rails/mongoid_spec\.rb}
+    add_filter %r{^/spec/controllers/}
+  end
+end
 
 require 'bundler/setup'
 Bundler.require
@@ -13,13 +28,15 @@ require 'rspec/its'
 begin
   require 'rails'
 rescue LoadError
+  warn 'rails not loaded'
 end
 
-%w{data_mapper mongoid active_record}.each do |orm|
+%w[data_mapper mongoid active_record].each do |orm|
   begin
     require orm
     break
   rescue LoadError
+    warn "#{orm} not loaded"
   end
 end
 
@@ -34,4 +51,4 @@ end
 
 Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |file| require file }
 
-require File.expand_path('../spec/non_rails_app/ruby_classes' , __dir__)
+require File.expand_path('../spec/non_rails_app/ruby_classes', __dir__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comma
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Marcus Crafter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2020-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -101,20 +101,6 @@ dependencies:
     - - ">="
       - !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:
 - crafterm@redartisan.com
@@ -136,30 +122,26 @@ files:
 - README.md
 - Rakefile
 - comma.gemspec
-- gemfiles/active4.0.13.gemfile
-- gemfiles/active4.0.13.gemfile.lock
-- gemfiles/active4.1.16.gemfile
-- gemfiles/active4.1.16.gemfile.lock
-- gemfiles/active4.2.8.gemfile
-- gemfiles/active4.2.8.gemfile.lock
-- gemfiles/active5.0.1.gemfile
-- gemfiles/active5.0.1.gemfile.lock
-- gemfiles/active5.1.0.gemfile
-- gemfiles/active5.1.0.gemfile.lock
-- gemfiles/active5.2.0.gemfile
-- gemfiles/active5.2.0.gemfile.lock
-- gemfiles/rails4.0.13.gemfile
-- gemfiles/rails4.0.13.gemfile.lock
-- gemfiles/rails4.1.16.gemfile
-- gemfiles/rails4.1.16.gemfile.lock
-- gemfiles/rails4.2.8.gemfile
-- gemfiles/rails4.2.8.gemfile.lock
-- gemfiles/rails5.0.1.gemfile
-- gemfiles/rails5.0.1.gemfile.lock
-- gemfiles/rails5.1.0.gemfile
-- gemfiles/rails5.1.0.gemfile.lock
-- gemfiles/rails5.2.0.gemfile
-- gemfiles/rails5.2.0.gemfile.lock
+- gemfiles/active5.0.7.2.gemfile
+- gemfiles/active5.0.7.2.gemfile.lock
+- gemfiles/active5.1.7.gemfile
+- gemfiles/active5.1.7.gemfile.lock
+- gemfiles/active5.2.4.3.gemfile
+- gemfiles/active5.2.4.3.gemfile.lock
+- gemfiles/active6.0.3.1.gemfile
+- gemfiles/active6.0.3.1.gemfile.lock
+- gemfiles/active6.1.0.gemfile
+- gemfiles/active6.1.0.gemfile.lock
+- gemfiles/rails5.0.7.2.gemfile
+- gemfiles/rails5.0.7.2.gemfile.lock
+- gemfiles/rails5.1.7.gemfile
+- gemfiles/rails5.1.7.gemfile.lock
+- gemfiles/rails5.2.4.3.gemfile
+- gemfiles/rails5.2.4.3.gemfile.lock
+- gemfiles/rails6.0.3.1.gemfile
+- gemfiles/rails6.0.3.1.gemfile.lock
+- gemfiles/rails6.1.0.gemfile
+- gemfiles/rails6.1.0.gemfile.lock
 - init.rb
 - lib/comma.rb
 - lib/comma/array.rb
@@ -185,6 +167,7 @@ files:
 - spec/rails_app/data_mapper/config.rb
 - spec/rails_app/mongoid/config.rb
 - spec/rails_app/rails_app.rb
+- spec/rails_app/tmp/.gitkeep
 - spec/spec_helper.rb
 homepage: http://github.com/comma-csv/comma
 licenses:
@@ -205,8 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: comma
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby Comma Seperated Values generation library
@@ -224,4 +206,5 @@ test_files:
 - spec/rails_app/data_mapper/config.rb
 - spec/rails_app/mongoid/config.rb
 - spec/rails_app/rails_app.rb
+- spec/rails_app/tmp/.gitkeep
 - spec/spec_helper.rb

data/gemfiles/active4.0.13.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "coveralls", :require => false
-gem "rubocop", :require => false
-gem "activesupport", "4.0.13"
-gem "activerecord", "4.0.13"
-
-gemspec :path => "../"

data/gemfiles/active4.0.13.gemfile.lock

@@ -1,107 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    comma (4.0.1)
-      activesupport (>= 4.0.0, < 5.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    appraisal (1.0.3)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (4.0.2)
-    ast (2.3.0)
-    builder (3.1.4)
-    coveralls (0.8.14)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    i18n (0.7.0)
-    json (2.0.1)
-    minitest (4.7.5)
-    multi_json (1.12.1)
-    parser (2.3.1.4)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.1.0)
-    rake (10.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-activemodel-mocks (1.0.3)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.5.2)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.43.0)
-      parser (>= 2.3.1.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    sqlite3 (1.3.11)
-    term-ansicolor (1.3.2)
-      tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tins (1.6.0)
-    tzinfo (0.3.51)
-    unicode-display_width (1.1.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 4.0.13)
-  activesupport (= 4.0.13)
-  appraisal (~> 1.0.0)
-  comma!
-  coveralls
-  rake (~> 10.5.0)
-  rspec (~> 3.5.0)
-  rspec-activemodel-mocks
-  rspec-its
-  rubocop
-  sqlite3 (~> 1.3.11)
-
-BUNDLED WITH
-   1.13.2