effective_resources 0.8.25 → 0.8.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f57a417ad564ad29d28a1412c0904dd625c2f29a
-  data.tar.gz: 52f253bcaffbb82d52608f3896710d0ffe303d9a
+  metadata.gz: a06e3e88a6bf810728238c3e946eb7cca8d91360
+  data.tar.gz: 2dc0d2c0e88675f7f355ec8a0c172faa5c5cd98d
 SHA512:
-  metadata.gz: 6c508fa5e22d48790095424fcdd57a7e33fceb3b5f497527759438387ebe5fd9cb1519676af99fdcffbdb2525e172a623dd0c51f58286a3f9cb5c6ae08636b43
-  data.tar.gz: 539d90c320493b985b4ba963d11fabfbb97977f58b76cf1d3918fb1fc7945af59822694d61a87e83b5622b1348d9868e15648c89aec7fe650370e6eb602393b2
+  metadata.gz: 6df911c7b05cf356999d037a0fe8873fc06a100e0bf3dffbe4b82343a9d876893a3ceac152c60c64e52391b660e09b3d3e59440403063a02cf2ee7e5552e0e2a
+  data.tar.gz: 0b3c9d1df71cecc5e0299587423e381e931b9a3bb730c0b636c02240dfbbe5fa2a87a8e4b9aa41ce0b6b5a76916d0dc2b93cf649cee0ba8098399128d3de10d6

data/app/helpers/effective_resources_helper.rb

@@ -38,15 +38,27 @@ module EffectiveResourcesHelper
     end
   end
 
-  # resource: resource is an
-  # show: true, edit: true, destroy: true
-  def render_resource_actions(resource, effective_resource: nil, namespace: nil, partial: nil, **atts, &block)
-    effective_resource ||= atts.delete(:resource)
-    effective_resource ||= controller.class.effective_resource if controller.class.respond_to?(:effective_resource)
-    effective_resource ||= Effective::Resource.new(controller_path)
-    raise 'Expected resource: value to be an Effective::Resource instance' unless effective_resource.kind_of?(Effective::Resource)
+  def render_resource_crud_actions(resource, instance = nil, atts = {}, &block)
+    (atts = instance; instance = nil) if instance.kind_of?(Hash) && atts.blank?
+    render_resource_actions(resource, instance, atts.merge(crud: true), &block)
+  end
+
+  # resource is an Effective::Resource
+  # instance is an ActiveRecord thing
+  # atts are crud: true|false, locals: {}, namespace:, partial:
+  # anything else are actions, edit: true, show: false, destroy: false and member GET actions
+  def render_resource_actions(resource, instance = nil, atts = {}, &block)
+    (atts = instance; instance = nil) if instance.kind_of?(Hash) && atts.blank?
+    raise 'expected first argument to be an Effective::Resource' unless resource.kind_of?(Effective::Resource)
+    raise 'expected attributes to be a Hash' unless atts.kind_of?(Hash)
+
+    instance = instance || instance_variable_get('@' + resource.name) || resource.instance
+    raise "unable to find resource instance.  Either pass the instance as the second argument, or assign @#{resource.name}" unless instance
 
-    namespace ||= effective_resource.namespace.to_sym if effective_resource.namespace
+    crud = atts.delete(:crud) || false
+    locals = atts.delete(:locals) || {}
+    namespace = atts.delete(:namespace) || (resource.namespace.to_sym if resource.namespace)
+    partial = atts.delete(:partial)
 
     partial = case partial
     when String
@@ -57,20 +69,28 @@ module EffectiveResourcesHelper
       'effective/resource/actions'
     end + '.html'.freeze
 
-    actions = effective_resource.resource_actions - atts.reject { |_, v| v }.keys + atts.select { |_, v| v }.keys
+    actions = (crud ? resource.resource_crud_actions : resource.resource_actions)
+    raise "unknown action for #{resource.name}: #{unknown}." if (unknown = (atts.keys - actions)).present?
+
+    actions = actions - atts.reject { |_, v| v }.keys + atts.select { |_, v| v }.keys
     actions = actions.uniq.select { |action| EffectiveResources.authorized?(controller, action, resource) }
 
-    locals = { resource: resource, effective_resource: effective_resource, namespace: namespace, actions: actions }
+    locals = { resource: instance, effective_resource: resource, namespace: namespace, actions: actions }.compact.merge(locals)
 
     block_given? ? render((partial), locals) { yield } : render((partial), locals)
   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 = {})
-    raise 'expected attributes to be a Hash. Try passing action: action if rendering custom action' unless atts.kind_of?(Hash)
+  def render_resource_form(resource, instance = nil, atts = {})
+    (atts = instance; instance = nil) if instance.kind_of?(Hash) && atts.blank?
+    raise 'expected first argument to be an Effective::Resource' unless resource.kind_of?(Effective::Resource)
+    raise 'expected attributes to be a Hash' unless atts.kind_of?(Hash)
+
+    instance = instance || instance_variable_get('@' + resource.name) || resource.instance
+    raise "unable to find resource instance.  Either pass the instance as the second argument, or assign @#{resource.name}" unless instance
 
     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)
+    atts = { :namespace => (resource.namespace.to_sym if resource.namespace), resource.name.to_sym => instance }.compact.merge(atts)
 
     if lookup_context.template_exists?("form_#{action}", controller._prefixes, :partial)
       render "form_#{action}", atts

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

@@ -72,7 +72,11 @@ module Effective
       # Used by render_resource_actions helper
       # All the actions we can actually make a link to
       def resource_actions
-        (routes.keys & [:show, :edit, :destroy]) + member_actions
+        (routes.keys & [:show, :edit, :destroy]) + member_get_actions
+      end
+
+      def resource_crud_actions
+        (routes.keys & [:show, :edit, :destroy])
       end
 
       # GET actions

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

@@ -1,7 +1,7 @@
 module Effective
   module Resources
     module Instance
-      attr_reader :instance
+      attr_accessor :instance
 
       # This is written for use by effective_logging and effective_trash
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.8.25'.freeze
+  VERSION = '0.8.26'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.8.25
+  version: 0.8.26
 platform: ruby
 authors:
 - Code and Effect