importeur 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 991119a8603e5c354fbe1329fff579e00e3a12bd06b2e8e468de8d567498807a
-  data.tar.gz: cbc7f5cb1fb21071476b1bd975c876c06949810669373ac10d22e4931455e2c0
+  metadata.gz: bcad980a9f4b5d2f67784fec871dd170e5b48ce9180255d51c63b68629cdadae
+  data.tar.gz: 27ba1d50f9445283412b8b3bdfe1d1815209911d4bd09aaba543fc5fb70bbe79
 SHA512:
-  metadata.gz: a0c732eb03484d40225ee8d7ce337e23f051a40996b56b064e7ea2c058fa90320885d39628f4fe5a86e3d404356fce9bc943f231a99fef8e8d4832ef60da0ac3
-  data.tar.gz: b0d8c47da29dd911a91b40abdca18d30dd152bb2375f34fc98e15702cdf6644f7c296c2458757ac0345d7634ae8b939a3fbf330f0262db14a54e5e18201c9829
+  metadata.gz: 62f42cfe882b4c4278edec84a135007977275c9774ae7d24f68bc59b37e0a2d2c215ae6d88a7d74bec2b28bfeb742e71ec9a2a258800fc83352c1a1dbe9ca8c7
+  data.tar.gz: c8b77a7abcbe9e0be3745637c0d79ceaea048dbf3db04de7d43aa0c9aa808859453ff8c7ce4af8286e9e8a1127298e62560a0394675789e5881b25f9cfd1bbd9

data/.ruby-version

@@ -0,0 +1 @@
+2.5.3

data/README.md

@@ -64,8 +64,7 @@ It takes as arguments a data source that needs to implement
 
 An `ActiveRecordPostgresLoader` exists, that has a few very specific
 dependencies. As the name suggests, it imports data into a Postgres database
-using `ActiveRecord`. Additionally, the model used, needs to use
-`acts_as_paranoid`.
+using `ActiveRecord`. Additionally, it supports `acts_as_paranoid` (optional).
 
 Example use-cases can be found in the `spec/integration` directory.
 

data/importeur.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'activerecord', '<5'
+  spec.add_development_dependency 'acts_as_paranoid'
   spec.add_development_dependency 'appnexusapi'
   spec.add_development_dependency 'bucket_cake'
   spec.add_development_dependency 'bundler', '~> 1.15'

data/lib/importeur/active_record_postgres_loader.rb

@@ -35,15 +35,16 @@ module Importeur
     def store_record(attrs, records)
       record = records.fetch(attrs[primary_key], model.new)
       record.assign_attributes(attrs)
-      record.deleted_at = nil
+      record.deleted_at = nil if paranoid?
       return unless record.changed?
       record.imported_at = Time.now
       record.save!
     end
 
     def records_for_batch(batch_ids)
-      model
-        .with_deleted
+      relation = model
+      relation = relation.with_deleted if paranoid?
+      relation
         .joins(batch_lookup_join_sql('INNER', batch_ids))
         .index_by(&primary_key)
     end
@@ -63,5 +64,10 @@ module Importeur
                   ON imported.primary_key = #{model.table_name}.#{primary_key}
       SQL
     end
+
+    def paranoid?
+      return @paranoid if defined?(@paranoid)
+      @paranoid = model.ancestors.map(&:to_s).include?('ActsAsParanoid::Core')
+    end
   end
 end

data/lib/importeur/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Importeur
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: importeur
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Helge Rausch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: acts_as_paranoid
+  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: appnexusapi
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +217,7 @@ files:
 - ".env"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile