pluck_all 2.2.1 → 2.3.3

data/lib/pluck_all/models/mongoid_extension.rb

@@ -1,70 +1,88 @@
-# 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
+    if defined?(Mongoid::Errors::CriteriaArgumentRequired)
+      def pluck_array(*fields)
+        where.pluck_array(*fields)
+      end
+
+      def pluck_all(*fields)
+        where.pluck_all(*fields)
+      end
+    else
+      def pluck_array(*fields)
+        where(nil).pluck_array(*fields)
+      end
+
+      def pluck_all(*fields)
+        where(nil).pluck_all(*fields)
+      end
+    end
+  end
+
+  module Findable
+    if singleton_class < Forwardable
+      def_delegators :with_default_scope, :pluck_all, :pluck_array
+    else
+      delegate :pluck_all, :pluck_array, to: :with_default_scope
+    end
+  end
+
+  module Contextual
+    if singleton_class < Forwardable
+      def_delegators :context, :pluck_all, :pluck_array
+    else
+      delegate :pluck_all, :pluck_array, to: :context
+    end
+
+    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.2.1'
-end
+# frozen_string_literal: true
+module PluckAll
+  VERSION = '2.3.3'
+end

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/pluck_all.gemspec

@@ -1,43 +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.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.2'
-
-  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.2.1
+  version: 2.3.3
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,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
@@ -115,7 +115,7 @@ files:
 - gemfiles/active_record_61.gemfile
 - gemfiles/mongoid_54.gemfile
 - gemfiles/mongoid_64.gemfile
-- gemfiles/mongoid_70.gemfile
+- gemfiles/mongoid_73.gemfile
 - lib/pluck_all.rb
 - lib/pluck_all/hooks.rb
 - lib/pluck_all/models/active_record_extension.rb
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.14
 signing_key: 
 specification_version: 4
 summary: Pluck multiple columns/attributes and return array of hashes. Support Rails

data/.travis.yml

@@ -1,73 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.2
-  - 2.6
-  - 2.7
-services:
-  - mongodb
-env:
-  global:
-    - CC_TEST_REPORTER_ID=db72eba1ff8fb1329dae5fb9b9dcd234243899d7a464ceb374e14a05ead27b7c
-  matrix:
-    - ORM_TYPE=ACTIVE_RECORD
-    - ORM_TYPE=MONGOID
-gemfile:
-  - gemfiles/active_record_32.gemfile
-  - gemfiles/active_record_42.gemfile
-  - 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
-matrix:
-  exclude:
-    - gemfile: gemfiles/active_record_32.gemfile
-      rvm: 2.6
-    - gemfile: gemfiles/active_record_32.gemfile
-      rvm: 2.7
-    - gemfile: gemfiles/active_record_32.gemfile
-      env: ORM_TYPE=MONGOID
-    - gemfile: gemfiles/active_record_42.gemfile
-      rvm: 2.7
-    - gemfile: gemfiles/active_record_42.gemfile
-      env: ORM_TYPE=MONGOID
-    - gemfile: gemfiles/active_record_50.gemfile
-      env: ORM_TYPE=MONGOID
-    - gemfile: gemfiles/active_record_51.gemfile
-      env: ORM_TYPE=MONGOID
-    - gemfile: gemfiles/active_record_52.gemfile
-      env: ORM_TYPE=MONGOID
-    - gemfile: gemfiles/active_record_60.gemfile
-      rvm: 2.2
-    - gemfile: gemfiles/active_record_60.gemfile
-      env: ORM_TYPE=MONGOID
-    - gemfile: gemfiles/active_record_61.gemfile
-      rvm: 2.2
-    - gemfile: gemfiles/active_record_61.gemfile
-      env: ORM_TYPE=MONGOID
-    - gemfile: gemfiles/mongoid_54.gemfile
-      rvm: 2.7
-    - gemfile: gemfiles/mongoid_54.gemfile
-      env: ORM_TYPE=ACTIVE_RECORD
-    - gemfile: gemfiles/mongoid_64.gemfile
-      env: ORM_TYPE=ACTIVE_RECORD
-    - gemfile: gemfiles/mongoid_70.gemfile
-      env: ORM_TYPE=ACTIVE_RECORD
-before_install:
-  - if `ruby -e 'exit(RUBY_VERSION.to_f < 2.7)'`; then
-      gem i rubygems-update -v '< 3' && update_rubygems;
-      gem install bundler -v '< 2';
-    fi
-  - gem --version
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script:
-  - if [ "$ORM_TYPE" = "ACTIVE_RECORD" ]; then bundle exec rake test_active_record; fi
-  - if [ "$ORM_TYPE" = "MONGOID" ]; then bundle exec rake test_mongoid; fi
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT