active_report 4.0.2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 484ee735d28a5b089d3004b7fdce895a0bff0f2c
-  data.tar.gz: 64537c78344b4ba6c23c21d1a29959c1109552ad
+  metadata.gz: 455d82fc5a50a79fdc57477851140306cb49b0ab
+  data.tar.gz: 7a9d01cb237fde5d1426f67e1afdff84da99820c
 SHA512:
-  metadata.gz: d50551e1afe24fd6b8e1e91edf641917c539f9ae986bd1cd4cc831db952b1a125e4e9807580f6ccb1943192b2258be23f38b351292c4980f9cf113bf9a3ebde8
-  data.tar.gz: d376110537ce7144f45727530789b3da301c1177fb95fda000ba2a97ceba87f53d5244946aa01dc05cf37efedb23443d5a1e202256804fc9cadac5e93409dbd7
+  metadata.gz: 0260ae9c52fbbc1a87bbbdd574d5e5ac3f6ebf6af08c49efa56a38db2a284ff131fdd33456c9f46b8b8396303dd97ec5271a99e165a19cef29e820e10344c10c
+  data.tar.gz: c9ce8bfe558375696e48b2e05d24c1c47fe111b2f27adbd08de8814fa25b6e32caa1bd2d8e99d0c0caaf0f471e281dd17537c6f50730c2b01cdddb5bd83b34fe

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/active_report.svg)](http://badge.fury.io/rb/active_report)
 [![Build Status](https://travis-ci.org/drexed/active_report.svg?branch=master)](https://travis-ci.org/drexed/active_report)
-[![Coverage Status](https://coveralls.io/repos/github/drexed/active_report/badge.svg?branch=master)](https://coveralls.io/github/drexed/active_report?branch=master)
 
 ActiveReport is a library to export CSV's out of arrays, hashes, and records and vice versa.
 
@@ -36,9 +35,9 @@ Or install it yourself as:
 `../config/initalizers/active_report.rb`
 
 ```ruby
-ActiveReport::Settings.configure do |config|
-  config.force_encoding = true
-  config.options = { encoding: 'UTF-8' }
+ActiveReport.configure do |config|
+  config.csv_force_encoding = true
+  config.csv_options = { encoding: 'UTF-8' }
 end
 ```
 

data/active_report.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # coding: utf-8
 
 lib = File.expand_path('../lib', __FILE__)
@@ -23,10 +25,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib support]
 
   spec.add_runtime_dependency 'activerecord'
-  spec.add_runtime_dependency 'dry-configurable'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'sqlite3'

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'active_report'

data/bin/rake

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-#
+# frozen_string_literal: true
+
 # This file was generated by Bundler.
 #
 # The application 'rake' is installed as part of a gem, and
 # this file is here to facilitate running it.
-#
 
 require 'pathname'
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)

data/lib/active_report.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'csv'
 
-%w[version settings base array hash record].each do |file_name|
+%w[version configuration base array hash record].each do |file_name|
   require "active_report/#{file_name}"
 end
 

data/lib/active_report/array.rb

@@ -1,40 +1,44 @@
+# frozen_string_literal: true
+
 class ActiveReport::Array < ActiveReport::Base
 
-  attr_accessor :datum, :headers, :options
+  attr_accessor :data, :headers, :options
 
-  def initialize(datum, headers: nil, options: {})
-    @datum = datum
+  def initialize(data, headers: nil, options: {})
+    @data = data
     @headers = headers
-    @options = duplicate_options.merge!(options)
+    @options = csv_options.merge(options)
   end
 
-  def self.export(datum, headers: nil, options: {})
-    new(datum, headers: headers, options: options).export
+  def self.export(data, headers: nil, options: {})
+    klass = new(data, headers: headers, options: options)
+    klass.export
   end
 
-  def self.import(datum, headers: nil, options: {})
-    new(datum, headers: headers, options: options).import
+  def self.import(data, headers: nil, options: {})
+    klass = new(data, headers: headers, options: options)
+    klass.import
   end
 
   def export
-    @datum = munge_first(@datum)
+    @data = munge_first(@data)
 
     CSV.generate(@options) do |csv|
       csv << @headers unless @headers.nil?
-      @datum.lazy.each { |cell| csv << cell }
+      @data.lazy.each { |cell| csv << cell }
     end
   end
 
   def import
-    datum = merge(@headers)
+    array = merge(@headers)
 
-    CSV.foreach(@datum, @options) do |data|
-      data = encode_to_utf8(data) if force_encoding?
-      datum.push(data)
+    CSV.foreach(@data, @options) do |row|
+      row = encode_to_utf8(row) if csv_force_encoding?
+      array.push(row)
     end
 
-    datum = datum.flatten if datum.size < 2
-    metatransform(datum)
+    array = array.flatten if array.size < 2
+    metatransform(array)
   end
 
 end

data/lib/active_report/base.rb

@@ -1,7 +1,17 @@
+# frozen_string_literal: true
+
 class ActiveReport::Base
 
   @@evaluate = false
 
+  def csv_options
+    ActiveReport.configuration.csv_options
+  end
+
+  def csv_force_encoding?
+    ActiveReport.configuration.csv_force_encoding
+  end
+
   def self.evaluate(value = true)
     @@evaluate = value
     self
@@ -9,15 +19,12 @@ class ActiveReport::Base
 
   private
 
-  def duplicate_options
-    ActiveReport::Settings.config.options.dup
-  end
-
   # rubocop:disable Performance/StringReplacement
   def encode_to_utf8(line)
     line.map do |chr|
       next if chr.nil?
-      chr.gsub!(/"/, '')
+
+      chr = chr.tr('"', '')
       chr.encode!('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
     end
   end
@@ -31,30 +38,19 @@ class ActiveReport::Base
 
   def filter(object)
     if @only.empty?
-      object.delete_if { |key, _| @except.include?(key) } unless @except.empty?
+      return if @except.empty?
+      object.delete_if { |key, _| @except.include?(key) }
     else
       object.keep_if { |key, _| @only.include?(key) }
     end
   end
 
-  def filter_first(object)
-    if @only.empty?
-      object.first.delete_if { |key, _| @except.include?(key) } unless @except.empty?
-    else
-      object.first.keep_if { |key, _| @only.include?(key) }
-    end
-  end
-
-  def force_encoding?
-    ActiveReport::Settings.config.force_encoding
-  end
-
   def humanize(object)
     object.to_s.tr('_', ' ').capitalize
   end
 
   def merge(object)
-    [].push(object).compact
+    [object].compact
   end
 
   # rubocop:disable Security/Eval, Lint/RescueException
@@ -65,34 +61,53 @@ class ActiveReport::Base
   end
   # rubocop:enable Security/Eval, Lint/RescueException
 
+  def metaform_array(datum)
+    datum.map { |val| metaform(val) }
+  end
+
+  def metaform_hash(datum)
+    datum.lazy.each { |key, val| datum[key] = metaform(val) }
+  end
+
+  def metamorph_array(datum)
+    case datum.first.class.name
+    when 'Array' then datum.map { |arr| metaform_array(arr) }
+    when 'Hash' then datum.map { |hsh| metaform_hash(hsh) }
+    else metaform_array(datum)
+    end
+  end
+
   def metamorph(datum)
     case datum.class.name
-    when 'Array'
-      if datum.first.is_a?(Array)
-        datum.map { |arr| arr.map { |val| metaform(val) } }
-      elsif datum.first.is_a?(Hash)
-        datum.map { |hsh| hsh.each { |key, val| hsh.store(key, metaform(val)) } }
-      else
-        datum.map { |val| metaform(val) }
-      end
-    when 'Hash'
-      datum.each { |key, val| datum.store(key, metaform(val)) }
-    else
-      metaform(datum)
+    when 'Array' then metamorph_array(datum)
+    when 'Hash' then metaform_hash(datum)
+    else metaform(datum)
     end
   end
 
   def metatransform(datum)
-    return(nil) if datum.empty?
+    return if datum.empty?
     evaluate? ? metamorph(datum) : datum
   end
 
-  def munge(object)
-    object.is_a?(Array) ? object : merge(object)
+  def munge(datum)
+    datum.is_a?(Array) ? datum : merge(datum)
+  end
+
+  def munge_first(datum)
+    datum.first.is_a?(Array) ? datum : merge(datum)
+  end
+
+  def filter_values(datum)
+    array = []
+    (filter(datum) || datum).each_value { |val| array << val }
+    array
   end
 
-  def munge_first(object)
-    object.first.is_a?(Array) ? object : merge(object)
+  def filter_humanize_keys(datum)
+    array = []
+    (filter(datum.first) || datum.first).each_key { |key| array << humanize(key) }
+    array
   end
 
 end

data/lib/active_report/configuration.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ActiveReport
+  class Configuration
+
+    attr_accessor :csv_force_encoding, :csv_options
+
+    def initialize
+      @csv_force_encoding = true
+      @csv_options = { encoding: 'UTF-8' }
+    end
+
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configuration=(config)
+    @configuration = config
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
+end

data/lib/active_report/hash.rb

@@ -1,57 +1,57 @@
+# frozen_string_literal: true
+
 class ActiveReport::Hash < ActiveReport::Base
 
   attr_accessor :datum, :only, :except, :headers, :options
 
   def initialize(datum, only: nil, except: nil, headers: nil, options: {})
     @datum = datum
-    @except = except
+    @only = munge(only)
+    @except = munge(except)
     @headers = headers
-    @only = only
-    @options = duplicate_options.merge!(options)
+    @options = csv_options.merge(options)
   end
 
   def self.export(datum, only: nil, except: nil, headers: nil, options: {})
-    new(datum, only: only, except: except, headers: headers, options: options).export
+    klass = new(datum, only: only, except: except, headers: headers, options: options)
+    klass.export
   end
 
   def self.import(datum, only: nil, except: nil, headers: nil, options: {})
-    new(datum, only: only, except: except, headers: headers, options: options).import
+    klass = new(datum, only: only, except: except, headers: headers, options: options)
+    klass.import
   end
 
   def export
     @datum = munge(@datum)
-    @only = munge(@only)
-    @except = munge(@except)
 
     CSV.generate(@options) do |csv|
-      csv << (@headers || (filter_first(@datum) || @datum.first).keys.map { |hdr| humanize(hdr) })
-      @datum.lazy.each { |data| csv << (filter(data) || data).values }
+      csv << (@headers || filter_humanize_keys(@datum))
+      @datum.lazy.each { |data| csv << filter_values(data) }
     end
   end
 
   def import
-    @only = munge(@only)
-    @except = munge(@except)
+    array = []
+    line = 0
 
-    datum = []
-    CSV.foreach(@datum, @options).with_index do |data, line|
-      data = encode_to_utf8(data) if force_encoding?
+    CSV.foreach(@datum, @options) do |data|
+      data = encode_to_utf8(data) if csv_force_encoding?
 
       if @headers.nil? && line.zero?
         @headers = data
       else
         subdata = {}
-        @headers.lazy.each_with_index do |header, idx|
-          subdata.store(header.to_s, data[idx])
-        end
+        @headers.lazy.each_with_index { |header, idx| subdata[header.to_s] = data[idx] }
         filter(subdata)
-        datum.push(subdata)
+        array.push(subdata)
       end
+
+      line += 1
     end
 
-    datum = datum.first if datum.size == 1
-    datum = metatransform(datum)
-    datum
+    array = array.first if array.size == 1
+    metatransform(array)
   end
 
 end

data/lib/active_report/record.rb

@@ -1,23 +1,28 @@
+# frozen_string_literal: true
+
 require 'json'
+
 class ActiveReport::Record < ActiveReport::Base
 
   attr_accessor :datum, :model, :only, :except, :headers, :options
 
   def initialize(datum, model: nil, only: nil, except: nil, headers: nil, options: {})
     @datum = datum
-    @except = except
-    @headers = headers
     @model = model
-    @only = only
-    @options = duplicate_options.merge!(options)
+    @only = munge(only)
+    @except = munge(except)
+    @headers = headers
+    @options = csv_options.merge(options)
   end
 
   def self.export(datum, only: nil, except: nil, headers: nil, options: {})
-    new(datum, only: only, except: except, headers: headers, options: options).export
+    klass = new(datum, only: only, except: except, headers: headers, options: options)
+    klass.export
   end
 
   def self.import(datum, only: nil, except: nil, headers: nil, options: {}, model: nil)
-    new(datum, only: only, except: except, headers: headers, options: options, model: model).import
+    klass = new(datum, only: only, except: except, headers: headers, options: options, model: model)
+    klass.import
   end
 
   def export
@@ -27,30 +32,30 @@ class ActiveReport::Record < ActiveReport::Base
                merge(@datum.attributes)
              end
 
-    @only = munge(@only).map(&:to_s)
-    @except = munge(@except).map(&:to_s)
+    @only.map!(&:to_s)
+    @except.map!(&:to_s)
 
     CSV.generate(@options) do |csv|
-      csv << (@headers || (filter_first(@datum) || @datum.first).keys.map { |hdr| humanize(hdr) })
-      @datum.lazy.each { |data| csv << (filter(data) || data).values }
+      csv << (@headers || filter_humanize_keys(@datum))
+      @datum.lazy.each { |data| csv << filter_values(data) }
     end
   end
 
   def import
     if @model.nil? || (@model.superclass != ActiveRecord::Base)
-      raise ArgumentError, 'Model must be an ActiveRecord::Base object.'
+      raise ArgumentError,
+            'Model must be an ActiveRecord::Base object.'
     end
 
     @datum = ActiveReport::Hash.import(@datum, headers: @headers, options: @options)
     @datum = munge(@datum)
-    @only = munge(@only)
-    @except = munge(@except)
 
     @datum.lazy.each do |data|
       params = {}
-      data.each do |key, value|
-        key = key.to_s.downcase.tr(' ', '_').tr('-', '_').to_sym
-        params.store(key, value)
+
+      data.lazy.each do |key, value|
+        key = key.to_s.downcase.gsub(/ |-/, '_').to_sym
+        params[key] = value
       end
 
       filter(params)

data/lib/active_report/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveReport
-  VERSION = '4.0.2'.freeze
+  VERSION ||= '5.0.0'
 end

data/lib/generators/active_report/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 class ActiveReport::InstallGenerator < Rails::Generators::Base

data/lib/generators/active_report/templates/install.rb

@@ -1,4 +1,6 @@
-ActiveReport::Settings.configure do |config|
-  config.force_encoding = true
-  config.options = { encoding: 'UTF-8' }
+# frozen_string_literal: true
+
+ActiveReport.configure do |config|
+  config.csv_force_encoding = true
+  config.csv_options = { encoding: 'UTF-8' }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_report
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dry-configurable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -205,9 +177,9 @@ files:
 - lib/active_report.rb
 - lib/active_report/array.rb
 - lib/active_report/base.rb
+- lib/active_report/configuration.rb
 - lib/active_report/hash.rb
 - lib/active_report/record.rb
-- lib/active_report/settings.rb
 - lib/active_report/version.rb
 - lib/generators/active_report/install_generator.rb
 - lib/generators/active_report/templates/install.rb
@@ -232,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Gem for exporting/importing ruby objects to flat files vice versa.

data/lib/active_report/settings.rb

@@ -1,9 +0,0 @@
-require 'dry-configurable'
-
-class ActiveReport::Settings
-  extend Dry::Configurable
-
-  setting :force_encoding, true
-  setting :options, { encoding: 'UTF-8' }
-
-end