pluck_all 2.0.3 → 2.0.4

data/Rakefile

@@ -1,22 +1,22 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
 
 Rake::TestTask.new(:test_active_record) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/active_record/**/*_test.rb']
 end
 
 Rake::TestTask.new(:test_mongoid) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/mongoid/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "pluck_all"
+require 'bundler/setup'
+require 'pluck_all'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "pluck_all"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install --gemfile=gemfiles/4.2.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_32.gemfile

@@ -2,13 +2,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pluck_all.gemspec
 
-gem "sqlite3",      "~> 1.3.0"
-gem "activerecord", "~> 3.2.0"
-gem "carrierwave",  "~> 0.11.0"
+gem 'sqlite3',      '~> 1.3.0'
+gem 'activerecord', '~> 3.2.0'
+gem 'carrierwave',  '~> 0.11.0'
 
 group :test do
-  gem "simplecov"
+  gem 'simplecov'
 end
 
-gemspec :path => "../"
-
+gemspec path: '../'

data/gemfiles/active_record_42.gemfile

@@ -2,13 +2,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pluck_all.gemspec
 
-gem "sqlite3",      "~> 1.3.0"
-gem "activerecord", "~> 4.2.0"
-gem "carrierwave",  "~> 0.11.0"
+gem 'sqlite3',      '~> 1.3.0'
+gem 'activerecord', '~> 4.2.0'
+gem 'carrierwave',  '~> 0.11.0'
 
 group :test do
-  gem "simplecov"
+  gem 'simplecov'
 end
 
-gemspec :path => "../"
-
+gemspec path: '../'

data/gemfiles/active_record_50.gemfile

@@ -2,13 +2,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pluck_all.gemspec
 
-gem "sqlite3",      "~> 1.3.0"
-gem "activerecord", "~> 5.0.0"
-gem "carrierwave",  "~> 0.11.0"
+gem 'sqlite3',      '~> 1.3.0'
+gem 'activerecord', '~> 5.0.0'
+gem 'carrierwave',  '~> 0.11.0'
 
 group :test do
-  gem "simplecov"
+  gem 'simplecov'
 end
 
-gemspec :path => "../"
-
+gemspec path: '../'

data/gemfiles/active_record_51.gemfile

@@ -2,13 +2,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pluck_all.gemspec
 
-gem "sqlite3",      "~> 1.3.0"
-gem "activerecord", "~> 5.1.0"
-gem "carrierwave",  "~> 0.11.0"
+gem 'sqlite3',      '~> 1.3.0'
+gem 'activerecord', '~> 5.1.0'
+gem 'carrierwave',  '~> 0.11.0'
 
 group :test do
-  gem "simplecov"
+  gem 'simplecov'
 end
 
-gemspec :path => "../"
-
+gemspec path: '../'

data/gemfiles/active_record_52.gemfile

@@ -2,13 +2,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pluck_all.gemspec
 
-gem "sqlite3",      "~> 1.3.0"
-gem "activerecord", "~> 5.2.0"
-gem "carrierwave",  "~> 0.11.0"
+gem 'sqlite3',      '~> 1.3.0'
+gem 'activerecord', '~> 5.2.0'
+gem 'carrierwave',  '~> 0.11.0'
 
 group :test do
-  gem "simplecov"
+  gem 'simplecov'
 end
 
-gemspec :path => "../"
-
+gemspec path: '../'

data/gemfiles/mongoid_54.gemfile

@@ -2,11 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pluck_all.gemspec
 
-gem "mongoid", "~> 5.4.0"
+gem 'mongoid', '~> 5.4.0'
 
 group :test do
-  gem "simplecov"
+  gem 'simplecov'
 end
 
-gemspec :path => "../"
-
+gemspec path: '../'

data/gemfiles/mongoid_64.gemfile

@@ -2,11 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pluck_all.gemspec
 
-gem "mongoid", "~> 6.4.0"
+gem 'mongoid', '~> 6.4.0'
 
 group :test do
-  gem "simplecov"
+  gem 'simplecov'
 end
 
-gemspec :path => "../"
-
+gemspec path: '../'

data/gemfiles/mongoid_70.gemfile

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

data/lib/pluck_all.rb

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

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
+    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

data/lib/pluck_all/models/active_record_extension.rb

@@ -1,142 +1,130 @@
-class ActiveRecord::Base
-  if !defined?(attribute_types) && defined?(column_types)
-    class << self
-      # column_types was changed to attribute_types in Rails 5
-      alias_method :attribute_types, :column_types
-    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)
-        # column_types was changed to attribute_types in Rails 5
-        alias deserialize type_cast_from_database
-      end
-    end
-  end
-end
-
-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
-    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?(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)
-      return construct_relation_for_association_calculations.pluck_all(*column_names) if has_include?(column_names.first)
-      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?(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{|hash|
-        result = hash.values #P.S. 這裡是相信ruby 1.9以後，hash.values的順序跟insert的順序一樣。
-        next (args.one? ? result.first : result)
-      }
-    end
-  else
-    alias_method :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_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