padrino-helpers 0.9.15 → 0.9.16

data/lib/padrino-helpers/dom_helpers.rb

@@ -0,0 +1,46 @@
+module Padrino
+  module Helpers
+    module DomHelpers 
+      ##
+      # Create DOM id from given object. You can also specify optional prefix.
+      #
+      # ==== Examples
+      # 
+      #   @user = User.new
+      #   dom_id(@user, "new")  # => "new_user"
+      #
+      #   @user.save
+      #   @user.id              # => 10
+      #   dom_id(@user)         # => user_10
+      #   dom_id(@user, "edit") # => edit_user_10
+      #   
+      def dom_id(object, prefix=nil)
+        chain = []
+        chain << prefix if prefix
+        chain << object.class.to_s.underscore.gsub("/", "_")
+        chain << object.id if object.respond_to?('id') && object.id
+        chain.join('_')
+      end
+      
+      ##
+      # Create DOM class name from given object. You can also specify optional 
+      # prefix.
+      # 
+      # ==== Examples
+      #
+      #   @user = User.new
+      #   dom_class(@user, "new") # => new_user
+      #   dom_class(@user)        # => user
+      #
+      #   @user.save
+      #   @user.id                # => 11
+      #   dom_class(@user)        # => user
+      def dom_class(object, prefix=nil)
+        chain = []
+        chain << prefix if prefix
+        chain << object.class.to_s.underscore.gsub("/", "_")
+        chain.join('_')
+      end
+    end # DomHelpers
+  end # Helpers
+end # Padrino

data/lib/padrino-helpers/form_helpers.rb

@@ -357,7 +357,7 @@ module Padrino
         return '' if option_items.blank?
         option_items.collect do |caption, value|
           value ||= caption
-          content_tag(:option, caption, :value => value, :selected => selected_value.to_s =~ /^(#{value}|#{caption})$/)
+          content_tag(:option, caption, :value => value, :selected => option_is_selected?(value, caption, selected_value))
         end
       end
 
@@ -374,6 +374,20 @@ module Padrino
           configured_builder = "Padrino::Helpers::FormBuilder::#{configured_builder}".constantize if configured_builder.is_a?(String)
           configured_builder
         end
+
+        
+        #
+        # Returns whether the option should be selected or not
+        #
+        def option_is_selected?(value, caption, selected_value)
+          if selected_value.is_a? Array
+            selected_value.any? do |selected| 
+              selected.to_s =~ /^(#{value}|#{caption})$/
+            end
+          else
+            selected_value.to_s =~ /^(#{value}|#{caption})$/
+          end
+        end
     end # FormHelpers
   end # Helpers
-end # Padrino
+end # Padrino

data/lib/padrino-helpers.rb

@@ -30,6 +30,7 @@ module Padrino
     class << self
       def registered(app)
         app.set :default_builder, 'StandardFormBuilder'
+        app.helpers Padrino::Helpers::DomHelpers
         app.helpers Padrino::Helpers::OutputHelpers
         app.helpers Padrino::Helpers::TagHelpers
         app.helpers Padrino::Helpers::AssetTagHelpers
@@ -42,4 +43,4 @@ module Padrino
       alias :included :registered
     end
   end # Helpers
-end # Padrino
+end # Padrino

data/test/test_dom_helpers.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestObject
+  attr_accessor :id
+end
+
+class TestDomHelpers < Test::Unit::TestCase
+  include Padrino::Helpers::DomHelpers
+
+  class SecondTestObject
+    attr_accessor :id
+  end
+
+  context 'for #dom_id method' do
+    should "return DOM id based on name of given object" do
+      assert_equal dom_id(TestObject.new), "test_object"
+      assert_equal dom_id(TestDomHelpers::SecondTestObject.new), "test_dom_helpers_second_test_object"
+    end
+    should "prepend given prefix to generated id" do
+      assert_equal dom_id(TestObject.new, "new"), "new_test_object"
+    end
+    should "append object #id to generated id if it's not empty" do
+      test_obj = TestObject.new
+      test_obj.id = 10
+      assert_equal dom_id(test_obj), "test_object_10"
+    end
+  end
+  
+  context 'for #dom_class method' do
+    should "return DOM class name based on name of given object" do
+      assert_equal dom_class(TestObject.new), "test_object"
+    end
+    should "prepend given prefix to generated class name" do
+      assert_equal dom_class(TestObject.new, "new"), "new_test_object"
+    end
+  end
+end

data/test/test_form_builder.rb

@@ -413,6 +413,26 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_has_tag('select option', :value => 'California', :selected => 'selected') { actual_html }
     end
 
+    should "display correct select html with selected item if it matches full value" do
+      @user.stubs(:state => 'Cali')
+      actual_html = standard_builder.select(:state, :options => ['Cali', 'California', 'Texas', 'Wyoming'])
+      assert_has_tag('select', :id => 'user_state', :name => 'user[state]') { actual_html }
+      assert_has_tag('select option', :selected => 'selected', :count => 1) { actual_html }
+      assert_has_tag('select option', :value => 'Cali', :selected => 'selected') { actual_html }
+      assert_has_tag('select option', :value => 'California') { actual_html }
+    end
+
+    should "display correct select html with multiple selected items" do
+      @user.stubs(:pickles => ['foo', 'bar'])
+      actual_html = standard_builder.select(
+        :pickles, :options => [ ['Foo', 'foo'], ['Bar', 'bar'], ['Baz', 'baz'], ['Bar Buz', 'bar buz'] ]
+      )
+      assert_has_tag('option', :value => 'foo', :content => 'Foo', :selected => 'selected')  { actual_html }
+      assert_has_tag('option', :value => 'bar', :content => 'Bar', :selected => 'selected')  { actual_html }
+      assert_has_tag('option', :value => 'baz', :content => 'Baz')  { actual_html }
+      assert_has_tag('option', :value => 'bar buz', :content => 'Bar Buz')  { actual_html }
+    end
+
     should "display correct select html with include_blank" do
       actual_html = standard_builder.select(:state, :options => ['California', 'Texas', 'Wyoming'], :include_blank => true)
       assert_has_tag('select', :id => 'user_state', :name => 'user[state]') { actual_html }
@@ -665,4 +685,4 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 9
-  - 15
-  version: 0.9.15
+  - 16
+  version: 0.9.16
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +02:00
+date: 2010-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 27
         segments: 
         - 0
         - 9
-        - 15
-        version: 0.9.15
+        - 16
+        version: 0.9.16
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - Rakefile
 - padrino-helpers.gemspec
 - lib/padrino-helpers/asset_tag_helpers.rb
+- lib/padrino-helpers/dom_helpers.rb
 - lib/padrino-helpers/form_builder/abstract_form_builder.rb
 - lib/padrino-helpers/form_builder/standard_form_builder.rb
 - lib/padrino-helpers/form_helpers.rb
@@ -119,6 +120,7 @@ files:
 - test/fixtures/render_app/views/template/some_template.haml
 - test/helper.rb
 - test/test_asset_tag_helpers.rb
+- test/test_dom_helpers.rb
 - test/test_form_builder.rb
 - test/test_form_helpers.rb
 - test/test_format_helpers.rb