rails-add_ons 1.5.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a60eef5c38dafca32f4fdaf89ba17d77a5a63381
-  data.tar.gz: a9db57320510f42ddca6f617296fc1fc9a3279f1
+  metadata.gz: 69a1ab049ebb2b6cb5ffeaf53cf556dcb4d47087
+  data.tar.gz: '0683101275419fdf2c44f61aa469a9564885d749'
 SHA512:
-  metadata.gz: 6b4a5ad94861003cac7785b22b922c2d38f6e2eac8a8558bdcb3925edbf3a033b78cdcb66b475ad24cc147f56850c74d1bff45670e29cfe0268f745f3844447f
-  data.tar.gz: cca30dcaf35e43d2bbaf60428c67a05b916e7045c6967e2a4ab380cb3eb0c6d9318159c0a9c0e194a94e53a31649daf9ca6316a7c4f1b3f055ea8f9df0344750
+  metadata.gz: 440300dfce19bda1377a4b20496eb1a3370aeb0aa50c90355ed68adfbeaf12a089f7691932a44b1af8579555959d7cf152c29f38cd1ef92583d0ca46c64313b9
+  data.tar.gz: d512ac00d69956e12f81c7630351b7ddd1aa3e3f90eac1eaf23074d52cec4cd8bac9ba0a2c92306d7d8adf52a8844c0e5672a307ab8686e194a3bcca371f750c

data/README.md

@@ -20,6 +20,10 @@ You may want to add
 
 to your applications javascript include file, as it was removed.
 
+### Update path to 2.0.0
+
+ServiceController::Base now uses the verbs new and create instead of invoke and call. Furthermore @resource is dropped in favor of @service. Please modify your controllers and views and routing accordingly.
+
 ## Installation
 Add this line to your application's Gemfile:
 

data/app/components/component/resource_table.rb

@@ -12,6 +12,16 @@ module Component
       @rows[name] = options
     end
 
+    def timestamps(options = {})
+      row(:created_at, options)
+      row(:updated_at, options)
+    end
+
+    def association(name, options = {}, &block)
+      options.reverse_merge!(block: block) if block_given?
+      @rows[name] = options
+    end
+
     private
 
     def view_locals
@@ -22,4 +32,4 @@ module Component
       }
     end
   end
-end
+end

data/app/concerns/resources_controller/rest_actions.rb

@@ -31,17 +31,29 @@ module ResourcesController::RestActions
     else
       @resource.update(permitted_params)
     end
-    respond_with(respond_with_namespace, @resource)
+    if respond_to?(:after_update_location, true)
+      respond_with(respond_with_namespace, @resource, location: after_update_location)
+    else
+      respond_with(respond_with_namespace, @resource)
+    end
   end
 
   def destroy
     @resource.destroy
-    respond_with(respond_with_namespace, @resource)
+    if respond_to?(:after_destroy_location, true)
+      respond_with(respond_with_namespace, @resource, location: after_destroy_location)
+    else
+      respond_with(respond_with_namespace, @resource)
+    end
   end
 
   def create
     @resource.save
-    respond_with(respond_with_namespace, @resource)
+    if respond_to?(:after_create_location, true)
+      respond_with(respond_with_namespace, @resource, location: after_create_location)
+    else
+      respond_with(respond_with_namespace, @resource)
+    end
   end
 
   private
@@ -50,10 +62,6 @@ module ResourcesController::RestActions
     nil
   end
 
-  def after_create_location
-    ->(controller) { resource_path(@resource) }
-  end
-
   def load_collection_scope
     resource_class
   end

data/app/concerns/service_controller/location_history.rb

@@ -0,0 +1,31 @@
+module ServiceController::LocationHistory
+  extend ActiveSupport::Concern
+
+  included do
+    if respond_to?(:before_action)
+      before_action :store_location
+    else
+      before_filter :store_location
+    end
+  end
+
+  private
+
+  def store_location
+    truncate_location_history(9)
+    location_history[Time.zone.now] = request.referer
+  end
+
+  def location_history
+    session[:location_history] ||= {}
+  end
+
+  def last_location
+    location_history.sort.last.try(:last)
+  end
+
+  def truncate_location_history(count = 0)
+    return if location_history.size <= count
+    session[:location_history] = session[:location_history].sort.last(count).to_h
+  end
+end

