miscellany 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee3173a46bc8dfb9c07bc8e6533776c332b6267e8d2465bada2e9d395192f199
-  data.tar.gz: cfef42a0855f7fe772e0ae50d08aaaca4fa6dba6a69caf189c1fbea1d076a168
+  metadata.gz: 592322f721c82c3a296438d483a372ac5dc4b06d2da56e1b4d614999ed7f1cb4
+  data.tar.gz: affc6540ac3f73d4096a544ab45d67e617da481aa97334e399bea704c5055c1e
 SHA512:
-  metadata.gz: 1035b6798d130d137a6feef1892dde982f04394fbdc228a63ab275685ba9cf460b84f909bdcae6bb5f41a78e952c237d331aaaf94ba4241d0c10bf984e24c3fe
-  data.tar.gz: d07f4e9beacb29caa4d5ca6e22e265240dc87857bab04b5165ed8d1587090811495095ba0a95579bb8ceac2fc25e7fec2c7af1c04ce06ea370fa5137d30c5ea9
+  metadata.gz: e7c5dd2f97d9998656c7eae1a1ef69c7091c09fdc0d34f7b98ccce3d18067751d67ee0b6790fa2c355149703becfe124a32eb6f65fc9b620cd5425ea66e8f6e4
+  data.tar.gz: 2cb31549f3dda188c255e0e3fb11d2770039eda248f63612e88bcfea13422e26228efc451369e69f2e688d5a0627ccbb815457d73b7b443fc19bec1b312d357e

data/lib/miscellany/active_record/arbitrary_prefetch.rb

@@ -16,6 +16,9 @@
 #     if you define a prefetch, it won't actually be loaded until you attempt to access it on one of the models.
 module Miscellany
   module ArbitraryPrefetch
+    ACTIVE_RECORD_VERSION = ::Gem::Version.new(::ActiveRecord::VERSION::STRING).release
+    PRE_RAILS_6_2 = ACTIVE_RECORD_VERSION < ::Gem::Version.new('6.2.0')
+
     class PrefetcherContext
       attr_accessor :model, :target_attribute
       attr_reader :options
@@ -49,7 +52,7 @@ module Miscellany
         @reflection ||= begin
           queryset = @queryset
           source_refl = model.reflections[@source_key.to_s]
-          scope = lambda { |*_args|
+          scope = lambda {|*_args|
             qs = queryset
             qs = qs.merge(source_refl.scope_for(model.unscoped)) if source_refl.scope
             qs
@@ -83,14 +86,16 @@ module Miscellany
         return super if loaded?
 
         records = super
-        preloader = nil
         (@values[:prefetches] || {}).each do |_key, opts|
           pfc = PrefetcherContext.new(model, opts)
           pfc.link_models(records)
 
           unless defined?(Goldiloader)
-            preloader ||= build_preloader
-            preloader.preload(records, opts[:attribute])
+            if PRE_RAILS_6_2
+              ::ActiveRecord::Associations::Preloader.new.preload(records, [opts[:attribute]])
+            else
+              ::ActiveRecord::Associations::Preloader.new(records: records, associations: [opts[:attribute]]).call
+            end
           end
         end
         records
@@ -143,15 +148,43 @@ module Miscellany
       end
     end
 
+    module ActiveRecordPreloaderPatch
+      if ACTIVE_RECORD_VERSION >= ::Gem::Version.new('6.0.0')
+        def grouped_records(association, records, polymorphic_parent)
+          h = {}
+          records.each do |record|
+            next unless record
+            reflection = record.class._reflect_on_association(association)
+            reflection ||= record.association(association)&.reflection
+            next if polymorphic_parent && !reflection || !record.association(association).klass
+            (h[reflection] ||= []) << record
+          end
+          h
+        end
+      end
+    end
+
+    module ActiveRecordReflectionPatch
+      def check_preloadable!
+        return if scope && scope.arity < 0
+        super
+      end
+    end
+
     def self.install
       ::ActiveRecord::Base.include(ActiveRecordBasePatch)
+
       ::ActiveRecord::Relation.prepend(ActiveRecordRelationPatch)
       ::ActiveRecord::Relation::Merger.prepend(ActiveRecordMergerPatch)
 
+      ::ActiveRecord::Associations::Preloader.prepend(ActiveRecordPreloaderPatch)
+
+      ::ActiveRecord::Reflection::AssociationReflection.prepend(ActiveRecordReflectionPatch)
+
       return unless defined? ::Goldiloader
 
       ::Goldiloader::AssociationLoader.module_eval do
-        def self.has_association?(model, association_name) # rubocop:disable Naming/PredicateName
+        def self.has_association?(model, association_name)
           model.association(association_name)
           true
         rescue ::ActiveRecord::AssociationNotFoundError => _err

data/lib/miscellany/version.rb

@@ -1,3 +1,3 @@
 module Miscellany
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miscellany
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ethan Knapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -270,7 +270,6 @@ files:
 - lib/miscellany/controller/http_error_handling.rb
 - lib/miscellany/controller/json_uploads.rb
 - lib/miscellany/controller/sliced_response.rb
-- lib/miscellany/controller/spa_render.rb
 - lib/miscellany/param_validator.rb
 - lib/miscellany/version.rb
 - miscellany.gemspec

data/lib/miscellany/controller/spa_render.rb

@@ -1,18 +0,0 @@
-module Miscellany
-  module SpaRender
-    extend ActiveSupport::Concern
-
-    def render(*args, **kwargs)
-      if kwargs[:spa].present?
-        js_env(kwargs.delete(:env))
-        kwargs[:template] ||= 'miscellany/spa_page'
-        kwargs[:locals] ||= {}
-        kwargs[:locals][:pack_name] ||= kwargs.delete(:spa)
-        kwargs[:formats] = [:html]
-        super(*args, **kwargs)
-      else
-        super
-      end
-    end
-  end
-end