comma 4.2.0 → 4.3.0

data/gemfiles/{rails4.2.8.gemfile → rails6.0.0.gemfile}

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "coveralls", :require => false
 gem "rubocop", :require => false
-gem "rails", "4.2.8"
+gem "rails", "6.0.0.beta3"
 gem "rspec-rails"
 gem "test-unit"
 

data/gemfiles/rails6.0.0.gemfile.lock

@@ -0,0 +1,237 @@
+PATH
+  remote: ..
+  specs:
+    comma (4.3.0)
+      activesupport (>= 4.0.0, < 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      activejob (= 6.0.0.beta3)
+      activerecord (= 6.0.0.beta3)
+      activestorage (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      actionview (= 6.0.0.beta3)
+      activejob (= 6.0.0.beta3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0.beta3)
+      actionview (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actiontext (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      activerecord (= 6.0.0.beta3)
+      activestorage (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+    activerecord (6.0.0.beta3)
+      activemodel (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+    activestorage (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      activerecord (= 6.0.0.beta3)
+      marcel (~> 0.3.1)
+    activesupport (6.0.0.beta3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 1.3, >= 1.3.1)
+    appraisal (1.0.3)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.0)
+    builder (3.2.3)
+    concurrent-ruby (1.1.5)
+    coveralls (0.7.1)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    crass (1.0.4)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    erubi (1.8.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.2)
+    json (2.2.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    netrc (0.11.0)
+    nio4r (2.3.1)
+    nokogiri (1.10.2)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.17.0)
+    parser (2.6.2.1)
+      ast (~> 2.4.0)
+    power_assert (1.1.4)
+    psych (3.1.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.0.beta3)
+      actioncable (= 6.0.0.beta3)
+      actionmailbox (= 6.0.0.beta3)
+      actionmailer (= 6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      actiontext (= 6.0.0.beta3)
+      actionview (= 6.0.0.beta3)
+      activejob (= 6.0.0.beta3)
+      activemodel (= 6.0.0.beta3)
+      activerecord (= 6.0.0.beta3)
+      activestorage (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0.beta3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
+    rake (10.5.0)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-activemodel-mocks (1.1.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      rspec-mocks (>= 2.99, < 4.0)
+    rspec-core (3.5.4)
+      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.3.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-rails (3.5.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.67.2)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      psych (>= 3.1.0)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    ruby-progressbar (1.10.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    test-unit (3.3.2)
+      power_assert
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tins (1.20.2)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.5.0)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    zeitwerk (1.4.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 1.0.0)
+  comma!
+  coveralls
+  rails (= 6.0.0.beta3)
+  rake (~> 10.5.0)
+  rspec (~> 3.5.0)
+  rspec-activemodel-mocks
+  rspec-its
+  rspec-rails
+  rubocop
+  sqlite3 (~> 1.3.11)
+  test-unit
+
+BUNDLED WITH
+   1.17.3

data/init.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'comma'

data/lib/comma.rb

@@ -1,26 +1,13 @@
-# load the right csv library
-if RUBY_VERSION >= '1.9'
-  require 'csv'
-  CSV_HANDLER = CSV
-else
-  begin
-    gem 'fastercsv'
-    require 'fastercsv'
+# frozen_string_literal: true
 
-    CSV_HANDLER = FasterCSV
-  rescue LoadError => e
-    raise "Error : FasterCSV not installed, please `gem install fastercsv` for faster processing on <Ruby 1.9"
-  end
-end
-
-raise "Error - This Comma version only supports Rails 3.x. Please use a 2.x version of Comma for use with earlier rails versions." if
-  defined? Rails and (Rails.version.split('.').map(&:to_i).first < 3)
+require 'csv'
+CSV_HANDLER = CSV
 
 module Comma
   DEFAULT_OPTIONS = {
-      :write_headers => true,
-      :style => :default
-    }
+    write_headers: true,
+    style: :default
+  }.freeze
 end
 
 require 'active_support/lazy_load_hooks'
@@ -38,30 +25,33 @@ require 'comma/generator'
 require 'comma/array'
 require 'comma/object'
 
-#Load into Rails controllers
+# Load into Rails controllers
 ActiveSupport.on_load(:action_controller) do
   if defined?(ActionController::Renderers) && ActionController::Renderers.respond_to?(:add)
     ActionController::Renderers.add :csv do |obj, options|
       filename    = options[:filename]  || 'data'
       extension   = options[:extension] || 'csv'
 
-      if Rails.version >= "5.0.0"
-        mime_type   = options[:mime_type] || Mime[:csv]
-      else
-        mime_type   = options[:mime_type] || Mime::CSV
-      end
+      mime_type = if Rails.version >= '5.0.0'
+                    options[:mime_type] || Mime[:csv]
+                  else
+                    options[:mime_type] || Mime::CSV
+                  end
 
-      #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).each_with_object({}) do |(k, v), h|
+      # 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 = csv_options.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
+               when :write_headers
+                 (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}\""
+      data = obj.to_comma(csv_options)
+      disposition = "attachment; filename=\"#{filename}.#{extension}\""
+      send_data data, type: mime_type, disposition: disposition
     end
   end
 end

data/lib/comma/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Array
   def to_comma(style = :default)
     Comma::Generator.new(self, style).run(:each)

data/lib/comma/data_extractor.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 require 'comma/extractor'
 
 module Comma
-
   class DataExtractor < Extractor
-
     class ExtractValueFromInstance
       def initialize(instance)
         @instance = instance
@@ -42,7 +42,7 @@ module Comma
 
       def null_association
         @null_association ||= Class.new(Class.const_defined?(:BasicObject) ? ::BasicObject : ::Object) do
-          def method_missing(symbol, *args, &block)
+          def method_missing(_symbol, *_args, &_block)
             nil
           end
         end.new
@@ -56,7 +56,7 @@ module Comma
       args.each do |arg|
         case arg
         when Hash
-          arg.each do |k, v|
+          arg.each do |k, _v|
             @results << ExtractValueFromAssociationOfInstance.new(@instance, sym).extract(k, &block)
           end
         when Symbol
@@ -69,7 +69,7 @@ module Comma
       end
     end
 
-    def __static_column__(header = nil, &block)
+    def __static_column__(_header = nil, &block)
       @results << (block ? yield(@instance) : nil)
     end
   end

data/lib/comma/data_mapper_collection.rb

@@ -1,5 +1,11 @@
-class DataMapper::Collection
-  def to_comma(style = :default)
-    Comma::Generator.new(self, style).run(:each)
+# frozen_string_literal: true
+
+if defined?(DataMapper)
+  module DataMapper
+    class Collection
+      def to_comma(style = :default)
+        Comma::Generator.new(self, style).run(:each)
+      end
+    end
   end
 end

data/lib/comma/extractor.rb

@@ -1,7 +1,7 @@
-module Comma
+# frozen_string_literal: true
 
+module Comma
   class Extractor
-
     def initialize(instance, style, formats)
       @instance = instance
       @style = style
@@ -10,7 +10,7 @@ module Comma
     end
 
     def results
-      instance_eval &@formats[@style]
+      instance_eval(&@formats[@style])
       @results.map { |r| convert_to_data_value(r) }
     end
 
@@ -28,7 +28,5 @@ module Comma
     def convert_to_data_value(result)
       result.nil? ? result : result.to_s
     end
-
   end
-
 end

data/lib/comma/generator.rb

@@ -1,24 +1,24 @@
-module Comma
+# frozen_string_literal: true
 
+module Comma
   class Generator
-
     def initialize(instance, style)
       @instance = instance
       @style    = style
       @options  = {}
 
-      if @style.is_a? Hash
-        @options                  = @style.clone
-        @style                    = @options.delete(:style) || Comma::DEFAULT_OPTIONS[:style]
-        @filename                 = @options.delete(:filename)
-      end
+      return unless @style.is_a?(Hash)
+
+      @options                  = @style.clone
+      @style                    = @options.delete(:style) || Comma::DEFAULT_OPTIONS[:style]
+      @filename                 = @options.delete(:filename)
     end
 
     def run(iterator_method)
       if @filename
-        CSV_HANDLER.open(@filename, 'w', @options){ |csv| append_csv(csv, iterator_method) } and return true
+        CSV_HANDLER.open(@filename, 'w', @options) { |csv| append_csv(csv, iterator_method) } && (return true)
       else
-        CSV_HANDLER.generate(@options){ |csv| append_csv(csv, iterator_method) }
+        CSV_HANDLER.generate(@options) { |csv| append_csv(csv, iterator_method) }
       end
     end
 
@@ -26,12 +26,12 @@ module Comma
 
     def append_csv(csv, iterator_method)
       return '' if @instance.empty?
+
       csv << @instance.first.to_comma_headers(@style) unless
-        @options.has_key?(:write_headers) && !@options[:write_headers]
+        @options.key?(:write_headers) && !@options[:write_headers]
       @instance.send(iterator_method) do |object|
         csv << object.to_comma(@style)
       end
     end
-
   end
 end