deep_pluck 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f04ba29f0ba05add69bb0765e11b4c72541cb7a5
-  data.tar.gz: f5fe6993d0004478facd381dcbb851aeebe92d9d
+  metadata.gz: b20668dbd7b6878ed071b71534eb5c73facbd2a5
+  data.tar.gz: d0717078533f829893fd2e22f3331d00b22003c2
 SHA512:
-  metadata.gz: 801eb82d2d1340ab93f60006a6be0d44588afd00c4354ec309af5c3714bc3aba9cca4074e2d6072d4e9a508a0bd6bd264d66e5a01a12700589a42f177d247a89
-  data.tar.gz: 8e416508a72b631d70112e3f6ef527a23930dd1f0b9db332aec12f431e2e1bb26e690bc0cf8aaf094f7d734bcf60aa525656d39bf52030aa29cf12cbbb68d36d
+  metadata.gz: 72273fc908114709b56b034faf6278684063d5787a84559cc7fe5353ce913fca112c6f4efc315156154a99a43518e301b87f40bea294f99aa87d5b1116d64d3d
+  data.tar.gz: b2c45401285b2f407194506dd26be1aa9327ace23bf2e16b7acef734391d34533177e897fd599eb2e5a93115e32ebff15b6f2bd67e0774206073a7700c9cc4fc

data/lib/deep_pluck/model.rb

@@ -13,13 +13,15 @@ module DeepPluck
   #---------------------------------------
   #  Reader
   #---------------------------------------
-    def reflect_on_association(association_key)
+    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(association_key, reverse = false)
-      reflect = reflect_on_association(association_key)
-      return (reflect.belongs_to? ? @relation.klass.primary_key : reflect.foreign_key) if reverse
-      return (reflect.belongs_to? ? reflect.foreign_key : @relation.klass.primary_key)
+    def get_foreign_key(reflect, reverse = false)
+      if reflect.options[:through] and reverse #reverse = parent
+        return "#{reflect.options[:through]}.#{reflect.chain.last.foreign_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)
     end
   #---------------------------------------
   #  Contruction OPs
@@ -30,7 +32,7 @@ module DeepPluck
     end
     def add_association(hash)
       hash.each do |key, value|
-        model = (@associations[key] ||= Model.new(reflect_on_association(key).klass.where(''), key, self))
+        model = (@associations[key] ||= Model.new(get_reflect(key).klass.where(''), key, self))
         model.add(value)
       end
     end
@@ -50,10 +52,20 @@ module DeepPluck
   #  Load
   #---------------------------------------
   private
-    def set_includes_data(parent, children_store_name, model, order_by = nil)
-      reflect = reflect_on_association(children_store_name)
+    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)
+      ids = parent.map{|s| s[parent_key]}
+      ids.uniq!
+      ids.compact!
+      return relation.where(relation_key => ids)
+    end
+  private
+    def set_includes_data(parent, children_store_name, model)
+      reflect = get_reflect(children_store_name)
       if reflect.belongs_to? #Child.where(:id => parent.pluck(:child_id))
-        children = model.load_data{|relaction| relaction.where(:id => parent.map{|s| s[reflect.foreign_key]}.uniq.compact).order(order_by) }
+        children = model.load_data{|relation| do_query(parent, reflect, relation) }
         children_hash = Hash[children.map{|s| [s["id"], s]}]
         parent.each{|s|
           next if (id = s[reflect.foreign_key]) == nil
@@ -62,9 +74,10 @@ module DeepPluck
       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]}]
-        children = model.load_data{|relaction| relaction.where(reflect.foreign_key => parent.map{|s| s["id"]}.uniq.compact).order(order_by) }
+        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
         children.each{|s|
-          next if (id = s[reflect.foreign_key]) == nil
+          next if (id = s[foreign_key]) == nil
           if reflect.collection?
             parent_hash[id][children_store_name] << s
           else
@@ -76,13 +89,14 @@ module DeepPluck
     end
   public
     def load_data
-      prev_need_columns = @parent_model.get_foreign_key(@parent_association_key, true) if @parent_model
-      next_need_columns = @associations.map{|key, _| get_foreign_key(key) }.uniq
+      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
       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
         @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.0.4"
+  VERSION = "0.1.0"
 end

metadata

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