deep_pluck 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f546a72a6ba6196d025dab3228d9f7bdb96ceed1675c10d4bdb04f9fd7cbd047
-  data.tar.gz: 99b48a384f25ccf25b7996d9cfcfc8594a4dd9bbc41e71976481ede3e4b89e94
+SHA1:
+  metadata.gz: 7c31e52771b994ea336dcb1ccdae8b5973e84bea
+  data.tar.gz: 948fba4e1893f1dffa78f3d9cbbe822c79089f9a
 SHA512:
-  metadata.gz: 326f4d9c3af855a85e48935ddc25e26e59603a3b43fe1c5b5e7e5dcf7450dcbf33dea3208215c19c7da60d91e6b570d66cb266de7a4d84de2434b6412d09e830
-  data.tar.gz: 9239f528f10b466c00ce367da8d8a5eb546264627e179c37a80ad492d00a80cec3f2ae0168955c14a4625ea1d0a798daa9be24d9aab1a613f739c502ce08c28f
+  metadata.gz: 056d01c1256f82927a0e4e9e24883b4222860d910ec21c4dfa4b2e56441ecb2232803389c9f5c66fcb05ba5896d5de6438b42a1f2a50d735c2bcfd5252b0ac58
+  data.tar.gz: ee892dd4fab06b89e15e9fcf5c67277fb6354344bc81ac1c62f18988b180ca3d3d2fdd4894d025b21b1e9ad43c94d816a132ff0f4be42196621846810039e108

data/.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   DisabledByDefault: true
-  Exclude:
+  Exclude: []
 
 #################### Lint ################################
 
@@ -22,7 +22,7 @@ Lint/AssignmentInCondition:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#safe-assignment-in-condition'
   Enabled: true
 
-Lint/BlockAlignment:
+Layout/BlockAlignment:
   Description: 'Align block ends correctly.'
   Enabled: true
 
@@ -30,7 +30,7 @@ Lint/CircularArgumentReference:
   Description: "Don't refer to the keyword argument in the default value."
   Enabled: true
 
-Lint/ConditionPosition:
+Layout/ConditionPosition:
   Description: >-
                  Checks for condition placed in a confusing position relative to
                  the keyword.
@@ -41,7 +41,7 @@ Lint/Debugger:
   Description: 'Check for debugger calls.'
   Enabled: true
 
-Lint/DefEndAlignment:
+Layout/DefEndAlignment:
   Description: 'Align ends corresponding to defs correctly.'
   Enabled: true
 
@@ -69,7 +69,7 @@ Lint/EmptyInterpolation:
   Description: 'Checks for empty string interpolation.'
   Enabled: true
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   Description: 'Align ends correctly.'
   Enabled: true
 
@@ -148,7 +148,7 @@ Lint/UnderscorePrefixedVariableName:
   Description: 'Do not use prefix `_` for a variable that is used.'
   Enabled: true
 
-Lint/UnneededDisable:
+Lint/UnneededCopDisableDirective:
   Description: >-
                  Checks for rubocop:disable comments that can be removed.
                  Note: this cop is not disabled when disabling all cops.
@@ -386,6 +386,7 @@ Layout/AlignHash:
   Description: >-
                  Align the elements of a hash literal if they span more than
                  one line.
+  EnforcedHashRocketStyle: table
   Enabled: true
 
 Layout/AlignParameters:
@@ -787,7 +788,8 @@ Style/Next:
 Style/NilComparison:
   Description: 'Prefer x.nil? to x == nil.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#predicate-methods'
-  Enabled: false
+  EnforcedStyle: comparison
+  Enabled: true
 
 Style/NonNilCheck:
   # With `IncludeSemanticChanges` set to `true`, this cop reports offenses for
@@ -799,7 +801,7 @@ Style/NonNilCheck:
   Description: 'Checks for redundant nil checks.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-non-nil-checks'
   IncludeSemanticChanges: true
-  Enabled: true
+  Enabled: false
 
 Style/Not:
   Description: 'Use ! instead of not.'
@@ -903,7 +905,7 @@ Style/RegexpLiteral:
   Description: 'Use / or %r around regular expressions.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-r'
   EnforcedStyle: slashes
-  AllowInnerSlashes: true
+  AllowInnerSlashes: false
   Enabled: true
 
 Layout/RescueEnsureAlignment:
@@ -1013,7 +1015,8 @@ Layout/SpaceInsideBlockBraces:
                  Checks that block braces have or don't have surrounding space.
                  For blocks taking parameters, checks that the left brace has
                  or doesn't have trailing space.
-  Enabled: false
+  SpaceBeforeBlockParameters: false
+  Enabled: true
 
 Layout/SpaceAroundBlockParameters:
   Description: 'Checks the spacing inside and after block parameters pipes.'
@@ -1032,10 +1035,32 @@ Layout/SpaceAroundOperators:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
   Enabled: true
 
-Layout/SpaceInsideBrackets:
-  Description: 'No spaces after [ or before ].'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-spaces-braces'
+Layout/SpaceInsideArrayLiteralBrackets:
+  Description: 'Checks the spacing inside array literal brackets.'
   Enabled: true
+  EnforcedStyle: no_space
+  SupportedStyles:
+    - space
+    - no_space
+    # 'compact' normally requires a space inside the brackets, with the exception
+    # that successive left brackets or right brackets are collapsed together
+    - compact
+  EnforcedStyleForEmptyBrackets: no_space
+  SupportedStylesForEmptyBrackets:
+    - space
+    - no_space
+
+Layout/SpaceInsideReferenceBrackets:
+  Description: 'Checks the spacing inside referential brackets.'
+  Enabled: true
+  EnforcedStyle: no_space
+  SupportedStyles:
+    - space
+    - no_space
+  EnforcedStyleForEmptyBrackets: no_space
+  SupportedStylesForEmptyBrackets:
+    - space
+    - no_space
 
 Layout/SpaceInsideHashLiteralBraces:
   Description: "Use spaces inside hash literal braces - or don't."
@@ -1116,14 +1141,24 @@ Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma
   Enabled: true
 
-Style/TrailingCommaInLiteral:
-  # If `comma`, the cop requires a comma after the last item in an array or
-  # hash, but only when each item is on its own line.
-  # If `consistent_comma`, the cop requires a comma after the last item of all
-  # non-empty array and hash literals.
-  Description: 'Checks for trailing comma in literals.'
+Style/TrailingCommaInArrayLiteral:
+  Description: 'Checks for trailing comma in array literals.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
+  EnforcedStyleForMultiline: comma
+  SupportedStylesForMultiline:
+    - comma
+    - consistent_comma
+    - no_comma
+  Enabled: true
+
+Style/TrailingCommaInHashLiteral:
+  Description: 'Checks for trailing comma in hash literals.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
   EnforcedStyleForMultiline: comma
+  SupportedStylesForMultiline:
+    - comma
+    - consistent_comma
+    - no_comma
   Enabled: true
 
 Layout/TrailingWhitespace:

data/.travis.yml

@@ -1,22 +1,34 @@
+sudo: false
+env:
+  global:
+    - CC_TEST_REPORTER_ID=29e69e7da6b55678f27b7de2444b6161a6c98e3c4b22e0e017ebab87ada18fd5
 language: ruby
 rvm:
   - 2.2
-  - 2.3
-sudo: required
-dist: trusty
-before_install: 
-  - gem install bundler
-  - gem update --system
-  - gem --version
+  - 2.6
 gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
   - gemfiles/5.1.gemfile
   - gemfiles/5.2.gemfile
-addons:
-    code_climate:
-        repo_token: 29e69e7da6b55678f27b7de2444b6161a6c98e3c4b22e0e017ebab87ada18fd5
-after_success:
-  - bundle exec codeclimate-test-reporter
-
+  - gemfiles/6.0.gemfile
+matrix:
+  exclude:
+    - gemfile: gemfiles/3.2.gemfile
+      rvm: 2.6
+    - gemfile: gemfiles/4.0.gemfile
+      rvm: 2.6
+    - gemfile: gemfiles/6.0.gemfile
+      rvm: 2.2
+before_install:
+  - gem i rubygems-update -v '<3' && update_rubygems
+  - gem install bundler -v 1.17.3
+  - gem --version
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+script:
+  - bundle exec rake test
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## Change Log
 
-### [upcoming](https://github.com/khiav223577/deep_pluck/compare/v1.1.0...HEAD) 2018/04/05
+### [v1.1.1](https://github.com/khiav223577/deep_pluck/compare/v1.1.0...v1.1.1) 2018/07/08
+- [#26](https://github.com/khiav223577/deep_pluck/pull/26) Fix: `id` may disappear when plucking at model instance (@khiav223577)
+- [#25](https://github.com/khiav223577/deep_pluck/pull/25) Refactor - move models definition to separate files (@khiav223577)
+- [#24](https://github.com/khiav223577/deep_pluck/pull/24) test Rails 5.2 (@khiav223577)
+- [#23](https://github.com/khiav223577/deep_pluck/pull/23) should test both 5.0.x and 5.1.x (@khiav223577)
 - [#22](https://github.com/khiav223577/deep_pluck/pull/22) #deep_pluck at active model without plucking deeply will cause ArgumentError (@khiav223577)
 - [#20](https://github.com/khiav223577/deep_pluck/pull/20) [ENHANCE] Eliminate Extra Select Loop in Hash Lookup (@berniechiu)
 

data/README.md

@@ -8,7 +8,7 @@
 
 Allow you to pluck deeply into nested associations without loading a bunch of records.
 
-Support Rails 3.2, 4.2, 5.0, 5.1, 5.2.
+Support Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0.
 
 
 ## Installation
@@ -33,10 +33,10 @@ Or install it yourself as:
 
 ```rb
 User.deep_pluck(:id, :name)
-# SELECT `users`.`id`, `users`.`name` FROM `users` 
-# => 
+# SELECT `users`.`id`, `users`.`name` FROM `users`
+# =>
 # [
-#   {'id' => 1, 'name' => 'David'}, 
+#   {'id' => 1, 'name' => 'David'},
 #   {'id' => 2, 'name' => 'Jeremy'},
 # ]
 ```
@@ -47,17 +47,17 @@ User.deep_pluck(:id, :name)
 User.deep_pluck(:name, 'posts' => :title)
 # SELECT `users`.`id`, `users`.`name` FROM `users`
 # SELECT `posts`.`user_id`, `posts`.`title` FROM `posts` WHERE `posts`.`user_id` IN (1, 2)
-# => 
+# =>
 # [
 #  {
-#    'name' => 'David' , 
+#    'name' => 'David' ,
 #    'posts' => [
-#      {'title' => 'post1'}, 
+#      {'title' => 'post1'},
 #      {'title' => 'post2'},
 #    ],
-#  }, 
+#  },
 #  {
-#    'name' => 'Jeremy', 
+#    'name' => 'Jeremy',
 #    'posts' => [
 #      {'title' => 'post3'},
 #    ],
@@ -72,9 +72,9 @@ user = User.find_by(name: 'David')
 user.deep_pluck(:name, :posts => :title)
 # =>
 # {
-#   'name' => 'David' , 
+#   'name' => 'David' ,
 #   :posts => [
-#     {'title' => 'post1'}, 
+#     {'title' => 'post1'},
 #     {'title' => 'post2'},
 #   ],
 # }
@@ -92,10 +92,10 @@ And the following #as_json example:
 ```rb
 User.where(:name => %w(Pearl Kathenrie)).includes([{:posts => :post_comments}, :contact]).as_json({
   :root => false,
-  :only => [:name, :email], 
+  :only => [:name, :email],
   :include => {
     'posts' => {
-      :only => :name, 
+      :only => :name,
       :include => {
         'post_comments' => {
           :only => :comment,
@@ -116,9 +116,9 @@ Not to mention the huge performace improvement by using #deep_pluck.
 You could refactor the example with #deep_pluck:
 ```rb
 User.where(:name => %w(Pearl Kathenrie)).deep_pluck(
-  :name, 
-  :email, 
-  'posts' => [:name, 'post_comments' => :comment], 
+  :name,
+  :email,
+  'posts' => [:name, 'post_comments' => :comment],
   'contact' => :address,
 )
 ```

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "deep_pluck"
+require 'bundler/setup'
+require 'deep_pluck'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "deep_pluck"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/deep_pluck.gemspec

@@ -4,35 +4,41 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'deep_pluck/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "deep_pluck"
+  spec.name          = 'deep_pluck'
   spec.version       = DeepPluck::VERSION
-  spec.authors       = ["khiav reoy"]
-  spec.email         = ["mrtmrt15xn@yahoo.com.tw"]
+  spec.authors       = ['khiav reoy']
+  spec.email         = ['mrtmrt15xn@yahoo.com.tw']
 
-  spec.summary       = %q{Use deep_pluck as a shortcut to select one or more attributes and include associated models without loading a bunch of records.}
-  spec.description   = %q{Use deep_pluck as a shortcut to select one or more attributes and include associated models without loading a bunch of records. And DRY up your code when using #as_json.}
-  spec.homepage      = "https://github.com/khiav223577/deep_pluck"
-  spec.license       = "MIT"
+  spec.summary       = 'Use deep_pluck as a shortcut to select one or more attributes and include associated models without loading a bunch of records.'
+  spec.description   = 'Use deep_pluck as a shortcut to select one or more attributes and include associated models without loading a bunch of records. And DRY up your code when using #as_json.'
+  spec.homepage      = 'https://github.com/khiav223577/deep_pluck'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
-  #if spec.respond_to?(:metadata)
+  # if spec.respond_to?(:metadata)
   #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  #else
+  # else
   #  raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  #end
+  # end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.files         = `git ls-files -z`.split("\x0").reject{|f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}){|f| File.basename(f) }
+  spec.require_paths = ['lib']
+  spec.metadata      = {
+    'homepage_uri'      => 'https://github.com/khiav223577/deep_pluck',
+    'changelog_uri'     => 'https://github.com/khiav223577/deep_pluck/blob/master/CHANGELOG.md',
+    'source_code_uri'   => 'https://github.com/khiav223577/deep_pluck',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/deep_pluck',
+    'bug_tracker_uri'   => 'https://github.com/khiav223577/deep_pluck/issues',
+  }
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "sqlite3", "~> 1.3"
-  spec.add_development_dependency "minitest", "~> 5.0"
-
-  spec.add_dependency "activerecord", ">= 3"
-  spec.add_dependency "pluck_all", ">= 1.2.3"
+  spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'sqlite3', '~> 1.3'
+  spec.add_development_dependency 'minitest', '~> 5.0'
 
+  spec.add_dependency 'activerecord', '>= 3'
+  spec.add_dependency 'pluck_all', '>= 1.2.3'
 end

data/gemfiles/3.2.gemfile

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

data/gemfiles/4.2.gemfile

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

data/gemfiles/5.0.gemfile

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

data/gemfiles/5.1.gemfile

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

data/gemfiles/5.2.gemfile

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

data/gemfiles/6.0.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0'
+gem 'pluck_all', '~> 2.0.4'
+
+group :test do
+  gem 'simplecov'
+  gem 'sqlite3', '~> 1.4.1'
+end
+
+gemspec path: '../'

data/lib/deep_pluck.rb

@@ -1,4 +1,4 @@
-require "deep_pluck/version"
+require 'deep_pluck/version'
 require 'deep_pluck/model'
 require 'active_record'
 require 'pluck_all'
@@ -11,13 +11,12 @@ end
 
 class ActiveRecord::Base
   def self.deep_pluck(*args)
-    self.where('').deep_pluck(*args)
+    where('').deep_pluck(*args)
   end
 
   def deep_pluck(*args)
-    hash_args, other_args = args.partition { |s| s.is_a?(Hash) }
-    preloaded_model = DeepPluck::PreloadedModel.new(self, other_args)
-    model = DeepPluck::Model.new(self.class.where(id: id), preloaded_model: preloaded_model)
+    hash_args, other_args = args.partition{|s| s.is_a?(Hash) }
+    model = DeepPluck::Model.new(self, need_columns: other_args)
     model.add(*hash_args) if hash_args.any?
     return model.load_all.first
   end

data/lib/deep_pluck/data_combiner.rb

@@ -12,7 +12,7 @@ module DeepPluck
       private
 
       def make_data_hash(collection, parent, primary_key, column_name)
-        return parent.map{|s| [s[primary_key], s]}.to_h if !collection
+        return parent.map{|s| [s[primary_key], s] }.to_h if !collection
         hash = {}
         parent.each do |model_hash|
           key = model_hash[primary_key]

data/lib/deep_pluck/model.rb

@@ -1,16 +1,24 @@
-require 'deep_pluck/preloaded_model'
 require 'deep_pluck/data_combiner'
+
 module DeepPluck
   class Model
     # ----------------------------------------------------------------
     # ● Initialize
     # ----------------------------------------------------------------
-    def initialize(relation, parent_association_key = nil, parent_model = nil, preloaded_model: nil)
-      @relation = relation
-      @preloaded_model = preloaded_model
+    def initialize(relation, parent_association_key = nil, parent_model = nil, need_columns: [])
+      if relation.is_a?(ActiveRecord::Base)
+        @model = relation
+        @relation = nil
+        @klass = @model.class
+      else
+        @model = nil
+        @relation = relation
+        @klass = @relation.klass
+      end
+
       @parent_association_key = parent_association_key
       @parent_model = parent_model
-      @need_columns = (preloaded_model ? preloaded_model.need_columns : [])
+      @need_columns = need_columns
       @associations = {}
     end
 
@@ -18,10 +26,10 @@ module DeepPluck
     # ● Reader
     # ----------------------------------------------------------------
     def get_reflect(association_key)
-      @relation.klass.reflect_on_association(association_key.to_sym) || # add to_sym since rails 3 only support symbol
+      @klass.reflect_on_association(association_key.to_sym) || # add to_sym since rails 3 only support symbol
         fail(ActiveRecord::ConfigurationError, "ActiveRecord::ConfigurationError: Association named \
-          '#{association_key}' was not found on #{@relation.klass.name}; perhaps you misspelled it?"
-        )
+          '#{association_key}' was not found on #{@klass.name}; perhaps you misspelled it?"
+      )
     end
 
     def with_conditions(reflect, relation)
@@ -92,7 +100,7 @@ module DeepPluck
     def do_query(parent, reflect, relation)
       parent_key = get_foreign_key(reflect)
       relation_key = get_foreign_key(reflect, reverse: true, with_table_name: true)
-      ids = parent.map{|s| s[parent_key]}
+      ids = parent.map{|s| s[parent_key] }
       ids.uniq!
       ids.compact!
       relation = with_conditions(reflect, relation)
@@ -129,13 +137,28 @@ module DeepPluck
       return [*prev_need_columns, *next_need_columns, *@need_columns].uniq(&Helper::TO_KEY_PROC)
     end
 
+    def pluck_values(columns)
+      includes_values = @relation.includes_values
+      @relation.includes_values = []
+
+      result = @relation.pluck_all(*columns)
+
+      @relation.includes_values = includes_values
+      return result
+    end
+
+    def loaded_models
+      return [@model] if @model
+      return @relation if @relation.loaded
+    end
+
     public
 
     def load_data
       columns = get_query_columns
       key_columns = columns.map(&Helper::TO_KEY_PROC)
       @relation = yield(@relation) if block_given?
-      @data = @preloaded_model ? [@preloaded_model.get_hash_data(key_columns)] : @relation.pluck_all(*columns)
+      @data = loaded_models ? loaded_models.as_json(root: false, only: key_columns) : pluck_values(columns)
       if @data.size != 0
         # for delete_extra_column_data!
         @extra_columns = key_columns - @need_columns.map(&Helper::TO_KEY_PROC)

data/lib/deep_pluck/version.rb

@@ -1,3 +1,3 @@
 module DeepPluck
-  VERSION = "1.1.1"
+  VERSION = '1.1.2'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: deep_pluck
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-08 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.17'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 3.x
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.17'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 3.x
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,15 +125,20 @@ files:
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
 - lib/deep_pluck.rb
 - lib/deep_pluck/data_combiner.rb
 - lib/deep_pluck/model.rb
-- lib/deep_pluck/preloaded_model.rb
 - lib/deep_pluck/version.rb
 homepage: https://github.com/khiav223577/deep_pluck
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/khiav223577/deep_pluck
+  changelog_uri: https://github.com/khiav223577/deep_pluck/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/khiav223577/deep_pluck
+  documentation_uri: https://www.rubydoc.info/gems/deep_pluck
+  bug_tracker_uri: https://github.com/khiav223577/deep_pluck/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -144,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Use deep_pluck as a shortcut to select one or more attributes and include

data/lib/deep_pluck/preloaded_model.rb

@@ -1,14 +0,0 @@
-module DeepPluck
-  class PreloadedModel
-    attr_reader :need_columns
-
-    def initialize(active_model, need_columns)
-      @active_model = active_model
-      @need_columns = need_columns
-    end
-
-    def get_hash_data(extra_columns)
-      @active_model.as_json(root: false, only: @need_columns + extra_columns)
-    end
-  end
-end