rest_framework 0.9.14 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a39ff15a5a6714fb7dc52f11e7db3cebe918805a44b0a8486567debebcefac
-  data.tar.gz: 5e2e530f249b567c64bb0d527875b291180052b07d61919bbbf76ae3f5ad7b1b
+  metadata.gz: 734af1c9a436fd842c36503794ef16b94e4b0d3f7ad91d011bcd12d06e4b1e21
+  data.tar.gz: d4c0140985a5405750cdd092c4a70b092be69b3523a3c088d2268711c38e5ad1
 SHA512:
-  metadata.gz: c15b1d0904dc34e2cbc095628b5d642213c0d33b6387e52b38660cf78b6552bc32818dca5ecbc5de710502139c7308fffb67a0a2aa3049749833c5e64a6757b5
-  data.tar.gz: 5656754554aa3bb4acc7ee333b72f21ea848d3e3cc8c06acf9e16d3529b427acfec9e00b3bac3ae67536b39608640146bcaab1459db77a7c6c46e6545e72dbae
+  metadata.gz: 4fc442c77a0c8543913ceacd7a7116f9e044ee1d9b0e3e08a5c58ddb6d00ee12b7f719c83e7aed233070075bb031aa8a90cabc7337bd57e28883aca4221d5ea6
+  data.tar.gz: 2f60ffddea13e956a3a0a0ec909d2de533cc0c5b350af75467f7e006b5133c982192cbcc28da7cb566803458c76917ae702f4838c3f0096722a94f5309babb7a

data/VERSION

@@ -1 +1 @@
-0.9.14
+0.9.15

data/lib/rest_framework/mixins/model_controller_mixin.rb

@@ -6,9 +6,11 @@ module RESTFramework::Mixins::BaseModelControllerMixin
     return {
       io: StringIO.new(Base64.decode64(payload)),
       content_type: content_type,
-      filename: "image_#{field}#{Rack::Mime::MIME_TYPES.invert[content_type]}",
+      filename: "file_#{field}#{Rack::Mime::MIME_TYPES.invert[content_type]}",
     }
   }
+  ACTIVESTORAGE_KEYS = [:io, :content_type, :filename, :identify, :key]
+
   include RESTFramework::BaseControllerMixin
 
   RRF_BASE_MODEL_CONFIG = {
@@ -411,18 +413,21 @@ module RESTFramework::Mixins::BaseModelControllerMixin
     # For fields, automatically add `_id`/`_ids` and `_attributes` variations for associations.
     variations = []
     hash_variations = {}
+    alt_hash_variations = {}
     reflections = self.class.get_model.reflections
     @_get_allowed_parameters = self.get_fields.map { |f|
       f = f.to_s
 
       # ActiveStorage Integration: `has_one_attached`.
       if reflections.key?("#{f}_attachment")
+        hash_variations[f] = ACTIVESTORAGE_KEYS
         next f
       end
 
       # ActiveStorage Integration: `has_many_attached`.
       if reflections.key?("#{f}_attachments")
         hash_variations[f] = []
+        alt_hash_variations[f] = ACTIVESTORAGE_KEYS
         next nil
       end
 
@@ -443,7 +448,9 @@ module RESTFramework::Mixins::BaseModelControllerMixin
       end
 
       if self.permit_nested_attributes_assignment
-        hash_variations["#{f}_attributes"] = self.class.get_field_config(f)[:sub_fields]
+        hash_variations["#{f}_attributes"] = (
+          self.class.get_field_config(f)[:sub_fields] + ["_destroy"]
+        )
       end
 
       # Associations are not allowed to be submitted in their bare form.
@@ -451,6 +458,7 @@ module RESTFramework::Mixins::BaseModelControllerMixin
     }.compact
     @_get_allowed_parameters += variations
     @_get_allowed_parameters << hash_variations
+    @_get_allowed_parameters << alt_hash_variations
     return @_get_allowed_parameters
   end
 
@@ -520,14 +528,22 @@ module RESTFramework::Mixins::BaseModelControllerMixin
     #
     # rubocop:enable Layout/LineLength
     self.class.get_model.attachment_reflections.keys.each do |k|
-      next unless (body_params[k].is_a?(String) && body_params[k].match?(BASE64_REGEX)) ||
-        (body_params[k].is_a?(Array) && body_params[k].all? { |v|
-          v.is_a?(String) && v.match?(BASE64_REGEX)
-        })
-
       if body_params[k].is_a?(Array)
-        body_params[k] = body_params[k].map { |v| BASE64_TRANSLATE.call(k, v) }
-      else
+        body_params[k] = body_params[k].map { |v|
+          if v.is_a?(String)
+            BASE64_TRANSLATE.call(k, v)
+          elsif v.is_a?(ActionController::Parameters)
+            if v[:io].is_a?(String)
+              v[:io] = StringIO.new(Base64.decode64(v[:io]))
+            end
+            v
+          end
+        }
+      elsif body_params[k].is_a?(ActionController::Parameters)
+        if body_params[k][:io].is_a?(String)
+          body_params[k][:io] = StringIO.new(Base64.decode64(body_params[k][:io]))
+        end
+      elsif body_params[k].is_a?(String)
         body_params[k] = BASE64_TRANSLATE.call(k, body_params[k])
       end
     end

data/lib/rest_framework/serializers/native_serializer.rb

@@ -271,6 +271,9 @@ class RESTFramework::Serializers::NativeSerializer < RESTFramework::Serializers:
         end
       elsif @model.method_defined?(f)
         methods << f
+      else
+        # Assume anything else is a virtual column.
+        columns << f
       end
     end
 

data/lib/rest_framework/utils.rb

@@ -159,9 +159,10 @@ module RESTFramework::Utils
     )
     parsed_fields += fields_hash[:include].map(&:to_s) if fields_hash[:include]
     parsed_fields -= fields_hash[:exclude].map(&:to_s) if fields_hash[:exclude]
+    parsed_fields -= fields_hash[:except].map(&:to_s) if fields_hash[:except]
 
     # Warn for any unknown keys.
-    (fields_hash.keys - [:only, :include, :exclude]).each do |k|
+    (fields_hash.keys - [:only, :except, :include, :exclude]).each do |k|
       Rails.logger.warn("RRF: Unknown key in fields hash: #{k}")
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_framework
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
 authors:
 - Gregory N. Schmit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-06 00:00:00.000000000 Z
+date: 2024-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails