lite-report 1.1.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c47012894f22e7cb6329fd29cd11d674436a26e0721042f92f8686827854ff2
-  data.tar.gz: 5bc35bc9c3f4604121aeb9a9fe519a582f4da4ed5aa7aed0afbd64e8fba5591d
+  metadata.gz: 5eef18beb2798dff3053f07868581c626de955a02cb9ffa9734336ba8fbe2e3c
+  data.tar.gz: 4e02507048f43678d3cea53b0fda428f5801b4405381d97275e4713ce93859c5
 SHA512:
-  metadata.gz: fb991fc839a2287a65de08bc70c3e44cc59a003618a2ef4db6eb2f05ece1e028c12ab71c86f6242c8423a723e6dd826414d2eb123fcd8af6b853146672aff5a9
-  data.tar.gz: b957984a667255674fd66e2122e2c813b515cbe04daff7c5e0227eb74c44c3c0425024945012a857901b92e3131277c7774e812a04f8e59802afb4d52c25672a
+  metadata.gz: 416502eb1aa8c0fe150cb0346cd2d6a2c7c6ec42d6c9fa51f533a4b16b23e83d4fd94e31ad5c2ca663706ffd70c72921a26d764b7dc350fe1b66aa2e87e7b661
+  data.tar.gz: bb6900054c612fae30583cdbd9664643fa3a558607239fa94df1385a54fd9a6f47f32d96e2c390b1d4223ffd83aca2ac7ce80d7d47cb796246e52f3cb2513e10

data/.rubocop.yml

@@ -3,7 +3,7 @@ require:
   - rubocop-rake
   - rubocop-rspec
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   NewCops: enable
   DisplayCopNames: true
   DisplayStyleGuide: true
@@ -32,6 +32,8 @@ Metrics/BlockLength:
     - '*.gemspec'
 RSpec/ExampleLength:
   Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
 Style/Documentation:

data/CHANGELOG.md

@@ -6,6 +6,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.3.1] - 2021-07-21
+### Changed
+- Improved Railtie support
+
+## [1.3.0] - 2021-07-19
+### Added
+- Added Ruby 3.0 support
+
+## [1.2.0] - 2021-07-18
+### Removed
+- Removed `activerecord-import` dependency
+- Removed `deep_pluck` dependency
+
+## [1.1.1] - 2021-05-07
+### Changed
+- Linter fixes
+
 ## [1.1.0] - 2021-01-06
 ### Added
 - Added Exporter helper class

data/Gemfile.lock

@@ -1,75 +1,69 @@
 PATH
   remote: .
   specs:
-    lite-report (1.1.0)
+    lite-report (1.3.1)
       activerecord
-      activerecord-import
-      deep_pluck
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.0)
-      actionview (= 6.1.0)
-      activesupport (= 6.1.0)
+    actionpack (6.1.4)
+      actionview (= 6.1.4)
+      activesupport (= 6.1.4)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.0)
-      activesupport (= 6.1.0)
+    actionview (6.1.4)
+      activesupport (= 6.1.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.1.0)
-      activesupport (= 6.1.0)
-    activerecord (6.1.0)
-      activemodel (= 6.1.0)
-      activesupport (= 6.1.0)
-    activerecord-import (1.0.7)
-      activerecord (>= 3.2)
-    activesupport (6.1.0)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activerecord (6.1.4)
+      activemodel (= 6.1.4)
+      activesupport (= 6.1.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    ast (2.4.1)
+    ast (2.4.2)
     builder (3.2.4)
     colorize (0.8.1)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    database_cleaner (1.8.5)
-    deep_pluck (1.1.4)
-      activerecord (>= 3)
-      pluck_all (>= 1.2.3)
-      rails_compatibility (>= 0.0.1)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     diff-lcs (1.4.4)
     erubi (1.10.0)
-    fasterer (0.8.3)
+    fasterer (0.9.0)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    i18n (1.8.7)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.8.0)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.5.0)
-    minitest (5.14.3)
-    nokogiri (1.11.1)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
-    pluck_all (2.2.1)
-      activesupport (>= 3.0.0)
-      rails_compatibility (>= 0.0.2)
     racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
@@ -79,22 +73,20 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_compatibility (0.0.2)
-      activerecord (>= 3)
-    railties (6.1.0)
-      actionpack (= 6.1.0)
-      activesupport (= 6.1.0)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 0.13)
       thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.3)
-    ransack (2.4.1)
+    rake (13.0.6)
+    ransack (2.4.2)
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
       i18n
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -104,46 +96,46 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.0.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
+    rspec-rails (5.0.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
       rspec-core (~> 3.10)
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.1)
-    rubocop (1.7.0)
+    rspec-support (3.10.2)
+    rubocop (1.18.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.9.2)
-      rubocop (>= 0.90.0, < 2.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.8.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.4)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.4.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
-    ruby_parser (3.15.0)
-      sexp_processor (~> 4.9)
-    sexp_processor (4.15.1)
+    ruby_parser (3.16.0)
+      sexp_processor (~> 4.15, >= 4.15.1)
+    sexp_processor (4.15.3)
     sqlite3 (1.4.2)
-    thor (1.0.1)
+    thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -166,4 +158,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.1.4
+   2.2.24

data/README.md

@@ -135,12 +135,15 @@ Lite::Report::Record.export(
   }
 )
 
-# Convert CSV file to an array of records
+# Convert CSV file to an array of records (import options are from Rails `insert_all`)
 Lite::Report::Record.import(
   'path/to/file.csv',
   data_options: {
     klass: User,
     except: [:age, :sex]
+  },
+  import_options: {
+    unique_by: %w[Name Age]
   }
 )
 ```
@@ -162,6 +165,11 @@ class LimitedExporter < Lite::Report::Exporter
       'Speed' => record.speed.ceil,
       'Date' => record.to_s(:short)
     }
+
+    # - or -
+
+    serializer = RecordSerializer.new(record)
+    serializer.serializable_hash
   end
 
 end

data/lib/generators/lite/report/install_generator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rails/generators'
-
 module Lite
   module Report
     class InstallGenerator < Rails::Generators::Base

data/lib/lite/report.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-require 'csv'
+require 'csv' unless defined?(CSV)
+
+require 'generators/lite/report/install_generator' if defined?(Rails::Generators)
+
 require 'lite/report/version'
 
 %w[converters encoders filters headers processors records transporters].each do |file_name|
@@ -10,5 +13,3 @@ end
 %w[configuration base array hash record exporter].each do |file_name|
   require "lite/report/#{file_name}"
 end
-
-require 'generators/lite/report/install_generator'

data/lib/lite/report/helpers/converters.rb

@@ -16,7 +16,7 @@ module Lite
 
         def convert_to_hash!(row)
           case row.class.name
-          when 'Array' then ::Hash[(0..(row.size - 1)).zip(row)]
+          when 'Array' then (0..(row.size - 1)).zip(row).to_h
           when 'CSV::Row' then row.to_hash
           else row
           end

data/lib/lite/report/record.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'active_record'
-require 'activerecord-import'
-require 'deep_pluck'
 
 class Lite::Report::Record < Lite::Report::Base
 
@@ -16,9 +14,13 @@ class Lite::Report::Record < Lite::Report::Base
     assign_import_csv_options!
 
     @data = Lite::Report::Hash.import(@data, csv_options: @csv_options, data_options: @data_options)
-                              .each { |row| row.delete(:id) || row.delete('id') }
+                              .each do |row|
+                                row.delete(:id) || row.delete('id')
+                                (row['created_at'] ||= timestamp) if created_at_timestamp?
+                                (row['updated_at'] ||= timestamp) if updated_at_timestamp?
+                              end
 
-    klass.import(@data, **@import_options)
+    klass.insert_all(@data, **@import_options)
   end
 
   private
@@ -41,9 +43,15 @@ class Lite::Report::Record < Lite::Report::Base
 
   def assign_export_data!
     columns = class_columns(@data)
-    @data = @data.result if ransack_class?(@data)
-    @data = @data.deep_pluck(*columns)
-    @data = [@data] if !@data.respond_to?(:each) || !@data.is_a?(Array)
+    @data = if ransack_class?(@data)
+              @data.result
+            elsif @data.try(:persisted?)
+              Array(@data)
+            else
+              @data
+            end
+
+    @data = @data.pluck(*columns).map { |values| columns.zip(values).to_h }
   end
 
   def generate_export!
@@ -56,4 +64,20 @@ class Lite::Report::Record < Lite::Report::Base
     super
   end
 
+  def timestamp
+    @timestamp ||= Time.try(:current) || Time.now
+  end
+
+  def created_at_timestamp?
+    return @created_at_timestamp if defined?(@created_at_timestamp)
+
+    @created_at_timestamp = klass.new.respond_to?(:created_at)
+  end
+
+  def updated_at_timestamp?
+    return @updated_at_timestamp if defined?(@updated_at_timestamp)
+
+    @updated_at_timestamp = klass.new.respond_to?(:updated_at)
+  end
+
 end

data/lib/lite/report/version.rb

@@ -3,7 +3,7 @@
 module Lite
   module Report
 
-    VERSION ||= '1.1.0'
+    VERSION = '1.3.1'
 
   end
 end

data/lite-report.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
     )
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+          'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
@@ -38,8 +38,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_runtime_dependency 'activerecord'
-  spec.add_runtime_dependency 'activerecord-import'
-  spec.add_runtime_dependency 'deep_pluck'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'database_cleaner'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lite-report
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Juan Gomez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,34 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord-import
-  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: deep_pluck
-  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
@@ -294,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.2.24
 signing_key:
 specification_version: 4
 summary: Import and export Ruby and Rails objects to flat files and vice versa