deep_pluck 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02452d4bac10e6638a4df989d324371064b4dd03
-  data.tar.gz: f82443f03983bbb1c58c9e4a17a4057e483946bb
+  metadata.gz: 5077b048b97b1e7e457fc7a7e86c4482ada1633c
+  data.tar.gz: 5a2c2cc80f8e0a30aa9013c1081650a7c092ad74
 SHA512:
-  metadata.gz: 89e9ef90f3a61e47dfb868075282b61376249db2cd685e81176cb2ae810f953bf34c1b0d737e9fd1ab21191bd5f67e84457993cfc002ab20177b3cfca5b29493
-  data.tar.gz: 8f2b8a6c7f7d1dcc714c2937654d8758c7732ae13b9ea7d4a102909d111e5be45774ae0fd7662b8e98a2808e8a4500a273db104ac90edc62397f1a3b51891685
+  metadata.gz: 217a43b1ac213499fc6138723a103e373c777e39adc9e3c61cca2ba51e578477e9084da2238ed8bcc49bdfcf3423c953aebf8d31cd46078adcf49127e0078ffa
+  data.tar.gz: ff5b2657d14cdadb7e3d2844d394c77c815253fcc21bbfde4d0df786356db92ed5e2ebcd498ad3e2d23e14898f117ade0d2ce08ac819ac499b1365331cf2ad8a

data/.travis.yml

@@ -12,6 +12,7 @@ gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
+  - gemfiles/5.1.gemfile
 addons:
     code_climate:
         repo_token: 29e69e7da6b55678f27b7de2444b6161a6c98e3c4b22e0e017ebab87ada18fd5

data/gemfiles/5.1.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in pluck_all.gemspec
+
+gem "activerecord", "~> 5.1"
+gem "pluck_all", "~> 1.2.2"
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+gemspec :path => "../"
+

data/lib/deep_pluck/model.rb

@@ -78,7 +78,9 @@ module DeepPluck
       ids.uniq!
       ids.compact!
       relation = with_conditions(reflect, relation)
-      return relation.joins(get_join_table(reflect)).where(relation_key => ids)
+      query = { relation_key => ids }
+      query[reflect.type] = reflect.active_record.to_s if reflect.type
+      return relation.joins(get_join_table(reflect)).where(query)
     end
     def set_includes_data(parent, column_name, model)
       reflect = get_reflect(column_name)

data/lib/deep_pluck/version.rb

@@ -1,3 +1,3 @@
 module DeepPluck
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_pluck
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,7 @@ files:
 - gemfiles/3.2.gemfile
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
+- gemfiles/5.1.gemfile
 - lib/deep_pluck.rb
 - lib/deep_pluck/data_combiner.rb
 - lib/deep_pluck/model.rb