pluck_all 2.0.4 → 2.3.2

data/gemfiles/mongoid_70.gemfile

@@ -1,11 +1,11 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in pluck_all.gemspec
-
-gem 'mongoid', '~> 7.0.0'
-
-group :test do
-  gem 'simplecov'
-end
-
-gemspec path: '../'
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in pluck_all.gemspec
+
+gem 'mongoid', '~> 7.0.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+end
+
+gemspec path: '../'

data/lib/pluck_all.rb

@@ -1,3 +1,3 @@
-# frozen_string_literal: true
-require 'pluck_all/version'
-require 'pluck_all/hooks'
+# frozen_string_literal: true
+require 'pluck_all/version'
+require 'pluck_all/hooks'

data/lib/pluck_all/hooks.rb

@@ -1,18 +1,18 @@
 module PluckAll
   class Hooks
-    def self.init
-      # ActiveRecord
-      begin
-        require 'active_record'
-        require 'pluck_all/models/active_record_extension'
-      rescue LoadError, Gem::LoadError
+    class << self
+      def init
+        require 'pluck_all/models/active_record_extension' if require_if_exists('active_record')
+        require 'pluck_all/models/mongoid_extension' if require_if_exists('mongoid')
       end
 
-      # Mongoid
-      begin
-        require 'mongoid'
-        require 'pluck_all/models/mongoid_extension'
+      private
+
+      def require_if_exists(path)
+        require path
+        return true
       rescue LoadError, Gem::LoadError
+        return false
       end
     end
   end

data/lib/pluck_all/models/active_record_extension.rb

@@ -1,4 +1,6 @@
-require_relative 'patches/attribute_types'
+require 'rails_compatibility/attribute_types'
+require 'rails_compatibility/has_include'
+require 'rails_compatibility/apply_join_dependency'
 require_relative 'patches/deserialize'
 
 class ActiveRecord::Relation
@@ -8,16 +10,24 @@ class ActiveRecord::Relation
     return self
   end
 
-  def select_all(*column_names)
+  def select_all(column_names)
     relation = clone
+
+    # See: https://github.com/globalize/globalize/pull/707
+    if relation.klass.method_defined?(:translated_attribute_names) && (parsed = parse_translated_columns(column_names))
+      relation = relation.join_translations
+      column_names = parsed
+    end
+
     relation.select_values = [].freeze # cannot use `unscope(:select)` in Rails 3
-    return klass.connection.select_all(relation.select(column_names).to_sql)
+
+    sql = relation.select(column_names.map(&to_sql_column_name)).to_sql
+    return klass.connection.select_all(sql)
   end
 
   if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0')
     def pluck_all(*column_names, cast_uploader_url: true)
-      column_names.map!(&to_sql_column_name)
-      result = select_all(*column_names)
+      result = select_all(column_names)
       result.map! do |attributes| # This map! behaves different to array#map!
         initialized_attributes = klass.initialize_attributes(attributes)
         attributes.each do |key, _attribute|
@@ -43,15 +53,12 @@ class ActiveRecord::Relation
     end
   else
     def pluck_all(*column_names, cast_uploader_url: true)
-      column_names.map!(&to_sql_column_name)
-      if has_include?(column_names.first)
-        # The `construct_relation_for_association_calculations` method was removed at Rails 5.2.
-        relation = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('5.2.0') ? apply_join_dependency : construct_relation_for_association_calculations
-        return relation.pluck_all(*column_names)
-      end
-      result = select_all(*column_names)
-      attribute_types = klass.attribute_types
-      result.map! do |attributes| # This map! behaves different to array#map!
+      has_include = RailsCompatibility.has_include?(self, column_names.first)
+      return RailsCompatibility.apply_join_dependency(self).pluck_all(*column_names) if has_include
+
+      result = select_all(column_names)
+      attribute_types = RailsCompatibility.attribute_types(klass)
+      result.map do |attributes| # This map behaves different to array#map
         attributes.each do |key, attribute|
           attributes[key] = result.send(:column_type, key, attribute_types).deserialize(attribute) # TODO: 現在AS過後的type cast會有一點問題，但似乎原生的pluck也有此問題
         end
@@ -80,12 +87,13 @@ class ActiveRecord::Relation
   # ----------------------------------------------------------------
   def cast_carrier_wave_uploader_url(attributes)
     if defined?(CarrierWave) && klass.respond_to?(:uploaders)
+      @pluck_all_cast_need_columns ||= nil
       @pluck_all_cast_klass ||= klass
       @pluck_all_uploaders ||= @pluck_all_cast_klass.uploaders.select{|key, _uploader| attributes.key?(key.to_s) }
       @pluck_all_uploaders.each do |key, _uploader|
         {}.tap do |hash|
           @pluck_all_cast_need_columns.each{|k| hash[k] = attributes[k] } if @pluck_all_cast_need_columns
-          obj = @pluck_all_cast_klass.new(hash)
+          obj = @pluck_all_cast_klass.instantiate(hash)
           obj[key] = attributes[key_s = key.to_s]
           # https://github.com/carrierwaveuploader/carrierwave/blob/87c37b706c560de6d01816f9ebaa15ce1c51ed58/lib/carrierwave/mount.rb#L142
           attributes[key_s] = obj.send(key)

data/lib/pluck_all/models/mongoid_extension.rb

@@ -1,70 +1,70 @@
-# frozen_string_literal: true
-module Mongoid
-  module Document::ClassMethods
-    def pluck_array(*fields)
-      where(nil).pluck_array(*fields)
-    end
-
-    def pluck_all(*fields)
-      where(nil).pluck_all(*fields)
-    end
-  end
-
-  module Findable
-    delegate :pluck_all, :pluck_array, to: :with_default_scope
-  end
-
-  module Contextual
-    delegate :pluck_all, :pluck_array, to: :context
-
-    class None
-      def pluck_array(*)
-        []
-      end
-
-      def pluck_all(*)
-        []
-      end
-    end
-
-    class Mongo
-      def pluck_array(*fields)
-        normalized_select = get_normalized_select(fields)
-        get_query_data(normalized_select).reduce([]) do |plucked, doc|
-          values = normalized_select.keys.map(&plucked_value_mapper(:array, doc))
-          plucked << (values.size == 1 ? values.first : values)
-        end
-      end
-
-      def pluck_all(*fields)
-        normalized_select = get_normalized_select(fields)
-        get_query_data(normalized_select).reduce([]) do |plucked, doc|
-          values = normalized_select.keys.map(&plucked_value_mapper(:all, doc))
-          plucked << values.to_h
-        end
-      end
-
-      private
-
-      def plucked_value_mapper(type, doc)
-        proc do |n|
-          values = [n, n =~ /\./ ? doc[n.partition('.')[0]] : doc[n]]
-          case type
-          when :array then values[1]
-          when :all   then values
-          end
-        end
-      end
-
-      def get_query_data(normalized_select)
-        return (@view ? @view.projection(normalized_select) : query.dup.select(normalized_select))
-      end
-
-      def get_normalized_select(fields)
-        fields.each_with_object({}) do |f, hash|
-          hash[klass.database_field_name(f)] = 1
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+module Mongoid
+  module Document::ClassMethods
+    def pluck_array(*fields)
+      where(nil).pluck_array(*fields)
+    end
+
+    def pluck_all(*fields)
+      where(nil).pluck_all(*fields)
+    end
+  end
+
+  module Findable
+    delegate :pluck_all, :pluck_array, to: :with_default_scope
+  end
+
+  module Contextual
+    delegate :pluck_all, :pluck_array, to: :context
+
+    class None
+      def pluck_array(*)
+        []
+      end
+
+      def pluck_all(*)
+        []
+      end
+    end
+
+    class Mongo
+      def pluck_array(*fields)
+        normalized_select = get_normalized_select(fields)
+        get_query_data(normalized_select).reduce([]) do |plucked, doc|
+          values = normalized_select.keys.map(&plucked_value_mapper(:array, doc))
+          plucked << (values.size == 1 ? values.first : values)
+        end
+      end
+
+      def pluck_all(*fields)
+        normalized_select = get_normalized_select(fields)
+        get_query_data(normalized_select).reduce([]) do |plucked, doc|
+          values = normalized_select.keys.map(&plucked_value_mapper(:all, doc))
+          plucked << values.to_h
+        end
+      end
+
+      private
+
+      def plucked_value_mapper(type, doc)
+        proc do |n|
+          values = [n, n =~ /\./ ? doc[n.partition('.')[0]] : doc[n]]
+          case type
+          when :array then values[1]
+          when :all   then values
+          end
+        end
+      end
+
+      def get_query_data(normalized_select)
+        return (@view ? @view.projection(normalized_select) : query.dup.select(normalized_select))
+      end
+
+      def get_normalized_select(fields)
+        fields.each_with_object({}) do |f, hash|
+          hash[klass.database_field_name(f)] = 1
+        end
+      end
+    end
+  end
+end

data/lib/pluck_all/models/patches/deserialize.rb

@@ -1,13 +1,13 @@
-module ActiveRecord
-  [
-    *([Type::Value, Type::Integer, Type::Serialized] if defined?(Type::Value)),
-    *([Enum::EnumType] if defined?(Enum::EnumType)),
-  ].each do |s|
-    s.class_eval do
-      if !method_defined?(:deserialize) && method_defined?(:type_cast_from_database)
-        # deserialize was changed to type_cast_from_database in Rails 5
-        alias_method :deserialize, :type_cast_from_database
-      end
-    end
-  end
-end
+module ActiveRecord
+  [
+    *([Type::Value, Type::Integer, Type::Serialized] if defined?(Type::Value)),
+    *([Enum::EnumType] if defined?(Enum::EnumType)),
+  ].each do |s|
+    s.class_eval do
+      if !method_defined?(:deserialize) && method_defined?(:type_cast_from_database)
+        # deserialize was changed to type_cast_from_database in Rails 5
+        alias_method :deserialize, :type_cast_from_database
+      end
+    end
+  end
+end

data/lib/pluck_all/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module PluckAll
-  VERSION = '2.0.4'
+  VERSION = '2.3.2'
 end

data/pluck_all.gemspec

@@ -1,35 +1,43 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pluck_all/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'pluck_all'
-  spec.version       = PluckAll::VERSION
-  spec.authors       = ['khiav reoy']
-  spec.email         = ['mrtmrt15xn@yahoo.com.tw']
-
-  spec.summary       = 'Pluck multiple columns/attributes and return array of hashes. Support Rails 3, 4, 5.'
-  spec.description   = 'Pluck multiple columns/attributes and return array of hashes. Support Rails 3, 4, 5. If you have a Rails 3 project, and want to pluck not only one column, feel free to use this gem and no need to worry about upgrading to Rails 4, 5 in the future will break this.'
-  spec.homepage      = 'https://github.com/khiav223577/pluck_all'
-  spec.license       = 'MIT'
-
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  # if spec.respond_to?(:metadata)
-  #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  # else
-  #  raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  # end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject{|f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}){|f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_dependency 'activesupport', '>= 3.0.0'
-
-  spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'pluck_all/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'pluck_all'
+  spec.version       = PluckAll::VERSION
+  spec.authors       = ['khiav reoy']
+  spec.email         = ['mrtmrt15xn@yahoo.com.tw']
+
+  spec.summary       = 'Pluck multiple columns/attributes and return array of hashes. Support Rails 3, 4, 5.'
+  spec.description   = 'Pluck multiple columns/attributes and return array of hashes. Support Rails 3, 4, 5. If you have a Rails 3 project, and want to pluck not only one column, feel free to use this gem and no need to worry about upgrading to Rails 4, 5 in the future will break this.'
+  spec.homepage      = 'https://github.com/khiav223577/pluck_all'
+  spec.license       = 'MIT'
+
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  # if spec.respond_to?(:metadata)
+  #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+  # else
+  #  raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  # end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject{|f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}){|f| File.basename(f) }
+  spec.require_paths = ['lib']
+  spec.metadata      = {
+    'homepage_uri'      => 'https://github.com/khiav223577/pluck_all',
+    'changelog_uri'     => 'https://github.com/khiav223577/pluck_all/blob/master/CHANGELOG.md',
+    'source_code_uri'   => 'https://github.com/khiav223577/pluck_all',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/pluck_all',
+    'bug_tracker_uri'   => 'https://github.com/khiav223577/pluck_all/issues',
+  }
+
+  spec.add_dependency 'activesupport', '>= 3.0.0'
+  spec.add_dependency 'rails_compatibility', '>= 0.0.7'
+
+  spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluck_all
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.3.2
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rails_compatibility
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,9 +96,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
@@ -97,6 +111,8 @@ files:
 - gemfiles/active_record_50.gemfile
 - gemfiles/active_record_51.gemfile
 - gemfiles/active_record_52.gemfile
+- gemfiles/active_record_60.gemfile
+- gemfiles/active_record_61.gemfile
 - gemfiles/mongoid_54.gemfile
 - gemfiles/mongoid_64.gemfile
 - gemfiles/mongoid_70.gemfile
@@ -104,14 +120,18 @@ files:
 - lib/pluck_all/hooks.rb
 - lib/pluck_all/models/active_record_extension.rb
 - lib/pluck_all/models/mongoid_extension.rb
-- lib/pluck_all/models/patches/attribute_types.rb
 - lib/pluck_all/models/patches/deserialize.rb
 - lib/pluck_all/version.rb
 - pluck_all.gemspec
 homepage: https://github.com/khiav223577/pluck_all
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/khiav223577/pluck_all
+  changelog_uri: https://github.com/khiav223577/pluck_all/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/khiav223577/pluck_all
+  documentation_uri: https://www.rubydoc.info/gems/pluck_all
+  bug_tracker_uri: https://github.com/khiav223577/pluck_all/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -127,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.14
 signing_key: 
 specification_version: 4
 summary: Pluck multiple columns/attributes and return array of hashes. Support Rails