effective_resources 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbff7f74429b0acf21d35b75cb64e6fedcdb4b35c2e62080c530d7416dd1d05c
-  data.tar.gz: 392c8953a3cd59673d093c9fb8c8160951d54866c293e4f7f200d358503e0aab
+  metadata.gz: e01b50384fc2d41b95913769c539276b592257b4f36109917a02afe5a74a8584
+  data.tar.gz: 005a5676dca6e1d0e14a19ad96f31d834a85fdec527514bc75b86d040b3ed2f0
 SHA512:
-  metadata.gz: 24f6a3cc4b8ab73cfd180e79f45ab609fd6cb3af7ef76f24c07b272c82d6ee1087203e76e09f2113e217975f1d29cd550930a99cd82197ccd18985a5f1faa1b0
-  data.tar.gz: 1b3c4ef600b6aae43357764d6d908141f13453853fb7645ed11bf58f136dcb2265e16fadbaed9cfd627dd1a6d557fe4f14f1a24021e66491e072ad676e174a3e
+  metadata.gz: 0d135e3a5f848c0ee8f40d89e5412a4576fdd4e25068cd5df6ee3d01d3901db36f10c034376dc9bc253cc0f7aebbdce242cebca9c988e8a2bb315621aee80f80
+  data.tar.gz: c7808cfa20c0b8c7b256a0dc5d46ba0b39bf6c638d1200820cd93c50228b8c456b77f9adbe34039825c6e0a00dc5312b6da4ab51a464769ac8b11f91393dcd78

data/app/helpers/effective_resources_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EffectiveResourcesHelper
 
   # effective_bootstrap
@@ -74,18 +76,22 @@ module EffectiveResourcesHelper
     namespace ||= (effective_resource.namespace.to_sym if effective_resource.namespace)
 
     # Assign actions
-    actions = if atts.key?(:actions) # We filter out any actions passed to us that aren't supported
-      available = effective_resource.actions + atts[:actions].map { |k, v| v[:action] if v[:path] }.compact
-      atts[:actions].inject({}) { |h, (commit, opts)| h[commit] = opts if available.include?(opts[:action]); h }
+    # We filter out any actions passed to us that aren't supported
+    actions = if atts.key?(:actions)
+      {}.tap do |actions|
+        atts[:actions].each do |commit, opts|
+          actions[commit] = opts if (effective_resource.actions.include?(opts[:action]) || opts[:path]).present?
+        end
+      end
     else
       (resource.kind_of?(Class) ? effective_resource.resource_klass_actions : effective_resource.resource_actions)
     end
 
     # Consider only, except, false and proc false
-    only = Array(atts[:only]).compact
-    except = Array(atts[:except]).compact
+    only = Array(atts[:only]) if atts[:only].present?
+    except = Array(atts[:except]) if atts[:except].present?
 
-    actions = actions.select do |_, opts|
+    actions.select! do |_, opts|
       action = opts[:action]
 
       if only.present? && !only.include?(action)
@@ -100,8 +106,11 @@ module EffectiveResourcesHelper
     end
 
     # Select Partial
-    partial = ['effective/resource/actions', partial.to_s].join('_') if partial.kind_of?(Symbol)
-    partial = (partial.presence || 'effective/resource/actions') + '.html'
+    partial = if partial.kind_of?(Symbol)
+      "effective/resource/actions_#{partial}.html"
+    else
+      "#{partial.presence || 'effective/resource/actions'}.html"
+    end
 
     # Assign Locals
     locals = {

data/app/helpers/effective_resources_private_helper.rb

@@ -2,21 +2,27 @@
 
 module EffectiveResourcesPrivateHelper
   REPLACE_PAGE_ACTIONS = {'update' => :edit, 'create' => :new}
+  BLACKLIST = [:default, :only, :except, :if, :unless, :redirect, :success, :danger, :klass]
+
+  DATA_CONFIRM = 'data-confirm'
 
   def permitted_resource_actions(resource, actions)
     page_action = REPLACE_PAGE_ACTIONS[params[:action]] || params[:action].try(:to_sym) || :save
     executor = Effective::ResourceExec.new(self, resource)
 
-    actions.select do |commit, args|
+    actions.each_with_object({}) do |(commit, args), h|
       action = (args[:action] == :save ? (resource.new_record? ? :create : :update) : args[:action])
 
-      (args.key?(:only) ? args[:only].include?(page_action) : true) &&
-      (args.key?(:except) ? !args[:except].include?(page_action) : true) &&
-      (args.key?(:if) ? executor.instance_exec(&args[:if]) : true) &&
-      (args.key?(:unless) ? !executor.instance_exec(&args[:unless]) : true) &&
-      EffectiveResources.authorized?(controller, action, resource)
-    end.inject({}) do |h, (commit, args)|
+      permitted = (args.key?(:only) ? args[:only].include?(page_action) : true) &&
+        (args.key?(:except) ? !args[:except].include?(page_action) : true) &&
+        (args.key?(:if) ? executor.instance_exec(&args[:if]) : true) &&
+        (args.key?(:unless) ? !executor.instance_exec(&args[:unless]) : true) &&
+        EffectiveResources.authorized?(controller, action, resource)
+
+      next unless permitted
+
       opts = args.except(:default, :only, :except, :if, :unless, :redirect, :success, :danger, :klass)
+      resource_to_s = resource.to_s.presence || resource.class.name.underscore
 
       # Transform data: { ... } hash into 'data-' keys
       if opts.key?(:data)
@@ -32,34 +38,34 @@ module EffectiveResourcesPrivateHelper
       end
 
       # Replace resource name in any token strings
-      if opts.key?('data-confirm')
-        opts['data-confirm'] = opts['data-confirm'].gsub('@resource', (resource.to_s.presence || resource.class.name.gsub('::', ' ').underscore.gsub('_', ' ')).to_s)
+      if opts[DATA_CONFIRM].present? && opts[DATA_CONFIRM].include?('@resource'.freeze)
+        opts[DATA_CONFIRM] = opts[DATA_CONFIRM].gsub('@resource'.freeze, resource_to_s)
       end
 
       # Assign class
       opts[:class] ||= (
-        if opts['data-method'].to_s == 'delete'
-          'btn btn-danger'
+        if opts['data-method'.freeze] == 'delete'.freeze
+          'btn btn-danger'.freeze
         elsif h.length == 0
-          'btn btn-primary'
+          'btn btn-primary'.freeze
         elsif defined?(EffectiveBootstrap)
-          'btn btn-secondary'
+          'btn btn-secondary'.freeze
         else
-          'btn btn-default'
+          'btn btn-default'.freeze
         end
       )
 
       # Assign title
       opts[:title] ||= case opts[:action]
         when :save then commit
-        when :edit then "Edit #{resource}"
-        when :show then "#{resource}"
-        when :destroy then "Delete #{resource}"
+        when :edit then "Edit #{resource_to_s}"
+        when :show then "#{resource_to_s}"
+        when :destroy then "Delete #{resource_to_s}"
         when :index then "All #{resource.class.name.gsub('::', ' ').underscore.gsub('_', ' ').titleize.pluralize}"
-        else "#{opts[:action].to_s.titleize} #{resource}"
+        else "#{opts[:action].to_s.titleize} #{resource_to_s}"
       end
 
-      h[commit] = opts; h
+      h[commit] = opts
     end
   end
 

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

@@ -1,12 +1,17 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Actions
+      EMPTY_HASH = {}
+      POST_VERBS = ['POST', 'PUT', 'PATCH']
+      CRUD_ACTIONS = %i(index new create show edit update destroy)
 
       # This was written for the Edit actions fallback templates and Datatables
       # Effective::Resource.new('admin/posts').routes[:index]
       def routes
         @routes ||= (
-          matches = [[namespace, plural_name].compact.join('/'.freeze), [namespace, name].compact.join('/'.freeze)]
+          matches = [[namespace, plural_name].compact.join('/'), [namespace, name].compact.join('/')]
 
           routes_engine.routes.routes.select do |route|
             matches.any? { |match| match == route.defaults[:controller] } && !route.name.to_s.end_with?('root')
@@ -19,7 +24,7 @@ module Effective
       # Effective::Resource.new('effective/order', namespace: :admin)
       def routes_engine
         case class_name
-        when 'Effective::Order'.freeze
+        when 'Effective::Order'
           EffectiveOrders::Engine
         else
           Rails.application
@@ -30,12 +35,14 @@ module Effective
       # This will return empty for create, update and destroy
       def action_path_helper(action)
         return unless routes[action]
-        return (routes[action].name + '_path'.freeze) if routes[action].name.present?
+        return (routes[action].name + '_path') if routes[action].name.present?
       end
 
       # Effective::Resource.new('admin/posts').action_path(:edit, Post.last) => '/admin/posts/3/edit'
       # Will work for any action. Returns the real path
-      def action_path(action, resource = nil, opts = {})
+      def action_path(action, resource = nil, opts = nil)
+        opts ||= EMPTY_HASH
+
         if klass.nil? && resource.present? && initialized_name.kind_of?(ActiveRecord::Reflection::BelongsToReflection)
           return Effective::Resource.new(resource, namespace: namespace).action_path(action, resource, opts)
         end
@@ -53,12 +60,26 @@ module Effective
           end
         end
 
-        # This generates the correct route when an object is overriding to_param
-        if (resource || instance).respond_to?(:attributes)
-          formattable = (resource || instance).attributes.symbolize_keys.merge(id: (resource || instance).to_param)
+        target = (resource || instance)
+
+        formattable = if routes[action].parts.include?(:id)
+          if target.respond_to?(:to_param) && target.respond_to?(:id) && (target.to_param != target.id.to_s)
+            routes[action].parts.each_with_object({}) do |part, h|
+              if part == :id
+                h[part] = target.to_param
+              elsif part == :format
+                # Nothing
+              elsif target.respond_to?(part)
+                h[part] = target.public_send(part)
+              end
+            end
+          else
+            target
+          end
         end
 
-        path = routes[action].format(formattable || {}).presence
+        # Generate the path
+        path = routes[action].format(formattable || EMPTY_HASH)
 
         if path.present? && opts.present?
           uri = URI.parse(path)
@@ -70,74 +91,85 @@ module Effective
       end
 
       def actions
-        routes.keys
+        @route_actions ||= routes.keys
       end
 
       def crud_actions
-        actions & %i(index new create show edit update destroy)
+        @crud_actions ||= (actions & CRUD_ACTIONS)
       end
 
       # GET actions
       def collection_actions
-        routes.values.map { |route| route.defaults[:action].to_sym if is_collection_route?(route) }.compact
+        @collection_actions ||= (
+          routes.map { |_, route| route.defaults[:action].to_sym if is_collection_route?(route) }.tap(&: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
+        @collection_get_actions ||= (
+          routes.map { |_, route| route.defaults[:action].to_sym if is_collection_route?(route) && is_get_route?(route) }.tap(&: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
+        @collection_post_actions ||= (
+          routes.map { |_, route| route.defaults[:action].to_sym if is_collection_route?(route) && is_post_route?(route) }.tap(&:compact!)
+        )
       end
 
       # All actions
       def member_actions
-        routes.values.map { |route| route.defaults[:action].to_sym if is_member_route?(route) }.compact
+        @member_actions ||= (
+          routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) }.tap(&: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
+        @member_get_actions ||= (
+          routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) && is_get_route?(route) }.tap(&:compact!)
+        )
       end
 
       def member_delete_actions
-        routes.values.map { |route| route.defaults[:action].to_sym if is_member_route?(route) && is_delete_route?(route) }.compact
+        @member_delete_actions ||= (
+          routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) && is_delete_route?(route) }.tap(&: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
+        @member_post_actions ||= (
+          routes.map { |_, route| route.defaults[:action].to_sym if is_member_route?(route) && is_post_route?(route) }.tap(&:compact!)
+        )
       end
 
       # Same as controller_path in the view
       def controller_path
-        [namespace, plural_name].compact * '/'.freeze
+        [namespace, plural_name].compact * '/'
       end
 
       private
 
       def is_member_route?(route)
-        (route.path.required_names || []).include?('id'.freeze)
+        (route.path.required_names || []).include?('id')
       end
 
       def is_collection_route?(route)
-        (route.path.required_names || []).include?('id'.freeze) == false
+        (route.path.required_names || []).include?('id') == false
       end
 
       def is_get_route?(route)
-        route.verb.to_s.include?('GET'.freeze)
+        route.verb == 'GET'
       end
 
       def is_delete_route?(route)
-        route.verb.to_s.include?('DELETE'.freeze)
+        route.verb == 'DELETE'
       end
 
       def is_post_route?(route)
-        ['POST', 'PUT', 'PATCH'].freeze.any? { |verb| route.verb == verb }
+        POST_VERBS.include?(route.verb)
       end
     end
   end
 end
-
-
-

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

@@ -1,3 +1,5 @@
+# frozen_sting_literals: true
+
 module Effective
   module Resources
     module Controller
@@ -66,15 +68,19 @@ module Effective
       # It is used by datatables
       def resource_actions
         {}.tap do |actions|
-          (member_get_actions & crud_actions).reverse_each do |action|
+          member_get_actions.reverse_each do |action|
+            next unless crud_actions.include?(action)
             actions[action.to_s.titleize] = { action: action, default: true }
           end
 
-          (member_get_actions - crud_actions).each do |action|
+          member_get_actions.each do |action|
+            next if crud_actions.include?(action)
             actions[action.to_s.titleize] = { action: action, default: true }
           end
 
-          (member_post_actions - crud_actions).each do |action|
+          member_post_actions.each do |action|
+            next if crud_actions.include?(action)
+
             actions[action.to_s.titleize] = { action: action, default: true, 'data-method' => :post, 'data-confirm' => "Really #{action} @resource?" }
 
             actions[action.to_s.titleize] = case action
@@ -89,7 +95,7 @@ module Effective
 
           member_delete_actions.each do |action|
             if action == :destroy
-              next if actions.values.find { |v| v[:action] == :archive }.present?
+              next if actions.find { |_, v| v[:action] == :archive }.present?
               actions['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
             else
               actions[action.to_s.titleize] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action} @resource?" }

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

@@ -1,5 +1,6 @@
 - permitted_resource_actions(resource, actions).each do |label, opts|
-  = link_to(label, (effective_resource.action_path(opts[:action], resource) || '#'), opts.except(:action))
+  - action = opts.delete(:action)
+  = link_to(label, (effective_resource.action_path(action, resource) || '#'), opts)
 
 = instance_exec(resource, &format_block) if local_assigns[:format_block]
 = yield if block_given?

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

@@ -1,6 +1,9 @@
 = dropdown(variation: :dropleft, btn_class: btn_class) do
   - permitted_resource_actions(resource, actions).each do |label, opts|
-    = dropdown_link_to(label, (effective_resource.action_path(opts[:action], resource) || '#'), opts.except(:action, :class).merge(btn_class: btn_class))
+    - action = opts.delete(:action)
+    - opts.delete(:class)
+
+    = dropdown_link_to(label, (effective_resource.action_path(action, resource) || '#'), opts)
 
   = instance_exec(resource, &format_block) if local_assigns[:format_block]
   = yield(resource) if block_given?

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

@@ -1,5 +1,8 @@
 - permitted_resource_actions(resource, actions).each do |label, opts|
-  = glyphicon_to(opts[:action], (effective_resource.action_path(opts[:action], resource) || '#'), opts.except(:action, :class))
+  - action = opts.delete(:action)
+  - opts.delete(:class)
+
+  = glyphicon_to(action, (effective_resource.action_path(action, resource) || '#'), opts)
 
 = instance_exec(resource, &format_block) if local_assigns[:format_block]
 = yield(resource) if block_given?

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.5.2'.freeze
+  VERSION = '1.5.3'.freeze
 end

metadata

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