effective_resources 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67493a1a7367667c97c119a2f4604a67e66c7d23
-  data.tar.gz: 9b22dc43ff5b95533a283b2ca3e8524c24ff149b
+  metadata.gz: 57a9fea58220e51746d9c8467b84e884a3039049
+  data.tar.gz: 3252c3a12d1dbff7591df1f8cbab3d9ea4961ddf
 SHA512:
-  metadata.gz: 2198031b19ebf08866385301e3e9b3891a34f0447a1d19caba6dd3cd5b827005b61994294d99a248ff407c3eb561900dd73a74975be274050a0351b21e4dc0fc
-  data.tar.gz: 4893defdbbbbde5e8d963565258d4bea255a398a44f7af0b957fcb09a5b59d015105bb4505d4b6c9852b73a1331c61bf31c51fbfe4a8b55be93921b21326fb7c
+  metadata.gz: e869b9eb37fe264c797927817fb67f30abf8415217e572ac2dd628ac6e15105e4f425f807bca12f690d01c908cc61b2fad5fe3f67eb2178a7c61b0e88486d2b4
+  data.tar.gz: cd024f08251b9b0ebcbfa22e7e3671b281bcaa603675c10eea7ca89fc05f90f32eddbae710e68a95277c13da844a2e08384f79b4ad6f936bd029abe1710a4e4a

data/README.md

@@ -32,21 +32,31 @@ Add to your contoller:
 class PostsController < ApplicationController
   include Effective::CrudController
 
-  member_action :something
+  # Sets the @page_title in a before_filter
+  page_title 'My Posts', only: [:index]
 
-  protected
+  # All queries and objects will be built with this scope
+  resource_scope -> { current_user.posts }
 
-  # If it's a Hash of attributes, the controller will call .where(attributes)
-  # and the attributes will be used to initialize the datatable on index
-  #
-  # If it's an ActiveRecord scope, or symbol, we initialize a datatable with {resource_scope: true}
-  # and leave it as a TODO for the datatable to do the right thin .
-  def post_scope
-    {client_id: current_user.client_id}
-    # Post.where(client_id: current_user.client_id)
-    # :approved
+  # Similar to above, with block syntax
+  resource_scope do
+    Post.active.where(user: current_user)
   end
 
+  # When GET request, will render the approve page
+  # When POST|PATCH|PUT request, will call @post.approve! and do the right thing
+  member_action :approve
+
+  # When GET request, will render an index page scoped to this method (if it's a scope on the model i.e. Post.approved)
+  collection_action :approved
+
+  # When POST|PATCH|PUT request, will call @post.approve! on each post as per params[:ids]
+  # Created with effective_datatables bulk actions in mind
+  collection_action :bulk_approve
+
+  protected
+
+  # The permitted parameters for this post.  Other recognized method names are posts_params and permitted_params
   def post_params
     params.require(:post).permit(:id, :title, :body)
   end
@@ -58,11 +68,13 @@ end
 
 Implements the 7 RESTful actions: `index`, `new`, `create`, `show`, `edit`, `update`, `destroy`.
 
-- Loads an appropriate `@post` type instance
+- Loads an appropriate `@posts` or `@post` type instance variable.
 - Sets a `@page_title` (effective_pages).
 - Calls authorize as per the configured `EffectiveResources.authorization_method` (flow through to CanCan or Pundit)
 - Does the create/update save
 - Sets a `flash[:success]` and redirects on success, or sets a `flash.now[:danger]` and renders on error.
+- Does the right thing with member and collection actions
+- Intelligently redirects based on commit message
 
 ## Helpers
 

data/app/controllers/concerns/effective/crud_controller.rb

@@ -101,10 +101,10 @@ module Effective
       resource.created_by ||= current_user if resource.respond_to?(:created_by=)
 
       if resource.save
-        flash[:success] = "Successfully created #{resource_human_name}"
+        flash[:success] = flash_success(resource)
         redirect_to(resource_redirect_path)
       else
-        flash.now[:danger] = "Unable to create #{resource_human_name}: #{resource.errors.full_messages.to_sentence}"
+        flash.now[:danger] = flash_danger(resource)
         render :new
       end
     end
@@ -130,10 +130,10 @@ module Effective
       EffectiveResources.authorized?(self, :update, resource)
 
       if resource.update_attributes(send(resource_params_method_name))
-        flash[:success] = "Successfully updated #{resource_human_name}"
+        flash[:success] = flash_success(resource)
         redirect_to(resource_redirect_path)
       else
-        flash.now[:danger] = "Unable to update #{resource_human_name}: #{resource.errors.full_messages.to_sentence}"
+        flash.now[:danger] = flash_danger(resource)
         render :edit
       end
     end
@@ -145,9 +145,9 @@ module Effective
       EffectiveResources.authorized?(self, :destroy, resource)
 
       if resource.destroy
-        flash[:success] = "Successfully deleted #{resource_human_name}"
+        flash[:success] = flash_success(resource, :delete)
       else
-        flash[:danger] = "Unable to delete #{resource_human_name}: #{resource.errors.full_messages.to_sentence}"
+        flash[:danger] = flash_danger(resource, :delete)
       end
 
       if request.referer.present? && !request.referer.include?(effective_resource.show_path)
@@ -164,10 +164,10 @@ module Effective
       begin
         resource.public_send("#{action}!") || raise("failed to #{action} #{resource}")
 
-        flash[:success] = "Successfully #{action_verb(action)} #{resource_human_name}"
+        flash[:success] = flash_success(resource, action)
         redirect_back(fallback_location: resource_redirect_path)
       rescue => e
-        flash.now[:danger] = "Unable to #{action} #{resource_human_name}: #{resource.errors.full_messages.to_sentence.presence || e.message}"
+        flash.now[:danger] = flash_danger(resource, action, e: e)
 
         referer = request.referer.to_s
 

data/app/controllers/concerns/effective/flash_messages.rb

@@ -0,0 +1,47 @@
+module Effective
+  module FlashMessages
+    extend ActiveSupport::Concern
+
+    # flash[:success] = flash_success(@post)
+    def flash_success(resource, action = nil, name: nil)
+      raise 'expected an ActiveRecord resource' unless (name || resource.class.respond_to?(:model_name))
+
+      action ||= :save
+      name ||= resource.class.model_name.human
+
+      "#{name.to_s.titleize} was successfully #{action}#{(action.to_s.end_with?('e') ? 'd' : 'ed')}"
+    end
+
+    # flash.now[:danger] = flash_danger(@post)
+    def flash_danger(resource, action = nil, e: nil, name: nil)
+      raise 'expected an ActiveRecord resource' unless resource.respond_to?(:errors) && (name || resource.class.respond_to?(:model_name))
+
+      action ||= resource.respond_to?(:new_record?) ? (resource.new_record? ? :create : :update) : :save
+      name ||= resource.class.model_name.human
+      messages = flash_errors(resource, e: e)
+
+      ["Unable to #{action} #{name.to_s.downcase}", (": #{messages}." if messages)].compact.join.html_safe
+    end
+
+    # flash.now[:danger] = "Unable to accept: #{flash_errors(@post)}"
+    def flash_errors(resource, e: nil)
+      raise 'expected an ActiveRecord resource' unless resource.respond_to?(:errors)
+
+      messages = resource.errors.map do |attribute, message|
+        if message[0] == message[0].upcase # If the error begins with a capital letter
+          message
+        elsif attribute == :base
+          "#{resource.class.model_name.human.downcase} #{message}"
+        elsif attribute.to_s.end_with?('_ids')
+          "#{resource.class.human_attribute_name(attribute.to_s[0..-5].pluralize).downcase} #{message}"
+        else
+          "#{resource.class.human_attribute_name(attribute).downcase} #{message}"
+        end
+      end
+
+      messages << e.message if messages.blank? && e && e.respond_to?(:message)
+
+      messages.to_sentence.presence
+    end
+  end
+end

data/app/helpers/effective_resources_helper.rb

@@ -15,7 +15,7 @@ module EffectiveResourcesHelper
 
   def simple_form_save(form, options = {class: 'form-actions'}, &block)
     content_tag(:div, class: options[:class]) do
-      form.button(:submit, 'Save', data: { disable_with: 'Saving...' }) + (capture(&:block) if block_given?)
+      form.button(:submit, 'Save', data: { disable_with: 'Saving...' }) + (capture(&block) if block_given?)
     end
   end
 

data/app/models/effective/resources/actions.rb

@@ -23,7 +23,7 @@ module Effective
         controller_routes.map { |route| route.defaults[:action] if is_get_member?(route) }.compact - crud_actions
       end
 
-      # GET actions
+      # POST/PUT/PATCH actions
       def member_post_actions
         controller_routes.map { |route| route.defaults[:action] if is_post_member?(route) }.compact - crud_actions
       end

data/lib/effective_resources/engine.rb

@@ -9,5 +9,12 @@ module EffectiveResources
       eval File.read("#{config.root}/config/effective_resources.rb")
     end
 
+    # Register the flash_messages concern so that it can be called in ActionController
+    initializer 'effective_resources.action_controller' do |app|
+      ActiveSupport.on_load :action_controller do
+        include(Effective::FlashMessages)
+      end
+    end
+
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.4.9'.freeze
+  VERSION = '0.4.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,6 +36,7 @@ files:
 - app/assets/javascripts/effective_resources.js
 - app/assets/javascripts/effective_resources/effective_ujs.js
 - app/controllers/concerns/effective/crud_controller.rb
+- app/controllers/concerns/effective/flash_messages.rb
 - app/helpers/effective_resources_helper.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/attribute.rb