pluck_all 2.0.4 → 2.1.0

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install --gemfile=gemfiles/active_record_42.gemfile
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install --gemfile=gemfiles/active_record_42.gemfile
+
+# Do any other automated setup that you need to do here

data/gemfiles/active_record_60.gemfile

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in pluck_all.gemspec
+
+gem 'sqlite3',      '~> 1.4.1'
+gem 'activerecord', '~> 6.0.0'
+gem 'carrierwave',  '~> 0.11.0'
+
+group :test do
+  gem 'simplecov'
+end
+
+gemspec path: '../'

data/lib/pluck_all/hooks.rb

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

data/lib/pluck_all/models/active_record_extension.rb

@@ -1,130 +1,130 @@
-require_relative 'patches/attribute_types'
-require_relative 'patches/deserialize'
-
-class ActiveRecord::Relation
-  def cast_need_columns(column_names, _klass = nil)
-    @pluck_all_cast_need_columns = column_names.map(&:to_s)
-    @pluck_all_cast_klass = _klass
-    return self
-  end
-
-  def select_all(*column_names)
-    relation = clone
-    relation.select_values = [].freeze # cannot use `unscope(:select)` in Rails 3
-    return klass.connection.select_all(relation.select(column_names).to_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.map! do |attributes| # This map! behaves different to array#map!
-        initialized_attributes = klass.initialize_attributes(attributes)
-        attributes.each do |key, _attribute|
-          attributes[key] = klass.type_cast_attribute(key, initialized_attributes) # TODO: 現在AS過後的type cast會有一點問題
-        end
-        cast_carrier_wave_uploader_url(attributes) if cast_uploader_url
-        next attributes
-      end
-    end
-
-    private
-
-    def to_sql_column_name
-      proc do |column_name|
-        if column_name.is_a?(Arel::Attributes::Attribute)
-          "#{column_name.relation.name}.#{column_name.name}"
-        elsif column_name.is_a?(Symbol) && column_names.include?(column_name.to_s)
-          "#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column_name)}"
-        else
-          column_name.to_s
-        end
-      end
-    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!
-        attributes.each do |key, attribute|
-          attributes[key] = result.send(:column_type, key, attribute_types).deserialize(attribute) # TODO: 現在AS過後的type cast會有一點問題，但似乎原生的pluck也有此問題
-        end
-        cast_carrier_wave_uploader_url(attributes) if cast_uploader_url
-        next attributes
-      end
-    end
-
-    private
-
-    def to_sql_column_name
-      proc do |column_name|
-        if column_name.is_a?(Arel::Attributes::Attribute)
-          "#{column_name.relation.name}.#{column_name.name}"
-        elsif column_name.is_a?(Symbol) && attribute_alias?(column_name)
-          attribute_alias(column_name)
-        else
-          column_name.to_s
-        end
-      end
-    end
-  end
-
-  # ----------------------------------------------------------------
-  # ● Support casting CarrierWave url
-  # ----------------------------------------------------------------
-  def cast_carrier_wave_uploader_url(attributes)
-    if defined?(CarrierWave) && klass.respond_to?(:uploaders)
-      @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[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)
-        end
-      end
-    end
-    return attributes
-  end
-end
-
-class ActiveRecord::Relation
-  if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.2')
-    def pluck_array(*args)
-      return pluck_all(*args, cast_uploader_url: false).map do |hash|
-        result = hash.values # P.S. 這裡是相信ruby 1.9以後，hash.values的順序跟insert的順序一樣。
-        next (args.one? ? result.first : result)
-      end
-    end
-  else
-    alias pluck_array pluck if not method_defined?(:pluck_array)
-  end
-end
-
-class << ActiveRecord::Base
-  def cast_need_columns(*args)
-    where(nil).cast_need_columns(*args)
-  end
-
-  def pluck_all(*args)
-    where(nil).pluck_all(*args)
-  end
-
-  def pluck_array(*args)
-    where(nil).pluck_array(*args)
-  end
-end
-
-module ActiveRecord::NullRelation
-  def pluck_all(*_args)
-    []
-  end
-end
+require 'rails_compatibility/attribute_types'
+require_relative 'patches/deserialize'
+
+class ActiveRecord::Relation
+  def cast_need_columns(column_names, _klass = nil)
+    @pluck_all_cast_need_columns = column_names.map(&:to_s)
+    @pluck_all_cast_klass = _klass
+    return self
+  end
+
+  def select_all(*column_names)
+    relation = clone
+    relation.select_values = [].freeze # cannot use `unscope(:select)` in Rails 3
+    return klass.connection.select_all(relation.select(column_names).to_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.map! do |attributes| # This map! behaves different to array#map!
+        initialized_attributes = klass.initialize_attributes(attributes)
+        attributes.each do |key, _attribute|
+          attributes[key] = klass.type_cast_attribute(key, initialized_attributes) # TODO: 現在AS過後的type cast會有一點問題
+        end
+        cast_carrier_wave_uploader_url(attributes) if cast_uploader_url
+        next attributes
+      end
+    end
+
+    private
+
+    def to_sql_column_name
+      proc do |column_name|
+        if column_name.is_a?(Arel::Attributes::Attribute)
+          "#{column_name.relation.name}.#{column_name.name}"
+        elsif column_name.is_a?(Symbol) && column_names.include?(column_name.to_s)
+          "#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column_name)}"
+        else
+          column_name.to_s
+        end
+      end
+    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 = 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
+        cast_carrier_wave_uploader_url(attributes) if cast_uploader_url
+        next attributes
+      end
+    end
+
+    private
+
+    def to_sql_column_name
+      proc do |column_name|
+        if column_name.is_a?(Arel::Attributes::Attribute)
+          "#{column_name.relation.name}.#{column_name.name}"
+        elsif column_name.is_a?(Symbol) && attribute_alias?(column_name)
+          attribute_alias(column_name)
+        else
+          column_name.to_s
+        end
+      end
+    end
+  end
+
+  # ----------------------------------------------------------------
+  # ● Support casting CarrierWave url
+  # ----------------------------------------------------------------
+  def cast_carrier_wave_uploader_url(attributes)
+    if defined?(CarrierWave) && klass.respond_to?(:uploaders)
+      @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.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)
+        end
+      end
+    end
+    return attributes
+  end
+end
+
+class ActiveRecord::Relation
+  if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.2')
+    def pluck_array(*args)
+      return pluck_all(*args, cast_uploader_url: false).map do |hash|
+        result = hash.values # P.S. 這裡是相信ruby 1.9以後，hash.values的順序跟insert的順序一樣。
+        next (args.one? ? result.first : result)
+      end
+    end
+  else
+    alias pluck_array pluck if not method_defined?(:pluck_array)
+  end
+end
+
+class << ActiveRecord::Base
+  def cast_need_columns(*args)
+    where(nil).cast_need_columns(*args)
+  end
+
+  def pluck_all(*args)
+    where(nil).pluck_all(*args)
+  end
+
+  def pluck_array(*args)
+    where(nil).pluck_array(*args)
+  end
+end
+
+module ActiveRecord::NullRelation
+  def pluck_all(*_args)
+    []
+  end
+end

data/lib/pluck_all/version.rb

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

data/pluck_all.gemspec

@@ -26,8 +26,16 @@ Gem::Specification.new do |spec|
   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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluck_all
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2020-10-19 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.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +111,7 @@ files:
 - gemfiles/active_record_50.gemfile
 - gemfiles/active_record_51.gemfile
 - gemfiles/active_record_52.gemfile
+- gemfiles/active_record_60.gemfile
 - gemfiles/mongoid_54.gemfile
 - gemfiles/mongoid_64.gemfile
 - gemfiles/mongoid_70.gemfile
@@ -104,14 +119,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 +146,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.0.3
 signing_key: 
 specification_version: 4
 summary: Pluck multiple columns/attributes and return array of hashes. Support Rails

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

@@ -1,8 +0,0 @@
-class ActiveRecord::Base
-  if !defined?(attribute_types) && defined?(column_types)
-    class << self
-      # column_types was changed to attribute_types in Rails 5
-      alias attribute_types column_types
-    end
-  end
-end