express_admin 1.7.21 → 1.7.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819ad66e5886f8d82cd60f27e1f97f8055f7de18
-  data.tar.gz: 0c7debd9cac98fd177979a42c1db055a70410589
+  metadata.gz: cce00b8f840033a5025e39117a2bf09edf6e45a7
+  data.tar.gz: 48a72003e0762ed38cc9569be3d4554723439dfe
 SHA512:
-  metadata.gz: ca7796446c91a43dc161a06455489f10c5dc39188d2a3935f8db70b214c8a7631cf320e950c7c516e17dba6b276905ae12e4813fa25610910dbb8432b74eb37c
-  data.tar.gz: 6e8cedddcd5fa99c8026645f47796dd595543d869af8f0deb5415c57433a987a6f4a43cd63642fb20495499fbf5380a4a65dfa06b8903e9f6b6da95ea35e79be
+  metadata.gz: 9856a9fc7ba75f1411f3b5550d8d4563190ed7351b4ac93303140207e4046ec60b02337bc210cf24e9e8d975a6cdb74a9e416bacb3622ba684fbbf3fc608f2fe
+  data.tar.gz: f9a78b32974a2a635d4ed771be1da187213f8b59cb1a07cae829eb0725b3ada223717ba0a270e961fab60620dd09d6f2796a58e0148d09a311765d2b2a67d1ab

data/app/components/express_admin/command_button.rb

@@ -4,7 +4,6 @@ module ExpressAdmin
       class CommandButton < ExpressTemplates::Components::Configurable
         include ExpressTemplates::Components::Capabilities::Resourceful
 
-
         has_argument :id, "The command name.  Invoked as an action on the resource.", as: :command, type: :symbol
         has_option :disabled, "Disables the button", type: :boolean
         has_option :confirm, "Prompt with the question specified."
@@ -24,7 +23,9 @@ module ExpressAdmin
         end
 
         def button_to_options
-          {disabled: config[:disabled], confirm: config[:confirm]}
+          options = {}
+          options = { data: { confirm: config[:confirm] } } if config[:confirm]
+          options.merge({ disabled: config[:disabled] })
         end
 
         def action

data/app/components/express_admin/command_button_list.rb

@@ -13,7 +13,7 @@ module ExpressAdmin
         contains -> {
           commands.each do |command|
             li {
-              command_button(command, disabled: !available?(command))
+              command_button(command[:name], command_button_options(command))
             }
           end
         }
@@ -23,14 +23,22 @@ module ExpressAdmin
         end
 
         def available?(command)
-          resource.available_commands.include?(command)
+          resource.available_commands.include?(command[:name])
         end
 
         def commands
           resource.commands
         end
 
+        private
+
+        def command_button_options(command)
+          options = {}
+          options = { confirm: command[:confirm] } if command[:confirm]
+          options.merge({ disabled: !available?(command) })
+        end
+
       end
     end
   end
-end
+end

data/lib/express_admin/commandable.rb

@@ -37,7 +37,7 @@ module ExpressAdmin
           resource_class.commands.each do |action|
             # post :foo, to: "module/controller#foo"
             mapper.member do
-              mapper.post action.debang, to: "#{controller_name}##{action.debang}"
+              mapper.post action[:name].debang, to: "#{controller_name}##{action[:name].debang}"
             end
           end
         end
@@ -62,4 +62,4 @@ module ActionDispatch::Routing::Mapper::Resources
   alias :resources_without_commandable :resources
   alias :resources :resources_with_commandable
 
-end
+end

data/lib/express_admin/commands.rb

@@ -13,12 +13,15 @@ module ExpressAdmin
     module ClassMethods
 
       def exposes_command(command)
+        command = { name: command } if command.is_a?(Symbol)
+
         exposes_commands command
       end
 
       def exposes_commands(*commands)
         self.commands += commands
       end
+
     end
 
     module InstanceMethods
@@ -29,9 +32,9 @@ module ExpressAdmin
 
       def available_commands
         if respond_to?(:aasm)
-          commands & aasm_event_triggers
+          command_names & aasm_event_triggers
         else
-          commands - unavailable_commands
+          command_names - unavailable_commands
         end
       end
 
@@ -39,6 +42,11 @@ module ExpressAdmin
         def aasm_event_triggers
           aasm.events.map(&:name).map(&:to_s).map {|s| "#{s}!"}.map(&:to_sym)
         end
+
+      private
+        def command_names
+          commands.map { |command| command[:name] }
+        end
     end
   end
 end
@@ -49,4 +57,4 @@ class Symbol
   def debang
     to_s.gsub(/\!\Z/, '').to_sym
   end
-end
+end

data/lib/express_admin/standard_actions.rb

@@ -32,7 +32,7 @@ module ExpressAdmin
 
           if self.resource_class.respond_to?(:commands)
             self.resource_class.commands.each do |command|
-              define_command_method(command.debang, command)
+              define_command_method(command[:name].debang, command[:name])
             end
           end
         end

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.21"
+  VERSION = "1.7.22"
 end

data/test/dummy/app/models/part.rb

@@ -1,3 +1,8 @@
 class Part < ActiveRecord::Base
   belongs_to :widget
+
+  exposes_command({ name: :trash, confirm: "Are you sure?" })
+
+  def trash
+  end
 end

data/test/dummy/test/components/command_button_test.rb

@@ -13,6 +13,9 @@ module Components
         def twiddle_widget_path(id)
           "/widgets/#{id}/twiddle"
         end
+        def trash_part_path(id)
+          "/parts/#{id}/trash"
+        end
       end
     end
 
@@ -25,19 +28,33 @@ module Components
     test "command button creates a form with a submit button having the correct name" do
       assert_match /form.*action="\/widgets\/\d+\/twiddle"/, command_button(:twiddle, resource_name: :widget)
       assert_match /input type="submit" value="Twiddle"/, command_button(:twiddle, resource_name: :widget)
+
+    end
+
+    test "command button accepts a confirm parameter to display a prompt" do
+      assert_match /input data-confirm="Are you sure\?" type="submit" value="Twiddle"/, command_button(:twiddle, resource_name: :widget, confirm: "Are you sure?")
     end
 
-    def command_button_list(*args)
+    def command_button_list_widget
       arbre(widget: widgets(:one)) {
-        command_button_list(*args)
+        command_button_list(:widget)
       }
     end
 
     test "command_button_list creates a list of command buttons" do
-      assert_match /ul class="command-button-list"/, command_button_list(:widget)
-      assert_match /li.*<form.*\<\/li>/, command_button_list(:widget).split("\n").join
+      assert_match /ul class="command-button-list"/, command_button_list_widget
+      assert_match /li.*<form.*\<\/li>/, command_button_list_widget.split("\n").join
     end
 
+    def command_button_list_parts
+      arbre(part: parts(:one)) {
+        command_button_list(:part)
+      }
+    end
+
+    test "command_button_list accepts confirm parameters" do
+      assert_match /input data-confirm="Are you sure\?" type="submit" value="Trash"/, command_button_list_parts
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.7.21
+  version: 1.7.22
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: express_templates