effective_resources 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35cbb54f201aa73759a5b30e40a64872edd06a90
-  data.tar.gz: 155d1eb21e118942bf426030951ad9c0711ec264
+  metadata.gz: 4fbe1f0439ac8728d4c40ac89c5fc1d9360879b4
+  data.tar.gz: 6a61cede865aedbff717d46778ee050b824fc460
 SHA512:
-  metadata.gz: f13b0ce467ebebdab7673f67c367118335d1894494b3c558cf9ae2486f7908c3d30c54dc380f2475cf3533212668fe27e16aee140c170ab57b8eaeec8e694d06
-  data.tar.gz: ec7a4f34b62a61c0c3bfa800dd71e12315b03fd970378dbc2ed79d4af23ee0cb2e7bc803adaada3f5e4267af86f84feabb33c2a0b1a9ee13e0f3bc1996dafa24
+  metadata.gz: 860e346086622e579d8042a150f9eaed72047e4e11e3d75839b158665494db9d5f1a5a9924cdd35bd2b8eda4501ffb1eff023460955a0401b695d12b8aff31bc
+  data.tar.gz: 6fcb1b207a5b8c7c1804d7b3fa54e65940e31c8ddee4e21d4a65e2bc7fb97128a54a7098ec8555e01efb59525b314d01fa72ebb45b1d7d7bd5b364e00af305f1

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

@@ -22,8 +22,8 @@ module Effective
       # Automatically respond to any action defined via the routes file
       def define_actions_from_routes
         resource = Effective::Resource.new(controller_path)
-        resource.member_actions.each { |action| member_action(action) }
-        resource.collection_actions.each { |action| collection_action(action) }
+        (resource.member_actions - resource.crud_actions).each { |action| member_action(action) }
+        (resource.collection_actions - resource.crud_actions).each { |action| collection_action(action) }
       end
 
       # https://github.com/rails/rails/blob/v5.1.4/actionpack/lib/abstract_controller/callbacks.rb

data/app/helpers/effective_resources_helper.rb

@@ -65,12 +65,11 @@ module EffectiveResourcesHelper
       'effective/resource/actions'.freeze
     end + '.html'.freeze
 
-    actions = (instance ? resource.resource_member_actions : resource.resource_collection_actions)
+    actions = (instance ? resource.member_get_actions : resource.collection_get_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?
 
+    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).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)
 

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

@@ -69,43 +69,36 @@ module Effective
         routes.keys
       end
 
-      # Used by render_resource_actions helper
-      # 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
-
-      # Used by render_resource_actions helper for the index screens or new record
-      def resource_collection_actions
-        (routes.keys & [:new]) + collection_get_actions
+      def crud_actions
+        actions & %i(index new create show edit update destroy)
       end
 
       # GET actions
       def collection_actions
-        routes.values.map { |route| route.defaults[:action].to_sym if is_collection_route?(route) }.compact - crud_actions
+        routes.values.map { |route| route.defaults[:action].to_sym if is_collection_route?(route) }.compact
       end
 
       def collection_get_actions
-        routes.values.map { |route| route.defaults[:action].to_sym if is_collection_route?(route) && is_get_route?(route) }.compact - crud_actions
+        routes.values.map { |route| route.defaults[:action].to_sym if is_collection_route?(route) && is_get_route?(route) }.compact
       end
 
       def collection_post_actions
-        routes.values.map { |route| route.defaults[:action].to_sym if is_collection_route?(route) && is_post_route?(route) }.compact - crud_actions
+        routes.values.map { |route| route.defaults[:action].to_sym if is_collection_route?(route) && is_post_route?(route) }.compact
       end
 
       # All actions
       def member_actions
-        routes.values.map { |route| route.defaults[:action].to_sym if is_member_route?(route) }.compact - crud_actions
+        routes.values.map { |route| route.defaults[:action].to_sym if is_member_route?(route) }.compact
       end
 
       # GET actions
       def member_get_actions
-        routes.values.map { |route| route.defaults[:action].to_sym if is_member_route?(route) && is_get_route?(route) }.compact - crud_actions
+        routes.values.map { |route| route.defaults[:action].to_sym if is_member_route?(route) && is_get_route?(route) }.compact
       end
 
       # POST/PUT/PATCH actions
       def member_post_actions
-        routes.values.map { |route| route.defaults[:action].to_sym if is_member_route?(route) && is_post_route?(route) }.compact - crud_actions
+        routes.values.map { |route| route.defaults[:action].to_sym if is_member_route?(route) && is_post_route?(route) }.compact
       end
 
       # Same as controller_path in the view
@@ -115,10 +108,6 @@ module Effective
 
       private
 
-      def crud_actions
-        %i(index new create show edit update destroy)
-      end
-
       def is_member_route?(route)
         (route.path.required_names || []).include?('id')
       end

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

@@ -12,7 +12,7 @@ module Effective
             submits['Save'] = { action: :save, default: true, class: 'btn btn-primary' }
           end
 
-          member_post_actions.each do |action| # default true means it will be overwritten by dsl methods
+          (member_post_actions - crud_actions).each do |action| # default true means it will be overwritten by dsl methods
             submits[action.to_s.titleize] = { action: action, default: true, class: 'btn btn-primary' }
           end
 

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

@@ -1,22 +1,34 @@
 - 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 EffectiveResources.authorized?(controller, :new, effective_resource.klass)
+    - 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 EffectiveResources.authorized?(controller, :edit, resource)
+    = 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'
+  - if EffectiveResources.authorized?(controller, :show, resource)
+    = link_to 'View', effective_resource.action_path(:show, resource), title: resource.to_s, class: 'btn btn-secondary'
 
-- (actions - [:new, :edit, :show, :destroy]).each do |action|
+- (actions - effective_resource.crud_actions).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}?"}
+    - if EffectiveResources.authorized?(controller, action, resource)
+      = 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}?"}
+
+  - elsif effective_resource.member_get_actions.include?(action)
+    - if EffectiveResources.authorized?(controller, action, resource)
+      = link_to action.to_s.titleize, effective_resource.action_path(action, resource), class: 'btn btn-secondary',
+        title: "#{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
+    - if EffectiveResources.authorized?(controller, action, effective_resource.klass)
+      = link_to action.to_s.titleize, effective_resource.action_path(action), class: 'btn btn-secondary',
+        title: action.to_s.titleize
 
 = yield if block_given?
 
 - if actions.index(:destroy)
-  = link_to 'Delete', effective_resource.action_path(:destroy, resource), class: 'btn btn-danger',
-    title: "Delete #{resource}", data: { method: :delete, confirm: "Delete #{resource}?" }
+  - if EffectiveResources.authorized?(controller, :destroy, 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

@@ -1,16 +1,28 @@
 = dropdown(variation: :dropleft) do
   - if actions.index(:edit)
-    = dropdown_link_to 'Edit', effective_resource.action_path(:edit, resource), title: "Edit #{resource}"
+    - if EffectiveResources.authorized?(controller, :edit, resource)
+      = dropdown_link_to 'Edit', effective_resource.action_path(:edit, resource), title: "Edit #{resource}"
 
   - if actions.index(:show)
-    = dropdown_link_to 'View', effective_resource.action_path(:show, resource), title: resource.to_s
+    - if EffectiveResources.authorized?(controller, :show, resource)
+      = dropdown_link_to 'View', effective_resource.action_path(:show, resource), title: resource.to_s
 
-  - (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: "#{action.to_s.titleize} #{resource}?"}
+  - (actions - effective_resource.crud_actions).each do |action|
+    - if effective_resource.member_post_actions.include?(action)
+      - if EffectiveResources.authorized?(controller, action, resource)
+        = dropdown_link_to action.to_s.titleize, effective_resource.action_path(action, resource),
+          title: "#{action} #{resource}", data: { method: :post, confirm: "#{action.to_s.titleize} #{resource}?"}
+
+    - elsif effective_resource.member_get_actions.include?(action)
+      - if EffectiveResources.authorized?(controller, action, resource)
+        = dropdown_link_to action.to_s.titleize, effective_resource.action_path(action, resource), title: "#{action.to_s.titleize} #{resource}"
+    - else
+      - if EffectiveResources.authorized?(controller, action, effective_resource.klass)
+        = dropdown_link_to action.to_s.titleize, effective_resource.action_path(action), title: action.to_s.titleize
 
   = yield if block_given?
 
   - if actions.index(:destroy)
-    = dropdown_link_to 'Delete', effective_resource.action_path(:destroy, resource),
-      title: "Delete #{resource}", data: { method: :delete, confirm: "Delete #{resource}?" }
+    - if EffectiveResources.authorized?(controller, :destroy, resource)
+      = dropdown_link_to 'Delete', effective_resource.action_path(:destroy, resource),
+        title: "Delete #{resource}", data: { method: :delete, confirm: "Delete #{resource}?" }

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

@@ -1,8 +1,11 @@
 - if actions.index(:edit)
-  = edit_icon_to effective_resource.action_path(:edit, resource)
+  - if EffectiveResources.authorized?(controller, :edit, resource)
+    = edit_icon_to effective_resource.action_path(:edit, resource)
 
 - if actions.index(:show)
-  = show_icon_to effective_resource.action_path(:show, resource)
+  - if EffectiveResources.authorized?(controller, :show, resource)
+    = show_icon_to effective_resource.action_path(:show, resource)
 
 - if actions.index(:destroy)
-  = destroy_icon_to effective_resource.action_path(:destroy, resource), data: { method: :delete, confirm: "Really delete #{resource}?" }
+  - if EffectiveResources.authorized?(controller, :destroy, resource)
+    = destroy_icon_to effective_resource.action_path(:destroy, resource), data: { method: :delete, confirm: "Really delete #{resource}?" }

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.9.1'.freeze
+  VERSION = '0.9.2'.freeze
 end

metadata

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