deep_pluck 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52f6de9f10f4af623d62fa914e2def86bdf2c7f9af69fe2e8260be2b2e8d83c3
-  data.tar.gz: 743caa89d3bff27bad73b543e3b4c0b8bee9a7c0fa3b4e41bd9746d9e6574232
+  metadata.gz: be904969a21ee38baa9e44b48a57be74b2b8b0a9189732d17a3e226afa75d13f
+  data.tar.gz: 92cc2e3650d2173d29ad048a417e46b3bb7cf93e39633a43ed247a4011fc7189
 SHA512:
-  metadata.gz: d21c3a241cb7d3bc9afbe11b52ecf1cbc17a110c3d5d0e2e4f1e73be5a8992634b51679348f8bac0a1d2b84e3807a9544366205d29fcb571bebbe3d6346c371e
-  data.tar.gz: e176efb7b6d920ae5863424a95052f9ed263a2a205fb0acd9897d2ae7beead768567fbc9adf63490ce8e37971ac8b18166f187793b6a1c2500d68ddad211b9f7
+  metadata.gz: 50d4a7a590da8a8800bce18dd4228572b551916b060be591c6dcb1957b1bb676e583c240b07687f00207a74019be09bf81427e84904e39bfdc178cc156cb1bd0
+  data.tar.gz: 4aab9a20e9bed08be0537644e07e12844df6059b50dff0d4198609c53e95ae6305506df378aa7c103de2d5dbbb49021dd17f7576e934df2f332b89a8b9c216c2

data/.github/workflows/ruby.yml

@@ -20,9 +20,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 2.2
+          - 2.3
           - 2.6
           - 2.7
+          - 3.0
+          - 3.1
         gemfile:
           - 3.2.gemfile
           - 4.2.gemfile
@@ -31,32 +33,57 @@ jobs:
           - 5.2.gemfile
           - 6.0.gemfile
           - 6.1.gemfile
+          - 7.0.gemfile
         exclude:
           - gemfile: 3.2.gemfile
             ruby: 2.6
           - gemfile: 3.2.gemfile
             ruby: 2.7
+          - gemfile: 3.2.gemfile
+            ruby: 3.0
+          - gemfile: 3.2.gemfile
+            ruby: 3.1
           - gemfile: 4.2.gemfile
             ruby: 2.7
+          - gemfile: 4.2.gemfile
+            ruby: 3.0
+          - gemfile: 4.2.gemfile
+            ruby: 3.1
+          - gemfile: 5.0.gemfile
+            ruby: 3.0
+          - gemfile: 5.0.gemfile
+            ruby: 3.1
+          - gemfile: 5.1.gemfile
+            ruby: 3.0
+          - gemfile: 5.1.gemfile
+            ruby: 3.1
+          - gemfile: 5.2.gemfile
+            ruby: 3.0
+          - gemfile: 5.2.gemfile
+            ruby: 3.1
           - gemfile: 6.0.gemfile
-            ruby: 2.2
+            ruby: 2.3
           - gemfile: 6.1.gemfile
-            ruby: 2.2
+            ruby: 2.3
+          - gemfile: 7.0.gemfile
+            ruby: 2.3
+          - gemfile: 7.0.gemfile
+            ruby: 2.6
     env:
       BUNDLE_GEMFILE: "gemfiles/${{ matrix.gemfile }}"
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run tests
-      run: bundle exec rake
-    - name: Publish code coverage
-      if: ${{ success() && github.event.pull_request.head.repo.full_name == github.repository }}
-      uses: paambaati/codeclimate-action@v2.7.5
-      env:
-        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake
+      - name: Publish code coverage
+        if: ${{ success() }}
+        uses: paambaati/codeclimate-action@v2.7.5
+        env:
+          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Change Log
 
+### [v1.2.0](https://github.com/khiav223577/deep_pluck/compare/v1.1.7...v1.2.0) 2021/06/10
+- [#50](https://github.com/khiav223577/deep_pluck/pull/50) Support `globalize` gem (@khiav223577)
+
 ### [v1.1.7](https://github.com/khiav223577/deep_pluck/compare/v1.1.6...v1.1.7) 2021/04/10
 - [#48](https://github.com/khiav223577/deep_pluck/pull/48) Fix: joins incorrect table when doing inverse lookup for HABTM associations with custom name (@khiav223577)
 - [#45](https://github.com/khiav223577/deep_pluck/pull/45) Do not publish code coverage for PRs from forks (@moon-moon-husky)

data/README.md

@@ -9,8 +9,8 @@
 Allow you to pluck deeply into nested associations without loading a bunch of records.
 
 ## Supports
-- Ruby 2.2 ~ 2.7
-- Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0
+- Ruby 2.3 ~ 2.7, 3.0 ~ 3.1
+- Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0, 7.0
 
 ## Installation
 

data/deep_pluck.gemspec

@@ -41,5 +41,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord', '>= 3'
   spec.add_dependency 'pluck_all', '>= 2.3.2'
-  spec.add_dependency 'rails_compatibility', '>= 0.0.4'
+  spec.add_dependency 'rails_compatibility', '>= 0.0.8'
 end

data/gemfiles/7.0.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gem 'zeitwerk'
+gem 'activerecord', '~> 7.0.0'
+gem 'pluck_all', '~> 2.3.2'
+
+# gem 'globalize',  '~> 6.0.1' # TODO: wait for globalize to support Rails 7.
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.4.1'
+end
+
+gemspec path: '../'

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'
@@ -50,6 +52,8 @@ module DeepPluck
     end
 
     def get_primary_key(reflect)
+      options = reflect.options
+      return options[:primary_key] if options[:primary_key]
       return (reflect.belongs_to? ? reflect.klass : reflect.active_record).primary_key
     end
 

data/lib/deep_pluck/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepPluck
-  VERSION = '1.2.0'
+  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.0
+  version: 1.3.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.8
 description: '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.'
@@ -142,6 +142,7 @@ files:
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
 - gemfiles/6.1.gemfile
+- gemfiles/7.0.gemfile
 - lib/deep_pluck.rb
 - lib/deep_pluck/data_combiner.rb
 - lib/deep_pluck/model.rb