effective_resources 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2388cda759dd479d527951e8d9ee29e95ccfd2
-  data.tar.gz: 4281eedf715d8d5ef2cfe6ea91cf5dbe686dfd1b
+  metadata.gz: 9ecad33788aad8f500973e4bce6486b1cd844c79
+  data.tar.gz: dda9302fd764fb11f1ec14946fa8b75fca388659
 SHA512:
-  metadata.gz: 89dd285d4e1179cad76c591719e8f48ca0faf6a2998cead46cfc59234e122f09767129d773da66ff8ce39d98272217eab0b892fe100a2fdb4f06426ad5e6b4f2
-  data.tar.gz: 0c0a5fd8aa744d0630af9686793ce190da98906d37455e5bc1bf8b6ea375e8b04ac0020061b21431d0f986c48cdc6aaa9275e9d18e78df286e55610cdf998b8d
+  metadata.gz: 62b2d628abef9e7c481211cc449d795f0e480af7187b1741f9c8446bea6f3fbbcca169e9f43b2eedef0f634574ddb6bae6fa67a0c7cb27a14d137e24e7809b60
+  data.tar.gz: 3aed9366a8292394a3cdecc420d6e607dcb62bbad965fa5948ec6c39df98a29b79d99026c88198c70799014d1fb602b93e08fb47bb2e61877fe184672509de72

data/README.md

@@ -61,10 +61,9 @@ class PostsController < ApplicationController
     params.require(:post).permit(:id, :author_id, :category, :title, :body)
   end
 
-  # On #create or #update, if you click 'Add New', the new resource form will be rendered with these attributes preopulated
-  # Makes it super quick to Add New items if only one or two of the fields are changing.
-  def add_new_post_params
-    permitted_params.slice(:author_id, :category)
+  # Pass /things/new?duplicate_id=3
+  def duplicate_resource(resource)
+    resource_klass.new(resource.attributes.slice('job_site', 'address'))
   end
 
 end

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

@@ -49,6 +49,7 @@ module Effective
       #
       # submit :toggle, 'Blacklist', if: -> { sync? }, class: 'btn btn-primary'
       # submit :toggle, 'Whitelist', if: -> { !sync? }, class: 'btn btn-primary'
+      # submit :save, 'Save', success: -> { "#{self} was saved okay!" }
 
       def submit(action, commit = nil, args = {})
         raise 'expected args to be a Hash or false' unless args.kind_of?(Hash) || args == false
@@ -95,6 +96,8 @@ module Effective
       # resource_scope do
       #   { user_id: current_user.id }
       # end
+      # Nested controllers? sure
+      # resource_scope -> { User.find(params[:user_id]).things }
 
       # Return value should be:
       # a Relation: Thing.where(user: current_user)
@@ -201,12 +204,24 @@ module Effective
 
       respond_to do |format|
         if save_resource(resource, action)
-          flash[:success] ||= flash_success(resource, action)
+          format.html do
+            flash[:success] ||= resource_flash(:success, resource, action)
+            redirect_to(resource_redirect_path)
+          end
 
-          format.html { redirect_to(resource_redirect_path) }
-          format.js {} # create.js.erb
+          format.js do
+            if commit_action[:redirect].present?
+              flash[:success] ||= resource_flash(:success, resource, action)
+              redirect_to(resource_redirect_path)
+            else
+              flash.now[:success] ||= resource_flash(:success, resource, action)
+              reload_resource
+              # create.js.erb
+            end
+          end
         else
-          flash.now[:danger] ||= flash_danger(resource, action)
+          flash.delete(:success)
+          flash.now[:danger] ||= resource_flash(:danger, resource, action)
 
           format.html { render :new }
           format.js {} # create.js.erb
@@ -245,15 +260,27 @@ module Effective
 
       respond_to do |format|
         if save_resource(resource, action)
-          flash[:success] ||= flash_success(resource, action)
+          format.html do
+            flash[:success] ||= resource_flash(:success, resource, action)
+            redirect_to(resource_redirect_path)
+          end
 
-          format.html { redirect_to(resource_redirect_path) }
-          format.js { reload_resource } # update.js.erb
+          format.js do
+            if commit_action[:redirect].present?
+              flash[:success] ||= resource_flash(:success, resource, action)
+              redirect_to(resource_redirect_path)
+            else
+              flash.now[:success] ||= resource_flash(:success, resource, action)
+              reload_resource
+              # update.js.erb
+            end
+          end
         else
-          flash.now[:danger] ||= flash_danger(resource, action)
+          flash.delete(:success)
+          flash.now[:danger] ||= resource_flash(:danger, resource, action)
 
           format.html { render :edit }
-          format.js {} # update.js.erb
+          format.js { } # update.js.erb
         end
       end
     end
@@ -261,20 +288,38 @@ module Effective
     def destroy
       self.resource = resource_scope.find(params[:id])
 
+      action = :destroy
       @page_title ||= "Destroy #{resource}"
-      EffectiveResources.authorize!(self, :destroy, resource)
+      EffectiveResources.authorize!(self, action, resource)
 
       respond_to do |format|
-        if save_resource(resource, :destroy)
-          flash[:success] ||= flash_success(resource, :delete)
+        if save_resource(resource, action)
+          format.html do
+            flash[:success] ||= resource_flash(:success, resource, action)
+            redirect_to(resource_redirect_path)
+          end
 
-          format.html { redirect_to(resource_redirect_path) }
-          format.js {} # delete.js.erb
+          format.js do
+            if commit_action[:redirect].present?
+              flash[:success] ||= resource_flash(:success, resource, action)
+              redirect_to(resource_redirect_path)
+            else
+              flash.now[:success] ||= resource_flash(:success, resource, action)
+              # delete.js.erb
+            end
+          end
         else
-          flash.now[:danger] ||= flash_danger(resource, :delete)
+          flash.delete(:success)
+
+          format.html do
+            flash[:danger] ||= resource_flash(:danger, resource, action)
+            redirect_to(resource_redirect_path)
+          end
 
-          format.html { redirect_to(resource_redirect_path) }
-          format.js {} # delete.js.erb
+          format.js do
+            flash.now[:danger] ||= resource_flash(:danger, resource, action)
+            # destroy.js.erb
+          end
         end
       end
     end
@@ -284,10 +329,10 @@ module Effective
       raise 'expected post, patch or put http action' unless (request.post? || request.patch? || request.put?)
 
       if save_resource(resource, action)
-        flash[:success] ||= flash_success(resource, action)
+        flash[:success] ||= resource_flash(:success, resource, action)
         redirect_to(referer_redirect_path || resource_redirect_path)
       else
-        flash.now[:danger] ||= flash_danger(resource, action)
+        flash.now[:danger] ||= resource_flash(:danger, resource, action)
 
         if resource_edit_path && (referer_redirect_path || '').end_with?(resource_edit_path)
           @page_title ||= "Edit #{resource}"
@@ -315,7 +360,7 @@ module Effective
 
       successes = 0
 
-      resource_klass.transaction do
+      ActiveRecord::Base.transaction do
         successes = resources.select do |resource|
           begin
             resource.public_send("#{action}!") if EffectiveResources.authorized?(self, action, resource)
@@ -336,7 +381,7 @@ module Effective
 
       resource.current_user ||= current_user if resource.respond_to?(:current_user=)
 
-      resource_klass.transaction do
+      ActiveRecord::Base.transaction do
         begin
           if resource.public_send("#{action}!") == false
             raise("failed to #{action} #{resource}")
@@ -346,7 +391,7 @@ module Effective
           run_callbacks(:resource_save)
           return true
         rescue => e
-          resource.restore_attributes(['status', 'state'])
+          resource.restore_attributes(['status', 'state']) if resource.respond_to?(:restore_attributes)
 
           flash.delete(:success)
           flash.now[:danger] = flash_danger(resource, action, e: e)
