rest_framework 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a9ae17435876f34d868d88ea187ae8844593a498f6d2d560c3ab2cfe1fa37a
-  data.tar.gz: ea04580ad618ed1e15f28cb29ed079e64beead85d77479a52896c10aed226bc8
+  metadata.gz: ce317c05e27ab6421b18f37595dbb846a747c8616d19fc9a1927a9ecc30fefc7
+  data.tar.gz: b8f88631bfca835f395677af0e0c0079b40c079aa8d9a6cc8c8ee46dc5d589c2
 SHA512:
-  metadata.gz: 3b596fb77e6bf656ce0fd7613ed2498019670b8576b022f6bda349d4f945d1502a2704bffb3d82a8cf2910ee0779f8fbcf2abae69bbd90e7734d59af1f2a8323
-  data.tar.gz: 9c11d18a0805d17adb55b15d2e5b75e563c7e065bf0734e330c2584991ba0301a542466d9ee5d87387ecd97848451656c0740fa5488d77cd3f187b1f8988aacb
+  metadata.gz: abd9fc1e83d61c60af77d834d3a3e03a4a904863f3ad4bb851d8cf35a5a563a322eef508a273764ce727303e3e25f526cca03a643127957a7d9952e4988de743
+  data.tar.gz: 8aadf4ba5467c645da2404df61880bd741a491eea0c14a09b20e7056726022f7fc7bd4b8a3f90e9ac068b578e63870c85cfaa813296245cf8c4fddfb7d002a66

data/lib/rest_framework/VERSION_STAMP

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/rest_framework/controller_mixins/base.rb

@@ -36,6 +36,8 @@ module RESTFramework
         ])
         base.rescue_from(ActiveRecord::RecordNotFound, with: :record_not_found)
         base.rescue_from(ActiveRecord::RecordInvalid, with: :record_invalid)
+        base.rescue_from(ActiveRecord::RecordNotSaved, with: :record_not_saved)
+        base.rescue_from(ActiveRecord::RecordNotDestroyed, with: :record_not_destroyed)
       end
     end
 
@@ -51,6 +53,14 @@ module RESTFramework
       return api_response({message: "Record not found.", exception: e}, status: 404)
     end
 
+    def record_not_saved(e)
+      return api_response({message: "Record not saved.", exception: e}, status: 406)
+    end
+
+    def record_not_destroyed(e)
+      return api_response({message: "Record not destroyed.", exception: e}, status: 406)
+    end
+
     def _get_routes
       begin
         formatter = ActionDispatch::Routing::ConsoleFormatter::Sheet
@@ -71,6 +81,11 @@ module RESTFramework
       json_kwargs ||= {}
       xml_kwargs ||= {}
 
+      # make empty responses status 204 unless a status is already explicitly defined
+      if (payload.nil? || payload == '') && !kwargs.key?(:status)
+        kwargs[:status] = 204
+      end
+
       respond_to do |format|
         if payload.respond_to?(:to_json)
           format.json {
@@ -94,7 +109,8 @@ module RESTFramework
           kwargs = kwargs.merge(html_kwargs)
           begin
             render(**kwargs)
-          rescue ActionView::MissingTemplate  # fallback to rest_framework default view
+          rescue ActionView::MissingTemplate  # fallback to rest_framework layout/view
+            kwargs[:layout] = "rest_framework"
             kwargs[:template] = "rest_framework/default"
           end
           render(**kwargs)

data/lib/rest_framework/controller_mixins/models.rb

@@ -13,6 +13,8 @@ module RESTFramework
           :recordset,
           :fields,
           :action_fields,
+          :native_serializer_config,
+          :native_serializer_action_config,
           :filterset_fields,
           :allowed_parameters,
           :allowed_action_parameters,
@@ -42,6 +44,19 @@ module RESTFramework
       return action_fields[action] || self.class.fields || []
     end
 
+    # Get a native serializer config for an action (or the current action if none given).
+    def get_native_serializer_config(action: nil)
+      native_serializer_action_config = self.class.native_serializer_action_config || {}
+
+      # action will, by default, be the current action name
+      action = action_name.to_sym unless action
+
+      # index action should use :list serializer config if :index is not provided
+      action = :list if action == :index && !native_serializer_action_config.key?(:index)
+
+      return native_serializer_action_config[action] || self.class.native_serializer_config
+    end
+
     # Get a list of parameters allowed for an action (or the current action if none given).
     def get_allowed_parameters(action: nil)
       allowed_action_parameters = self.class.allowed_action_parameters || {}
@@ -178,12 +193,8 @@ module RESTFramework
   module DestroyModelMixin
     def destroy
       @record = self.get_record
-      if @record
-        @record.destroy!
-        api_response('')
-      else
-        api_response({detail: "Method 'DELETE' not allowed."}, status: 405)
-      end
+      @record.destroy!
+      api_response(nil)
     end
   end
 

data/lib/rest_framework/serializers.rb

@@ -24,17 +24,26 @@ module RESTFramework
 
     # Get a configuration passable to `as_json` for the model.
     def get_native_serializer_config
+      # return a serializer config if one is defined
+      serializer_config = @controller.send(:get_native_serializer_config)
+      return serializer_config if serializer_config
+
+      # build serializer config from fields
       fields = @controller.send(:get_fields)
       unless fields.blank?
         columns, methods = fields.partition { |f| f.to_s.in?(@model.column_names) }
         return {only: columns, methods: methods}
       end
+
       return {}
     end
 
     # Convert the object(s) to Ruby primitives.
     def serialize
-      return @object.as_json(self.get_native_serializer_config)
+      if @object
+        return @object.as_json(self.get_native_serializer_config)
+      end
+      return nil
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_framework
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Gregory N. Schmit