associationist 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c677453494e691f75964f69bcb31bf51c570ca8
-  data.tar.gz: 32d6145dcc5dba97839d56c5a0120bbf186fdc74
+  metadata.gz: c13e33e027bf5c4f2179768a057f58ec9b9dbebb
+  data.tar.gz: 8bbf078f6efa66a7f50ba4472745b8dbfdf8cfa8
 SHA512:
-  metadata.gz: baa71bfc317a28311ce5fc555bab2b7a370314ab3803b4551e51af1e7cab49370ffbaedfbadc2ca2271c840797ef45fe92dd17a9251516ef0148c229e60c1946
-  data.tar.gz: 3dd0780d1b8a0928af9b73c8e2754f1200ee62219e7dd4e2bc166a621a45ec5a8b490070d3af3d7db2b5a50586d2dbaacae513253f4f57c32ee5c25aa50e17ea
+  metadata.gz: 69c81e0b47375b0a1cebd5eac7c294b1f582f04d65f099d99a6c7969d77131b80d2970da2c235cdc96922f57087f7a7d25e6b14530d88e59c0fe481ab85e7a95
+  data.tar.gz: 6701a7aba3615e53fe18045a5db0aa66e9605369a4b91818e9b890b4f8b5a3107663ecdb8ca80d14d872e0c2389700181c8911676c481247cedaa6cce05e1ced

data/lib/associationist/associations/collection_association.rb

@@ -0,0 +1,20 @@
+module Associationist
+  module Associations
+    class CollectionAssociation < ::ActiveRecord::Associations::CollectionAssociation
+      def association_scope
+        reflection.config.scope_proc.call(owner)
+      end
+
+      case
+      when ActiveRecord.version < Gem::Version.new('5.2.0')
+        def skip_statement_cache?
+          true
+        end
+      when ActiveRecord.version >= Gem::Version.new('5.2.0')
+        def skip_statement_cache? scope
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -1,23 +1,41 @@
 module Associationist
   module Associations
     module Preloader
-      class SingularAssociation < ActiveRecord::Associations::Preloader::SingularAssociation
-        def associated_records_by_owner preloader
-          reflection.config.preloader_proc.call(owners).map{|k, v| [k, [v]]}
+      class SingularAssociation
+        def initialize klass, owners, reflection, preload_scope
+          @owners = owners
+          @reflection = reflection
         end
 
+        def run preloader
+          @reflection.config.preloader_proc.call(@owners).map do |record, value|
+            record.association(@reflection.name).target = value
+          end
+        end
       end
 
     end
   end
 
   module ActiveRecordPreloaderPatch
-    def preloader_for(reflection, owners, rhs_klass)
-      config = reflection.options[:associationist]
-      if config
-        Associationist::Associations::Preloader::SingularAssociation
-      else
-        super
+    case
+    when ActiveRecord.version < Gem::Version.new('5.2.0')
+      def preloader_for(reflection, owners, rhs_klass)
+        config = reflection.options[:associationist]
+        if config
+          Associationist::Associations::Preloader::SingularAssociation
+        else
+          super
+        end
+      end
+    when ActiveRecord.version >= Gem::Version.new('5.2.0')
+      def preloader_for(reflection, owners)
+        config = reflection.options[:associationist]
+        if config
+          Associationist::Associations::Preloader::SingularAssociation
+        else
+          super
+        end
       end
     end
   end

data/lib/associationist/associations/singular_association.rb

@@ -1,12 +1,20 @@
 module Associationist
   module Associations
     class SingularAssociation < ::ActiveRecord::Associations::SingularAssociation
-      def scope
-        raise NotImplementedError
+      def association_scope
+        if reflection.config.scope_proc
+          reflection.config.scope_proc.call(owner)
+        else
+          raise NotImplementedError
+        end
       end
 
       def find_target
-        reflection.config.loader_proc.call(owner)
+        if reflection.config.scope_proc
+          super
+        else
+          reflection.config.loader_proc.call(owner)
+        end
       end
 
       def find_target?
@@ -14,7 +22,11 @@ module Associationist
       end
 
       def klass
-        Object
+        if reflection.config.scope_proc
+          super
+        else
+          Object
+        end
       end
 
       def force_reload_reader
@@ -22,6 +34,18 @@ module Associationist
         target
       end
 
+      case
+      when ActiveRecord.version < Gem::Version.new('5.2.0')
+        def skip_statement_cache?
+          true
+        end
+      when ActiveRecord.version >= Gem::Version.new('5.2.0')
+        def skip_statement_cache? scope
+          true
+        end
+      end
+
+
     end
   end
 end

data/lib/associationist/builder/collection_association.rb

@@ -0,0 +1,26 @@
+module Associationist
+  module Builder
+    class CollectionAssociation < ::ActiveRecord::Associations::Builder::CollectionAssociation
+      def self.macro
+        :has_many
+      end
+
+      def self.valid_options(options)
+        super + [:associationist]
+      end
+
+      def self.valid_dependent_options
+        [:destroy, :delete_all, :nullify, :restrict_with_error, :restrict_with_exception]
+      end
+
+      def self.create_reflection(model, name, scope, options, extension = nil)
+        raise ArgumentError, "association names must be a Symbol" unless name.kind_of?(Symbol)
+
+        validate_options(options)
+
+        scope = build_scope(scope, extension)
+        Reflection::CollectionReflection.new(name, scope, options, model)
+      end
+    end
+  end
+end

data/lib/associationist/config.rb

@@ -23,7 +23,21 @@ module Associationist
     end
 
     def type
-      @config[:type]
+      @config[:type] || :singular
+    end
+
+    def scope_proc
+      @config[:scope]
+    end
+
+    def check
+      if @config[:loader] && @config[:scope]
+        raise "cannot define both loader and scope"
+      end
+
+      if @config[:type] && !@config[:scope]
+        raise "type option only effects when scope defined"
+      end
     end
   end
 end

data/lib/associationist/mixin.rb

@@ -6,9 +6,18 @@ module Associationist
 
     def included base
       config = Config.new @raw_config
+      config.check
+
       reflection_options = {associationist: config}
 
-      reflection = Builder::SingularAssociation.build(base, config.name, nil, reflection_options)
+      case config.type
+      when :singular
+        reflection = Builder::SingularAssociation.build(base, config.name, nil, reflection_options)
+      when :collection
+        reflection = Builder::CollectionAssociation.build(base, config.name, nil, reflection_options)
+      else
+        raise "unknown type #{config.type.inspect}"
+      end
       ::ActiveRecord::Reflection.add_reflection base, config.name, reflection
     end
 

data/lib/associationist/reflection/collection_reflection.rb

@@ -0,0 +1,17 @@
+module Associationist
+  module Reflection
+    class CollectionReflection < ::ActiveRecord::Reflection::HasManyReflection
+      def association_class
+        Associations::CollectionAssociation
+      end
+
+      def check_eager_loadable!
+
+      end
+
+      def config
+        options[:associationist]
+      end
+    end
+  end
+end

data/lib/associationist/version.rb

@@ -1,3 +1,3 @@
 module Associationist
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: associationist
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - CicholGricenchos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2019-05-26 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.0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -94,11 +94,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/associationist.rb
+- lib/associationist/associations/collection_association.rb
 - lib/associationist/associations/preloader/singular_association.rb
 - lib/associationist/associations/singular_association.rb
+- lib/associationist/builder/collection_association.rb
 - lib/associationist/builder/singular_association.rb
 - lib/associationist/config.rb
 - lib/associationist/mixin.rb
+- lib/associationist/reflection/collection_reflection.rb
 - lib/associationist/reflection/singular_reflection.rb
 - lib/associationist/version.rb
 homepage: https://github.com/CicholGricenchos/associationist
@@ -121,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: ''