associationist 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5dc42ac69ef4e8beec23a8567406fa076dab9f64
-  data.tar.gz: de294aa901979338765ddd720b32e65804b83b76
+SHA256:
+  metadata.gz: c75eb700e6e6c890aec7cae636c49a57738a00771a12fd09f5dda2d162007e48
+  data.tar.gz: 362195a0a4dded2bb3a0d7ebf96ecdedecd03a8e886301e345206da54bce3242
 SHA512:
-  metadata.gz: e263253c65967cde5e4b30d2821e8807ca5ecfb12ff0f05721da7dfa746312982fbaf998fc8b2497b801cb9a13632b41996d0163a397f6bb9d57e976d7ac101e
-  data.tar.gz: 604af5c76a3c90963b003804734f16fbe3f99a64e9f31d0d6e2de4daeee2d51fd56a9a2554bf26120fea00ccf00d016f100b70069238cd0f2bc8c8b8c5c8f798
+  metadata.gz: b8688e1747f381abf579877309ca810e3835a10e1abe1dccba27254fa1c78f4bba9fb297e3b801543abb4ce0a8dfa38848b61727a73f37d7e6986306338ce38b
+  data.tar.gz: f113f4e66963eeef080acaceed81e533903121119696b1975041b6513436aaaebcb3f9f745fef72ce1cee986bc991396fb77678ab749e17ff474c53f9e81d488

data/lib/associationist/associations/collection_association.rb

@@ -2,7 +2,7 @@ module Associationist
   module Associations
     class CollectionAssociation < ::ActiveRecord::Associations::HasManyAssociation
       def association_scope
-        reflection.config.scope_proc.call(owner)
+        @_association_scope ||= reflection.config.scope_proc.call(owner)
       end
 
       def find_target?
@@ -27,6 +27,14 @@ module Associationist
           true
         end
       end
+
+      def self.define_writers(mixin, name)
+        mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{name}=(value)
+            raise "Virtual associations are read-only."
+          end
+        CODE
+      end
     end
   end
 end

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,11 @@ module Associationist
               end
             end
           end
+          self
+        end
+
+        def preloaded_records
+          @owners.flat_map { |owner| owner.association(@reflection.name).target }
         end
       end
 

data/lib/associationist/associations/singular_association.rb

@@ -2,11 +2,11 @@ module Associationist
   module Associations
     class SingularAssociation < ::ActiveRecord::Associations::SingularAssociation
       def association_scope
-        if reflection.config.scope_proc
-          reflection.config.scope_proc.call(owner)
-        else
-          raise NotImplementedError
-        end
+        @_association_scope ||= if reflection.config.scope_proc
+                                  reflection.config.scope_proc.call(owner)
+                                else
+                                  raise NotImplementedError
+                                end
       end
 
       def find_target

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,10 +25,23 @@ 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
 
+      def self.define_writers(mixin, name)
+        mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{name}=(value)
+            raise "Virtual associations are read-only."
+          end
+        CODE
+      end
+
     end
   end
 end

data/lib/associationist/version.rb

@@ -1,3 +1,3 @@
 module Associationist
-  VERSION = '0.1.2'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: associationist
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
-- CicholGricenchos
+- onyxblade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2020-08-21 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
@@ -104,7 +104,7 @@ files:
 - lib/associationist/reflection/collection_reflection.rb
 - lib/associationist/reflection/singular_reflection.rb
 - lib/associationist/version.rb
-homepage: https://github.com/CicholGricenchos/associationist
+homepage: https://github.com/onyxblade/associationist
 licenses:
 - MIT
 metadata: {}
@@ -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.1.2
 signing_key: 
 specification_version: 4
 summary: ''