deep_pluck 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b20668dbd7b6878ed071b71534eb5c73facbd2a5
-  data.tar.gz: d0717078533f829893fd2e22f3331d00b22003c2
+  metadata.gz: 02455f382f53378da4401571796aa5f0d200327e
+  data.tar.gz: a7ae7dcc3a2e5b38416766ae1ac0564574375660
 SHA512:
-  metadata.gz: 72273fc908114709b56b034faf6278684063d5787a84559cc7fe5353ce913fca112c6f4efc315156154a99a43518e301b87f40bea294f99aa87d5b1116d64d3d
-  data.tar.gz: b2c45401285b2f407194506dd26be1aa9327ace23bf2e16b7acef734391d34533177e897fd599eb2e5a93115e32ebff15b6f2bd67e0774206073a7700c9cc4fc
+  metadata.gz: db336700568010031bf5a22f4eb98dcee584b5f631d2d74c78d251a811ac4f857f5b3b09093df3350b0d74732ecf19fa54c0b012de3fbd8a6503ef9c7f9f0573
+  data.tar.gz: 9c273df567114544e2b356dbc67d80bf1839e41dd0617983bcde494ed98b8cbabf547057970997a58a5fc63b61b7db0bf7f9c0a9d8217260326f717aad7eb46d

data/lib/deep_pluck/model.rb

@@ -16,12 +16,18 @@ module DeepPluck
     def get_reflect(association_key)
       @relation.klass.reflect_on_association(association_key.to_sym) #add to_sym since rails 3 only support symbol
     end
-    def get_foreign_key(reflect, reverse = false)
+    def get_foreign_key(reflect, reverse: false, with_table_name: false)
       if reflect.options[:through] and reverse #reverse = parent
-        return "#{reflect.options[:through]}.#{reflect.chain.last.foreign_key}"
+        chain_reflect = reflect.chain.last
+        table_name = chain_reflect.table_name
+        key = chain_reflect.foreign_key
+      else
+        return (reflect.belongs_to? ? reflect.active_record.primary_key : reflect.foreign_key) if reverse
+        table_name = reflect.active_record.table_name
+        key = (reflect.belongs_to? ? reflect.foreign_key : reflect.active_record.primary_key)
       end
-      return (reflect.belongs_to? ? reflect.active_record.primary_key : reflect.foreign_key) if reverse
-      return (reflect.belongs_to? ? reflect.foreign_key : reflect.active_record.primary_key)
+      return key if !with_table_name
+      return "#{table_name}.#{key}"
     end
   #---------------------------------------
   #  Contruction OPs
@@ -54,8 +60,8 @@ 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, false)
-      relation_key = get_foreign_key(reflect, true)
+      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!
@@ -66,16 +72,23 @@ module DeepPluck
       reflect = get_reflect(children_store_name)
       if reflect.belongs_to? #Child.where(:id => parent.pluck(:child_id))
         children = model.load_data{|relation| do_query(parent, reflect, relation) }
-        children_hash = Hash[children.map{|s| [s["id"], s]}]
+        children_hash = children.map{|s| [s["id"], s]}.to_h
         parent.each{|s|
           next if (id = s[reflect.foreign_key]) == nil
           s[children_store_name] = children_hash[id]
         }
       else       #Child.where(:parent_id => parent.pluck(:id))
-        parent.each{|s| s[children_store_name] = [] } if reflect.collection?
-        parent_hash = Hash[parent.map{|s| [s["id"], s]}]
+        parent_hash = {}
+        parent.each do |model_hash|
+          key = model_hash['id']
+          if reflect.collection?
+            array = (parent_hash[key] ? parent_hash[key][children_store_name] : []) #hare the children if id is duplicated
+            model_hash[children_store_name] = array
+          end
+          parent_hash[key] = model_hash
+        end
         children = model.load_data{|relation| do_query(parent, reflect, relation) }
-        foreign_key = get_foreign_key(reflect, true).sub(/\w+\./, '') #user_achievements.user_id => user_id
+        foreign_key = get_foreign_key(reflect, reverse: true)
         children.each{|s|
           next if (id = s[foreign_key]) == nil
           if reflect.collection?
@@ -89,14 +102,14 @@ module DeepPluck
     end
   public
     def load_data
-      prev_need_columns = @parent_model.get_foreign_key(@parent_model.get_reflect(@parent_association_key), true) if @parent_model
-      next_need_columns = @associations.map{|key, _| get_foreign_key(get_reflect(key)) }.uniq
+      prev_need_columns = @parent_model.get_foreign_key(@parent_model.get_reflect(@parent_association_key), reverse: true, with_table_name: true) if @parent_model
+      next_need_columns = @associations.map{|key, _| get_foreign_key(get_reflect(key), with_table_name: true) }.uniq
       all_need_columns = [*prev_need_columns, *next_need_columns, *@need_columns].uniq
       @relation = yield(@relation) if block_given?
       @data = @relation.pluck_all(*all_need_columns)
       if @data.size != 0
         @extra_columns = all_need_columns - @need_columns #for delete_extra_column_data!
-        @extra_columns.map!{|s| s.sub(/\w+\./, '')} #user_achievements.user_id => user_id
+        @extra_columns.map!{|s| s.gsub(/\w*[^\w]/, '')} #user_achievements.user_id => user_id
         @associations.each do |key, model|
           set_includes_data(@data, key, model)
         end

data/lib/deep_pluck/version.rb

@@ -1,3 +1,3 @@
 module DeepPluck
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_pluck
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Use deep_pluck as a shortcut to select one or more attributes and include