miscellany 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72845736f45daa922b30d36b4adb18b1fc36b0e568f3b2d59c9c7c3194c18e28
-  data.tar.gz: d4e402081459c3691240d47df56bd2c3ee82ea7fa9b543f058c2540c63b24408
+  metadata.gz: 2e8daf2119169fb42523d39ed55e69d90dc43db0bed0178971b60aa279797a3e
+  data.tar.gz: 96716ff17fbc11304ead76e6c294888db6b48fad5f3fa7ea214b6fb445870260
 SHA512:
-  metadata.gz: '07283382e3066d8ae5e787226b3f4f4b424fd1a9069aefab6da9afe075f5ab5870794294d11bb7ccd7770d4168a3f57a59316b90441cea8e9854023799bfb6bc'
-  data.tar.gz: a2ee658dbd4fe63aa454fd3adfa5392c5447b2e0da04cf258230cfe2433958e06288f2db28d75d7ad3c24ffb75272f328ba86d8673b5b6f693e09ecf9f353635
+  metadata.gz: c0320bcd305fbbaa8588c705293ae81be13cd20e2b41cad37aaa56e4fc84c1a7414a79bc15f3d22337bc376307a56064df26d238a979f4a0da5edfd1567dfd4f
+  data.tar.gz: 6f6f45648681860132544efc225e35d0575c7cf6f8a0b478ade5fe4defab8be9a498dd26d4af3f4159c5737146cee5332c31d7c912b10a1c083c126205f87423

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.30".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.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Ethan Knapp