associationist 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 86629357a2894bef36a64e5b1509b7e9a15cef85
-  data.tar.gz: 943b4fe8c567c4c92d638efe961b8f07146843b9
+SHA256:
+  metadata.gz: a186e1fe166c48b9bafc22d84e421eb54b558fe3e004bb72ab8447d4e0ddf431
+  data.tar.gz: 39f5280cbc21527d1fc9f67e841ab9f8c1f40ef96a67012ee6967274de2903e1
 SHA512:
-  metadata.gz: 0a4b7c799474d1aff7511a8f77f4993b1f7cc70d59a0f83974cef653ae775bdc6636580046ef1ac8a912d90f3524a5ebcc0a26b04557999617354d6240ad5285
-  data.tar.gz: ad01edca0cd23d63c53165f6fccb5bf22ee41aa16c1e3abbf38e4fdafaae50a629749e36f1c9a56d2fdb41063a611594a3d6531c26dd966076113f1711029f33
+  metadata.gz: 6e769a4f0a5e5c4ea3d8c8a00ac1b2f06d4072e575a4e6131c0256a1846a6fbc0ddd6f0fb3f58a2ff0b9584a93946abc29bc5e12652969c49fb60c4e372abb07
+  data.tar.gz: bf4d00764a6deaebe802f2b60e2f0a8bed901abd50a244d47e421d2a7243f2dacdad36e849dcc2bb26188a2dff432f9c2697aa5a089b724ec15446f9561ae0dd

data/lib/associationist/associations/preloader/singular_association.rb

@@ -7,7 +7,8 @@ module Associationist
           @reflection = reflection
         end
 
-        def run preloader
+        # handle >= 6.0
+        def run preloader = nil
           case
           when @reflection.config.preloader_proc
             @reflection.config.preloader_proc.call(@owners).each do |record, value|
@@ -29,6 +30,7 @@ module Associationist
               end
             end
           end
+          self
         end
 
         def preloaded_records

data/lib/associationist/builder/collection_association.rb

@@ -18,7 +18,12 @@ module Associationist
 
         validate_options(options)
 
-        scope = build_scope(scope, extension)
+        case
+        when ActiveRecord.version >= Gem::Version.new('6.0.0')
+          scope = build_scope(scope)
+        else
+          scope = build_scope(scope, extension)
+        end
         Reflection::CollectionReflection.new(name, scope, options, model)
       end
     end

data/lib/associationist/builder/singular_association.rb

@@ -25,7 +25,12 @@ module Associationist
         raise ArgumentError, "association names must be a Symbol" unless name.kind_of?(Symbol)
 
         validate_options(options)
-        scope = build_scope(scope, extension)
+        case
+        when ActiveRecord.version >= Gem::Version.new('6.0.0')
+          scope = build_scope(scope)
+        else
+          scope = build_scope(scope, extension)
+        end
         Reflection::SingularReflection.new(name, scope, options, model)
       end
 

data/lib/associationist/version.rb

@@ -1,3 +1,3 @@
 module Associationist
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: associationist
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - CicholGricenchos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: ''