merb-helpers 1.1.0.rc1 → 1.1.0

data/lib/merb-helpers/form/builder.rb

@@ -262,9 +262,9 @@ module Merb::Helpers::Form::Builder
 
         option_attrs = {:value => value}
         if sel.is_a?(Array)
-          option_attrs.merge!(:selected => "selected") if value.in? sel
+          option_attrs.merge!(:selected => "selected") if value.in? sel.map {|e| e.to_s }
         else
-          option_attrs.merge!(:selected => "selected") if value == sel
+          option_attrs.merge!(:selected => "selected") if value == sel.to_s
         end
         tag(:option, text, option_attrs)
       end).join

data/lib/merb-helpers/version.rb

@@ -1,5 +1,5 @@
 module Merb
   module Helpers
-    VERSION = '1.1.0.rc1'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/spec/fixture/app/views/select_specs/selected.html.erb

@@ -1 +1 @@
-<%= select(:name => "foo", :collection => %w(one two three), :selected => "three") %>
+<%= select(:name => "foo", :collection => @collection, :selected => @selected) %>

data/spec/merb_helpers_form_spec.rb

@@ -937,13 +937,33 @@ describe "select" do
     r.should have_selector("select[name=foo] option:contains('three')")
   end
   
-  it "should allow selecting an option by passing in :selected => 'three'" do
+  it "should allow selecting an option by passing in :selected => string" do
+    @c.instance_variable_set(:@collection, %w(one two three))
+    @c.instance_variable_set(:@selected, 'three')
     r = @c.render :selected
     r.should_not have_selector("select[name=foo] option[selected]:contains('one')")
     r.should_not have_selector("select[name=foo] option[selected]:contains('two')")
     r.should have_selector("select[name=foo] option[selected]:contains('three')")
   end
 
+  it "should allow selecting an option by passing in :selected => integer" do
+    @c.instance_variable_set(:@collection, %w(1 2 3))
+    @c.instance_variable_set(:@selected, 3)
+    r = @c.render :selected
+    r.should_not have_selector("select[name=foo] option[selected]:contains('1')")
+    r.should_not have_selector("select[name=foo] option[selected]:contains('2')")
+    r.should have_selector("select[name=foo] option[selected]:contains('3')")
+  end
+
+  it "should allow selecting an option by passing in :selected => [integers]" do
+    @c.instance_variable_set(:@collection, %w(1 2 3))
+    @c.instance_variable_set(:@selected, [2, 3])
+    r = @c.render :selected
+    r.should_not have_selector("select[name=foo] option[selected]:contains('1')")
+    r.should have_selector("select[name=foo] option[selected]:contains('2')")
+    r.should have_selector("select[name=foo] option[selected]:contains('3')")
+  end
+
   it "should render the select tag with suffix '[]' to name when :multiple => true" do
     r = @c.render :multiple
     r.should match_tag( :select, :name => "foo[]")

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: merb-helpers
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 1
   - 1
   - 0
-  - rc1
-  version: 1.1.0.rc1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Michael D. Ivey
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 +00:00
+date: 2010-03-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +28,7 @@ dependencies:
         - 1
         - 1
         - 0
-        - rc1
-        version: 1.1.0.rc1
+        version: 1.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -277,6 +275,7 @@ files:
 - spec/merb_helpers_form_spec.rb
 - spec/merb_helpers_tag_helper_spec.rb
 - spec/merb_helpers_text_spec.rb
+- spec/merb_test.log
 - spec/numeric_extlib_spec.rb
 - spec/ordinalize_spec.rb
 - spec/spec.opts
@@ -300,13 +299,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: