express_admin 1.4.11 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc5b5fd470148d183da2706152e9b7019eb2c6d9
-  data.tar.gz: b39194d97af745e8e35873dd0a9e9e44bfb356f7
+  metadata.gz: 2ee970ef95e2385137a11fa6508edacd01faeae8
+  data.tar.gz: 9fb8fd28dacf2d2c4bfd81cfcdf603e6be99f678
 SHA512:
-  metadata.gz: 1411b21129cb3d05ba04f7f83bb13428e6145cab8702897079d5cbcb9304486ca516f9076b60c9b71e8f6edc48abe880e21010404d1d9ccd0081a2fe8427e49b
-  data.tar.gz: f0348de1c2da9faf4f5810c53449721a01c0f423d1af63e0048a80b01e4f5b9fa8cc226cc0a84b915a48bd60864231277edef22d7bea874f665a521740034be6
+  metadata.gz: c627d21e2cfdfed8d54317c2f05aa401614781431afa7aabcb98f8c8c0604075de1005ed1f070024ad3b18273d4035536fd81e9c61931a968a1f351ed2b3df7c
+  data.tar.gz: 7c6897243cc55e89e07c80eccd7089a051078b9602ad4918985dfe13657b6e4332d8c065edd7ecd4d7a9c1ead4bc279995e62b9b6255e98e778cfd5db637a73f

data/app/assets/javascripts/express_admin.js

@@ -1,6 +1,6 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui/sortable
+//= require jquery-ui
 //= require jquery.loadingdotdotdot
 //= require tinymce-jquery
 //= require select2

data/app/assets/stylesheets/express_admin/components/_pane.sass

@@ -11,3 +11,10 @@
       size: 1rem
       weight: normal
     padding: 0.5rem 0
+
+.pane
+  @include breakpoint(medium)
+    max-height: 300px
+
+  @include breakpoint(large)
+    max-height: 500px

data/app/assets/stylesheets/express_admin/components/_v_box.sass

@@ -1,2 +1,2 @@
 .v-box
-  @include grid-block($orientation: vertical)
+  @include grid-block($orientation: vertical)

data/app/assets/stylesheets/express_admin/globals/_variables.sass

@@ -4,6 +4,7 @@ $border-color: #dedede
 $light-gray: #f9f9f9
 $block-alt-bg-color: whitesmoke
 $dark: #444
+$light: #fff
 
 $blue: #26ade4
 $light-blue: #94bde1

data/app/assets/stylesheets/express_admin/shared/_tables.sass

@@ -21,15 +21,16 @@
 
 // Still a bit hacky. Need to polish this more
 // This was done to contain the giant table in rbac's routes#index
-.large-table-container
-  @include breakpoint(small)
-    height: 300px
-
-  @include breakpoint(medium)
-    height: 500px
-
-  @include breakpoint(large)
-    height: 800px
+// Might not need this anymore because of 77b7136
+// .large-table-container
+//   @include breakpoint(small)
+//     height: 300px
+//
+//   @include breakpoint(medium)
+//     height: 500px
+//
+//   @include breakpoint(large)
+//     height: 800px
 
 .definition-table
   tbody

data/app/components/express_admin/page_header.rb

@@ -1,14 +1,17 @@
 module ExpressAdmin
   class PageHeader < ExpressTemplates::Components::Base
-    ETC = ExpressTemplates::Components
 
     contains -> {
-      h1 {
-        content_for(:page_header) if content_for?(:page_header)
-      }
-      para(class: 'lead') {
-        content_for(:page_header_lead) if content_for?(:page_header_lead)
-      }
+      if content_for?(:page_header)
+        h1 {
+          content_for(:page_header)
+        }
+      end
+      if content_for?(:page_header_lead)
+        para(class: 'lead') {
+          content_for(:page_header_lead)
+        }
+      end
     }
   end
-end
+end

data/lib/express_admin/commandable.rb

@@ -0,0 +1,37 @@
+module ExpressAdmin
+  class Commandable
+    def initialize(defaults = {})
+      @defaults = defaults
+    end
+
+    def call(mapper, options = {})
+      options = @defaults.merge(options)
+      controller_name = mapper.send(:parent_resource).controller
+      resource_class = "#{controller_name.classify.pluralize}Controller".constantize.resource_class
+      resource_class.commands.each do |action|
+        # post :foo, to: "module/controller#foo"
+        mapper.member do
+          mapper.post action, to: "#{controller_name}##{action}"
+        end
+      end
+    end
+
+  end
+end
+
+module ActionDispatch::Routing::Mapper::Resources
+  def resources_with_commandable(*resources, &block)
+    unless @concerns[:commandable]
+      concern :commandable, ExpressAdmin::Commandable.new
+    end
+
+    resources_without_commandable(*resources) do |resource|
+      block.call(resource) unless block.nil?
+      concerns :commandable
+    end
+  end
+
+  alias :resources_without_commandable :resources
+  alias :resources :resources_with_commandable
+
+end

data/lib/express_admin/commands.rb

@@ -0,0 +1,46 @@
+module ExpressAdmin
+  module Commands
+    def self.included(base)
+      base.class_eval do
+        include InstanceMethods
+        extend ClassMethods
+
+        class_attribute :commands
+        self.commands = []
+      end
+    end
+
+    module ClassMethods
+
+      def exposes_command(command)
+        exposes_commands command
+      end
+
+      def exposes_commands(*commands)
+        self.commands += commands
+      end
+    end
+
+    module InstanceMethods
+      # If not using, AASM, override this for disallowing commands
+      def unavailable_commands
+        []
+      end
+
+      def available_commands
+        if respond_to?(:aasm)
+          commands & aasm_event_triggers
+        else
+          commands - unavailable_commands
+        end
+      end
+
+      protected
+        def aasm_event_triggers
+          aasm.events.map(&:name).map(&:to_s).map {|s| "#{s}!"}.map(&:to_sym)
+        end
+    end
+  end
+end
+
+ActiveRecord::Base.include(ExpressAdmin::Commands)

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)
+              define_command_method(command.to_s.gsub(/\!\Z/, ''), command)
             end
           end
         end
@@ -48,8 +48,8 @@ module ExpressAdmin
 
       protected
 
-        def define_command_method(command)
-          define_method(command) do
+        def define_command_method(action, command)
+          define_method(action) do
             load_resource
             begin
               resource.send(command)
@@ -246,10 +246,6 @@ module ExpressAdmin
           "@#{resource_name}".to_sym
         end
 
-        # def resource_class
-        #   self.class.to_s.gsub(/Controller$/, '').singularize.classify.constantize
-        # end
-
         # Foo::WidgetsController ->  widget
         def resource_name
           self.class.resource_name

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.4.11"
+  VERSION = "1.5.0"
 end

data/lib/express_admin.rb

@@ -1,6 +1,8 @@
 require File.join(File.dirname(__FILE__), "core_extensions/string_promptify")
 require "express_admin/engine"
 require "express_admin/routes"
+require "express_admin/commands"
+require "express_admin/commandable"
 
 module ExpressAdmin
 end

data/test/controllers/standard_controller_test.rb

@@ -19,6 +19,7 @@ module ExpressAdmin
       eigenclass.send(:define_method, :params) do
         ActionController::Parameters.new(params.with_indifferent_access)
       end
+      # hack so we can call the action without all controller stuff
       eigenclass.send(:define_method, :respond_to) do |&block|
         block.call(ActionController::MimeResponds::Collector.new([], 'text/html'))
       end
@@ -110,8 +111,14 @@ module ExpressAdmin
 
     test ".define_command_method defines a command action method on the controller" do
       refute widgets_controller.respond_to?(:foo)
-      widgets_controller.class.send(:define_command_method, :foo)
+      widgets_controller.class.send(:define_command_method, :foo, :foo!)
       assert widgets_controller.respond_to?(:foo)
     end
+
+    test "if a resource exposes commands, the controllers should have an action for the command" do
+      assert widgets_controller.respond_to?(:twiddle), "widgets_controller#twiddle should be there"
+      widgets_controller(id: widgets(:one).id).twiddle
+      assert widgets(:one).reload.column2.eql?("twiddled"), "widgets_controller#twiddle didn't twiddle the widget"
+    end
   end
 end

data/test/dummy/app/controllers/categories_controller.rb

@@ -0,0 +1,2 @@
+class CategoriesController < ExpressAdmin::StandardController
+end

data/test/dummy/app/controllers/parts_controller.rb

@@ -0,0 +1,2 @@
+class PartsController < ExpressAdmin::StandardController
+end

data/test/dummy/app/controllers/widgets_controller.rb

@@ -0,0 +1,2 @@
+class WidgetsController < ExpressAdmin::StandardController
+end

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

@@ -7,4 +7,10 @@ class Widget < ActiveRecord::Base
 
   attr :password
 
+  exposes_command :twiddle
+
+  def twiddle
+    update_attributes(column2: "twiddled")
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.4.11
+  version: 1.5.0
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -427,8 +427,11 @@ files:
 - config/initializers/request_store_current_user.rb
 - config/initializers/tinymce-rails.rb
 - config/tinymce.yml
+- lib/core_extensions/active_record_base_commands.rb
 - lib/core_extensions/string_promptify.rb
 - lib/express_admin.rb
+- lib/express_admin/commandable.rb
+- lib/express_admin/commands.rb
 - lib/express_admin/engine.rb
 - lib/express_admin/menu.rb
 - lib/express_admin/routes.rb
@@ -461,7 +464,10 @@ files:
 - test/dummy/app/controllers/admin/parts_controller.rb
 - test/dummy/app/controllers/admin/widgets_controller.rb
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/categories_controller.rb
 - test/dummy/app/controllers/demo_controller.rb
+- test/dummy/app/controllers/parts_controller.rb
+- test/dummy/app/controllers/widgets_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/demo_helper.rb
 - test/dummy/app/models/category.rb
@@ -797,7 +803,10 @@ test_files:
 - test/dummy/app/controllers/admin/parts_controller.rb
 - test/dummy/app/controllers/admin/widgets_controller.rb
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/categories_controller.rb
 - test/dummy/app/controllers/demo_controller.rb
+- test/dummy/app/controllers/parts_controller.rb
+- test/dummy/app/controllers/widgets_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/demo_helper.rb
 - test/dummy/app/models/category.rb