pluck_all 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4e9c99236d4d19b7bce24b3d03f816856c12bf2
-  data.tar.gz: 32b12e58e910477f6b07309cbd36517ceeb1bc03
+  metadata.gz: c81452c77b812b47946aa8f1b7d8d42722724707
+  data.tar.gz: 1eb4b3f65fd32ecd32065f0cb34938759c3a7ac8
 SHA512:
-  metadata.gz: 609f211a5cec23ea23ed82e9e817eb65fbbe8dba4e06773b1cb996deaa0672aba6f5b5d93fb895701c952c4486a1ee7331fa039f4580ee46d099843314612867
-  data.tar.gz: 2700b74ec0c40ba5cc8c3deb69ac432b9cd7857c1de01a91efdf466cf539888418eefa8fe0b7d5d1f836e9d6a6382a16a32ff8afb652d3854c1a8fa93eea6d51
+  metadata.gz: ec691ecc0da995f34ac68785b8d9d36318e008435a9847301e6cea6769e5fa9e998fbb439fe1c0facf9f7c41dc6656b5b42bcfd146de329f0557cbb7ca0f18ce
+  data.tar.gz: 72302a9cfacab2337a4919eb1f7f69ffc6003c47c804231eb91ceac46847f94e2948de4c514cedcbe6fc0452eefc0e728b7928fc71368bacf26475a314dc475f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Change Log
 
+### [upcoming](https://github.com/khiav223577/pluck_all/compare/v2.0.1...HEAD) 2018/06/29
+- [#28](https://github.com/khiav223577/pluck_all/pull/28) Fix test cases and the result format may be wrong when plucking multiple columns with nil value may (@khiav223577)
+- [#27](https://github.com/khiav223577/pluck_all/pull/27) [Feature] Mongoid Hooks And Tests Separation (@berniechiu)
+- [#26](https://github.com/khiav223577/pluck_all/pull/26) [FIX] Wrong Module Skipped (@berniechiu)
+
 ### [v2.0.1](https://github.com/khiav223577/pluck_all/compare/v2.0.0...v2.0.1) 2018/05/27
 - [#25](https://github.com/khiav223577/pluck_all/pull/25) Fix that project without mongoid will raise LoadError (@khiav223577)
 

data/lib/pluck_all/models/active_record_extension.rb

@@ -22,9 +22,21 @@ module ActiveRecord
 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(*args, cast_uploader_url: true)
-      result = select_all(*args)
+    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|
@@ -34,9 +46,23 @@ class ActiveRecord::Relation
         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(*args, cast_uploader_url: true)
-      result = select_all(*args)
+    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|
@@ -46,27 +72,18 @@ class ActiveRecord::Relation
         next attributes
       end
     end
-  end
 
-  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
-
-  private
+    private
 
-  def select_all(*args)
-    args.map! 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
+    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
-    relation = clone
-    return klass.connection.select_all(relation.select(args).to_sql)
-    #return klass.connection.select_all(relation.arel)
   end
 
   # ----------------------------------------------------------------

data/lib/pluck_all/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluck_all
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport