rails-add_ons 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3304f03de5df92b79dbcbe3c9335e3fa66bdb5e
-  data.tar.gz: 9c27f2d35c275fdd82d71732b74dd0229e892588
+  metadata.gz: 8e074f79fe60106ad1f033af4e541a57c3408043
+  data.tar.gz: 34397cc5eecf03f97f98f2f7a91b283f2518f63f
 SHA512:
-  metadata.gz: 93d068c7e9021068d4284857721322a10c771b5183ca2c401d02b0384bd054ddd5f08840cf13ca81e441ed6392514c07512539d089329ec868432f870dcb9646
-  data.tar.gz: d82c2d27b6e54c06113ba147e3fc0539154f09364821e808de56a68d42379350b5ffb742ab77f23182fda4be80c20f75ca07a5957d84da1653bed414521717e1
+  metadata.gz: 605848c5d9f91c7ee298c810300436ff487b82d4b5bbf5cd59ff0bc1f0a6abfa4ee3e6a82d396d87f0f3ec79255c5ca4363fa078e51775f659d2b0c68dc5b9f3
+  data.tar.gz: 654ae257f587810df2202ba8f403b497e8038cfbfb32b0eb52140c342b6e4b530fb94cefe5aa8ab48ca3248df5364695299c465aaee7b12ae02a4c54f48bb9a8

data/app/concerns/resources_controller/kaminari.rb

@@ -0,0 +1,15 @@
+module ResourcesController::Kaminari
+  def self.included(base)
+    base.helper_method :paginate?
+  end
+
+  def paginate?
+    true
+  end
+
+  private
+
+  def load_collection
+    @collection = load_collection_scope.page(params[:page])
+  end
+end

data/app/concerns/service_controller/rest_actions.rb

@@ -0,0 +1,72 @@
+module ServiceController::RestActions
+  extend ActiveSupport::Concern
+
+  included do
+    respond_to :html
+    responders :flash
+
+    if respond_to?(:before_action)
+      before_action :initialize_service_for_invoke, only: [:invoke]
+      before_action :initialize_service_for_call, only: [:call]
+    else
+      before_filter :initialize_service_for_invoke, only: [:invoke]
+      before_filter :initialize_service_for_call, only: [:call]
+    end
+  end
+
+  def index
+  end
+
+  def invoke
+    respond_with @service
+  end
+
+  def call
+    @result = execute_service
+    if @result.success?
+
+      if respond_to?(:after_success_location)
+        redirect_to(after_success_location, notice: success_message)
+      else
+        flash.now[:success] = success_message
+        render :success
+      end
+    else
+      render :invoke
+    end
+  end
+
+  private
+
+  def success_message
+    t('flash.actions.perform.notice', resource_name: @resource.class.model_name.human)
+  end
+
+  def execute_service
+    @service.send(execute_method)
+  end
+
+  def execute_method
+    :perform
+  end
+
+  def hashified_params
+    if permitted_params.respond_to?(:to_h)
+      permitted_params.to_h
+    else
+      permitted_params
+    end
+  end
+
+  def initialize_service_for_invoke
+    service_class.new
+  end
+
+  def initialize_service_for_call
+    service_class.new(hashified_params)
+  end
+
+  def permitted_params
+    raise "Not implemented"
+  end
+end

data/app/concerns/service_controller/rest_service_urls.rb

@@ -0,0 +1,25 @@
+module ServiceController::RestServiceUrls
+  extend ActiveSupport::Concern
+  
+  included do
+    helper_method :collection_path,
+                  :call_service_path,
+                  :invoke_service_path
+  end
+
+  def collection_path
+    resource_router.send(:url_for, { action: :index, only_path: true })
+  end
+
+  def invoke_service_path
+    resource_router.send(:url_for, { action: :invoke, only_path: true })
+  end
+
+  def call_service_path
+    resource_router.send(:url_for, { action: :call, only_path: true })
+  end
+
+  def resource_router
+    self
+  end
+end

data/app/concerns/service_controller/service.rb

@@ -0,0 +1,11 @@
+module ServiceController::Service
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :service_class
+  end
+
+  def service_class
+    self.class.service_class
+  end
+end

data/app/concerns/service_controller/service_inflections.rb

@@ -0,0 +1,15 @@
+module ServiceController::ServiceInflections
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :inflections
+  end
+
+  private
+
+  def inflections
+    {
+      service_name: service_class.model_name.human(count: 1)
+    }
+  end
+end

data/app/controllers/api/resources_controller/base.rb

@@ -119,6 +119,10 @@ module Api
               scope = scope.order(condition)
             when 'includes'
               scope = scope.includes(condition.map(&:to_sym))
+            when 'scopes'
+              condition.each do |scope_name|
+                scope = scope.send(scope_name.to_sym)
+              end
             else
               condition_statement = ::Api::ResourcesController::ConditionParser.new(scope, field, condition).condition_statement
               scope = scope.where(condition_statement)
@@ -153,9 +157,7 @@ module Api
 
         def serialize_collection(collection)
           collection.collect do |resource|
-            json = resource.as_json
-            json[:errors] = serialize_errors(resource.errors) if resource.errors.any?
-            json
+            serialize_resource(resource)
           end
         end
 

data/app/helpers/rails/add_ons/table_helper.rb

@@ -25,7 +25,7 @@ module Rails
           end
 
           @view_context = view_context
-          @column_name  = column_name
+          @column_name  = @options[:column_name] || column_name
           @title        = title
 
           if h.params[:sort_direction].present?
@@ -47,4 +47,4 @@ module Rails
       end
     end
   end
-end
+end

data/lib/rails/add_ons/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module AddOns
-    VERSION = '1.4.1'
+    VERSION = '1.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-add_ons
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,6 +191,7 @@ files:
 - app/components/component/resource_table.rb
 - app/concerns/api_controller_concerns/exception_handling.rb
 - app/concerns/controller/query_conditions.rb
+- app/concerns/resources_controller/kaminari.rb
 - app/concerns/resources_controller/location_history.rb
 - app/concerns/resources_controller/pagination.rb
 - app/concerns/resources_controller/resource_inflections.rb
@@ -199,6 +200,10 @@ files:
 - app/concerns/resources_controller/rest_resource_urls.rb
 - app/concerns/resources_controller/sorting.rb
 - app/concerns/resources_controller/will_paginate.rb
+- app/concerns/service_controller/rest_actions.rb
+- app/concerns/service_controller/rest_service_urls.rb
+- app/concerns/service_controller/service.rb
+- app/concerns/service_controller/service_inflections.rb
 - app/controllers/api/resources_controller/base.rb
 - app/controllers/api/service_controller/base.rb
 - app/controllers/rails/add_ons/widgets_controller.rb