effective_resources 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f7e34ae7d9694f5c661938ca3be425aafa8e485777805079a9295284ace1028
-  data.tar.gz: 8421d429c3869a68583227823120a89ade1304b8ae3109c4a4be8f0f3f932a93
+  metadata.gz: 00676e20bca2b28bf3ade5d56980806ab7bcb55b015681a74d8813f823f597d4
+  data.tar.gz: 0e69b1862f3ed5f64a2327c077cd7aef520c47ca7e7e6d6040b81b55d7777a76
 SHA512:
-  metadata.gz: f3d14ffd6009c288dc866f146e9aa88f26e1d1e1e69d45580cd4df347346b515e831078c23b7081f146af755e6d38ba28500268948b8875b23fe01d0861ede4f
-  data.tar.gz: 376071961ace632d78d96a870feac9cd9cd686aeea87dc1c9f68a9e9a839cc92ee69cfa364eadb944f71fc01ce746856a6760d029a35b51048a04c5bb255c008
+  metadata.gz: 219fbc86a55a7251655d2d67d7f46cc603a4e496613c68e5cd276b56839b3bea25f65d7e816984c8c056ef54a338aa98a396eb7c8c455dfd48e9ecfb7196cfb0
+  data.tar.gz: fb1ad2e01fdba48d1e401eff91f6226da6266a0d8717cc07d1d2ab7c632b281aef50d1d687e1edb07e50f4b5d8b7e1d0586c51d9abafaf9329f74812396cbe21

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018 Code and Effect Inc.
+Copyright 2019 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/helpers/effective_resources_helper.rb

@@ -58,43 +58,54 @@ module EffectiveResourcesHelper
   # you can also pass all action names and true/false such as edit: true, show: false
   def render_resource_actions(resource, atts = {}, &block)
     unless resource.kind_of?(ActiveRecord::Base) || resource.kind_of?(Class) || resource.kind_of?(Array) || resource.class.ancestors.include?(ActiveModel::Model)
-      raise 'expected first argument to be an ActiveRecord::Base object or Array of objects' 
+      raise 'expected first argument to be an ActiveRecord::Base object or Array of objects'
     end
-    
+
     raise 'expected attributes to be a Hash' unless atts.kind_of?(Hash)
 
     btn_class = atts[:btn_class]
+    effective_resource = atts[:effective_resource]
+    namespace = atts[:controller_namespace] || atts[:namespace]
     locals = atts[:locals] || {}
     partial = atts[:partial]
     spacer_template = locals[:spacer_template]
 
-    effective_resource = (atts[:effective_resource] || find_effective_resource(resource))
-    namespace = atts[:namespace] || (effective_resource.namespace.to_sym if effective_resource.namespace)
+    effective_resource ||= find_effective_resource(resource)
+    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 # [:new, :edit, ...]
+      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 }
     else
       (resource.kind_of?(Class) ? effective_resource.resource_klass_actions : effective_resource.resource_actions)
     end
 
     # Filter out false and proc false
-    actions = actions.select { |_, v| atts[v[:action]].respond_to?(:call) ? Effective::ResourceExec.new(self, resource).instance_exec(&atts[v[:action]]) : (atts[v[:action]] != false) }
+    actions = actions.select do |_, opts|
+      if atts[opts[:action]].respond_to?(:call)
+        Effective::ResourceExec.new(self, resource).instance_exec(&atts[opts[:action]])
+      else
+        atts[opts[:action]] != false
+      end
+    end
 
     # Select Partial
     partial = ['effective/resource/actions', partial.to_s].join('_') if partial.kind_of?(Symbol)
     partial = (partial.presence || 'effective/resource/actions') + '.html'
 
     # Assign Locals
-    locals = { resource: resource, effective_resource: effective_resource, namespace: namespace, actions: actions, btn_class: btn_class.to_s }.compact.merge(locals)
+    locals = {
+      resource: resource,
+      effective_resource: effective_resource,
+      format_block: (block if block_given?),
+      namespace: namespace,
+      actions: actions,
+      btn_class: (btn_class || '')
+    }.compact.merge(locals)
 
-    # Render
     if resource.kind_of?(Array)
-      locals[:format_block] = block if block_given?
       render(partial: partial, collection: resource, as: :resource, locals: locals.except(:resource), spacer_template: spacer_template)
-    elsif block_given?
-      render(partial, locals) { capture(&block).to_s.html_safe }
     else
       render(partial, locals)
     end

data/app/helpers/effective_resources_private_helper.rb

@@ -16,13 +16,21 @@ module EffectiveResourcesPrivateHelper
       (args.key?(:unless) ? !executor.instance_exec(&args[:unless]) : true) &&
       EffectiveResources.authorized?(controller, action, resource)
     end.inject({}) do |h, (commit, args)|
-      opts = args.except(:default, :only, :except, :if, :unless, :redirect, :success, :danger)
+      opts = args.except(:default, :only, :except, :if, :unless, :redirect, :success, :danger, :klass)
 
       # Transform data: { ... } hash into 'data-' keys
       if opts.key?(:data)
         opts.delete(:data).each { |k, v| opts["data-#{k}"] ||= v }
       end
 
+      if opts.key?(:path)
+        opts[:href] = opts.delete(:path)
+      end
+
+      if opts.key?(:url)
+        opts[:href] = opts.delete(:url)
+      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)

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

@@ -98,6 +98,15 @@ module Effective
         end
       end
 
+      # Used by datatables
+      def fallback_resource_actions
+        {
+          'Show': { action: :show, default: true },
+          'Edit': { action: :edit, default: true },
+          'Delete': { action: :destroy, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
+        }
+      end
+
       # This is the fallback for render_resource_actions when no actions are specified, but a class is given
       # Used by Datatables new
       def resource_klass_actions

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.3.5'.freeze
+  VERSION = '1.3.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails