express_admin 1.3.0 → 1.3.1

data/test/lib/generators/express_admin/install_generator_test.rb

@@ -10,7 +10,7 @@ class ExpressAdmin::Generators::InstallGeneratorTest < Rails::Generators::TestCa
   def test_install_on_invoke
     run_generator
 
-    assert_file 'app/controllers/tmp/admin/admin_controller.rb' do |content|
+    assert_file 'app/controllers/tmp/admin_controller.rb' do |content|
       assert_match /module Tmp/, content
       assert_match /class AdminController < ApplicationController/, content
       assert_match /before_filter :authenticate_user! if defined\?\(Devise\)/, content

data/test/lib/generators/express_admin/scaffold_generator_test.rb

@@ -18,11 +18,10 @@ class ExpressAdmin::Generators::ScaffoldGeneratorTest < Rails::Generators::TestC
     assert_migration "db/migrate/create_agents.rb"
 
     # View
-    assert_file "app/views/admin/agents/index.html.et"
+    assert_file "app/views/agents/index.html.et"
 
     # Controller
-    assert_file "app/controllers/admin/agents_controller.rb" do |content|
-      assert_match(/module Admin/, content)
+    assert_file "app/controllers/agents_controller.rb" do |content|
       assert_match(/class AgentsController < AdminController/, content)
 
       assert_match(/defaults resource_class: Agent/, content)
@@ -32,7 +31,6 @@ class ExpressAdmin::Generators::ScaffoldGeneratorTest < Rails::Generators::TestC
     # Routes
     assert_file "config/routes.rb" do |content|
       assert_match(/Dummy::Engine.routes.draw/, content)
-      assert_match(/namespace :admin do/, content)
       assert_match(/resources :agents/, content)
     end
   end
@@ -44,10 +42,10 @@ class ExpressAdmin::Generators::ScaffoldGeneratorTest < Rails::Generators::TestC
     assert_no_file "app/models/dummy/agent.rb"
 
     # View
-    assert_no_file "app/views/dummy/admin/agents/index.html.et"
+    assert_no_file "app/views/dummy/agents/index.html.et"
 
     # Controller
-    assert_no_file "app/controllers/dummy/admin/agents_controller.rb"
+    assert_no_file "app/controllers/dummy/agents_controller.rb"
 
     # Route
     assert_file "config/routes.rb" do |route|

data/vendor/gems/express_templates/lib/arbre/patches.rb

@@ -39,12 +39,24 @@ module Arbre
       elsif assigns && assigns.has_key?(name)
         assigns[name]
       elsif helpers.respond_to?(name)
-        current_arbre_element.add_child helpers.send(name, *args, &block)
+        helper_method(name, *args, &block)
       else
         super
       end
     end
 
+    # In order to not pollute our templates with helpers. prefixed
+    # everywhere we want to try to distinguish helpers that are almost
+    # always used as parameters to other methods such as path helpers
+    # and not add them as elements
+    def helper_method(name, *args, &block)
+      if name.match /_path$/
+        helpers.send(name, *args, &block)
+      else
+        current_arbre_element.add_child helpers.send(name, *args, &block)
+      end
+    end
+
   end
 
 end

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

@@ -97,7 +97,15 @@ module ExpressTemplates
         end
 
         def collection
-          config[:collection] || helpers.collection
+          if config[:collection]
+            if config[:collection].respond_to?(:call)
+              config[:collection].call()
+            else
+              config[:collection]
+            end
+          else
+            helpers.collection
+          end
         end
 
         def collection_path

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

@@ -37,7 +37,7 @@ module ExpressTemplates
         def use_supplied_options
           opts = supplied_component_options[:options]
           if opts.respond_to?(:call) # can be a proc
-            opts.call()
+            opts.call(resource)
           else
             opts
           end
@@ -47,9 +47,23 @@ module ExpressTemplates
           resource.class.distinct(field_name.to_sym).pluck(field_name.to_sym)
         end
 
+        def normalize_for_helper(supplied_options)
+          supplied_options.map do |opt|
+            [opt.respond_to?(:name) ? opt.name : opt.to_s,
+             opt.respond_to?(:id) ? opt.id : opt.to_s]
+          end
+        end
+
+        def selected_value
+          field_options[:selected]||resource.send(field_name)
+        end
+
         def options_from_supplied_or_field_values
           if select_options_supplied?
-            use_supplied_options
+            helpers.options_for_select(
+                normalize_for_helper(use_supplied_options),
+                selected_value
+            )
           else
             generate_options_from_field_values
           end
@@ -68,11 +82,7 @@ module ExpressTemplates
         end
 
         def simple_options_with_selection
-          if selection = field_options[:selected]
-            helpers.options_for_select(options_from_supplied_or_field_values, selection)
-          else
-            helpers.options_for_select(options_from_supplied_or_field_values, resource.send(field_name))
-          end
+          helpers.options_for_select(options_from_supplied_or_field_values, selected_value)
         end
 
         # Returns the options which will be supplied to the select_tag helper.

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

@@ -8,7 +8,7 @@ module ExpressTemplates
             if args.first.is_a?(String) or args.empty?
               submit_tag(args.first || 'Save', (args[1]||{}))
             else
-              submit_tag 'Save', (args[1] || {})
+              submit_tag 'Save', (args.first || {})
             end
           }
         end

data/vendor/gems/express_templates/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/vendor/gems/express_templates/test/components/forms/express_form_test.rb

@@ -40,7 +40,7 @@ class ExpressFormTest < ActiveSupport::TestCase
   end
 
   test "simplest_form contains submit" do
-    assert_match '<input type="submit" name="commit" value="Save" />', simplest_form
+    assert_match '<input type="submit" name="commit" value="Save it!" />', simplest_form
   end
 
   test "simplest_form uses form_action for the action" do

data/vendor/gems/express_templates/test/components/forms/select_test.rb

@@ -24,7 +24,7 @@ class SelectTest < ActiveSupport::TestCase
     assert_match /<label.*for="person_gender"/, html
   end
 
-  test "select generates correct options when values are specified" do
+  test "select generates correct options when values are specified as array" do
     html = arbre {
       express_form(:person) {
         select :gender, options: ['Male', 'Female'], selected: 'Male'

data/vendor/gems/express_templates/test/components/forms/submit_test.rb

@@ -11,7 +11,22 @@ class SubmitTest < ActiveSupport::TestCase
     fragment = -> (ctx) {
       submit "Save it!"
     }
-    assert_match '<div class="field-wrapper"><input type="submit" name="commit" value="Save it!" /></div>', 
+    assert_match '<div class="field-wrapper"><input type="submit" name="commit" value="Save it!" /></div>',
                  arbre(&fragment)
   end
+  test "submit accepts a class option" do
+    fragment = -> (ctx) {
+      submit class: 'button'
+    }
+    assert_match '<div class="field-wrapper"><input type="submit" name="commit" value="Save" class="button" /></div>',
+                 arbre(&fragment)
+  end
+  test "submit accepts a class option when string provided as first param" do
+    fragment = -> (ctx) {
+      submit 'XYZ', class: 'button'
+    }
+    assert_match '<div class="field-wrapper"><input type="submit" name="commit" value="XYZ" class="button" /></div>',
+                 arbre(&fragment)
+  end
+
 end