comma 4.1.0 → 4.4.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,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
-ActiveRecord::Base.configurations = {'test' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
+ActiveRecord::Base.configurations = { 'test' => { 'adapter' => 'sqlite3', 'database' => ':memory:' } }
 ActiveRecord::Base.establish_connection(:test)

data/spec/rails_app/active_record/models.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 class Post < ActiveRecord::Base
   has_one :user
@@ -15,7 +15,7 @@ class User < ActiveRecord::Base
   comma do
     first_name
     last_name
-    full_name "Name"
+    full_name 'Name'
   end
 
   comma :shortened do
@@ -29,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,3 +1,3 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 DataMapper.setup(:default, 'sqlite::memory:')

data/spec/rails_app/mongoid/config.rb

@@ -1,9 +1,9 @@
-# -*- coding: utf-8 -*-
+# 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,13 +1,14 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'action_controller/railtie'
 require 'action_view/railtie'
 
 # orm configs
 require 'rails_app/active_record/config' if defined?(ActiveRecord)
 
-app = Class.new(Rails::Application)
+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__)
@@ -15,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
@@ -49,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 }
@@ -68,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,9 +1,23 @@
-# -*- coding: utf-8 -*-
+# 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
@@ -14,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
 
@@ -35,4 +51,4 @@ end
 
 Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |file| require file }
 
-require File.expand_path('../../spec/non_rails_app/ruby_classes' , __FILE__)
+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.1.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Marcus Crafter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-07 00:00:00.000000000 Z
+date: 2020-06-23 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: '5.2'
+        version: '6.1'
   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: '5.2'
+        version: '6.1'
 - !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
@@ -133,29 +119,25 @@ files:
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
-- README.markdown
+- 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/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/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/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
 - init.rb
 - lib/comma.rb
 - lib/comma/array.rb
@@ -181,8 +163,9 @@ 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/crafterm/comma
+homepage: http://github.com/comma-csv/comma
 licenses:
 - MIT
 metadata: {}
@@ -201,8 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: comma
-rubygems_version: 2.5.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby Comma Seperated Values generation library
@@ -220,4 +202,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/README.markdown

@@ -1,353 +0,0 @@
-#COMMA
-
-http://github.com/comma-csv/comma
-
-[![Gem Version](https://badge.fury.io/rb/comma.png)](http://badge.fury.io/rb/comma)
-
-##COMPATIBILITY
-The mainline of this project builds gems to the 3.x version series, and is compatible and tested with :
-
-* Ruby 2.x
-* Rails 4.x, 5.0 (with ActiveRecord, DataMapper and Mongoid support)
-
-[![Build Status](https://travis-ci.org/comma-csv/comma.png?branch=master)](https://travis-ci.org/comma-csv/comma) [![Code Climate](https://codeclimate.com/github/comma-csv/comma.png)](https://codeclimate.com/github/comma-csv/comma)
-
-Comma is distributed as a gem, best installed via Bundler.
-
-Include the gem in your Gemfile:
-
-```Ruby
-  gem "comma", "~> 4.0.0"
-```
-
-Or, if you want to live life on the edge, you can get master from the main comma repository:
-
-```Ruby
-  gem "comma",  :git => "git://github.com/comma-csv/comma.git"
-```
-
-##DESCRIPTION:
-
-Comma is a CSV (i.e. comma separated values) generation extension for Ruby objects, that lets you seamlessly define a CSV output format via a small DSL. Comma works well on pure Ruby objects with attributes, as well as complex ones such as ActiveRecord objects with associations, extensions, etc. It doesn't distinguish between attributes, methods, associations, extensions, etc. - they all are considered equal and invoked identically via the Comma DSL description. Multiple different CSV output descriptions can also be defined.
-
-When multiple objects in an Array are converted to CSV, the output includes generation of a header row reflected from names of the properties requested, or specified via the DSL.
-
-CSV can be a bit of a boring format - the motivation behind Comma was to have a CSV extension that was simple, flexible, and would treat attributes, methods, associations, etc., all the same without the need for any complex configuration, and also work on Ruby objects, not just ActiveRecord or other base class derivatives.
-
-An example Comma CSV enabled ActiveRecord class:
-
-```Ruby
-
- class Book < ActiveRecord::Base
-
-   # ================
-   # = Associations =
-   # ================
-   has_many   :pages
-   has_one    :isbn
-   belongs_to :publisher
-
-   # ===============
-   # = CSV support =
-   # ===============
-   comma do
-
-     name
-     description
-
-     pages :size => 'Pages'
-     publisher :name
-     isbn :number_10 => 'ISBN-10', :number_13 => 'ISBN-13'
-     blurb 'Summary'
-
-   end
-
- end
-
-```
-
-Annotated, the comma description is as follows:
-
-```Ruby
- # starts a Comma description block, generating 2 methods #to_comma and
- # #to_comma_headers for this class.
- comma do
-
-   # name, description are attributes of Book with the header being reflected as
-   # 'Name', 'Description'
-   name
-   description
-
-   # pages is an association returning an array, :size is called on the
-   # association results, with the header name specified as 'Pages'
-   pages :size => 'Pages'
-
-   # publisher is an association returning an object, :name is called on the
-   # associated object, with the reflected header 'Name'
-   publisher :name
-
-   # isbn is an association returning an object, :number_10 and :number_13 are
-   # called on the object with the specified headers 'ISBN-10' and 'ISBN-13'
-   isbn :number_10 => 'ISBN-10', :number_13 => 'ISBN-13'
-
-   # blurb is an attribute of Book, with the header being specified directly
-   # as 'Summary'
-   blurb 'Summary'
-
- end
-
-```
-
-In the above example, any of the declarations (name, description, pages, publisher, isbn, blurb, etc), could be methods, attributes, associations, etc - no distinction during configuration is required, as everything is invoked via Ruby's #send method.
-
-You can get the CSV representation of any object by calling the to_comma method, optionally providing a CSV description name to use.
-
-Object values are automatically converted to strings via to_s allowing you to reuse any existing to_s methods on your objects (instead of having to call particular properties or define CSV specific output methods). Header names are also automatically humanised when reflected (eg. Replacing _ characters with whitespace). The 'isbn' example above shows how multiple values can be added to the CSV output.
-
-Multiple CSV descriptions can also be specified for the same class, eg:
-
-```Ruby
-
- class Book < ActiveRecord::Base
-
-   # ================
-   # = Associations =
-   # ================
-   has_many   :pages
-   has_one    :isbn
-   belongs_to :publisher
-
-   # ===============
-   # = CSV support =
-   # ===============
-   comma do
-
-     name
-     description
-
-     pages :size => 'Pages'
-     publisher :name
-     isbn :number_10 => 'ISBN-10', :number_13 => 'ISBN-13'
-     blurb 'Summary'
-
-   end
-
-   comma :brief do
-
-     name
-     description
-     blurb 'Summary'
-
-   end
-
- end
-
-```
-
-You can specify which output format you would like to use via an optional parameter to to_comma:
-
-```Ruby
- Book.limited(10).to_comma(:brief)
-```
-
-Specifying no description name to to_comma is equivalent to specifying :default as the description name.
-
-You can pass all options for the CSV renderer (see : http://ruby-doc.org/stdlib-1.9.2/libdoc/csv/rdoc/CSV.html ), e.g.
-
-```Ruby
- Book.limited(10).to_comma(:style        => :brief,
-                           :col_sep      => ';',
-                           :force_quotes => true)
-```
-
-You can pass the :filename option and have Comma writes the CSV output to this file:
-
-```Ruby
- Book.limited(10).to_comma(:filename => 'books.csv')
-```
-
-You also can pass the :write_header option to hide the header line (true is default):
-
-```Ruby
- Book.limited(10).to_comma(:write_headers => false)
-```
-
-##Using blocks
-
-For more complex relationships you can pass blocks for calculated values, or related values. Following the previous example here is a comma set using blocks (both with and without labels for your CSV headings):
-
-```Ruby
-
- class Publisher < ActiveRecord::Base
-   # ================
-   # = Associations =
-   # ================
-   has_one  :primary_contact, :class_name => "User" #(basic user with a name)
-   has_many :users
- end
-
- class Book < ActiveRecord::Base
-
-   # ================
-   # = Associations =
-   # ================
-   has_many   :pages
-   has_one    :isbn
-   belongs_to :publisher
-
-   # ===============
-   # = CSV support =
-   # ===============
-   comma do
-     name
-     description
-
-     pages :size => 'Pages'
-     publisher :name
-     publisher { |publisher| publisher.primary_contact.name.to_s.titleize }
-     publisher 'Number of publisher users' do |publisher| publisher.users.size end
-     isbn :number_10 => 'ISBN-10', :number_13 => 'ISBN-13'
-     blurb 'Summary'
-
-   end
-
- end
-
-```
-
-In the preceding example, the 2 new fields added (both based on the publisher relationship) mean that the following will be added:
-
-*   the first example 'publishers_contact' is loaded straight as a block. The value returned by the lambda is displayed with a header value of 'Publisher'
-*   the second example 'total_publishers_users' is sent via a hash and a custom label is set, if used in the first examples method the header would be 'Publisher', but sent as a hash the header is 'Number of publisher users'.
-
-##Using special fields
-
-###\_\_use\_\_
-
-With `__use__` field, you can reuse output formats that are defined in
-the same class. In the example below, default format (`:default`)
-includes `:minimum` format when `#to_comma` is called.
-
-```ruby
- class Book < ActiveRecord::Base
-   comma do
-     __use__ :minimum
-
-     description
-
-     isbn :number_10 => 'ISBN-10', :number_13 => 'ISBN-13'
-   end
-
-   comma :minimum do
-     name
-   end
- end
-```
-
-###\_\_static_column\_\_
-
-When you want to have static value in your CSV output, you can use
-`__static__` field. You can provide values to output to blocks.
-Without block, field will become empty.
-
-```ruby
- class Book < ActiveRecord::Base
-   comma do
-     __static_column__ 'Check' do ' ' end
-     name
-     __static_column__ 'Spacer'
-     description
-   end
- end
-```
-
-##USING WITH RAILS
-
-When used with Rails (ie. add 'comma' as a gem dependency), Comma automatically adds support for rendering CSV output in your controllers:
-
-```Ruby
-
- class BooksController < ApplicationController
-
-   def index
-     respond_to do |format|
-       format.csv { render :csv => Book.limited(50) }
-     end
-   end
-
- end
-
-```
-
-You can specify which output format you would like to use by specifying a style parameter or adding any available CSV option:
-
-```Ruby
-
- class BooksController < ApplicationController
-
-   def index
-     respond_to do |format|
-       format.csv { render :csv => Book.limited(50), :style => :brief }
-     end
-   end
-
- end
-
-```
-
-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.
-
-When used with Rails 3.+, Comma also adds support for exporting scopes:
-
-```Ruby
-
- class Book < ActiveRecord::Base
-   scope :recent,
-               lambda { { :conditions => ['created_at > ?', 1.month.ago] } }
-
-   # ...
- end
-
-```
-
-Calling the to_comma method on the scope will internally use Rails' find_each method, instantiating only 1,000 ActiveRecord objects at a time:
-
-```Ruby
-
- Book.recent.to_comma
-
-```
-
-##DEPENDENCIES
-
-If you have any questions or suggestions for Comma, please feel free to contact me at tom@venombytes.com, all feedback welcome!
-
-##TESTING
-
-To run the test suite across multiple gem file sets, we're using [Appraisal](https://github.com/thoughtbot/appraisal), use the following commands :
-
-```Bash
-
-bundle install
-bundle exec appraisal install
-bundle exec appraisal rake spec
-
-```