effective_resources 0.8.22 → 0.8.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea79be8241b1adfcfa31e764bc65c969bdaa1f44
-  data.tar.gz: 426a75287d398c5919e8763f367ab7b83f0793f7
+  metadata.gz: 2351c882edaa8001b94935acbca780edc8ab05e7
+  data.tar.gz: 75f007247f863e9b558cea41b4e43cff121e1e18
 SHA512:
-  metadata.gz: 7499ad2d9c36efe72581c0a297350cff5e45615c92f629278e66829f4631365898e4b15a8487659ee7d725a5e03d2ffa831e610eb803b0ccbdda828f4ae8fbae
-  data.tar.gz: 90da0e9fd065300b63d953e4b2b33cc93f35701693b3c1731760ff7d9331528f9e693063bd872757b6491b2e55b564006878c5484693eb571445610a462c16b4
+  metadata.gz: 63101f42de0d3bbd16e50a7b62620021e5894bad5872cd749764b44ba948c9bcee859e5a8e0cacce49486d82b950d6aea57aff2223f0c72e4ffe61823d268d6a
+  data.tar.gz: 50d7e165820db6cdd024f375c1b7a87549e6dd327a06b937ff625bda4fdc4fc4f34dca9d6e51619150fa93348609c922af2fd11639fc2a1bf40556081352634e

data/README.md

@@ -175,6 +175,13 @@ to render just the `Save` button, with appropriate data-disable, title, etc.
     = f.save 'Will be appended'
 ```
 
+### Remote Delete will automatically fade out the closest match
+
+```
+= link_to 'Delete', post_path(post), remote: true,
+  data: { confirm: "Really delete #{post}?", method: :delete, closest: '.post' }
+```
+
 ### acts_as_tokened
 
 Quickly adds rails 5 `has_secure_token` to your model, along with some `Post.find()` enhancements to work with tokens instead of IDs.

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

@@ -157,7 +157,7 @@ module Effective
     end
 
     def index
-      Rails.logger.info '  Processed by Effective::CrudController#index'
+      Rails.logger.info 'Processed by Effective::CrudController#index'
 
       @page_title ||= resource_plural_name.titleize
       EffectiveResources.authorize!(self, :index, resource_klass)
@@ -173,7 +173,7 @@ module Effective
     end
 
     def new
-      Rails.logger.info '  Processed by Effective::CrudController#new'
+      Rails.logger.info 'Processed by Effective::CrudController#new'
 
       self.resource ||= resource_scope.new
 
@@ -201,7 +201,7 @@ module Effective
     end
 
     def create
-      Rails.logger.info '  Processed by Effective::CrudController#create'
+      Rails.logger.info 'Processed by Effective::CrudController#create'
 
       self.resource ||= resource_scope.new
 
@@ -239,7 +239,7 @@ module Effective
     end
 
     def show
-      Rails.logger.info '  Processed by Effective::CrudController#show'
+      Rails.logger.info 'Processed by Effective::CrudController#show'
 
       self.resource ||= resource_scope.find(params[:id])
 
@@ -250,7 +250,7 @@ module Effective
     end
 
     def edit
-      Rails.logger.info '  Processed by Effective::CrudController#edit'
+      Rails.logger.info 'Processed by Effective::CrudController#edit'
 
       self.resource ||= resource_scope.find(params[:id])
 
@@ -261,7 +261,7 @@ module Effective
     end
 
     def update
-      Rails.logger.info '  Processed by Effective::CrudController#update'
+      Rails.logger.info 'Processed by Effective::CrudController#update'
 
       self.resource ||= resource_scope.find(params[:id])
 
@@ -297,7 +297,7 @@ module Effective
     end
 
     def destroy
-      Rails.logger.info '  Processed by Effective::CrudController#destroy'
+      Rails.logger.info 'Processed by Effective::CrudController#destroy'
 
       self.resource = resource_scope.find(params[:id])
 
@@ -307,7 +307,7 @@ module Effective
 
       respond_to do |format|
         if save_resource(resource, action)
-          request.format = :html if specific_redirect_path?
+          request.format = :html if specific_redirect_path?(action)
 
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)
@@ -320,16 +320,13 @@ module Effective
           end
         else
           flash.delete(:success)
+          request.format = :html  # Don't run destroy.js.erb
 
           format.html do
             flash[:danger] = (flash.now[:danger].presence || resource_flash(:danger, resource, action))
             redirect_to(resource_redirect_path(action))
           end
 
-          format.js do
-            flash.now[:danger] ||= resource_flash(:danger, resource, action)
-            # destroy.js.erb
-          end
         end
       end
     end
@@ -339,7 +336,7 @@ module Effective
 
       respond_to do |format|
         if save_resource(resource, action, (send(resource_params_method_name) rescue {}))
-          request.format = :html if specific_redirect_path?
+          request.format = :html if specific_redirect_path?(action)
 
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)
@@ -579,11 +576,15 @@ module Effective
 
     # Based on the incoming params[:commit] or passed action
     def commit_action(action = nil)
-      self.class.submits[params[:commit].to_s] ||
-      self.class.submits[action.to_s] ||
-      self.class.submits.find { |_, v| v[:action] == action }.try(:last) ||
-      self.class.submits.find { |_, v| v[:action] == :save }.try(:last) ||
-      { action: (action || :save) }
+      if action.present?
+        self.class.submits[action.to_s] ||
+        self.class.submits.find { |_, v| v[:action] == action }.try(:last) ||
+        { action: action }
+      else # Get the current commit
+        self.class.submits[params[:commit].to_s] ||
+        self.class.submits.find { |_, v| v[:action] == :save }.try(:last) ||
+        { action: :save }
+      end
     end
 
     def specific_redirect_path?(action = nil)

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

@@ -47,10 +47,12 @@ module Effective
 
     def action_verb(action)
       action = action.to_s.gsub('_', ' ')
-      word = action.split(' ').first
+      word = action.split(' ').first.to_s
 
       if word.end_with?('e')
         action.sub(word, word + 'd')
+      elsif ['a', 'i', 'o', 'u', 'y'].include?(word[-1])
+        action
       else
         action.sub(word, word + 'ed')
       end

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

@@ -271,7 +271,7 @@ module Effective
           keys = relation.pluck(association.foreign_key)
         end
 
-        keys.uniq.compact.map { |value| "#{key}=#{value} DESC" }.join(',')
+        Arel.sql(keys.uniq.compact.map { |value| "#{key}=#{value} DESC" }.join(','))
       end
 
     end

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

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

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.8.22'.freeze
+  VERSION = '0.8.23'.freeze
 end

metadata

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