directory_diff 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa326af22cd07dc2ab6819d6f1221b030c98a849
-  data.tar.gz: f46469c536c45a3cbcea3b26932bcaac0a0280e9
+  metadata.gz: 9acbd5bf09de7513e092a97a9f023e1365ce5cdc
+  data.tar.gz: 9af762d9aa44ef637ef71b3984e7d64518426607
 SHA512:
-  metadata.gz: 0b539659c810d9bd19472074663bfda1c1ee2937349eafb44fca14503251860caa80743ddd3a3d11e9e902af4668f02380603f88990bc3ca3e53854f32f5077f
-  data.tar.gz: dd56c2f064b7a4e2e708c59bbdbb962bd72483bf2dbe490bb703bedaa42b4bc4ed37a5a6fca2596a42e66e441ca7e9b8304cf40d6276b4aa475b2a88661b4549
+  metadata.gz: c3fdb9eaa12a867d21cd42919069f54451ce28a67f46898cbab1401ddbdc09dede9c4608d1cb86c634d59c45dec716f822bfec022994c153b18bccb734f0b0df
+  data.tar.gz: 9c23a147e8d137516cac4d49308f38a5c6aa046448bae6222e9efa7fe54b0eba03252d5439dd07005192cde081bbd33ab327509dc726497622b6942e49b6d45d

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -1,23 +1,13 @@
 language: ruby
 dist: xenial
-matrix:
-  include:
-    - name: "Run Ruby 2.4.4 against pg 9"
-      rvm: 2.4.4
-      addons:
-        postgresql: 9.6
-    - name: "Run Ruby 2.4.4 against pg 10"
-      rvm: 2.4.4
-      addons:
-        postgresql: 10
-    - name: "Run Ruby 2.5.1 against pg 9"
-      rvm: 2.5.1
-      addons:
-        postgresql: 9.6
-    - name: "Run Ruby 2.5.1 against pg 10"
-      rvm: 2.5.1
-      addons:
-        postgresql: 10
+addons:
+  postgresql: 9.6
+rvm:
+  - 2.4.4
+  - 2.5.1
+gemfile:
+  - gemfiles/activerecord_5.1.gemfile
+  - gemfiles/activerecord_5.2.gemfile
 before_install: gem install bundler -v 1.11.2
 script:
   - bundle exec rake db:create

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "activerecord-5.1" do
+  gem "activerecord", "~> 5.1.6"
+end
+
+appraise "activerecord-5.2" do
+  gem "activerecord", "~> 5.2.1"
+end

data/directory_diff.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activerecord", ">= 5.1.4"
   spec.add_dependency "pg", "~> 1.1.3"
   spec.add_dependency "temping", "~> 3.10.0"
-  spec.add_dependency "activerecord_pg_stuff", "~> 0.2.0"
+  spec.add_dependency "envoy-activerecord_pg_stuff", "~> 0.3.0"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "appraisal"
 end

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/activerecord_5.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.1.6"
+
+gemspec path: "../"

data/gemfiles/activerecord_5.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2.1"
+
+gemspec path: "../"

data/lib/directory_diff/transformer/temp_table.rb

@@ -25,7 +25,7 @@ module DirectoryDiff
       # @param new_directory a table containing only the new records to compare
       #                      against, most likely a temp table.
       def into(new_directory, options = {})
-        temp_table(current_directory_relation) do |temp_current_directory|
+        current_directory_temp_table do |temp_current_directory|
           new_directory_temp_table(new_directory) do |deduped_csv|
             # Get Arel tables for referencing fields, table names
             employees = temp_current_directory.table
@@ -106,8 +106,12 @@ module DirectoryDiff
 
       private
 
-      def current_directory_relation(&block)
-        current_directory.select(SQL.current_directory_projection)
+      def current_directory_temp_table(&block)
+        # outer temp table is required so that the projection does not run into
+        # ambiguous column issues
+        temp_table(current_directory) do |rel|
+          temp_table(rel.select(SQL.current_directory_projection), &block)
+        end
       end
 
       def new_directory_temp_table(source, &block)
@@ -162,7 +166,11 @@ module DirectoryDiff
         create_temp_table(source) do |name|
           klass = current_directory.klass
           dec = ActiveRecordPgStuff::Relation::TemporaryTable::Decorator.new(klass, name)
-          rel = ActiveRecord::Relation.new(dec, table: dec.arel_table)
+          if activerecord52?
+            rel = ActiveRecord::Relation.new(dec)
+          else
+            rel = ActiveRecord::Relation.new(dec, dec.arel_table, dec.predicate_builder, {})
+          end
           rel.readonly!
           block.call(rel)
         end
@@ -238,6 +246,10 @@ module DirectoryDiff
       def connection
         current_directory.connection
       end
+
+      def activerecord52?
+        ActiveRecord.gem_version >= Gem::Version.new("5.2.x")
+      end
     end
 
     module SQL

data/lib/directory_diff/version.rb

@@ -1,3 +1,3 @@
 module DirectoryDiff
-  VERSION = "0.4.9"
+  VERSION = "0.4.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directory_diff
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Kamal Mahyuddin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.10.0
 - !ruby/object:Gem::Dependency
-  name: activerecord_pg_stuff
+  name: envoy-activerecord_pg_stuff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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'
 description: This microlibrary implements employee directory diffing between two versions.
 email:
 - kamal@envoy.com
@@ -120,6 +134,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -128,6 +143,9 @@ files:
 - bin/console
 - bin/setup
 - directory_diff.gemspec
+- gemfiles/.bundle/config
+- gemfiles/activerecord_5.1.gemfile
+- gemfiles/activerecord_5.2.gemfile
 - lib/directory_diff.rb
 - lib/directory_diff/transform.rb
 - lib/directory_diff/transformer/in_memory.rb