lite-report 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9559d49c8162d5c74d507ad986917f959add7da9a95d3566b36a3a3668194db5
-  data.tar.gz: acaf0fec27642dbb3b1d6244ece60467065adc76cdc8709eaa48766bb27198dc
+  metadata.gz: e5306a141edec1f32743651c3fe81fc7d9f99a4f091ae21b2cee30de8e428b02
+  data.tar.gz: bef4ad772798d30c09c27ad0807201b0701062372b52ca7adfc3094715a6c636
 SHA512:
-  metadata.gz: a8f6269d6985c6ade54c2c3a2efd73751053cb653341fdb96edeb9e2fea935b59afaebbc62eed75a30b13157bc4b16516f8a537f398d2e53b788cb8f9782ad6a
-  data.tar.gz: 6bce2655d3e3aec419000de951a65cd369136ee63d10933c5744e326ac49de884a2cd91cf8dce588cc220706c8f25118351a3801713e24b6611af46aec02bffd
+  metadata.gz: effd567e92022ea1c3487694d41d692cb46fb5f01678676627d3c9deca79739c3fd61ce0994157067ad4ba0430f459a65b1fd5c61e541a33511056ebe7eb6355
+  data.tar.gz: 1d165fe27b4495ab9a594f7ff4c7f91f23c40d92309044c53ca21815134d6349ef6f4dd4fd538d1359db9a318c68989c31424c38b94738bd39b44255cccf5f07

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.20.0] - 2021-07-18
+### Removed
+- Removed `activerecord-import` dependency
+- Removed `deep_pluck` dependency
+
 ## [1.1.1] - 2021-05-07
 ### Changed
 - Linter fixes

data/Gemfile.lock

@@ -1,35 +1,31 @@
 PATH
   remote: .
   specs:
-    lite-report (1.1.1)
+    lite-report (1.2.0)
       activerecord
-      activerecord-import
-      deep_pluck
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.3.2)
-      actionview (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    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.3.2)
-      activesupport (= 6.1.3.2)
+    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.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord-import (1.0.8)
-      activerecord (>= 3.2)
-    activesupport (6.1.3.2)
+    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)
@@ -38,18 +34,14 @@ GEM
     ast (2.4.2)
     builder (3.2.4)
     colorize (0.8.1)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
-    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)
-    deep_pluck (1.1.7)
-      activerecord (>= 3)
-      pluck_all (>= 1.2.3)
-      rails_compatibility (>= 0.0.4)
     diff-lcs (1.4.4)
     erubi (1.10.0)
     fasterer (0.9.0)
@@ -60,21 +52,18 @@ GEM
       railties (>= 3.0.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.1)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.5.1)
+    mini_portile2 (2.5.3)
     minitest (5.14.4)
-    nokogiri (1.11.3)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     parallel (1.20.1)
-    parser (3.0.1.1)
+    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)
@@ -84,16 +73,14 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails_compatibility (0.0.5)
-      activerecord (>= 3)
-    railties (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    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)
+    rake (13.0.6)
     ransack (2.4.2)
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
@@ -121,29 +108,29 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    rubocop (1.14.0)
+    rubocop (1.18.3)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
+    rubocop-ast (1.8.0)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.11.3)
+    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.3.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.1)
-      sexp_processor (~> 4.9)
-    sexp_processor (4.15.2)
+    ruby_parser (3.16.0)
+      sexp_processor (~> 4.15, >= 4.15.1)
+    sexp_processor (4.15.3)
     sqlite3 (1.4.2)
     thor (1.1.0)
     tzinfo (2.0.4)
@@ -171,4 +158,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.17
+   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/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.1'
+    VERSION = '1.2.0'
 
   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.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-07-19 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.17
+rubygems_version: 3.2.24
 signing_key:
 specification_version: 4
 summary: Import and export Ruby and Rails objects to flat files and vice versa