miscellany 0.1.29 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50e74322b5cc0f463bd09f082491be38e13cbdad7f0cab5e57ce6dfb11d104ec
-  data.tar.gz: b35718937386a37a7b8125d9006d8c54b4f9a59310bc460d1ad7bd72f87f2dbc
+  metadata.gz: 2e8daf2119169fb42523d39ed55e69d90dc43db0bed0178971b60aa279797a3e
+  data.tar.gz: 96716ff17fbc11304ead76e6c294888db6b48fad5f3fa7ea214b6fb445870260
 SHA512:
-  metadata.gz: f8594352d01054713237c5f70edab357aa69bd032ab6446746679998d359cf43b9f80e9b7d505f545581606b944e598d7e42f020b4b96fd706e48fe578468ba5
-  data.tar.gz: dcf72b6a6f6cd180198e62e611b3f1b43ba372b0cce95310d4eb092f92d656e858ce3a35d924e7873794873701572a594f8a57637c635299ecc7d3902313bb7b
+  metadata.gz: c0320bcd305fbbaa8588c705293ae81be13cd20e2b41cad37aaa56e4fc84c1a7414a79bc15f3d22337bc376307a56064df26d238a979f4a0da5edfd1567dfd4f
+  data.tar.gz: 6f6f45648681860132544efc225e35d0575c7cf6f8a0b478ade5fe4defab8be9a498dd26d4af3f4159c5737146cee5332c31d7c912b10a1c083c126205f87423

data/lib/miscellany/active_record/arbitrary_prefetch.rb

@@ -104,7 +104,7 @@ module Miscellany
         def add_prefetches!(kwargs)
           return unless kwargs.present?
 
-          if Rails.version < "8.0"
+          if Rails.version < "7.2"
             assert_mutability!
           else
             assert_modifiable!
@@ -233,6 +233,11 @@ module Miscellany
     def self.install
       apply_patches(ActiveRecordPatches, ::ActiveRecord)
 
+      begin
+        require "goldiloader"
+      rescue LoadError
+      end
+
       return unless defined? ::Goldiloader
 
       ::Goldiloader::AssociationLoader.module_eval do

data/lib/miscellany/controller/json_uploads.rb

@@ -4,32 +4,34 @@ module Miscellany
 
     # This hackery allows using JSON params along with file-uploads
     # On the frontend, use MultiPart form data, and add _parameters as an entry
-    def params
-      if @_params.nil?
-        params_obj = @_params = super
-        phash = params_obj.instance_variable_get(:@parameters)
-        if phash[:_parameters].present?
-          json_layer = JSON.parse(phash.delete(:_parameters))
-          shared_keys = phash.keys & json_layer.keys
-          main_layer = phash.slice(*shared_keys)
-          merge_params(json_layer, main_layer)
-          phash.merge!(json_layer)
-        end
+    def process_action(*)
+      json_param = request.request_parameters[:_parameters]
+      if json_param.present?
+        parsed = JSON.parse(json_param)
+        overlapping_params = request.request_parameters.slice(*(request.request_parameters.keys & parsed.keys))
+        _merge_json_params(parsed, overlapping_params)
+
+        request.parameters.merge! parsed
+        request.request_parameters.merge! parsed
       end
-      @_params
+      super
     end
 
     private
 
-    def merge_params(base, layer)
+    def _wrapper_enabled?
+      (_wrapper_options.format.include?(:json) && request.request_parameters[:_parameters].present?) || super
+    end
+
+    def _merge_json_params(base, layer)
       if base.is_a?(Array) && (layer.is_a?(Hash) || layer.is_a?(Array))
         base.each_with_index.map do |v, i|
           over_key = layer.is_a?(Hash) ? i.to_s : i
-          merge_params(v, layer[over_key])
+          _merge_json_params(v, layer[over_key])
         end
       elsif base.is_a?(Hash) && layer.is_a?(Hash)
         base.each do |k, v|
-          base[k] = merge_params(v, layer[k])
+          base[k] = _merge_json_params(v, layer[k])
         end
         layer.merge(base)
       else

data/lib/miscellany/version.rb

@@ -1,3 +1,3 @@
 module Miscellany
-  VERSION = "0.1.29".freeze
+  VERSION = "0.1.31".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miscellany
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.31
 platform: ruby
 authors:
 - Ethan Knapp