associationist 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a9835646291edd9f2d75a26abc8f3b91fcd411a1
-  data.tar.gz: 941be132ac91bb5d37e524d59d473dfc77ac62cb
+SHA256:
+  metadata.gz: 71ae82541e7c023fb388765d041d9f7e9cf3f13084a4299b7f6c2c954197cbf2
+  data.tar.gz: f49611ceb83887ed9fb24a41611259c3087f715fe612485f9240751613f0ef6a
 SHA512:
-  metadata.gz: aaafd92115b6034cbd557d317399124076ffeac833d7209cabd2b167a5307571a063dd2388f986458ea5792e36b41be35fcadd273a21042849405b20e1f85174
-  data.tar.gz: 178b0ee74e1494e0f10622a1e0d9c35d55fd270722106279d1c71d9023b4175537929495aac5ea170e0fe80e7ef4698aaf212eaf08351a52579af36b2ffbfe48
+  metadata.gz: 58b53ffc2067262d0f20682ac3eb26bd0f7cf1d23d3aeb7de1f490b6c8540d0923b0616ded48271f198aa46263a90d2f2dbdd8807cc29885e3a10108628e465e
+  data.tar.gz: a98b9f10263294b01ea57430fff3004da4ceb26a7395a3ee073071c124235cff37350ba98d0bc034599302d735edd302d5d29877aaff40f7e9420606f9da4702

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?
@@ -13,6 +13,10 @@ module Associationist
         false
       end
 
+      def klass
+        association_scope.klass
+      end
+
       case
       when ActiveRecord.version < Gem::Version.new('5.2.0')
         def skip_statement_cache?

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
@@ -23,7 +23,7 @@ module Associationist
 
       def klass
         if reflection.config.scope_proc
-          super
+          association_scope.klass
         else
           Object
         end

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)
+            association(:#{name}).target = value
+          end
+        CODE
+      end
+
     end
   end
 end

data/lib/associationist/reflection/collection_reflection.rb

@@ -9,6 +9,10 @@ module Associationist
 
       end
 
+      def has_cached_counter?
+        false
+      end
+
       def config
         options[:associationist]
       end

data/lib/associationist/reflection/singular_reflection.rb

@@ -13,6 +13,10 @@ module Associationist
         false
       end
 
+      def has_cached_counter?
+        false
+      end
+
       def config
         options[:associationist]
       end

data/lib/associationist/version.rb

@@ -1,3 +1,3 @@
 module Associationist
-  VERSION = '0.1.1'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: associationist
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - CicholGricenchos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 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
@@ -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: ''