data/app/concerns/service_controller/rest_actions.rb

@@ -6,40 +6,40 @@ module ServiceController::RestActions
     responders :flash
 
     if respond_to?(:before_action)
-      before_action :initialize_service_for_invoke, only: [:invoke]
-      before_action :initialize_service_for_call, only: [:call]
+      before_action :initialize_service, only: [:new]
+      before_action :initialize_service_for_create, only: [:create]
     else
-      before_filter :initialize_service_for_invoke, only: [:invoke]
-      before_filter :initialize_service_for_call, only: [:call]
+      before_filter :initialize_service, only: [:new]
+      before_filter :initialize_service_for_create, only: [:create]
     end
   end
 
-  def index
-  end
+  def new; end
 
-  def invoke
-    respond_with @service
+  def create
+    perform
   end
 
-  def call
+  private
+
+  def perform
     @result = execute_service
     if @result.success?
 
-      if respond_to?(:after_success_location)
+      if respond_to?(:after_success_location, true)
         redirect_to(after_success_location, notice: success_message)
       else
         flash.now[:success] = success_message
-        render :success
+        render :create
       end
     else
-      render :invoke
+      render :new
     end
   end
 
-  private
 
   def success_message
-    t('flash.actions.perform.notice', resource_name: @resource.class.model_name.human)
+    t('flash.actions.perform.notice', resource_name: @service.class.model_name.human)
   end
 
   def execute_service
@@ -58,15 +58,23 @@ module ServiceController::RestActions
     end
   end
 
-  def initialize_service_for_invoke
-    service_class.new
+  def initialize_service
+    @service = service_class.new({}, service_options)
+  end
+
+  def initialize_service_for_create
+    @service = service_class.new(hashified_params, service_options)
+  end
+
+  def service_options
+    default_options
   end
 
-  def initialize_service_for_call
-    service_class.new(hashified_params)
+  def default_options
+    { autosave: true }
   end
 
   def permitted_params
-    raise "Not implemented"
+    raise "You have to implement permitted_params in #{self.class.name}."
   end
 end

data/app/concerns/service_controller/rest_service_urls.rb

@@ -1,22 +1,17 @@
 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 })
+  included do
+    helper_method :new_service_path,
+                  :create_service_path
   end
 
-  def invoke_service_path
-    resource_router.send(:url_for, { action: :invoke, only_path: true })
+  def new_service_path
+    resource_router.send(:url_for, { action: :new, only_path: true })
   end
 
-  def call_service_path
-    resource_router.send(:url_for, { action: :call, only_path: true })
+  def create_service_path
+    resource_router.send(:url_for, { action: :create, only_path: true })
   end
 
   def resource_router

data/app/controllers/service_controller/base.rb

@@ -2,147 +2,10 @@ module ServiceController
   class Base < ::FrontendController
     layout 'rails/add_ons/application'
 
-    module RestActions
-      extend ActiveSupport::Concern
-
-      included do
-        include ActionController::MimeResponds
-        
-        respond_to :html
-        responders :flash
-        
-        if respond_to?(:before_action)
-          before_action :initialize_service, only: [:new]
-          before_action :initialize_service_for_create, only: [:create]
-        else
-          before_filter :initialize_service, only: [:new]
-          before_filter :initialize_service_for_create, only: [:create]
-        end
-      end
-
-
-      def new; end
-      
-      def create
-        perform
-      end
-
-      private
-
-      def perform
-        @result = @resource.perform
-        if @result.success?
-          flash.now[:success] = t('flash.actions.perform.notice', resource_name: @resource.class.model_name.human)
-          render :create
-        else
-          render :new
-        end
-      end
-
-      def initialize_service
-        @resource = service_class.new
-      end
-
-      def initialize_service_for_create
-        @resource = service_class.new(hashified_params)
-      end
-
-      def hashified_params
-        if permitted_params.respond_to?(:to_h)
-          permitted_params.to_h
-        else
-          permitted_params
-        end
-      end
-
-      def permitted_params
-        raise "not implemented"
-      end
-    end
-
-    module Service
-      extend ActiveSupport::Concern
-      
-      included do
-        helper_method :service_class
-      end
-
-      def service_class
-        self.class.service_class
-      end
-    end
-
-    module RestResourceUrls
-      extend ActiveSupport::Concern
-
-      included do
-        helper_method :new_resource_path
-        helper_method :create_resource_path
-      end
-
-      private
-
-      def new_resource_path
-        url_for(action: :new, only_path: true)
-      end
-
-      def create_resource_path
-        url_for(action: :create, only_path: true)
-      end
-    end
-
-    module ResourceInflections
-      extend ActiveSupport::Concern
-
-      included do
-        helper_method :inflections
-      end
-
-      private
-
-      def inflections
-        {
-          service_name: service_class.model_name.human
-        }
-      end
-    end
-
-    module LocationHistory
-      extend ActiveSupport::Concern
-
-      included do
-        if respond_to?(:before_action)
-          before_action :store_location
-        else
-          before_filter :store_location
-        end
-      end
-
-      private
-
-      def store_location
-        truncate_location_history(9)
-        location_history[Time.zone.now] = request.referer
-      end
-
-      def location_history
-        session[:location_history] ||= {}
-      end
-
-      def last_location
-        location_history.sort.last.try(:last)
-      end
-
-      def truncate_location_history(count = 0)
-        return if location_history.size <= count
-        session[:location_history] = session[:location_history].sort.last(count).to_h
-      end
-    end
-
-    include Service
-    include RestActions
-    include RestResourceUrls
-    include ResourceInflections
-    include LocationHistory
+    include ServiceController::Service
+    include ServiceController::RestActions
+    include ServiceController::RestServiceUrls
+    include ServiceController::ServiceInflections
+    include ServiceController::LocationHistory
   end
 end

data/app/views/component/_collection_table.haml

@@ -25,5 +25,8 @@
           - if options[:block].present?
             %td{ td_options }= options[:block].call(resource)
           - else
-            %td{ td_options }= resource.send(name)
-
+            %td{ td_options }
+              - if options[:label_method].present?
+                = resource.send(name).send(options[:label_method])
+              - else
+                = resource.send(name)

data/app/views/component/_resource_table.haml

@@ -12,4 +12,7 @@
           = options[:block].call(resource)
       - else
         %td
-          = resource.send(name)
+          - if options[:label_method].present?
+            = resource.send(name).send(options[:label_method])
+          - else
+            = resource.send(name)

data/app/views/service_controller/base/_form_errors.haml

@@ -1,6 +1,6 @@
-- if resource.errors.any?
+- if service.errors.any?
   = bootstrap_alert(context: :danger, class: 'error-explanation') do
-    .error-heading= t('errors.template.header', count: resource.errors.count, model: resource.class.model_name.human)
+    .error-heading= t('errors.template.header', count: service.errors.count, model: service.class.model_name.human)
     %ul
-      - resource.errors.full_messages.each do |msg|
-        %li= msg
+      - service.errors.full_messages.each do |msg|
+        %li= msg

data/app/views/service_controller/base/create.haml

@@ -9,6 +9,6 @@
 
 = render 'create_after_service_output', result: @result
 
-= bootstrap_button(to: new_resource_path, context: :success) do
+= bootstrap_button(to: new_service_path, context: :success) do
   = fa_icon :back
   = t('.back')

data/app/views/service_controller/base/new.haml

@@ -1,6 +1,6 @@
 %h1= t('.title', inflections)
 
-= bootstrap_form_for(@resource, url: create_resource_path) do |f|
-  = render 'form_errors',  resource: f.object
+= bootstrap_form_for(@service, url: create_service_path) do |f|
+  = render 'form_errors',  service: f.object
   = render 'form',         form: f
-  = render 'form_buttons', form: f
+  = render 'form_buttons', form: f

data/lib/rails/add_ons/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module AddOns
-    VERSION = '1.5.2'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-add_ons
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,6 +200,7 @@ 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/location_history.rb
 - app/concerns/service_controller/rest_actions.rb
 - app/concerns/service_controller/rest_service_urls.rb
 - app/concerns/service_controller/service.rb