effective_resources 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1179bc927b2e8cd0cc3293d291aacff6ab58e6b4
-  data.tar.gz: 5fd8f1a47e8e01aaf97f1f38568eb5a06128532d
+  metadata.gz: 1ea8856025d95c68494d488970226e6c212a919d
+  data.tar.gz: b024cdc31307bf491b9432d7bb24e84928edb16a
 SHA512:
-  metadata.gz: f407ebc649b42b9ecbbe766621cdce2f6290dd9ebffd316da013a0d76dce7a5b2e30c7265dd8414fb56fea3e01e4598ed8c3a539f7b0dc4063b8e6a97f51c3e1
-  data.tar.gz: ff419e84356ea9b20916dd404ed9afaf966228ed7f4c578637127f51eab77785bb5a895ef31f1d4b4f87deb3d7bbbe83b061f6811878da10c26e9ed718bc516e
+  metadata.gz: 80b4b4aec2b1bc80403e808e72949904c4a8d791e7c42f2f848aa4056424ea937514d3896565a1c82e53a747564f2fb0b7788ac5378e07590abf899e952218ef
+  data.tar.gz: 60b75dbf6e5c7cedd1448e6599090b9be54106bb6cbd1603a48fb90ada7cc8034999d1613c710e0fcc721ee67cb428032b9cd22350a28530e3299849482ce9cd

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

@@ -18,7 +18,7 @@ module Effective
             raise "expected @#{resource_name} to respond to #{action}!" unless resource.respond_to?("#{action}!")
 
             begin
-              raise 'exception' unless resource.send("#{action}!")
+              resource.send("#{action}!") || raise('exception')
 
               flash[:success] = "Successfully #{action}#{action.to_s.end_with?('e') ? 'd' : 'ed'} #{resource_human_name}"
               redirect_back fallback_location: resource_redirect_path
@@ -130,7 +130,12 @@ module Effective
         flash[:danger] = "Unable to delete #{resource_human_name}: #{resource.errors.full_messages.to_sentence}"
       end
 
-      request.referer.present? ? redirect_to(request.referer) : redirect_to(send(resource_index_path))
+      if request.referer.present? && !request.referer.include?(send(effective_resource.show_path))
+        redirect_to(request.referer)
+      else
+        redirect_to(send(resource_index_path))
+      end
+
     end
 
     protected
@@ -140,7 +145,10 @@ module Effective
       when 'Save'               ; send(effective_resource.edit_path, resource)
       when 'Save and Continue'  ; send(effective_resource.index_path)
       when 'Save and Add New'   ; send(effective_resource.new_path)
-      else send((effective_resource.show_path(check: true) || effective_resource.edit_path), resource)
+      when 'Save and Return'
+        request.referer.present? ? request.referer : send(resource_index_path)
+      else
+        send((effective_resource.show_path(check: true) || effective_resource.edit_path), resource)
       end
     end
 

data/app/views/application/edit.html.haml

@@ -1,20 +1,21 @@
 - resource = (@_effective_resource || Effective::Resource.new(controller_path))
-- @resource = instance_variable_get('@' + resource.name)
+- @resource = instance_variable_get('@' + resource.name) if resource.name
 
-.row
-  .col-sm-6
-    %h1= @page_title
-  .col-sm-6
-    %p.text-right
-      - resource.member_post_actions.each do |action|
-        - if EffectiveResources.authorized?(controller, action.to_sym, @resource)
-          - if resource.action_post_path(action, check: true).present?
-            = link_to action.titleize, send(resource.action_post_path(action), @resource), class: 'btn btn-primary',
-              data: { confirm: "Really #{action} #{@resource}?", method: :post }
+- if @resource
+  .row
+    .col-sm-6
+      %h1= @page_title
+    .col-sm-6
+      %p.text-right
+        - resource.member_post_actions.each do |action|
+          - if EffectiveResources.authorized?(controller, action.to_sym, @resource)
+            - if resource.action_post_path(action, check: true).present?
+              = link_to action.titleize, send(resource.action_post_path(action), @resource), class: 'btn btn-primary',
+                data: { confirm: "Really #{action} #{@resource}?", method: :post }
 
-      - if EffectiveResources.authorized?(controller, :destroy, @resource)
-        - if resource.destroy_path(check: true).present?
-          = link_to 'Delete', send(resource.destroy_path, @resource), class: 'btn btn-danger',
-            data: { confirm: "Really delete #{@resource}?", method: :delete }
+        - if EffectiveResources.authorized?(controller, :destroy, @resource)
+          - if resource.destroy_path(check: true).present?
+            = link_to 'Delete', send(resource.destroy_path, @resource), class: 'btn btn-danger',
+              data: { confirm: "Really delete #{@resource}?", method: :delete }
 
-= render 'form', resource.name.to_sym => @resource
+  = render 'form', resource.name.to_sym => @resource

data/app/views/application/index.html.haml

@@ -11,13 +11,13 @@
 - if @datatable
   = render_datatable(@datatable)
 
-- elsif instance_variable_get('@' + resource.plural_name)
+- elsif instance_variable_get('@' + resource.plural_name).respond_to?(:to_partial_path)
   = render instance_variable_get('@' + resource.plural_name)
 
-- elsif instance_variable_get('@' + resource.name)
+- elsif instance_variable_get('@' + resource.name).respond_to?(:to_partial_path)
   = render instance_variable_get('@' + resource.name)
 
 - elsif Rails.env.development?
   %p effective_resources index view is not sure what to render.
-  %p Define an @datatable, @#{resource.plural_name}, or @#{resource.name}.
+  %p Define an @datatable, @#{resource.try(:plural_name) || 'a plural'}, or @#{resource.try(:name) || 'a singular'}.
   %p or include Effective::CrudController in your controller

data/app/views/application/new.html.haml

@@ -2,4 +2,5 @@
 
 %h1= @page_title
 
-= render 'form', resource.name.to_sym => instance_variable_get('@' + resource.name)
+- if resource.name.present? && instance_variable_get('@' + resource.name)
+  = render 'form', resource.name.to_sym => instance_variable_get('@' + resource.name)

data/app/views/application/show.html.haml

@@ -1,20 +1,21 @@
 - resource = (@_effective_resource || Effective::Resource.new(controller_path))
-- @resource = instance_variable_get('@' + resource.name)
+- @resource = instance_variable_get('@' + resource.name) if resource.name
 
-.row
-  .col-sm-6
-    %h1= @page_title
-  .col-sm-6
-    %p.text-right
-      - resource.member_post_actions.each do |action|
-        - if EffectiveResources.authorized?(controller, action.to_sym, @resource)
-          - if resource.action_post_path(action, check: true).present?
-            = link_to action.titleize, send(resource.action_post_path(action), @resource), class: 'btn btn-primary',
-              data: { confirm: "Really #{action} #{@resource}?", method: :post }
+- if @resource
+  .row
+    .col-sm-6
+      %h1= @page_title
+    .col-sm-6
+      %p.text-right
+        - resource.member_post_actions.each do |action|
+          - if EffectiveResources.authorized?(controller, action.to_sym, @resource)
+            - if resource.action_post_path(action, check: true).present?
+              = link_to action.titleize, send(resource.action_post_path(action), @resource), class: 'btn btn-primary',
+                data: { confirm: "Really #{action} #{@resource}?", method: :post }
 
-      - if EffectiveResources.authorized?(controller, :destroy, @resource)
-        - if resource.destroy_path(check: true).present?
-          = link_to 'Delete', send(resource.destroy_path, @resource), class: 'btn btn-danger',
-            data: { confirm: "Really delete #{@resource}?", method: :delete }
+        - if EffectiveResources.authorized?(controller, :destroy, @resource)
+          - if resource.destroy_path(check: true).present?
+            = link_to 'Delete', send(resource.destroy_path, @resource), class: 'btn btn-danger',
+              data: { confirm: "Really delete #{@resource}?", method: :delete }
 
-= render @resource
+  = render @resource

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails