deep_pluck 0.1.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dd60ee2a2873d438651509c33b1aad2e046c16c
-  data.tar.gz: b413505ee2ce1109174954377a7e99fb4bc4e4c3
+  metadata.gz: 447d5c0f34cda3c5fc8d241abac799236ff6e09b
+  data.tar.gz: c0aed3f2c80dbf2364ece10fee44f3d97c979f08
 SHA512:
-  metadata.gz: 93a7cd552701c578a624fae3823e588a2eb881f83d482536500228f3d0c9cdadc6e0177ba6b1023dcfa3e7ac03be124554c65e46a8993d1072f7c3335282fecf
-  data.tar.gz: ed86dcb371deac4a1b4603d0cfa7785797345c859b9e9b7d8d99ce36cc6d660565534ba99851074df7c0dc6a6a3305d454c08a4d813b5177e9f858e24c8edc59
+  metadata.gz: 4ee9e958b7a168d182a56695096cc756fcccaa1b6b07bffb4c027a98848b97a539c0a5e39ed84bdb6d09f84327d7723da0495590656853a16e6343e5aba77515
+  data.tar.gz: cf325186ebb8cc23bd989f9302c10b91d2fe1688b728f704e303a7b3d0cb75bc89ac57822fdb12f81408eea0aef44ffee69ac411c80f55ae55db575925899f89

data/deep_pluck.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3", "~> 1.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 
-  spec.add_dependency "rails", ">= 3"
+  spec.add_dependency "active_record", "> 3.x"
   spec.add_dependency "pluck_all", "~> 1.2.2"
 
 end

data/lib/deep_pluck/data_combiner.rb

@@ -0,0 +1,37 @@
+module DeepPluck
+  module DataCombiner
+    class << self
+      def combine_data(parent, children, primary_key, column_name, foreign_key, reverse, collection)
+        source =  reverse ? parent : children
+        target = !reverse ? parent : children
+        data_hash = make_data_hash(collection, source, primary_key, column_name)
+        assign_values_to_parent(collection, target, data_hash, column_name, foreign_key, reverse: reverse)
+        return children
+      end
+    private
+      def make_data_hash(collection, parent, primary_key, column_name)
+        return parent.map{|s| [s[primary_key], s]}.to_h if !collection
+        hash = {}
+        parent.each do |model_hash|
+          key = model_hash[primary_key]
+          array = (hash[key] ? hash[key][column_name] : []) #share the children if id is duplicated
+          model_hash[column_name] = array
+          hash[key] = model_hash
+        end
+        return hash
+      end
+      def assign_values_to_parent(collection, parent, children_hash, column_name, foreign_key, reverse: false)
+        parent.each{|s|
+          next if (id = s[foreign_key]) == nil
+          left   =  reverse ? children_hash[id] : s
+          right  = !reverse ? children_hash[id] : s
+          if collection
+            left[column_name] << right
+          else
+            left[column_name] = right
+          end
+        }
+      end
+    end
+  end
+end

data/lib/deep_pluck/model.rb

@@ -1,3 +1,4 @@
+require 'deep_pluck/data_combiner'
 module DeepPluck
   class Model
   #---------------------------------------
@@ -23,10 +24,10 @@ module DeepPluck
       relation = relation.where(options[:conditions]) if options[:conditions]
       return relation
     end
-    def get_join_table(reflect, bool_flag = false)
+    def get_join_table(reflect)
       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
+      return nil
     end
     def get_primary_key(reflect)
       return (reflect.belongs_to? ? reflect.klass : reflect.active_record).primary_key
@@ -35,12 +36,11 @@ module DeepPluck
       if reverse and (table_name = get_join_table(reflect)) #reverse = parent
         key = reflect.chain.last.foreign_key
       else
-        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 : get_primary_key(reflect))
+        key = (reflect.belongs_to? == reverse ? get_primary_key(reflect) : reflect.foreign_key)
+        table_name = (reverse ? reflect.klass : reflect.active_record).table_name
       end
-      return key.to_s if !with_table_name #key may be symbol if specify foreign_key in association options
-      return "#{table_name}.#{key}"
+      return "#{table_name}.#{key}" if with_table_name
+      return key.to_s #key may be symbol if specify foreign_key in association options
     end
   #---------------------------------------
   #  Contruction OPs
@@ -80,40 +80,15 @@ module DeepPluck
       relation = with_conditions(reflect, relation)
       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)
+    def set_includes_data(parent, column_name, model)
+      reflect = get_reflect(column_name)
+      reverse = !reflect.belongs_to?
+      foreign_key = get_foreign_key(reflect, reverse: reverse)
       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[primary_key], s]}.to_h
-        foreign_key = get_foreign_key(reflect)
-        parent.each{|s|
-          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[primary_key]
-          if reflect.collection?
-            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
-        end
-        children = model.load_data{|relation| do_query(parent, reflect, relation) }
-        foreign_key = get_foreign_key(reflect, reverse: true)
-        children.each{|s|
-          next if (id = s[foreign_key]) == nil
-          if reflect.collection?
-            parent_hash[id][children_store_name] << s
-          else
-            parent_hash[id][children_store_name] = s
-          end
-        }
-      end
-      return children
+      children = model.load_data{|relation| do_query(parent, reflect, relation) }
+      #reverse = false: Child.where(:id => parent.pluck(:child_id))
+      #reverse = true : Child.where(:parent_id => parent.pluck(:id))
+      return DataCombiner.combine_data(parent, children, primary_key, column_name, foreign_key, reverse, reflect.collection?)
     end
   public
     def load_data

data/lib/deep_pluck/version.rb

@@ -1,3 +1,3 @@
 module DeepPluck
-  VERSION = "0.1.4"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_pluck
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.x
 - !ruby/object:Gem::Dependency
   name: pluck_all
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ files:
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - lib/deep_pluck.rb
+- lib/deep_pluck/data_combiner.rb
 - lib/deep_pluck/model.rb
 - lib/deep_pluck/version.rb
 homepage: https://github.com/khiav223577/deep_pluck
@@ -138,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Use deep_pluck as a shortcut to select one or more attributes and include