@@ -359,7 +404,7 @@ module Effective
     end
 
     def reload_resource
-      self.resource = resource_scope.find(params[:id])
+      self.resource.reload if resource.respond_to?(:reload)
     end
 
     # Should return a new resource based on the passed one
@@ -367,6 +412,18 @@ module Effective
       resource.dup
     end
 
+    def resource_flash(status, resource, action)
+      message = commit_action[status].respond_to?(:call) ? instance_exec(&commit_action[status]) : commit_action[status]
+      return message if message.present?
+
+      message || case status
+      when :success then flash_success(resource, action)
+      when :danger then flash_danger(resource, action)
+      else
+        raise "unknown resource flash status: #{status}"
+      end
+    end
+
     def resource_redirect_path
       redirect = commit_action[:redirect].respond_to?(:call) ? instance_exec(&commit_action[:redirect]) : commit_action[:redirect]
 
@@ -402,7 +459,7 @@ module Effective
     def referer_redirect_path
       url = request.referer.to_s
 
-      return if (resource && resource.destroyed? && url.include?("/#{resource.to_param}"))
+      return if (resource && resource.respond_to?(:destroyed?) && resource.destroyed? && url.include?("/#{resource.to_param}"))
       return if url.include?('duplicate_id=')
       return unless (Rails.application.routes.recognize_path(URI(url).path) rescue false)
 
@@ -480,7 +537,9 @@ module Effective
     end
 
     def commit_action
-      self.class.submits[params[:commit].to_s] || { action: :save }
+      self.class.submits[params[:commit].to_s] ||
+      self.class.submits.find { |_, v| v[:action] == :save }&.last ||
+      { action: :save }
     end
 
     # Returns an ActiveRecord relation based on the computed value of `resource_scope` dsl method

data/app/helpers/effective_resources_helper.rb

@@ -39,8 +39,8 @@ module EffectiveResourcesHelper
   end
 
   # When called from /admin/things/new.html.haml this will render 'admin/things/form', or 'things/form', or 'thing/form'
-  def render_resource_form(resource)
-    atts = {:namespace => (resource.namespace.to_sym if resource.namespace.present?), resource.name.to_sym => instance_variable_get('@' + resource.name)}.compact
+  def render_resource_form(resource, atts = {})
+    atts = {:namespace => (resource.namespace.to_sym if resource.namespace.present?), resource.name.to_sym => instance_variable_get('@' + resource.name)}.compact.merge(atts)
 
     if lookup_context.template_exists?('form', controller._prefixes, :partial)
       render 'form', atts

data/app/views/application/create.js.erb

@@ -1,5 +1,5 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveBootstrap.remote_form_payload = $("<%= j render_resource_form(resource) %>");
-EffectiveBootstrap.remote_form_flash = <%= raw flash.to_json %>;
+EffectiveForm.remote_form_payload = $("<div><%= j render_resource_form(resource) %></div>");
+EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

data/app/views/application/destroy.js.erb

@@ -1,5 +1,5 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveBootstrap.remote_form_payload = $("<%= j render_resource_form(resource) %>");
-EffectiveBootstrap.remote_form_flash = <%= raw flash.to_json %>;
+EffectiveForm.remote_form_payload = $("<div><%= j render_resource_form(resource) %></div>");
+EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

data/app/views/application/update.js.erb

@@ -1,5 +1,5 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveBootstrap.remote_form_payload = $("<%= j render_resource_form(resource) %>");
-EffectiveBootstrap.remote_form_flash = <%= raw flash.to_json %>;
+EffectiveForm.remote_form_payload = $("<div><%= j render_resource_form(resource) %></div>");
+EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.8.6'.freeze
+  VERSION = '0.8.7'.freeze
 end

data/lib/effective_resources.rb

@@ -24,7 +24,7 @@ module EffectiveResources
   end
 
   def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied unless authorized?(controller, action, resource)
+    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails