deep_pluck 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51c4e3a56a22aaf35ded1d2614e87d76f5b52283
-  data.tar.gz: 5638b67af223f0c2c34009abdcfa7d7fe75c1186
+  metadata.gz: b2fc03be65ab872d226258b31d8ae589f3fbcd5a
+  data.tar.gz: e9509aff8cb651ac9f5cdc6589df4a392c1da44e
 SHA512:
-  metadata.gz: 76a4685fbe45190c0da0c75175dcc0769da3a43007be9791bf78f06208cf701534f997f946b72f095916cda4e8971bf1583de2758166a6ded366849d2c1dd814
-  data.tar.gz: 57c237f957442f8b04c915808f1f3e58491000e78ec0aae54a312dd8c2d9f051886269fcc6e323dfaa942c42b5cb8c12afe88a447405d4ba483f90e12fd99b2b
+  metadata.gz: 23ac49792df4c092022648f7a7ae8bc1ca90f27f6bb743b29ed5f7648c1048ff20d41f6697e1bda4c12f87f59e5b122a515c409c3bade3d233f3a32fa2c4e156
+  data.tar.gz: 4a470d307b03034676d5b16fdd2da2a13c52258e1403c6313e156ef58201f72e2f705679c35d8a98fe9ab711d9ad4273adf7c2e9b2a3767049460755fd6e28b5

data/README.md

@@ -6,7 +6,9 @@
 [![Code Climate](https://codeclimate.com/github/khiav223577/deep_pluck/badges/gpa.svg)](https://codeclimate.com/github/khiav223577/deep_pluck)
 [![Test Coverage](https://codeclimate.com/github/khiav223577/deep_pluck/badges/coverage.svg)](https://codeclimate.com/github/khiav223577/deep_pluck/coverage)
 
-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.
+Allow you to pluck deeply into nested associations without loading a bunch of records.
+
+And DRY up your code when using #as_json.
 
 
 ## Installation
@@ -36,12 +38,12 @@ User.deep_pluck(:id, :name)
 
 ### Pluck deep into associations
 ```rb
-User.deep_pluck(:name, 'posts' => :title)
+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' , 'posts' => [{'title' => 'post1'}, {'title' => 'post2'}]}, 
-#  {'name' => 'Jeremy', 'posts' => [{'title' => 'post3'}]}
+#  {'name' => 'David' , :posts => [{'title' => 'post1'}, {'title' => 'post2'}]}, 
+#  {'name' => 'Jeremy', :posts => [{'title' => 'post3'}]}
 # ]
 ```
 

data/lib/deep_pluck/model.rb

@@ -17,17 +17,23 @@ module DeepPluck
       @relation.klass.reflect_on_association(association_key.to_sym) || #add to_sym since rails 3 only support symbol
         raise(ActiveRecord::ConfigurationError, "ActiveRecord::ConfigurationError: Association named '#{association_key}' was not found on #{@relation.klass.name}; perhaps you misspelled it?")
     end
+    def get_join_table(reflect, bool_flag = false)
+      return reflect.options[:through] if reflect.options[:through]
+      return (reflect.options[:join_table] || reflect.send(:derive_join_table)) if reflect.macro == :has_and_belongs_to_many
+      return
+    end
+    def get_primary_key(reflect)
+      return (reflect.belongs_to? ? reflect.klass : reflect.active_record).primary_key
+    end
     def get_foreign_key(reflect, reverse: false, with_table_name: false)
-      if reflect.options[:through] and reverse #reverse = parent
-        chain_reflect = reflect.chain.last
-        table_name = chain_reflect.table_name
-        key = chain_reflect.foreign_key
+      if reverse and (table_name = get_join_table(reflect)) #reverse = parent
+        key = reflect.chain.last.foreign_key
       else
-        return (reflect.belongs_to? ? reflect.active_record.primary_key : reflect.foreign_key) if reverse
+        return (reflect.belongs_to? ? get_primary_key(reflect) : reflect.foreign_key).to_s if reverse
         table_name = reflect.active_record.table_name
-        key = (reflect.belongs_to? ? reflect.foreign_key : reflect.active_record.primary_key)
+        key = (reflect.belongs_to? ? reflect.foreign_key : get_primary_key(reflect))
       end
-      return key if !with_table_name
+      return key.to_s if !with_table_name #key may be symbol if specify foreign_key in association options
       return "#{table_name}.#{key}"
     end
   #---------------------------------------
@@ -60,30 +66,31 @@ module DeepPluck
   #---------------------------------------
   private
     def do_query(parent, reflect, relation)
-      relation = relation.joins(reflect.options[:through]) if reflect.options[:through]
       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.uniq!
       ids.compact!
-      return relation.where(relation_key => ids)
+      return relation.joins(get_join_table(reflect)).where(relation_key => ids)
     end
   private
     def set_includes_data(parent, children_store_name, model)
       reflect = get_reflect(children_store_name)
+      primary_key = get_primary_key(reflect)
       if reflect.belongs_to? #Child.where(:id => parent.pluck(:child_id))
         children = model.load_data{|relation| do_query(parent, reflect, relation) }
-        children_hash = children.map{|s| [s["id"], s]}.to_h
+        children_hash = children.map{|s| [s[primary_key], s]}.to_h
+        foreign_key = get_foreign_key(reflect)
         parent.each{|s|
-          next if (id = s[reflect.foreign_key]) == nil
+          next if (id = s[foreign_key]) == nil
           s[children_store_name] = children_hash[id]
         }
       else       #Child.where(:parent_id => parent.pluck(:id))
         parent_hash = {}
         parent.each do |model_hash|
-          key = model_hash['id']
+          key = model_hash[primary_key]
           if reflect.collection?
-            array = (parent_hash[key] ? parent_hash[key][children_store_name] : []) #hare the children if id is duplicated
+            array = (parent_hash[key] ? parent_hash[key][children_store_name] : []) #share the children if id is duplicated
             model_hash[children_store_name] = array
           end
           parent_hash[key] = model_hash

data/lib/deep_pluck/version.rb

@@ -1,3 +1,3 @@
 module DeepPluck
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_pluck
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler