rails_select_on_includes 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a2caeab29b58b5631fc738fa18f31f5256108e1
-  data.tar.gz: 7d9fd421155250e63ed2557b8e60c60c3b9b8650
+  metadata.gz: 7b57b9f8c06e67c99cf4719b7bb192778e4da854
+  data.tar.gz: f551cd5aac2d88d2eb159e64002194cf892cc3b5
 SHA512:
-  metadata.gz: fbe99ddb4401a7ddfbbec3d391880d3350e627e28ea75561a7aa39816439e9462ba75102c80aadc45ff1e70bf2e23e74e68d83faa8931f8659ad026c6977f13e
-  data.tar.gz: 600c219a75816d2dce8fb54563e77ff9b185a2b014928e37de8550bf6f33dfc2e128d917448cbbf6a6254c46ba997c61dcf1057bede6d2eb0c01535f945b1f5a
+  metadata.gz: 5dd172b53816e4ddd23c827827f51a27811739496c4b446eed27d860e3dfb61e023e24b550a6a8cdcaa5c4df88f179bf566a6cf7642177ed9f37dd1f75752fc6
+  data.tar.gz: f45c2992a8f78bb673946ae334764b986cdcea5a8c90aae2c1d5438f8647a0358c105bfc6e2a5b14948f76ffe738342ca38a5e8e62822ac11fe8bf8d96d0de80

data/README.md

@@ -1,9 +1,13 @@
+#Rails version
+
+Supports rails 4.x and rails 5 now!
+
 # RailsSelectOnIncludes
 
-This gem solves issue in rails: https://github.com/rails/rails/issues/15185 for base_class.
+This gem solves issue in rails: https://github.com/rails/rails/issues/15185 for base_class. 
 
 It was impossible to select virtual attributes to object from its relations or any other way 
-when using includes and where. 
+when using includes and where ( actually when includes becomes eager_load, i.e. when you add not SOME_CONDITION, but SOME_CONDITION_ON_INCLUDES, http://blog.bigbinary.com/2013/07/01/preload-vs-eager-load-vs-joins-vs-includes.html ). 
 
 Example from upper rails issue: 
 
@@ -30,7 +34,7 @@ post.comments.first.testval # Undefined method!
 
 Данный gem решает проблему в рельсах с виртуальными аттрибутами при использовании includes, 
 когда рельсы собирают в запрос в joins с алиасами на все аттрибуты. В настоящий момент в модель не собираются 
-никаким боком виртуальные аттрибуты.
+никаким боком виртуальные аттрибуты ( имеется ввиду когда includes ведет себя как eager_load и создает сложный одинарный запрос, подробнее: http://blog.bigbinary.com/2013/07/01/preload-vs-eager-load-vs-joins-vs-includes.html ).
 
 В частности проблема описана здесь: https://github.com/rails/rails/issues/15185 
 
@@ -56,12 +60,16 @@ post.comments.first.testval # Undefined method!
 ```
 
 
-## Installation
+## Installation 
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rails_select_on_includes'
+#rails 4
+gem 'rails_select_on_includes', '~> 0.4.3' 
+
+#rails 5
+gem 'rails_select_on_includes', '~> 0.5.0' 
 ```
 
 And then execute:

data/lib/rails_select_on_includes.rb

@@ -1,112 +1,106 @@
 require 'active_support/deprecation'
 require 'active_support/core_ext/string/filters'
 
-module ActiveRecord
-  module Associations
-    class JoinDependency # :nodoc:
-
-      class Aliases # :nodoc:
-        def initialize(tables)
-          @tables = tables
-          @alias_cache = tables.each_with_object({}) { |table,h|
-            h[table.node] = table.columns.each_with_object({}) { |column,i|
-              i[column.name] = column.alias
-            }
-          }
-          @name_and_alias_cache = tables.each_with_object({}) { |table,h|
-            h[table.node] = table.columns.map { |column|
-              [column.name, column.alias]
-            }
-            @base_class_node_aliases ||= h[table.node] if table.node.is_a?(ActiveRecord::Associations::JoinDependency::JoinBase)
-          }
-
-          @virtual_attributes_names = []
-        end
-        # valid formats are:
-        # 1 'table_name.column' or 'table_name.column as column_1' will be parsed! distinct on can be used also
-        # 2 {table_name: column} or { table_name: [column1, column2] }
-        # 3 table_name: 2
-        def update_aliases_to_select_values( select_values )
-          return if select_values.blank?
-          select_values.each do |sv|
-            # if sv is symbol that we assume that its a base table column and it will be aliased and added as usual
-            # all we need is some specials joins+select from related tables
-            if sv.is_a?(Hash)
-              flatten_hash_values(sv).each{|sub_sv| @base_class_node_aliases << [sub_sv, sub_sv]; @virtual_attributes_names << sub_sv }
-            elsif sv.is_a?(String)
-              # this is the case of long raw select
-              sv.split( ", " ).each do |sub_sv|
-                if sub_sv[/.+ as .+/i]
-                  selected_column = sub_sv[/ as .+/i][4..-1]
-                  @base_class_node_aliases << [selected_column, selected_column]
-                  @virtual_attributes_names << selected_column
-                elsif sub_sv[/.+\.[^\*]+/]
-                  selected_column = sub_sv[/\..+/][1..-1]
-                  @base_class_node_aliases << [selected_column, selected_column]
-                  @virtual_attributes_names << selected_column
-                end
-              end
-            end
-          end
-        end
 
-        def slice_selected_attr_types( column_types )
-          column_types.slice( *@virtual_attributes_names )
-        end
-
-        private
-        def flatten_hash_values( some_hash )
-          some_hash.values.map{ |value| value.is_a?(Hash) ? flatten_hash_values( value ) : value }.flatten
+::ActiveRecord::Associations::JoinDependency::Aliases.class_eval do # :nodoc:
+  def initialize(tables)
+    @tables = tables
+    @alias_cache = tables.each_with_object({}) { |table,h|
+      h[table.node] = table.columns.each_with_object({}) { |column,i|
+        i[column.name] = column.alias
+      }
+    }
+    @name_and_alias_cache = tables.each_with_object({}) { |table,h|
+      h[table.node] = table.columns.map { |column|
+        [column.name, column.alias]
+      }
+      @base_class_node_aliases ||= h[table.node] if table.node.is_a?(ActiveRecord::Associations::JoinDependency::JoinBase)
+    }
+
+    @virtual_attributes_names = []
+  end
+  # valid formats are:
+  # 1 'table_name.column' or 'table_name.column as column_1' will be parsed! distinct on can be used also
+  # 2 {table_name: column} or { table_name: [column1, column2] }
+  # 3 table_name: 2
+  def update_aliases_to_select_values( select_values )
+    return if select_values.blank?
+    select_values.each do |sv|
+      # if sv is symbol that we assume that its a base table column and it will be aliased and added as usual
+      # all we need is some specials joins+select from related tables
+      if sv.is_a?(Hash)
+        flatten_hash_values(sv).each{|sub_sv| @base_class_node_aliases << [sub_sv, sub_sv]; @virtual_attributes_names << sub_sv }
+      elsif sv.is_a?(String)
+        # this is the case of long raw select
+        sv.split( ", " ).each do |sub_sv|
+          if sub_sv[/.+ as .+/i]
+            selected_column = sub_sv[/ as .+/i][4..-1]
+            @base_class_node_aliases << [selected_column, selected_column]
+            @virtual_attributes_names << selected_column
+          elsif sub_sv[/.+\.[^\*]+/]
+            selected_column = sub_sv[/\..+/][1..-1]
+            @base_class_node_aliases << [selected_column, selected_column]
+            @virtual_attributes_names << selected_column
+          end
         end
       end
+    end
+  end
 
-      class JoinBase
-        def instantiate(row, aliases, column_types = {}, &block)
-          base_klass.instantiate(extract_record(row, aliases), column_types, &block)
-        end
-      end
+  def slice_selected_attr_types( column_types )
+    column_types.slice( *@virtual_attributes_names )
+  end
 
-      def instantiate(result_set, aliases)
-        primary_key = aliases.column_alias(join_root, join_root.primary_key)
-
-        seen = Hash.new { |h,parent_klass|
-          h[parent_klass] = Hash.new { |i,parent_id|
-            i[parent_id] = Hash.new { |j,child_klass| j[child_klass] = {} }
-          }
-        }
-
-        model_cache = Hash.new { |h,klass| h[klass] = {} }
-        parents = model_cache[join_root]
-        column_aliases = aliases.column_aliases join_root
-
-        message_bus = ActiveSupport::Notifications.instrumenter
-
-        payload = {
-            record_count: result_set.length,
-            class_name: join_root.base_klass.name
-        }
-
-        message_bus.instrument('instantiation.active_record', payload) do
-          result_set.each { |row_hash|
-            parent_key = primary_key ? row_hash[primary_key] : row_hash
-            # DISTINCTION PART > join_root.instantiate(row_hash, column_aliases, aliases.slice_selected_attr_types( result_set.column_types ) )
-            # PREVIOUS         > join_root.instantiate(row_hash, column_aliases )
-            parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases, aliases.slice_selected_attr_types( result_set.column_types ) )
-            construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
-          }
-        end
+  private
+  def flatten_hash_values( some_hash )
+    some_hash.values.map{ |value| value.is_a?(Hash) ? flatten_hash_values( value ) : value }.flatten
+  end
+end
 
-        parents.values
-      end
+::ActiveRecord::Associations::JoinDependency::JoinBase.class_eval do
+  def instantiate(row, aliases, column_types = {}, &block)
+    base_klass.instantiate(extract_record(row, aliases), column_types, &block)
+  end
+end
 
+::ActiveRecord::Associations::JoinDependency.class_eval do
+  def instantiate(result_set, aliases)
+    primary_key = aliases.column_alias(join_root, join_root.primary_key)
+
+    seen = Hash.new { |h,parent_klass|
+      h[parent_klass] = Hash.new { |i,parent_id|
+        i[parent_id] = Hash.new { |j,child_klass| j[child_klass] = {} }
+      }
+    }
+
+    model_cache = Hash.new { |h,klass| h[klass] = {} }
+    parents = model_cache[join_root]
+    column_aliases = aliases.column_aliases join_root
+
+    message_bus = ActiveSupport::Notifications.instrumenter
+
+    payload = {
+        record_count: result_set.length,
+        class_name: join_root.base_klass.name
+    }
+
+    message_bus.instrument('instantiation.active_record', payload) do
+      result_set.each { |row_hash|
+        parent_key = primary_key ? row_hash[primary_key] : row_hash
+        # DISTINCTION PART > join_root.instantiate(row_hash, column_aliases, aliases.slice_selected_attr_types( result_set.column_types ) )
+        # PREVIOUS         > join_root.instantiate(row_hash, column_aliases )
+        parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases, aliases.slice_selected_attr_types( result_set.column_types ) )
+        construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
+      }
     end
+
+    parents.values
   end
 end
 
-module ActiveRecord
-  module FinderMethods
 
-    def find_with_associations
+::ActiveRecord::FinderMethods.class_eval do
+  def find_with_associations
       # NOTE: the JoinDependency constructed here needs to know about
       #       any joins already present in `self`, so pass them in
       #
@@ -138,7 +132,6 @@ module ActiveRecord
         end
       end
     end
-
-  end
 end
 
+

data/lib/rails_select_on_includes/version.rb

@@ -1,3 +1,3 @@
 module RailsSelectOnIncludes
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_select_on_includes
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - alekseyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord