rest_framework 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285ffa895b2f49246b09e98dce670236ee322c5323c4f715b7cd9e27675b8a48
-  data.tar.gz: eead75ee8eaee0a62bcefe469e3957cedc480047b8819c4109c46c7ccd6f1372
+  metadata.gz: 2fa5466e302bc512ac4dc91b6f79c504bfcc88102be9282be9f55f33bad9a475
+  data.tar.gz: f940e69f12a56fc29ca69e10f81a33a5239bbbd8098966af308f2d4e7e2e1cbf
 SHA512:
-  metadata.gz: aa0ddef34da4717063c928a48d30fd08d9629db792e7560d03b15ba6bd2b77532715bd76de4348ab27c03ca556d26e2bf6b8bf625a7d972aa11370b67fc387b0
-  data.tar.gz: fc654b64c4cfe8e014047ee04a4c0eb60990a7d28491fe82686259c870098b27dcaa8a49e69f4fd650f50c51917ac9c5206fd1a49449a171d12816f615908b29
+  metadata.gz: 1089f785c9003daecb5c416f9122996526f585dd86639efd626bc90760f94d1c6c02eea72cb0c8cf3af67bd68feba9c1f520c8fce85827dec70ab22489b982c2
+  data.tar.gz: 833cbaf0e4ca413b0b96faa60eea950188764deebe6035501b2f28da1642aa173b442c13b89042d3c40fe4577651c1450b3a53ae240b99c9d3dd7321b139284f

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.2

data/lib/rest_framework/controller_mixins/models.rb

@@ -266,6 +266,13 @@ module RESTFramework::BaseModelControllerMixin
           # Update `required` if we find a presence validator.
           metadata[:required] = true if kind == :presence
 
+          # Resolve procs (and lambdas), and symbols for certain arguments.
+          if options[:in].is_a?(Proc)
+            options = options.merge(in: options[:in].call)
+          elsif options[:in].is_a?(Symbol)
+            options = options.merge(in: model.send(options[:in]))
+          end
+
           metadata[:validators] ||= {}
           metadata[:validators][kind] ||= []
           metadata[:validators][kind] << options
@@ -290,7 +297,7 @@ module RESTFramework::BaseModelControllerMixin
     def setup_delegation
       # Delegate extra actions.
       self.extra_actions&.each do |action, config|
-        next unless config.is_a?(Hash) && config[:delegate]
+        next unless config.is_a?(Hash) && config.dig(:metadata, :delegate)
         next unless self.get_model.respond_to?(action)
 
         self.define_method(action) do
@@ -306,7 +313,7 @@ module RESTFramework::BaseModelControllerMixin
 
       # Delegate extra member actions.
       self.extra_member_actions&.each do |action, config|
-        next unless config.is_a?(Hash) && config[:delegate]
+        next unless config.is_a?(Hash) && config.dig(:metadata, :delegate)
         next unless self.get_model.method_defined?(action)
 
         self.define_method(action) do

data/lib/rest_framework/utils.rb

@@ -16,15 +16,14 @@ module RESTFramework::Utils
         v = v.symbolize_keys
         methods = v.delete(:methods)
 
-        # First, remove any metadata keys.
-        delegate = v.delete(:delegate)
-        fields = v.delete(:fields)
+        # First, remove the route metadata.
+        metadata = v.delete(:metadata) || {}
 
         # Add label to fields.
-        if controller && fields
-          fields = fields.map { |f| [f, {}] }.to_h if f.is_a?(Array)
-          fields&.each do |field, cfg|
-            cfg[:label] = controller.get_label(field)
+        if controller && metadata[:fields]
+          metadata[:fields] = metadata[:fields].map { |f| [f, {}] }.to_h if f.is_a?(Array)
+          metadata[:fields]&.each do |field, cfg|
+            cfg[:label] = controller.get_label(field) unless cfg[:label]
           end
         end
 
@@ -47,8 +46,7 @@ module RESTFramework::Utils
           path: path,
           methods: methods,
           kwargs: kwargs,
-          delegate: delegate,
-          fields: fields,
+          metadata: metadata.presence,
           type: :extra,
         }.compact,
       ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_framework
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Gregory N. Schmit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-22 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails