rails_select_on_includes 5.2.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d39a2874d64c8681290836b2a7a7ece40572769ab425c451ca4c4a1f854cd15
-  data.tar.gz: ad32d81616f470249d37d7da77f6af3f52670b050afc075216beb9d586730170
+  metadata.gz: e3af4d14781af22c9f021619f3ec07e83d353a96145227a1ab3c6dbc2b956ed1
+  data.tar.gz: fe28d9937d55fab0548ae565ddcf773697346866719bbdf5676a35d11d6adba4
 SHA512:
-  metadata.gz: df43fcd041449a955903f07a09055a92a346bfc607b45ca521469684636e0fc3d9629297a76b78292f4c27a2bd92d714d0027422d59698f5d3c8ffe658e45e7e
-  data.tar.gz: 7fdfd73563b6f769af6e8908de76ad71b11c002c26109cc59c0b102b5723dfa71379fb7723d6119779bb1f74c4893ddb01a3de39f8c59fb9029483ada1577381
+  metadata.gz: f0a10497309de2e7e3bc49fd84c9f104a115bcc6e960e0a1a28f1b45a502c5dbcc65286e3517c1a9942c5a753eb70da7cea35397e791fbbd07f123ebdec51803
+  data.tar.gz: 740bd6b513b7c45a3481f28322ea3527d09d9255cd71e079f333e59461eae8d0416909ab60400302869e707eccb4f7e43b3c94cb14ddce340abcce6135f1c49e

data/.travis.yml

@@ -0,0 +1,6 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.4.4
+  - 2.5.1
+  - 2.3.7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+#6.0.0
+* support for rails 6.0, master now on rails 6.
+
 # 5.2.1
 * resolve issue #16
 * add development dependencies on niceql and byebug

data/README.md

@@ -71,6 +71,9 @@ post.comments.first.testval # Undefined method!
 Add this line to your application's Gemfile:
 
 ```ruby
+#rails 6
+gem 'rails_select_on_includes', '~> 6.0.0'
+
 #rails 4
 gem 'rails_select_on_includes', '~> 0.4.11' 
 

data/lib/rails_select_on_includes.rb

@@ -10,13 +10,10 @@ require 'active_support/core_ext/string/filters'
         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]
-      }
+    @columns_cache = tables.each_with_object({}) { |table, h|
+      h[table.node] = table.columns
       @base_class_node_aliases ||= h[table.node] if table.node.is_a?(ActiveRecord::Associations::JoinDependency::JoinBase)
     }
-
     @virtual_attributes_names = []
   end
   # valid formats are:
@@ -59,7 +56,7 @@ require 'active_support/core_ext/string/filters'
   end
 
   def add_virtual_attribute(selected_column)
-    @base_class_node_aliases << [selected_column, selected_column]
+    @base_class_node_aliases << ActiveRecord::Associations::JoinDependency::Aliases::Column.new(selected_column, selected_column)
     @virtual_attributes_names << selected_column
   end
 end
@@ -102,7 +99,7 @@ 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)
+        construct(parent, join_root, row_hash, seen, model_cache)
       }
     end
 

data/lib/rails_select_on_includes/version.rb

@@ -1,3 +1,3 @@
 module RailsSelectOnIncludes
-  VERSION = "5.2.1"
+  VERSION = "6.0.0"
 end

data/rails_select_on_includes.gemspec

@@ -30,9 +30,9 @@ 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.2.1"
+  spec.add_dependency "activerecord", ">=6"
 
-  spec.add_development_dependency "rails", ">=5.2.1"
+  spec.add_development_dependency "rails", ">=6"
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'sqlite3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_select_on_includes
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 6.0.0
 platform: ruby
 authors:
 - alekseyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-25 00:00:00.000000000 Z
+date: 2019-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Patching rails include/select/virtual attributes issue