effective_resources 0.8.12 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d9f3c476a1b25d899e3ef80460fd11bf5738949
-  data.tar.gz: bff4db8bfebd28a8b194e390837a2509aff6f9fd
+  metadata.gz: d4e0b794db680cc5d1128cec78d437057338870c
+  data.tar.gz: b5ce5e70f5abb3c49dd771ab6745fc859610e82a
 SHA512:
-  metadata.gz: 036821b4210acece00173e2c1afd0aa406a11359b50b91f1d6eae3b1be4da035cdfacd104b5e8a8a2608a6aed8df1a3257b0991a16f01fd086fcf6df3f6921a6
-  data.tar.gz: 5b208d0903fc51e37e3236c40a22a06d4938e4679d3131dede7b7df358754072e54fc3b9abb429677ee2ff56c8de36688b94e99477dd8d23167310414cbca8b1
+  metadata.gz: 0e25d29b786c84a6337c1a655d90719dfecdeb4a824db2d37d2815cb9a6c485df6a5c7fe7e53da9cfc509c0f3d0d5e9e959bff939ee38f5f197dfe7c468f33bd
+  data.tar.gz: 41a58b98945b99b7725f45b7c7b7f4ff5de90f2c3cb1e659f1f031cf2e6d0ea05a4648fdf418360da6105a5b29fb43afff8ae40286ae95f3f8ffcb103244b418

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

@@ -199,11 +199,10 @@ module Effective
       EffectiveResources.authorize!(self, action, resource) unless action == :save
       EffectiveResources.authorize!(self, :create, resource) if action == :save
 
-      resource.assign_attributes(send(resource_params_method_name))
       resource.created_by ||= current_user if resource.respond_to?(:created_by=)
 
       respond_to do |format|
-        if save_resource(resource, action)
+        if save_resource(resource, action, send(resource_params_method_name))
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)
             redirect_to(resource_redirect_path)
@@ -256,10 +255,8 @@ module Effective
       EffectiveResources.authorize!(self, action, resource) unless action == :save
       EffectiveResources.authorize!(self, :update, resource) if action == :save
 
-      resource.assign_attributes(send(resource_params_method_name))
-
       respond_to do |format|
-        if save_resource(resource, action)
+        if save_resource(resource, action, send(resource_params_method_name))
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)
             redirect_to(resource_redirect_path)
@@ -305,7 +302,7 @@ module Effective
               redirect_to(resource_redirect_path)
             else
               flash.now[:success] ||= resource_flash(:success, resource, action)
-              # delete.js.erb
+              # destroy.js.erb
             end
           end
         else
@@ -327,12 +324,8 @@ module Effective
     def member_post_action(action)
       raise 'expected post, patch or put http action' unless (request.post? || request.patch? || request.put?)
 
-      # TODO: This is a recent change. Used to not assign attributes. Is this breaking?
-      valid_params = (send(resource_params_method_name) rescue {})
-      resource.assign_attributes(valid_params)
-
       respond_to do |format|
-        if save_resource(resource, action)
+        if save_resource(resource, action, (send(resource_params_method_name) rescue {}))
           format.html do
             flash[:success] ||= resource_flash(:success, resource, action)
             redirect_to(resource_redirect_path)
@@ -345,7 +338,7 @@ module Effective
             else
               flash.now[:success] ||= resource_flash(:success, resource, action)
               reload_resource
-              # action.js.erb
+              render_member_action(action)
             end
           end
         else
@@ -369,11 +362,17 @@ module Effective
             end
           end
 
-          format.js {} # action.js.erb
+          format.js { render_member_action(action) }
         end
       end
     end
 
+    # Which member javascript view to render: #{action}.js or effective_resources member_action.js
+    def render_member_action(action)
+      view = lookup_context.template_exists?(action, _prefixes) ? action : :member_action
+      render(view, locals: { action: action })
+    end
+
     # No attributes are assigned or saved. We purely call action! on the resource
     def collection_post_action(action)
       action = action.to_s.gsub('bulk_', '').to_sym
@@ -399,13 +398,15 @@ module Effective
     protected
 
     # This calls the appropriate member action, probably save!, on the resource.
-    def save_resource(resource, action = :save, &block)
+    def save_resource(resource, action = :save, to_assign = {}, &block)
       raise "expected @#{resource_name} to respond to #{action}!" unless resource.respond_to?("#{action}!")
 
       resource.current_user ||= current_user if resource.respond_to?(:current_user=)
 
       ActiveRecord::Base.transaction do
         begin
+          resource.assign_attributes(to_assign) if to_assign.present?
+
           if resource.public_send("#{action}!") == false
             raise("failed to #{action} #{resource}")
           end

data/app/helpers/effective_resources_helper.rb

@@ -40,9 +40,14 @@ module EffectiveResourcesHelper
 
   # 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 = {})
+    raise 'expected attributes to be a Hash. Try passing action: action if rendering custom action' unless atts.kind_of?(Hash)
+
+    action = atts.delete(:action)
     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)
+    if lookup_context.template_exists?("form_#{action}", controller._prefixes, :partial)
+      render "form_#{action}", atts
+    elsif lookup_context.template_exists?('form', controller._prefixes, :partial)
       render 'form', atts
     elsif lookup_context.template_exists?('form', resource.plural_name, :partial)
       render "#{resource.plural_name}/form", atts

data/app/models/concerns/acts_as_tokened.rb

@@ -15,7 +15,7 @@ module ActsAsTokened
   end
 
   included do
-    has_secure_token
+    has_secure_token  # Will always be 24-digits long
 
     extend FinderMethods
   end

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

@@ -28,7 +28,7 @@ module Effective
 
       # Here we look at all available (class level) member actions, see which ones apply to the current resource
       # This feeds into the helper simple_form_submit(f)
-      # Returns a Hash of {'Save': {data-disable-with: 'Saving...'}, 'Approve': {data-disable-with: 'Approve'}}
+      # Returns a Hash of {'Save': {class: 'btn btn-primary'}, 'Approve': {class: 'btn btn-secondary'}}
       def submits_for(obj, controller:)
         submits.select do |commit, args|
           args[:class] = args[:class].to_s

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 %>
 
-EffectiveForm.remote_form_payload = $("<div><%= j render_resource_form(resource) %></div>");
+EffectiveForm.remote_form_payload = "<%= j render_resource_form(resource) %>";
 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 %>
 
-EffectiveForm.remote_form_payload = $("<div><%= j render_resource_form(resource) %></div>");
+EffectiveForm.remote_form_payload = "<%= j render_resource_form(resource) %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

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

@@ -0,0 +1,5 @@
+<% 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, action: action) %>";
+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 %>
 
-EffectiveForm.remote_form_payload = $("<div><%= j render_resource_form(resource) %></div>");
+EffectiveForm.remote_form_payload = "<%= j render_resource_form(resource) %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.8.12'.freeze
+  VERSION = '0.8.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,7 @@ files:
 - app/views/application/destroy.js.erb
 - app/views/application/edit.html.haml
 - app/views/application/index.html.haml
+- app/views/application/member_action.js.erb
 - app/views/application/new.html.haml
 - app/views/application/show.html.haml
 - app/views/application/update.js.erb