simple_resource_controller 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8362241a63c88604c893743e4dddc6e87ef4f51c036ac2f3d597af0a1857099d
-  data.tar.gz: 0f439681b0637be16b0f1194bf4545cc93b3cf10bdd8044502ff69470c967b7b
+  metadata.gz: 41e99ec931e6de3bf1a4d68cb23fe2357e8671c97ebbcf1bf7aecdb001bbc1f5
+  data.tar.gz: 1d18e94778a8f51b3a7bfe404e3a91b07a6889df7b632968e5735a34050d3e26
 SHA512:
-  metadata.gz: a20db372c476b423a58774cbb55fb0bb0b6ee518cc9bec64c94f4e405ba0f4a7617953971f4d3e7d1bacb40e8524ce3dd5c61fffea8ba05cf137d9b8fc284007
-  data.tar.gz: a93645e48f00c63fd7282dc7b8139532d7659197c7826e507e6b98bfc8202e20aa89dcecca5f03cad98cd1686a63bb091153d606a362a844fbd92b8180c440cc
+  metadata.gz: 020cfb5e4304c2f7527eecee4f62973d320837fc725a0d8b503440c674e67f1d88eac61bfb8553da6f663434f737787e10dcdc2560686e83949ee4b2e0f8ffac
+  data.tar.gz: cac6d60eff27e7688dc685a0f2193f196a47e4bc36ee05de6eeb4131d1943e83671e4157a2d565bcb90d13aa83ed2dc9339a1355596f541ac5f51417f49d91d3

data/README.md

@@ -70,7 +70,16 @@ Gem suppports [jbuilder](https://github.com/rails/jbuilder) and [activemodel_ser
 #### JBuilder
 
 ```ruby
-resource_api jbuilder: true
+class AnotherArticlesController < ApplicationController
+  resource_actions :crud
+  resource_api jbuilder: true
+
+  private
+
+  def permitted_params
+    params.require(:article).permit(:title)
+  end
+end
 ```
 
 But you will also need to add all view files for your actions, including `new` and `edit`.
@@ -82,13 +91,54 @@ But you will also need to add all view files for your actions, including `new` a
 Minimum config:
 
 ```ruby
-resource_api activemodel_serializer: { }
+class AnotherArticlesController < ApplicationController
+  resource_actions :crud
+  resource_api activemodel_serializer: { }
+
+  private
+
+  def permitted_params
+    params.require(:article).permit(:title)
+  end
+end
 ```
 
 All options:
 
 ```ruby
-resource_api activemodel_serializer: { record_serializer: MyArticleSerializer, error_serializer: MyErrorSerializer }
+class AnotherArticlesController < ApplicationController
+  resource_actions :crud
+  resource_api activemodel_serializer: { collection_serializer: MyCollectionSerializer, resource_serializer: MyArticleSerializer, error_serializer: MyErrorSerializer }
+
+  private
+
+  def permitted_params
+    params.require(:article).permit(:title)
+  end
+end
+```
+
+With redefined options:
+
+**Important note: you should always set the error_serializer**
+
+```ruby
+class AnotherArticlesController < ApplicationController
+  resource_actions :crud
+  resource_api activemodel_serializer: { collection_serializer: MyCollectionSerializer, resource_serializer: MyArticleSerializer, error_serializer: MyErrorSerializer }
+
+  # will use the AnotherArticleSerializer when success
+  # will use the MyErrorSerializer when failure
+  def update
+    update! serializer: AnotherArticleSerializer
+  end
+
+  private
+
+  def permitted_params
+    params.require(:article).permit(:title)
+  end
+end
 ```
 
 **You can find example inside tests.**

data/lib/simple_resource_controller/controller/actions.rb

@@ -3,6 +3,14 @@ module SimpleResourceController
     module Actions
       module Index
         def index(options={}, &block)
+          unless block_given?
+            if current_controller_api?
+              api_before_index_response_callback(options)
+            else
+              html_before_index_response_callback(options)
+            end
+          end
+
           respond_with collection, options, &block
         end
         alias :index! :index
@@ -10,6 +18,14 @@ module SimpleResourceController
 
       module Show
         def show(options={}, &block)
+          unless block_given?
+            if current_controller_api?
+              api_before_show_response_callback(options)
+            else
+              html_before_show_response_callback(options)
+            end
+          end
+
           respond_with resource, options, &block
         end
         alias :show! :show
@@ -47,7 +63,17 @@ module SimpleResourceController
 
       module Destroy
         def destroy(options={}, &block)
-          destroy_resource_and_respond!(options, &block)
+          resource.destroy
+
+          unless block_given?
+            if current_controller_api?
+              api_before_destroy_response_callback(options)
+            else
+              html_before_destroy_response_callback(options)
+            end
+          end
+
+          respond_with resource, options, &block
         end
         alias :destroy! :destroy
       end

data/lib/simple_resource_controller/controller/implementation/format/api.rb

@@ -5,13 +5,32 @@ module SimpleResourceController
         module Api
           private
 
+          def api_before_index_response_callback(options)
+            if activemodel_serializer?
+              resource_serializer = self.class.api_config.dig(:activemodel_serializer, :resource_serializer)
+              collection_serializer = self.class.api_config.dig(:activemodel_serializer, :collection_serializer)
+
+              options[:json] ||= collection
+              options[:each_serializer] ||= resource_serializer if resource_serializer.present?
+              options[:serializer] ||= collection_serializer if collection_serializer.present?
+            end
+          end
+
+          def api_before_show_response_callback(options)
+            if activemodel_serializer?
+              resource_serializer = self.class.api_config.dig(:activemodel_serializer, :resource_serializer)
+              options[:json] ||= resource
+              options[:serializer] ||= resource_serializer if resource_serializer.present?
+            end
+          end
+
           def api_before_save_success_response_callback(options)
             options[:status] ||= :created if action_name == "create"
 
             if activemodel_serializer?
-              record_serializer = self.class.api_config.dig(:activemodel_serializer, :record_serializer)
+              resource_serializer = self.class.api_config.dig(:activemodel_serializer, :resource_serializer)
               options[:json] ||= resource
-              options[:serializer] ||= record_serializer
+              options[:serializer] ||= resource_serializer if resource_serializer.present?
             end
           end
 
@@ -27,9 +46,9 @@ module SimpleResourceController
 
           def api_before_destroy_response_callback(options)
             if activemodel_serializer?
-              record_serializer = self.class.api_config.dig(:activemodel_serializer, :record_serializer)
+              resource_serializer = self.class.api_config.dig(:activemodel_serializer, :resource_serializer)
               options[:json] ||= resource
-              options[:serializer] ||= record_serializer
+              options[:serializer] ||= resource_serializer if resource_serializer.present?
             end
           end
 

data/lib/simple_resource_controller/controller/implementation/format/html.rb

@@ -5,6 +5,12 @@ module SimpleResourceController
         module Html
           private
 
+          def html_before_index_response_callback(options)
+          end
+
+          def html_before_show_response_callback(options)
+          end
+
           def html_before_save_success_response_callback(options)
             options[:location] ||= after_save_redirect_path
             setup_flash_messages(after_create_messages) if action_name == "create"

data/lib/simple_resource_controller/controller/implementation.rb

@@ -96,31 +96,23 @@ module SimpleResourceController
       def build_resource
         return instance_variable_get(:"@#{resource_name}") if instance_variable_get(:"@#{resource_name}").present?
 
-        new_instance = association_chain.is_a?(ActiveRecord::Relation) ? association_chain.build : association_chain.new
-        instance_variable_set(:"@#{resource_name}", new_instance)
+        instance = association_chain.is_a?(ActiveRecord::Relation) ? association_chain.build : association_chain.new
+        instance.assign_attributes(permitted_params) if action_name == "create"
+
+        instance_variable_set(:"@#{resource_name}", instance)
       end
 
       def resource
         return instance_variable_get(:"@#{resource_name}") if instance_variable_get(:"@#{resource_name}").present?
-        instance_variable_set(:"@#{resource_name}",  association_chain.find(params[:id]))
-      end
 
-      def destroy_resource_and_respond!(options={}, &block)
-        resource.destroy
-
-        unless block_given?
-          if current_controller_api?
-            api_before_destroy_response_callback(options)
-          else
-            html_before_destroy_response_callback(options)
-          end
-        end
+        instance = association_chain.find(params[:id])
+        instance.assign_attributes(permitted_params) if action_name == "update"
 
-        respond_with resource, options, &block
+        instance_variable_set(:"@#{resource_name}",  instance)
       end
 
       def save_resource_and_respond!(options={}, &block)
-        success = resource.update(permitted_params)
+        success = resource.save
 
         # process not saved result because of failed callback or another ActiveRecord magic
         if resource.valid? && !success

data/lib/simple_resource_controller/controller.rb

@@ -23,8 +23,6 @@ module SimpleResourceController
         raise 'Unknown action name' unless (actions - DEPENDENCIES_MAP.keys).size.zero?
       end
 
-      controller_class.extend Config
-
       loaded_modules = [Implementation]
 
       if actions.include?(ALL_ACTIONS_ALIAS)

data/lib/simple_resource_controller/railtie.rb

@@ -1,5 +1,6 @@
 module SimpleResourceController
   require 'rails'
+  require_relative './controller/config'
 
   class Railtie < Rails::Railtie
     initializer  'insert SimpleResourceController to ActionController' do
@@ -13,6 +14,7 @@ module SimpleResourceController
     def self.insert
       if defined?(::ActionController)
         ::ActionController::Base.extend(Configurator)
+        ::ActionController::Base.extend(SimpleResourceController::Controller::Config)
       end
     end
   end

data/lib/simple_resource_controller/version.rb

@@ -1,3 +1,3 @@
 module SimpleResourceController
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_resource_controller
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Oleg Zaporozhchenko