merb-helpers 0.9.9 → 0.9.10

data/Rakefile

@@ -37,7 +37,7 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', "= #{Merb::VERSION}")
+  s.add_dependency('merb-core', ">= #{Merb::VERSION}")
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end

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

@@ -72,7 +72,7 @@ module Merb::Helpers::Form::Builder
       val = control_value(method)
       arr.map do |attrs|
         attrs = {:value => attrs} unless attrs.is_a?(Hash)
-        attrs[:checked] ||= (val == attrs[:value])
+        attrs[:checked] = true if (val == attrs[:value])
         radio_group_item(method, attrs)
       end.join
     end

data/spec/fixture/app/controllers/exceptions.rb

@@ -1,4 +1,4 @@
-class Exceptions < Application
+class Exceptions < Merb::Controller
 
   attr_reader :handler 
   

data/spec/fixture/config/router.rb

@@ -23,7 +23,9 @@ Merb.logger.info("Compiling routes...")
 Merb::Router.prepare do |r|
   # RESTful routes
   # r.resources :posts
-  r.resources :fake_models
+  resources :fake_models
+  resources :obj
+  resources :models
 
   # This is the default route for /:controller/:action/:id
   # This is fine for most cases.  If you're heavily using resource-based

data/spec/merb.main.pid

@@ -0,0 +1 @@
+72928

data/spec/merb_helpers_form_spec.rb

@@ -42,11 +42,6 @@ Merb::Plugins.config[:helpers] = {
   :default_builder => Merb::Helpers::Form::Builder::FormWithErrors
 }
 
-Merb::Router.append do
-  resources :obj
-end
-
-
 describe "error_messages_for" do
 
   before :each do
@@ -652,10 +647,6 @@ describe "bound_hidden_field" do
 
     model.stub!(:errors).and_return(errors)
 
-    Merb::Router.append do
-      resources :models
-    end
-
     @c.instance_variable_set(:@model, model)
     r = @c.render :hidden_error
     r.should match_tag(:input, :type => "hidden", :name => "my_class[foo]", :class => "error hidden")
@@ -791,6 +782,13 @@ describe "bound_radio_group" do
     radio[0].should match_tag(:input, :id => 'bar_id')
     radio[1].should match_tag(:label, :for => 'bar_id')
   end
+
+  it "should only have one element with the checked property" do
+    r = @c.render :basic
+    radio = r.scan(/<[^>]*>/)[2..-2]
+    radio[0].should match_tag(:input, :checked => "checked")
+    radio[3].should_not match_tag(:input, :checked => "false")
+  end
 end
 
 

data/spec/merb_helpers_tag_helper_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-Merb::Router.prepare do
-  default_routes
-end
+# Merb::Router.prepare do
+#   default_routes
+# end
 
 describe Merb::Helpers::Tag do
   include Merb::Helpers::Tag

data/spec/merb_test.log

@@ -0,0 +1,9 @@
+ ~ Compiling routes...
+ ~ Params: {"format"=>"", "action"=>"tag_with_content", "id"=>"", "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>1.5e-05, :before_filters_time=>1.4e-05, :action_time=>0.000996}
+ ~ Params: {"format"=>"", "action"=>"tag_with_content_in_the_block", "id"=>"", "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>6.0e-06, :before_filters_time=>6.0e-06, :action_time=>0.000538}
+ ~ Params: {"format"=>"", "action"=>"tag_with_attributes", "id"=>"", "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>6.0e-06, :before_filters_time=>6.0e-06, :action_time=>0.000543}
+ ~ Params: {"format"=>"", "action"=>"nested_tags", "id"=>"", "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>6.0e-06, :before_filters_time=>6.0e-06, :action_time=>0.000665}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Michael D. Ivey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-13 00:00:00 +03:00
+date: 2008-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 description: Helper support for Merb
 email: ivey@gweezlebur.com
@@ -272,11 +272,13 @@ files:
 - spec/fixture/public/merb.fcgi
 - spec/fixture/public/stylesheets
 - spec/fixture/public/stylesheets/master.css
+- spec/merb.main.pid
 - spec/merb_helpers_config_spec.rb
 - spec/merb_helpers_date_time_spec.rb
 - 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_helper.rb
@@ -303,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Helper support for Merb