effective_resources 0.8.26 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a06e3e88a6bf810728238c3e946eb7cca8d91360
-  data.tar.gz: 2dc0d2c0e88675f7f355ec8a0c172faa5c5cd98d
+  metadata.gz: b065e313e4557d61719a9164d5ac32226a8070e4
+  data.tar.gz: 2e451c636d5644ff487a5df44c546053675eaed6
 SHA512:
-  metadata.gz: 6df911c7b05cf356999d037a0fe8873fc06a100e0bf3dffbe4b82343a9d876893a3ceac152c60c64e52391b660e09b3d3e59440403063a02cf2ee7e5552e0e2a
-  data.tar.gz: 0b3c9d1df71cecc5e0299587423e381e931b9a3bb730c0b636c02240dfbbe5fa2a87a8e4b9aa41ce0b6b5a76916d0dc2b93cf649cee0ba8098399128d3de10d6
+  metadata.gz: d428a2f4135014eb14d5bd92734e327cb1befff5acbc0e2c7b5c9d9a58c07e34aeca29531f8228e1614ac046bccd30d9c43665e3ec594bdead3018cb7b5febc5
+  data.tar.gz: c072a4f0c130c92e5b7c2ac57a299b6e61c092c8b3d8d17a59a51d8af49ffb1292b2006aae0a38a2720eee2a04679b088141d108d3fda37ba0bff45f7f60652f

data/app/helpers/effective_resources_helper.rb

@@ -38,46 +38,49 @@ module EffectiveResourcesHelper
     end
   end
 
-  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
-
+  # Renders the effective/resource view partial for this resource
   # 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
+  # instance is an ActiveRecord thing, an Array of ActiveRecord things, or nil
+  # Atts are everything else. Interesting ones include:
+
+  # partial: :dropleft|:glyphicons|string
+  # locals: {} render locals
+  # you can also pass all action names and true/false such as edit: true, show: false
   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
-
-    crud = atts.delete(:crud) || false
     locals = atts.delete(:locals) || {}
     namespace = atts.delete(:namespace) || (resource.namespace.to_sym if resource.namespace)
     partial = atts.delete(:partial)
+    spacer_template = locals.delete(:spacer_template)
 
     partial = case partial
     when String
       partial
     when Symbol
-      ['effective/resource/actions', partial.to_s].join('_')
+      ['effective/resource/actions'.freeze, partial.to_s].join('_')
     else
-      'effective/resource/actions'
+      'effective/resource/actions'.freeze
     end + '.html'.freeze
 
-    actions = (crud ? resource.resource_crud_actions : resource.resource_actions)
-    raise "unknown action for #{resource.name}: #{unknown}." if (unknown = (atts.keys - actions)).present?
+    actions = (instance ? resource.resource_member_actions : resource.resource_collection_actions)
+    actions = (actions & resource.crud_actions) if atts.delete(:crud)
+    raise "unknown action for #{resource.name}: #{(atts.keys - actions).join(' ')}." if (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) }
+    actions = (actions - atts.reject { |_, v| v }.keys + atts.select { |_, v| v }.keys).uniq
+    actions.select! { |action| EffectiveResources.authorized?(controller, action, (Array(instance).first || resource.klass)) }
 
     locals = { resource: instance, effective_resource: resource, namespace: namespace, actions: actions }.compact.merge(locals)
 
-    block_given? ? render((partial), locals) { yield } : render((partial), locals)
+    if instance.kind_of?(Array) # Render as collection mode
+      render(partial: partial, collection: instance, as: :resource, locals: locals.except(:resource), spacer_template: spacer_template)
+    elsif block_given?
+      render(partial, locals) { yield }
+    else
+      render(partial, locals)
+    end
   end
 
   # When called from /admin/things/new.html.haml this will render 'admin/things/form', or 'things/form', or 'thing/form'

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

@@ -70,13 +70,14 @@ module Effective
       end
 
       # Used by render_resource_actions helper
-      # All the actions we can actually make a link to
-      def resource_actions
+      # All the actions we can actually make a link to but not submits
+      def resource_member_actions
         (routes.keys & [:show, :edit, :destroy]) + member_get_actions
       end
 
-      def resource_crud_actions
-        (routes.keys & [:show, :edit, :destroy])
+      # Used by render_resource_actions helper for the index screens or new record
+      def resource_collection_actions
+        (routes.keys & [:new]) + collection_get_actions
       end
 
       # GET actions

data/app/views/effective/resource/_actions.html.haml

@@ -1,15 +1,22 @@
+- if actions.index(:new)
+  - name = effective_resource.human_name.titleize
+  = link_to "New #{name}", effective_resource.action_path(:new), title: "New #{name}", class: 'btn btn-primary'
+
 - if actions.index(:edit)
   = link_to 'Edit', effective_resource.action_path(:edit, resource), title: "Edit #{resource}", class: 'btn btn-secondary'
 
 - if actions.index(:show)
   = link_to 'View', effective_resource.action_path(:show, resource), title: resource.to_s, class: 'btn btn-secondary'
 
-- (actions - [:edit, :show, :destroy]).each do |action|
-  = link_to action.to_s.titleize, effective_resource.action_path(action, resource), class: 'btn btn-secondary',
-    title: "#{action} #{resource}", data: { method: :post, confirm: "Really #{action} #{resource}?"}
+- (actions - [:new, :edit, :show, :destroy]).each do |action|
+  - if effective_resource.member_post_actions.include?(action)
+    = link_to action.to_s.titleize, effective_resource.action_path(action, resource), class: 'btn btn-secondary',
+      title: "#{action} #{resource}", data: { method: :post, confirm: "#{action.to_s.titleize} #{resource}?"}
+  - else
+    = link_to action.to_s.titleize, effective_resource.action_path(action), class: 'btn btn-secondary', title: action.to_s.titleize
 
-= yield
+= yield if block_given?
 
 - if actions.index(:destroy)
-  = link_to "Delete #{resource}", effective_resource.action_path(:destroy, resource), class: 'btn btn-danger',
-    title: "Delete #{resource}", data: { method: :delete, confirm: "Really delete #{resource}?" }
+  = link_to 'Delete', effective_resource.action_path(:destroy, resource), class: 'btn btn-danger',
+    title: "Delete #{resource}", data: { method: :delete, confirm: "Delete #{resource}?" }

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -7,10 +7,10 @@
 
   - (actions - [:edit, :show, :destroy]).each do |action|
     = dropdown_link_to action.to_s.titleize, effective_resource.action_path(action, resource),
-      title: "#{action} #{resource}", data: { method: :post, confirm: "Really #{action} #{resource}?"}
+      title: "#{action} #{resource}", data: { method: :post, confirm: "#{action.to_s.titleize} #{resource}?"}
 
-  = yield
+  = yield if block_given?
 
   - if actions.index(:destroy)
-    = dropdown_link_to "Delete #{resource}", effective_resource.action_path(:destroy, resource),
-      title: "Delete #{resource}", data: { method: :delete, confirm: "Really delete #{resource}?" }
+    = dropdown_link_to 'Delete', effective_resource.action_path(:destroy, resource),
+      title: "Delete #{resource}", data: { method: :delete, confirm: "Delete #{resource}?" }

data/lib/effective_resources/version.rb

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

metadata

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