express_admin 1.4.10 → 1.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e25ebe07ee84728e3a8f4acca5974226f02d2f21
-  data.tar.gz: 4a76de8d7ac61d45004c76f75b40e4fb7ed369d3
+  metadata.gz: dc5b5fd470148d183da2706152e9b7019eb2c6d9
+  data.tar.gz: b39194d97af745e8e35873dd0a9e9e44bfb356f7
 SHA512:
-  metadata.gz: 490d110f3e7eaff50d813d3b7b1c7248e758635b1badeef9f44211c09d3efe64a0eb99902408ab67412a086c2bc03d7b3794587474b54eb216ec61342827b420
-  data.tar.gz: 7ad9bbce99efb8503150a6e955d905733da5b14b30eb92a493241e3dc448e92fc3820fde08ceb470ff5a6d279cf7f75a78d2de4f622b2d0dce5b3958ed1df3c5
+  metadata.gz: 1411b21129cb3d05ba04f7f83bb13428e6145cab8702897079d5cbcb9304486ca516f9076b60c9b71e8f6edc48abe880e21010404d1d9ccd0081a2fe8427e49b
+  data.tar.gz: f0348de1c2da9faf4f5810c53449721a01c0f423d1af63e0048a80b01e4f5b9fa8cc226cc0a84b915a48bd60864231277edef22d7bea874f665a521740034be6

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

@@ -30,3 +30,8 @@
 
   @include breakpoint(large)
     height: 800px
+
+.definition-table
+  tbody
+    td
+      padding: 0.5rem

data/app/components/express_admin/smart_table.rb

@@ -101,7 +101,7 @@ module ExpressAdmin
       if config[:row_class].try(:respond_to?, :call)
         config[:row_class].call(item)
       else
-        item.eql?(helpers.resource) ? 'current' : ''
+        item.eql?(resource) ? 'current' : ''
       end
     end
 

data/app/components/express_admin/widget_box.rb

@@ -21,7 +21,11 @@ module ExpressAdmin
       end
 
       def box_title
-        config[:title] || (helpers.resource.persisted? ? "Edit #{resource_name}" : "New #{resource_name}")
+        config[:title] || (resource.persisted? ? "Edit #{resource_name}" : "New #{resource_name}")
+      end
+
+      def resource
+        self.send(config[:id])
       end
   end
 end

data/app/helpers/express_admin/admin_helper.rb

@@ -56,9 +56,9 @@ module ExpressAdmin
       content_for?(:description) ? yield(:description) : 'Testapp'
     end
 
-    def admin_javascript_and_css_includes
+    def admin_javascript_and_css_includes(admin_path = nil)
       current_module_path = current_module.to_s.underscore
-      admin_path = current_module_path.eql?('admin') ? "admin" : "#{current_module_path}/admin"
+      admin_path ||= current_module_path.eql?('admin') ? "admin" : "#{current_module_path}/admin"
       a = []
       a << stylesheet_link_tag("#{admin_path}/application")
       a << stylesheet_link_tag("app_express/admin/application") if defined?(AppExpress)

data/lib/express_admin/standard_actions.rb

@@ -24,11 +24,53 @@ module ExpressAdmin
             params.require(:#{base.resource_name}).permit!
           end
         RUBY
+
+        base.class_eval do
+
+          class_attribute :resource_class
+          self.resource_class = resource_name.classify.constantize
+
+          if self.resource_class.respond_to?(:commands)
+            self.resource_class.commands.each do |command|
+              define_command_method(command)
+            end
+          end
+        end
+      end
+
+      def manages(a_resource_class)
+        self.resource_class = a_resource_class
       end
 
       def resource_name
         self.to_s.demodulize.gsub(/Controller$/, '').singularize.underscore
       end
+
+      protected
+
+        def define_command_method(command)
+          define_method(command) do
+            load_resource
+            begin
+              resource.send(command)
+              respond_to do |format|
+                format.html { redirect_to :show, layout: defaults[:layout] }
+                format.js { render status: :ok } # maybe we should return enough info
+                                                 #to alter display of available or enabled commands?
+
+              end
+            rescue => e
+              respond_to do |format|
+                format.html {
+                  flash[:error] = e.to_s
+                  redirect_to :show, layout: defaults[:layout]
+                }
+                format.js { render status: :bad_request, body: e.to_s }
+              end
+            end
+          end
+        end
+
     end
 
     module InstanceMethods
@@ -157,14 +199,19 @@ module ExpressAdmin
 
         def end_of_association_chain
           if nested?
-            parent_resource.send(resource_name.pluralize)
+            parent_resource
           else
-            resource_class
+            nil
           end
         end
 
         def load_collection
-          self.instance_variable_set(collection_ivar, end_of_association_chain.all)
+          scope = if end_of_association_chain
+            end_of_association_chain.send(collection_name)
+          else
+            resource_class
+          end
+          self.instance_variable_set(collection_ivar, scope.all)
         end
 
         def collection_ivar
@@ -185,7 +232,7 @@ module ExpressAdmin
 
         def build_resource(*args)
           if nested?
-            self.instance_variable_set(resource_ivar, end_of_association_chain.build(*args))
+            self.instance_variable_set(resource_ivar, end_of_association_chain.send(collection_name).build(*args))
           else
             self.instance_variable_set(resource_ivar, resource_class.new(*args))
           end
@@ -199,9 +246,9 @@ module ExpressAdmin
           "@#{resource_name}".to_sym
         end
 
-        def resource_class
-          self.class.to_s.gsub(/Controller$/, '').singularize.classify.constantize
-        end
+        # def resource_class
+        #   self.class.to_s.gsub(/Controller$/, '').singularize.classify.constantize
+        # end
 
         # Foo::WidgetsController ->  widget
         def resource_name

data/lib/express_admin/version.rb

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

data/test/controllers/standard_controller_test.rb

@@ -107,5 +107,11 @@ module ExpressAdmin
 
     # TODO: Implement later
     # test "for nested resources it should try to expose a current method for parent resources"
+
+    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)
+      assert widgets_controller.respond_to?(:foo)
+    end
   end
 end

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

@@ -5,4 +5,6 @@ class Widget < ActiveRecord::Base
   has_many :tags, through: :widget_tags
   has_many :parts
 
+  attr :password
+
 end

data/test/dummy/test/components/definition_list_test.rb

@@ -9,7 +9,7 @@ module ExpressAdmin
     end
 
     def helpers
-      mock_action_view(assigns)
+      mock_action_view
     end
 
     def list_types

data/test/dummy/test/components/definition_table_test.rb

@@ -9,7 +9,7 @@ module ExpressAdmin
     end
 
     def helpers
-      mock_action_view(assigns)
+      mock_action_view
     end
 
     def list_types

data/test/dummy/test/components/flash_messages_test.rb

@@ -4,16 +4,13 @@ module Components
 
   class FlashMessagesTest < ActiveSupport::TestCase
 
-    def assigns
-      { flash: flash }
-    end
-
-    def flash
-      {notice: "Message"}
-    end
-
     def helpers
-      view = mock_action_view(assigns)
+      mock_action_view do
+        def flash
+          {notice: "Message"}
+        end
+
+      end
     end
 
     def flashmsg

data/test/dummy/test/components/icon_link_test.rb

@@ -21,7 +21,7 @@ module ExpressAdmin
     end
 
     def helpers
-      mock_action_view(assigns)
+      mock_action_view
     end
 
     def rendered_icon_link(*args)

data/test/dummy/test/components/icon_test.rb

@@ -9,7 +9,7 @@ module Components
     end
 
     def helpers
-      mock_action_view(assigns)
+      mock_action_view
     end
 
     def rendered_icon(*args)

data/test/dummy/test/components/module_sidebar_test.rb

@@ -20,28 +20,22 @@ module Components
       }
     end
 
-    def assigns
-      { current_menu: current_menu,
-        current_menu_name: current_menu_name,
-        foo_path: 'foo',
-        bar_path: 'bar',
-        baz_path: 'baz'
-      }
-    end
-
-    def current_menu
-      MenuItem.new('Big Menu', 'menu_path', [
-                      MenuItem.new('Foo', 'foo_path',[]),
-                      MenuItem.new('Bar', 'bar_path', []),
-                      MenuItem.new('Baz', 'baz_path', [])])
-    end
-
-    def current_menu_name
-      current_menu.title
-    end
-
     def helpers
-      mock_action_view(assigns)
+      mock_action_view do
+        def foo_path ; "foo" ; end
+        def bar_path ; "bar" ; end
+        def baz_path ; "baz" ; end
+        def current_menu
+          MenuItem.new('Big Menu', 'menu_path', [
+                          MenuItem.new('Foo', 'foo_path',[]),
+                          MenuItem.new('Bar', 'bar_path', []),
+                          MenuItem.new('Baz', 'baz_path', [])])
+        end
+        def current_menu_name
+          current_menu.title
+        end
+
+      end
     end
 
     test "renders the correct current menu name as sidebar title" do
@@ -49,7 +43,7 @@ module Components
     end
 
     test "evals the correct path" do
-      assert_equal "foo", helpers.instance_eval(current_menu.items.first.path)
+      assert_equal "foo", helpers.instance_eval(helpers.current_menu.items.first.path)
     end
 
   end

data/test/dummy/test/components/smart_form_test.rb

@@ -5,11 +5,11 @@ module ExpressAdmin
   class SmartFormTest < ActiveSupport::TestCase
 
     def resource_assigns
-      {resource: Widget.new, collection: Widget.all, example_engine: ExampleEngine::MockRouteProxy.new}
+      {example_engine: ExampleEngine::MockRouteProxy.new}
     end
 
     def helpers
-      view = mock_action_view(resource_assigns)
+      view = mock_action_view
       class << view
         def widget_path(widget_id)
           "/widgets/#{widget_id.to_param}"
@@ -27,7 +27,7 @@ module ExpressAdmin
     end
 
     def widget_form(*args)
-      arbre {
+      arbre(widget: Widget.new) {
         smart_form(:widget, *args)
       }
     end
@@ -55,7 +55,7 @@ module ExpressAdmin
     end
 
     test "text field column3 is a text_area" do
-      assert_match /<textarea.*rows="10".*name="widget\[column3\]"/, widget_form
+      assert_match /<textarea.*name="widget\[column3\]".*rows="10"/, widget_form
     end
 
     test "datetime field column4 is a datetime_field" do

data/test/dummy/test/components/smart_table_test.rb

@@ -5,20 +5,17 @@ module Components
 
     fixtures :widgets, :categories
 
-    def resource_assigns
-      {resource: Widget.new, collection: Widget.all}
-    end
     def helpers
-      view = mock_action_view(resource_assigns)
-      class << view
+      view = mock_action_view do
         def widget_path(widget_id)
           "/widgets/#{widget_id.to_param}"
         end
       end
       view
     end
+
     def compiled_widget_table(*args)
-      arbre {
+      arbre(widget: Widget.first, widgets: Widget.all) {
         smart_table(:widgets, *args)
       }
     end
@@ -65,7 +62,7 @@ module Components
     end
 
     def compiled_widget_table_with_proc_column
-      arbre {
+      arbre(widget: Widget.first, widgets: Widget.all) {
          smart_table(:widgets, columns: {
            "This column will error" => -> (widget) { doesnt_work },
            "This column will be fine" => -> (widget) { widget.column2.upcase },
@@ -86,7 +83,7 @@ module Components
     end
 
     test 'attribute accessor appended with _link generates a link' do
-      fragment = arbre {
+      fragment = arbre(widget: Widget.first, widgets: Widget.all) {
           smart_table(:widgets, columns: {
               'A link column' => :column3_link
             })
@@ -95,7 +92,7 @@ module Components
     end
 
     test 'timestamp accessor appeneded with _in_words generates code that uses time_ago_in_words' do
-      fragment = arbre {
+      fragment = arbre(widget: Widget.first, widgets: Widget.all) {
           smart_table(:widgets, columns: {
               'Created' => :created_at_in_words
             })

data/test/dummy/test/components/widget_box_test.rb

@@ -5,25 +5,25 @@ module ExpressAdmin
   class WidgetBoxTest < ActiveSupport::TestCase
 
     def helpers
-      mock_action_view(assigns)
+      mock_action_view
     end
 
     def assigns
-      {resource: Widget.first}
+      {category: Category.first}
     end
 
     def rendered_widget_box(*args)
       arbre {
-        widget_box(:test, *args)
+        widget_box(:category, *args)
       }
     end
 
     test "renders correct widget box title" do
-      assert_match /<header class="title">Edit Test/, rendered_widget_box
+      assert_match /<header class="title">Edit Category/, rendered_widget_box
     end
 
     test "renders correct widget box title with param" do
-      assert_match /<header class="title">Widget Box/, rendered_widget_box(title: "Widget Box")
+      assert_match /<header class="title">Category Box/, rendered_widget_box(title: "Category Box")
     end
 
   end

data/test/test_helper.rb

@@ -56,21 +56,23 @@ end
 
 module ActiveSupport
   class TestCase
-    def arbre(assigns = {}, &block)
-      Arbre::Context.new assigns, helpers, &block
+    def arbre(additional_assigns = {}, &block)
+      Arbre::Context.new assigns.merge(additional_assigns), helpers, &block
     end
-    def mock_action_view(assigns = {})
+    def assigns
+      @arbre_assigns ||={}
+    end
+    def helpers
+      mock_action_view
+    end
+    def mock_action_view &block
       controller = ActionView::TestCase::TestController.new
       ActionView::Base.send :include, ActionView::Helpers
       ActionView::Base.send :include, ActionView::Helpers::UrlHelper
       ActionView::Base.send :include, AdditionalHelpers
       view = ActionView::Base.new(ActionController::Base.view_paths, assigns, controller)
-      eigenklass = class << view
-        self
-      end
-      assigns.each do |helper_name,value|
-        eigenklass.send(:define_method, helper_name) { value }
-      end
+      eigenklass = class << view; self; end
+      eigenklass.class_eval &block unless block.nil?
       view
     end
   end

data/vendor/gems/express_templates/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    express_templates (0.9.7)
+    express_templates (0.10.0)
       activesupport (~> 4.2)
       arbre (~> 1.0)
       parslet (~> 1.6)

data/vendor/gems/express_templates/lib/express_templates/components/all.rb

@@ -0,0 +1,26 @@
+module ExpressTemplates
+  module Components
+    class All < Container
+
+      has_argument :id, "Name of the collection", as: :collection_name, type: :symbol
+
+      contains -> (&block) {
+        prepended
+        collection.each do |item|
+          assigns[member_name] = item
+          block.call(self) if block
+        end
+        appended
+      }
+
+      def member_name
+        config[:collection_name].to_s.singularize.to_sym
+      end
+
+      def collection
+        self.send(config[:collection_name])
+      end
+
+    end
+  end
+end

data/vendor/gems/express_templates/lib/express_templates/components/capabilities/resourceful.rb

@@ -120,7 +120,7 @@ module ExpressTemplates
               config[:collection]
             end
           else
-            helpers.collection
+            self.send(collection_name)
           end
         end
 
@@ -165,19 +165,15 @@ module ExpressTemplates
         end
 
         def path_namespace
-          resource_class_name = resource_class.to_s
+          resource_class_name = resource.class.to_s
           resource_class_name.match(/::/) ?
             resource_class_name.split("::").first.try(:underscore) : nil
         end
 
-        # accepts boolean to indicate whether to use an ivar or not
-        # and also may accept a resource on which we call to_param
-        def resource_path(ivar_or_resource = nil)
+        def resource_path(object = nil)
           if config[:resource_path]
-            if config[:resource_path].respond_to?(:call) &&
-              ivar_or_resource.respond_to?(:to_param) &&
-              ![true, false].include?(ivar_or_resource)
-              config[:resource_path].call(ivar_or_resource)
+            if config[:resource_path].respond_to?(:call) && object.respond_to?(:to_param)
+              config[:resource_path].call(object)
             else
               config[:resource_path]
             end
@@ -186,12 +182,7 @@ module ExpressTemplates
                helpers.resource.to_param.present? # skip on nil resource
               helpers.resource_path
             else
-              if ivar_or_resource.respond_to?(:to_param) &&
-                ![true, false].include?(ivar_or_resource)
-                helpers.instance_eval("#{resource_path_helper}('#{ivar_or_resource.to_param}')")
-              else
-                helpers.instance_eval("#{resource_path_helper}(#{ivar_or_resource ? '@' : ''}#{resource_name})")
-              end
+              helpers.send(resource_path_helper, object)
             end
           end
         end
@@ -207,6 +198,11 @@ module ExpressTemplates
         def resource_attributes
           resource_class.columns
         end
+
+        def resource
+          assigns.try(:[], resource_name.to_sym)
+          # self.send(resource_name)
+        end
       end
     end
   end

data/vendor/gems/express_templates/lib/express_templates/components/forms/basic_fields.rb

@@ -11,7 +11,7 @@ module ExpressTemplates
             class #{type.classify} < FormComponent
               contains {
                 label_tag(label_name, label_text)
-                #{type}_field resource_var, field_name.to_sym, input_attributes
+                #{type}_field_tag field_name_attribute, field_value, field_helper_options
               }
             end
 RUBY
@@ -24,20 +24,20 @@ RUBY
       # class Email < FormComponent
       #   contains {
       #      label_tag label_name, label_text
-      #      email_field resource_var, field_name.to_sym, input_attributes
+      #      email_field  field_name_attribute, field_value, field_helper_options
       #   }
       # end
 
       class Textarea < FormComponent
         contains {
           label_tag(label_name, label_text)
-          text_area resource_var, field_name.to_sym, input_attributes
+          text_area_tag field_name_attribute, field_value, field_helper_options
         }
       end
 
       class Hidden < FormComponent
         contains {
-          hidden_field resource_var, field_name.to_sym, input_attributes
+          hidden_field_tag field_name_attribute, field_value, field_helper_options
         }
       end
     end

data/vendor/gems/express_templates/lib/express_templates/components/forms/checkbox.rb

@@ -7,7 +7,7 @@ module ExpressTemplates
 
         contains {
           label_tag(label_name, label_text) if label_before?
-          check_box(resource_var, field_name.to_sym, field_options, checked_value, unchecked_value)
+          check_box(resource_name, field_name.to_sym, field_options, checked_value, unchecked_value)
           label_tag(label_name, label_text) if label_after?
         }
 

data/vendor/gems/express_templates/lib/express_templates/components/forms/express_form.rb

@@ -8,12 +8,16 @@ module ExpressTemplates
 
         has_option :method, 'The form method', default: 'POST', attribute: true #, options: ['PUT', 'POST', 'GET', 'DELETE']
         has_option :action, 'The form action containing the resource path or url.'
+        has_option :on_success, 'Pass a form value indicating where to go on a successful submission.'
+        has_option :on_failure, 'Pass a form value indicating where to go on a failed submission.'
 
         prepends -> {
           div(style: 'display:none') {
             add_child helpers.utf8_enforcer_tag
             add_child helpers.send(:method_tag, resource.persisted? ? :put : :post)
-            helpers.send(:token_tag)
+            add_child helpers.send(:token_tag)
+            hidden_field_tag :on_success, config[:on_success] if config[:on_success]
+            hidden_field_tag :on_failure, config[:on_failure] if config[:on_failure]
           }
         }
 
@@ -28,7 +32,7 @@ module ExpressTemplates
         end
 
         def form_action
-          config[:action] || (resource.try(:persisted?) ? resource_path(true) : collection_path)
+          config[:action] || (resource.try(:persisted?) ? resource_path(resource) : collection_path)
         end
 
       end

data/vendor/gems/express_templates/lib/express_templates/components/forms/form_component.rb

@@ -15,16 +15,16 @@ module ExpressTemplates
         has_option :wrapper_class, 'Override the class of the wrapping div of a form component', default: 'field-wrapper'
         has_option :label, 'Override the inferred label of a form component'
 
+        def resource
+          self.send(resource_name)
+        end
+
         # Lookup the resource_name from the parent ExpressForm.
         def resource_name
           raise "FormComponent must have a parent form" unless parent_form
           parent_form.config[:id].to_s
         end
 
-        def resource_var
-          resource_name.to_sym
-        end
-
         def resource_class
           parent_form.resource_class
         end
@@ -45,12 +45,24 @@ module ExpressTemplates
           (config[:id] || (@args.first.is_a?(String) && @args.first)).to_s
         end
 
+        def field_value
+          resource.send(field_name)
+        end
+
         # Return the field name attribute.  Currently handles only simple attributes
         # on the resource.  Does not handle attributes for associated resources.
         def field_name_attribute
           "#{resource_name.singularize}[#{field_name}]"
         end
 
+        def field_id_attribute
+          "#{resource_name.singularize}_#{field_name}"
+        end
+
+        def field_helper_options
+          {id: field_id_attribute}.merge(input_attributes||nil)
+        end
+
         # Search the parent graph until we find an ExpressForm.  Returns nil if none found.
         def parent_form
           @my_form ||= parent