deep_pluck 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 005fdc992119dbb5eceeb1f62ad7ab4c884af86cf556dacba454eb389f45ec7b
-  data.tar.gz: bd2e0b8915f71a956238bf2b2a6cd32243c5bf7c18374fd5b0111c20f5550100
+  metadata.gz: be904969a21ee38baa9e44b48a57be74b2b8b0a9189732d17a3e226afa75d13f
+  data.tar.gz: 92cc2e3650d2173d29ad048a417e46b3bb7cf93e39633a43ed247a4011fc7189
 SHA512:
-  metadata.gz: 3fc6109cac1f4afbd414d63aa5b92fda46ec48fde691d5456c8e6d71582e8bd01dbffdf4f1244e2c825a7790f3278113ceafecc6166fcd8aea80fc84e2c66fb7
-  data.tar.gz: 04c2c14548aaee28873a2167cd88ab86cab91143bc315b717d03446e10357c22247d5db851c8b577aedb3ef6961b5a4a411c9f83eb172b146b3f606ed9d89220
+  metadata.gz: 50d4a7a590da8a8800bce18dd4228572b551916b060be591c6dcb1957b1bb676e583c240b07687f00207a74019be09bf81427e84904e39bfdc178cc156cb1bd0
+  data.tar.gz: 4aab9a20e9bed08be0537644e07e12844df6059b50dff0d4198609c53e95ae6305506df378aa7c103de2d5dbbb49021dd17f7576e934df2f332b89a8b9c216c2

data/lib/deep_pluck/data_combiner.rb

@@ -1,40 +1,53 @@
-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 do |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
-end
+# frozen_string_literal: true
+
+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, reverse)
+        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, reverse)
+        hash = {}
+
+        parent.each do |model_hash|
+          key = model_hash[primary_key]
+
+          if reverse
+            if collection
+              array = (hash[key] ? hash[key][column_name] : []) # share the children if id is duplicated
+              model_hash[column_name] = array # set the value of this association key to empty array by default
+            else
+              model_hash[column_name] = nil # set the value of this association key to be nil by default
+            end
+          end
+
+          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 do |data|
+          id = data[foreign_key]
+
+          left = reverse ? children_hash[id] : data
+          right = !reverse ? children_hash[id] : data
+
+          if collection
+            left[column_name] << right
+          else
+            left[column_name] = right
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deep_pluck/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_compatibility'
 require 'rails_compatibility/unscope_where'
 require 'rails_compatibility/build_joins'

data/lib/deep_pluck/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepPluck
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/lib/deep_pluck.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'deep_pluck/version'
 require 'deep_pluck/model'
 require 'active_record'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_pluck
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-06 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler