rails_select_on_includes 0.5.7 → 5.1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58c0c965a81e2298fa093659f4b8cd490987b7ba
-  data.tar.gz: 40f53bca05f1f013bd7757702bb378db03bcbd21
+  metadata.gz: a469600a55953ed0756cd3c743cb63fe74ee37f3
+  data.tar.gz: bb03a46fd331813f085396cf5da81c9a0233e9e9
 SHA512:
-  metadata.gz: 4cf96d2b09cafac42251f840afb79f7fcabbb60f6ab7d51642d1a26014cf3563390064e6f77454a70983df04eba1132801a989af3c84a87b0b3527d60af4726f
-  data.tar.gz: 3b9381419cf0f8d44bc9cc23b8088016863b3c7759cf37fcf04c2ad8f48238b34123ba2314e2f684b0e99f6b3368d78a2d83b92c6d0841975c8b6bdf2a13457a
+  metadata.gz: e0e1d39a0dcab674aa7e148406f546f5c5b20b403b8be25f9f53e13d651a29a82594b8c329f15f0de18cbeeafb4110d9af3a4c0f9081e59f8b699b593c0402d5
+  data.tar.gz: a812ebc0e9c299de69979ddff256ca89c7e189db8d77c2bcdc8672c65d341dcbc25ad6240923e4d7f507933c7dc4742b4de9cd35275dfa065d57b10c2b035ec8

data/README.md

@@ -2,8 +2,11 @@
 Selected virtual attributes will be now typecasted as usual attributes
 
 #Rails version
-Supports rails 4.x and rails 5 now! 
-Maser is now runs on 5.x, rails_4 branch is for rails 4 support
+Supports rails 4.x and rails 5-5.1.4, and 5.1.5 now! 
+
+Master is now runs on rails 5.1.5, 
+rails_5.1.4 branch is for rails less than 5.1.5,
+rails_4 branch is for rails 4 support
 
 # RailsSelectOnIncludes
 
@@ -69,10 +72,13 @@ Add this line to your application's Gemfile:
 
 ```ruby
 #rails 4
-gem 'rails_select_on_includes', '~> 0.4.10' 
+gem 'rails_select_on_includes', '~> 0.4.11' 
+
+#rails 5.1.4
+gem 'rails_select_on_includes', '~> 5.1.4.0' 
 
-#rails 5
-gem 'rails_select_on_includes', '~> 0.5.6' 
+#rails 5.1.5
+gem 'rails_select_on_includes', '~> 5.1.5.0'
 ```
 
 And then execute:

data/lib/rails_select_on_includes.rb

@@ -62,80 +62,87 @@ require 'active_support/core_ext/string/filters'
   end
 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)
+  def instantiate(result_set, &block)
+    primary_key = aliases.column_alias(join_root, join_root.primary_key)
 
-  seen = Hash.new { |i, object_id|
-    i[object_id] = Hash.new { |j, child_class|
-      j[child_class] = {}
+    seen = Hash.new { |i, object_id|
+      i[object_id] = Hash.new { |j, child_class|
+        j[child_class] = {}
+      }
     }
-  }
-
-  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)
+
+    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
     }
-  end
-  parents.values
-end
-end
 
+    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, &block)
 
-::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
-    #
-    # failing to do so means that in cases like activerecord/test/cases/associations/inner_join_association_test.rb:136
-    # incorrect SQL is generated. In that case, the join dependency for
-    # SpecialCategorizations is constructed without knowledge of the
-    # preexisting join in joins_values to categorizations (by way of
-    # the `has_many :through` for categories).
-    #
-    join_dependency = construct_join_dependency(joins_values)
-
-    aliases  = join_dependency.aliases
-    relation = select aliases.columns
-    relation = apply_join_dependency(relation, join_dependency)
-
-    if block_given?
-      yield relation
-    else
-      if ActiveRecord::NullRelation === relation
-        []
-      else
-        arel = relation.arel
-        rows = connection.select_all(arel, 'SQL', relation.bound_attributes)
-        #1 DISTINCTION IS HERE:
-        # now we gently mokey-patching existing column aliases with select values
-        aliases.update_aliases_to_select_values(values[:select]) unless values[:select].blank?
-
-        join_dependency.instantiate(rows, aliases)
-      end
+        parent = parents[parent_key] ||=
+            join_root.instantiate(row_hash, column_aliases, aliases.slice_selected_attr_types( result_set.column_types ), &block )
+        construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
+      }
     end
+
+    parents.values
   end
 end
 
 
+::ActiveRecord::Relation.class_eval do
+  private
+
+    def exec_queries(&block)
+      @records =
+          if eager_loading?
+            find_with_associations do |relation, join_dependency|
+              if ActiveRecord::NullRelation === relation
+                []
+              else
+                rows = connection.select_all(relation.arel, "SQL", relation.bound_attributes)
+                #1 DISTINCTION IS HERE:
+                # now we gently mokey-patching existing column aliases with select values
+                join_dependency.aliases.update_aliases_to_select_values(values[:select]) unless values[:select].blank?
+
+                join_dependency.instantiate(rows, &block)
+              end.freeze
+            end
+          else
+            klass.find_by_sql(arel, bound_attributes, &block).freeze
+          end
+
+      preload = preload_values
+      preload += includes_values unless eager_loading?
+      preloader = nil
+      preload.each do |associations|
+        preloader ||= build_preloader
+        preloader.preload @records, associations
+      end
+
+      @records.each(&:readonly!) if readonly_value
+
+      @loaded = true
+      @records
+    end
+
+end

data/lib/rails_select_on_includes/version.rb

@@ -1,3 +1,3 @@
 module RailsSelectOnIncludes
-  VERSION = "0.5.7"
+  VERSION = "5.1.4.1"
 end

data/rails_select_on_includes.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">=5"
+  spec.add_dependency "activerecord", '>= 5', '<= 5.1.4'
 
   spec.add_development_dependency "rails", ">=5"
   spec.add_development_dependency "bundler", "~> 1.13"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_select_on_includes
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 5.1.4.1
 platform: ruby
 authors:
 - alekseyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 5.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement