occams-record 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79f596ff4340bb78be9568862a4e2ed4b170cc5e5433ea5e89d039e05d12b608
-  data.tar.gz: 461865caca31938b4edcef8ad8301654a78d0d7f335cef094b8e939c6a02bb5d
+  metadata.gz: 2b133d571ce7f9e293908fe1a19e7b835032daa6df97c8b24ecd5a62aba90d59
+  data.tar.gz: db6b2825f6a449be9fa4354d062c45b7705a00a99faefe3ec3b6549e852f59d2
 SHA512:
-  metadata.gz: 3e2a1ed22da61aecccf805fbe5cfbae7abe4b9b49ffb55fc270f9166744d5e36eac8acbb4d0e6a4cb76da537a1f18daca40d28c574425d5cb12c658126f0a62c
-  data.tar.gz: ff1d5d5e82e39e88a7316905b9342209bd91c7c76a7b26418a48ae96344849701a4abcac2729980ace7a42be09ba6419360d49efeebde942b3e3838a9ef2c1db
+  metadata.gz: 60ebbebfea762188eb0b05e6d80821299f243e91a58ff9b4feea538e3363a6975ef07268c8fef4233442c92f6ff6283c02b884f4c030cfe0f4ea4ceb95fdf429
+  data.tar.gz: e6d2b6e806a238fb910a2abc4cf3415f4376e2c169039f9ab276b17fb833582ea4222b842e5b887150d97441be04772cb47c4544bf36ada165ef593d00c97dd2

data/lib/occams-record/eager_loaders/context.rb

@@ -18,9 +18,11 @@ module OccamsRecord
       # Initialize a new eager loading context.
       #
       # @param mode [ActiveRecord::Base] the model that contains the associations that will be referenced.
+      # @param polymorphic [Boolean] When true, model is allowed to change, and it's assumed that not every loader
+      # is applicable to every model.
       #
-      def initialize(model = nil)
-        @model = model
+      def initialize(model = nil, polymorphic: false)
+        @model, @polymorphic = model, polymorphic
         @loaders = []
         @dynamic_loaders = []
       end
@@ -33,8 +35,8 @@ module OccamsRecord
       def model=(model)
         @model = model
         @loaders = @loaders + @dynamic_loaders.map { |args|
-          build_loader(*args)
-        }
+          @polymorphic ? build_loader(*args) : build_loader!(*args)
+        }.compact
         @dynamic_loaders = []
       end
 
@@ -75,7 +77,7 @@ module OccamsRecord
       #
       def add(assoc, scope = nil, select: nil, use: nil, as: nil, optimizer: :select, &builder)
         if @model
-          loader = build_loader(assoc, scope, select, use, as, optimizer, builder)
+          loader = build_loader!(assoc, scope, select, use, as, optimizer, builder)
           @loaders << loader
           loader
         else
@@ -100,10 +102,16 @@ module OccamsRecord
 
       private
 
+      def build_loader!(assoc, scope, select, use, as, optimizer, builder)
+        build_loader(assoc, scope, select, use, as, optimizer, builder) ||
+          raise("OccamsRecord: No assocation `:#{assoc}` on `#{@model.name}` or subclasses")
+      end
+
       def build_loader(assoc, scope, select, use, as, optimizer, builder)
-        ref = @model.reflections[assoc.to_s]
-        ref ||= @model.subclasses.map(&:reflections).detect { |x| x.has_key? assoc.to_s }&.[](assoc.to_s)
-        raise "OccamsRecord: No assocation `:#{assoc}` on `#{@model.name}` or subclasses" if ref.nil?
+        ref = @model.reflections[assoc.to_s] ||
+          @model.subclasses.map(&:reflections).detect { |x| x.has_key? assoc.to_s }&.[](assoc.to_s)
+        return nil if ref.nil?
+
         scope ||= ->(q) { q.select select } if select
         loader_class = !!ref.through_reflection ? EagerLoaders::Through : EagerLoaders.fetch!(ref)
         loader_class.new(ref, scope, use: use, as: as, optimizer: optimizer, &builder)

data/lib/occams-record/eager_loaders/polymorphic_belongs_to.rb

@@ -21,7 +21,7 @@ module OccamsRecord
         @name = (as || ref.name).to_s
         @foreign_type = @ref.foreign_type.to_sym
         @foreign_key = @ref.foreign_key.to_sym
-        @eager_loaders = EagerLoaders::Context.new
+        @eager_loaders = EagerLoaders::Context.new(nil, polymorphic: true)
         instance_eval(&builder) if builder
       end
 

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # Library version
-  VERSION = '0.33.0'.freeze
+  VERSION = '0.34.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Jordan Hollinger