merb-helpers 1.0.15 → 1.1.0.pre

data/README

@@ -5,13 +5,14 @@ A plugin for the Merb Web framework that provides different view helpers.
 
 To use this plugin in merb in your app
 
-config/dependencies.rb
+edit:
+./Gemfile
 
-#...
+add the li:
+gem "merb-helpers"
 
-dependency "merb-helpers"
-
-#...
+run:
+gem bundle
 
 # TODO: describe date_time_helpers, form_helpers, tag_helpers
 

data/Rakefile

@@ -1,73 +1,65 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
-
-##############################################################################
-# Package && release
-##############################################################################
-RUBY_FORGE_PROJECT  = "merb"
-PROJECT_URL         = "http://merbivore.com"
-PROJECT_SUMMARY     = "Helper support for Merb"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY
-
-GEM_AUTHOR = "Michael D. Ivey"
-GEM_EMAIL  = "ivey@gweezlebur.com"
-
-GEM_NAME    = "merb-helpers"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
-
-RELEASE_NAME    = "REL #{GEM_VERSION}"
-
-require "extlib/tasks/release"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = RUBY_FORGE_PROJECT
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = PROJECT_SUMMARY
-  s.description = PROJECT_DESCRIPTION
-  s.author = GEM_AUTHOR
-  s.email = GEM_EMAIL
-  s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', "~> #{Merb::VERSION}")
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
-end
+require 'rubygems'
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+# Load this library's version information
+require File.expand_path('../lib/merb-helpers/version', __FILE__)
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
+begin
+
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = Merb::Helpers::VERSION
+
+    gemspec.name        = "merb-helpers"
+    gemspec.description = "Merb plugin containing view helpers"
+    gemspec.summary     = "Merb plugin that provides helpers for writing HTML templates"
+
+    gemspec.authors     = [ "Michael D. Ivey" ]
+    gemspec.email       = "ivey@gweezlebur.com"
+    gemspec.homepage    = "http://merbivore.com/"
+
+    gemspec.files       = %w(LICENSE Rakefile README TODO) + Dir['{lib,spec}/**/*']
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-core', "~> #{Merb::VERSION}"
+
+    # Development dependencies
+    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
+
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-desc "Run all examples (or a specific spec with TASK=xxxx)"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts  = ["-cfs"]
-  t.spec_files = begin
-    if ENV["TASK"] 
-      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
-    else
-      FileList['spec/**/*_spec.rb']
-    end
-  end
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-desc 'Default: run spec examples'
-task :default => 'spec'
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "test_gem #{Merb::Helpers::VERSION}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/merb-helpers/core_ext/numeric.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class Numeric
   module Transformer
     
@@ -36,7 +37,7 @@ class Numeric
         :separator => '.'
         },
         :currency => { 
-          :unit => '$;',
+          :unit => '$',
           :format => '%u%n',
           :precision => 2 
         }
@@ -385,4 +386,4 @@ class Numeric
   end
   
   
-end
+end

data/lib/merb-helpers/core_ext.rb

@@ -1,5 +1,6 @@
 require "date"
-require File.dirname(__FILE__) + '/date_time_formatting'
+require 'merb-helpers/date_time_formatting'
+
 class Date
   include DateAndTimeFormatting
   

data/lib/merb-helpers/date_time_formatting.rb

@@ -151,6 +151,6 @@ module OrdinalizedFormatting
   # ==== Examples
   #    5.days.ago.strftime_ordinalized('%b %d, %Y')     # => 
   def strftime_ordinalized(fmt, format=nil)
-    strftime(fmt.gsub(/(^|[^-])%d/, '\1_%d_')).gsub(/_(\d+)_/) { |s| s.to_i.ordinalize }
+    strftime(fmt.gsub(/(^|[^-])%d/, '\1_%d_')).gsub(/_(\d+)_/) { $1.to_i.ordinalize }
   end
 end

data/lib/merb-helpers/date_time_helpers.rb

@@ -80,13 +80,13 @@ module Merb
           relative_date(times.first)
         else
           first = times.first; last = times.last; now = DateAndTime.time_class.now
-          arr = [first.strftime_ordinalized('%b %d')]
-          arr << ", #{first.year}" unless first.year == last.year
-          arr << ' - '
-          arr << last.strftime('%b') << ' ' unless first.year == last.year && first.month == last.month
-          arr << last.day.ordinalize
-          arr << ", #{last.year}" unless first.year == last.year && last.year == now.year
-          arr.to_s
+          str = first.strftime_ordinalized('%b %d')
+          str << ", #{first.year}" unless first.year == last.year
+          str << ' - '
+          str << last.strftime('%b') << ' ' unless first.year == last.year && first.month == last.month
+          str << last.day.ordinalize
+          str << ", #{last.year}" unless first.year == last.year && last.year == now.year
+          str
         end
       end
       
@@ -114,17 +114,17 @@ module Merb
       
         else
           first = times.first; last = times.last; now = DateAndTime.time_class.now        
-          arr = [prettier_time(first)]
-          arr << ' '
-          arr << first.strftime_ordinalized('%b %d')
-          arr << ", #{first.year}" unless first.year == last.year
-          arr << ' - '
-          arr << prettier_time(last)
-          arr << ' '
-          arr << last.strftime('%b') << ' ' unless first.year == last.year && first.month == last.month
-          arr << last.day.ordinalize
-          arr << ", #{last.year}" unless first.year == last.year && last.year == now.year
-          arr.to_s
+          str = prettier_time(first)
+          str << ' '
+          str << first.strftime_ordinalized('%b %d')
+          str << ", #{first.year}" unless first.year == last.year
+          str << ' - '
+          str << prettier_time(last)
+          str << ' '
+          str << last.strftime('%b') << ' ' unless first.year == last.year && first.month == last.month
+          str << last.day.ordinalize
+          str << ", #{last.year}" unless first.year == last.year && last.year == now.year
+          str.to_s
         end
       end
       

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

@@ -1,4 +1,6 @@
-load File.dirname(__FILE__) / ".." / "tag_helpers.rb"
+#load File.dirname(__FILE__) / ".." / "tag_helpers.rb"
+
+require 'merb-helpers/tag_helpers'
 
 module Merb::Helpers::Form::Builder
 
@@ -116,7 +118,7 @@ module Merb::Helpers::Form::Builder
 
     def submit(value, attrs)
       attrs[:type]  ||= "submit"
-      attrs[:name]  ||= "submit"
+      attrs[:name]  ||= "form_submit"
       attrs[:value] ||= value
       update_unbound_controls(attrs, "submit")
       self_closing_tag(:input, attrs)
@@ -131,7 +133,7 @@ module Merb::Helpers::Form::Builder
       attrs[:method] = :post unless attrs[:method] == :get
       # Use a fake PUT if the object is not new, otherwise use the method
       # passed in. Defaults to :post if no method is set.
-      method ||= (@obj.respond_to?(:new?) && !@obj.new?) || (@obj.respond_to?(:new_record?) && !@obj.new_record?) ? :put : :post
+      method ||= (@obj.respond_to?(:new_record?) && !@obj.new_record?) ? :put : :post
 
       attrs[:enctype] = "multipart/form-data" if attrs.delete(:multipart) || @multipart
 
@@ -140,7 +142,7 @@ module Merb::Helpers::Form::Builder
 
     # This can be overridden to use another method to fake out methods
     def fake_out_method(attrs, method)
-      self_closing_tag(:input, :type => "hidden", :name => "_method", :value => method)
+      unbound_hidden_field(:name => "_method", :value => method)
     end
 
     def update_bound_controls(method, attrs, type)
@@ -375,8 +377,7 @@ module Merb::Helpers::Form::Builder
 
     def update_unbound_controls(attrs, type)
       if attrs[:name] && !attrs[:id]
-        # '[' and ']' are illegal in HTML id attributes
-        attrs.merge!(:id => attrs[:name].to_s.gsub(/(\[|\])/, '_'))
+        attrs.merge!(:id => valid_xhtml_id(attrs[:name]))
       end
       case type
       when "text", "radio", "password", "hidden", "checkbox", "file"
@@ -385,6 +386,10 @@ module Merb::Helpers::Form::Builder
       super
     end
 
+    def valid_xhtml_id(candidate)
+      candidate.to_s.gsub(/(\[|\])/, '_')
+    end
+
     def radio_group_item(method, attrs)
       unless attrs[:id]
         attrs.merge!(:id => "#{@name}_#{method}_#{attrs[:value]}")
@@ -400,21 +405,20 @@ module Merb::Helpers::Form::Builder
       obj ||= @obj
       return "" unless obj.respond_to?(:errors)
 
-      sequel = !obj.errors.respond_to?(:each)
-      errors = sequel ? obj.errors.full_messages : obj.errors
+      errors = obj.errors
 
       return "" if errors.empty?
 
       header_message = header % [errors.size, errors.size == 1 ? "" : "s"]
       markup = %Q{<div class='#{error_class}'>#{header_message}<ul>}
-      errors.each {|err| markup << (build_li % (sequel ? err : err.join(" ")))}
+      errors.each {|err| markup << (build_li % err.join(" "))}
       markup << %Q{</ul></div>}
     end
 
     private
 
     def update_bound_controls(method, attrs, type)
-      if @obj && !@obj.errors.on(method.to_sym).blank?
+      if @obj && !@obj.errors[method.to_sym].blank?
         add_css_class(attrs, "error")
       end
       super

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

@@ -20,7 +20,7 @@ module Merb::Helpers::Form
     if name.is_a?(String) || name.is_a?(Symbol)
       ivar = instance_variable_get("@#{name}")
     else
-      ivar, name = name, name.class.to_s.snake_case
+      ivar, name = name, name.class.to_s.snake_case.split('::').last
     end
     builder ||= current_form_context.class if current_form_context
     (builder || self._default_builder).new(ivar, name, self)

data/lib/merb-helpers/form_helpers.rb

@@ -1,5 +1,8 @@
-load File.dirname(__FILE__) / "form" / "helpers.rb"
-load File.dirname(__FILE__) / "form" / "builder.rb"
+#load File.dirname(__FILE__) / "form" / "helpers.rb"
+#load File.dirname(__FILE__) / "form" / "builder.rb"
+
+require 'merb-helpers/form/helpers'
+require 'merb-helpers/form/builder'
 
 module Merb::GlobalHelpers
   include Merb::Helpers::Form

data/lib/merb-helpers/version.rb

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

data/lib/merb-helpers.rb

@@ -6,9 +6,10 @@ module Merb
     @@helpers_files = Dir["#{@@helpers_dir}/*_helpers.rb"].collect {|h| h.match(/\/(\w+)\.rb/)[1]}
     
     def self.load
-      require @@helpers_dir + '/time_dsl'
-      require @@helpers_dir + '/core_ext'
-      require @@helpers_dir + '/core_ext/numeric'
+
+      require 'merb-helpers/time_dsl'
+      require 'merb-helpers/core_ext'
+      require 'merb-helpers/core_ext/numeric'
 
       if Merb::Plugins.config[:merb_helpers]
         config = Merb::Plugins.config[:merb_helpers]
@@ -28,6 +29,7 @@ module Merb
     
     # Load only specific helpers instead of loading all the helpers
     def self.load_helpers(helpers = @@helpers_files)
+      helpers = helpers.is_a?(Array) ? helpers : [helpers]
       helpers.each {|helper| Kernel.load(File.join(@@helpers_dir, "#{helper}.rb") )} # using load here allows specs to work
     end
     

data/spec/core_ext_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "String" do
   before :each do

data/spec/fixture/app/models/namespaced_generic_fake_model.rb

@@ -0,0 +1,7 @@
+module MyNamespace
+  class NamespacedFakeModel < FakeModel
+    def foo
+      'named_foo'
+    end
+  end
+end

data/spec/fixture/app/views/bound_radio_group_specs/basic.html.erb

@@ -1,3 +1,3 @@
 <%= form_for @obj do %>
-  <%= radio_group (:foo, ["foowee", "baree"]) %>
+  <%= radio_group(:foo, ["foowee", "baree"]) %>
 <% end =%>

data/spec/fixture/app/views/bound_radio_group_specs/mixed.html.erb

@@ -1,4 +1,4 @@
 <%= form_for @obj do %>
-  <%= radio_group (:foo, [:bar]) %>
-  <%= radio_group (:foo, [{:value => 'bar', :label => 'Bar'}])%>
+  <%= radio_group(:foo, [:bar]) %>
+  <%= radio_group(:foo, [{:value => 'bar', :label => 'Bar'}])%>
 <% end =%>

data/spec/fixture/app/views/form_for_specs/advanced.html.erb

@@ -0,0 +1,3 @@
+<%= form_for(:obj, :action => "/some/url") do %>
+Hello
+<% end =%>

data/spec/fixture/app/views/hacker/radio_group.html.erb

@@ -1,3 +1,3 @@
 <%= form_for @obj do %>
-  <%= radio_group (:foo, ["foowee", "baree"]) %>
+  <%= radio_group(:foo, ["foowee", "baree"]) %>
 <% end =%>

data/spec/fixture/config/router.rb

@@ -20,7 +20,7 @@
 # See merb/specs/merb/router.rb for a fairly complete usage sample.
 
 Merb.logger.info("Compiling routes...")
-Merb::Router.prepare do |r|
+Merb::Router.prepare do
   # RESTful routes
   # r.resources :posts
   resources :fake_models
@@ -31,8 +31,8 @@ Merb::Router.prepare do |r|
   # This is fine for most cases.  If you're heavily using resource-based
   # routes, you may want to comment/remove this line to prevent
   # clients from calling your create or destroy actions with a GET
-  r.default_routes
+  default_routes
   
   # Change this for your home page to be available at /
-  # r.match('/').to(:controller => 'whatever', :action =>'index')
-end
+  # match('/').to(:controller => 'whatever', :action =>'index')
+end

data/spec/merb_helpers_date_time_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "relative_date" do
   include Merb::Helpers::DateAndTime
@@ -237,11 +237,19 @@ describe "Date" do
   end
 
   it "Should do to_time conversion to utc by default" do
-    @date.to_time.to_s.should == 'Fri Nov 02 00:00:00 UTC 2007'
+    if RUBY_VERSION < "1.9"
+      @date.to_time.to_s.should == 'Fri Nov 02 00:00:00 UTC 2007'
+    else
+      @date.to_time.to_s.should == '2007-11-02 00:00:00 UTC'
+    end
   end
 
   it "Should do to_time conversion to utc when param :utc is given" do
-    @date.to_time(:utc).to_s.should == 'Fri Nov 02 00:00:00 UTC 2007'
+    if RUBY_VERSION < "1.9"
+      @date.to_time(:utc).to_s.should == 'Fri Nov 02 00:00:00 UTC 2007'
+    else
+      @date.to_time(:utc).to_s.should == '2007-11-02 00:00:00 UTC'
+    end
   end
 
   it "Should do to_time conversion to local time when param :local is given" do

data/spec/merb_helpers_form_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 # Quick rundown of how these specs work
 # please read before hacking on this plugin
@@ -49,8 +49,7 @@ describe "error_messages_for" do
     @dm_obj = Object.new
     @sq_obj = Object.new
     @dm_errors = [["foo", "bar"],["baz","bat"]]
-    @sq_errors = Object.new
-    @sq_errors.stub!(:full_messages).and_return(["foo", "baz"])
+    @sq_errors = {:foo => ["bar"],:baz => ["bat"]}
     @dm_obj.stub!(:errors).and_return(@dm_errors)
     @dm_obj.stub!(:new_record?).and_return(false)
     @sq_obj.stub!(:errors).and_return(@sq_errors)
@@ -67,8 +66,8 @@ describe "error_messages_for" do
   it "should build default error messages for Sequel-like models" do
     errs = @c.error_messages_for(@sq_obj)
     errs.should include("<h2>Form submission failed because of 2 problems</h2>")
-    errs.should include("<li>foo</li>")
-    errs.should include("<li>baz</li>")
+    errs.should include("<li>foo bar</li>")
+    errs.should include("<li>baz bat</li>")
   end
 
   # it "should build default error messages for symbol" do
@@ -132,13 +131,13 @@ describe "form" do
   it "should fake out the put method if set" do
     ret = @c.render(:fake_put_if_set)
     ret.should have_selector("form[method=post]")
-    ret.should have_selector("input[type=hidden][name=_method][value=put]")
+    ret.should have_selector("input[type=hidden][name=_method][value=put][class=hidden]")
   end
 
   it "should fake out the delete method if set" do
     ret = @c.render(:fake_delete_if_set)
     ret.should have_selector("form[method=post]")
-    ret.should have_selector("input[type=hidden][name=_method][value=delete]")
+    ret.should have_selector("input[type=hidden][name=_method][value=delete][class=hidden]")
   end
 
   # TODO: Why is this required?
@@ -187,6 +186,13 @@ describe "form_for" do
     form.should_not have_selector("input[type=hidden][name=_method]")
   end
 
+  it "should use POST if the object passed in is nil" do
+    @c.instance_variable_set(:@obj, nil)
+    form = @c.render :advanced
+    form.should have_selector("form[method=post]")
+    form.should_not have_selector("input[type=hidden][value=put][name=_method]")
+  end
+
   it "should support PUT if the object passed in is not a new_record? via a hidden field" do
     form = @c.render :basic
     form.should have_selector("form[method=post]")
@@ -226,6 +232,13 @@ describe "fields_for" do
     r = @c.render :midstream
     r.should have_selector("input[id=fake_model_foo][name='fake_model[foo]'][type=text][extra=true]")
   end
+
+  it "should be able to handle namespaced models by setting name attribute to concrete class name" do
+    @c.instance_variable_set(:@obj2, MyNamespace::NamespacedFakeModel.new)
+    r = @c.render :midstream
+    r.should have_selector("input[type=text][value=foowee]")
+    r.should have_selector("input[name='namespaced_fake_model[foo]'][type=text][value=named_foo]")
+  end
 end
 
 describe "text_field" do
@@ -273,6 +286,12 @@ describe "bound_text_field" do
     r.should have_selector("input[type=text][id=fake_model_foo][name='fake_model[foo]'][value=foowee]")
   end
 
+  it "should take a namespaced model and return correct fieldname" do
+    @c.instance_variable_set(:@obj, MyNamespace::NamespacedFakeModel.new)
+    r = @c.render :basic
+    r.should have_selector("input[type=text][id=namespaced_fake_model_foo][name='namespaced_fake_model[foo]'][value=named_foo]")
+  end
+
   it "should take additional attributes and use them" do
     r = @c.render :basic
     r.should have_selector("input[type=text][name='fake_model[foo]'][value=foowee][bar='7']")
@@ -300,7 +319,7 @@ describe "bound_text_field" do
     model.stub!(:class).and_return("MyClass")
     model.stub!(:foo).and_return("FOO")
     errors = mock("errors")
-    errors.should_receive(:on).with(:foo).and_return(true)
+    errors.should_receive(:[]).with(:foo).and_return(true)
 
     model.stub!(:errors).and_return(errors)
     @c.instance_variable_set(:@obj, model)
@@ -348,7 +367,7 @@ describe "bound_radio_button" do
     model.stub!(:class).and_return("MyClass")
     model.stub!(:foo).and_return("FOO")
     errors = mock("errors")
-    errors.should_receive(:on).with(:foo).and_return(true)
+    errors.should_receive(:[]).with(:foo).and_return(true)
 
     model.stub!(:errors).and_return(errors)
     @c.instance_variable_set(:@obj, model)
@@ -419,7 +438,7 @@ describe "bound_password_field" do
     model.stub!(:class).and_return("MyClass")
     model.stub!(:foo).and_return("FOO")
     errors = mock("errors")
-    errors.should_receive(:on).with(:foo).and_return(true)
+    errors.should_receive(:[]).with(:foo).and_return(true)
 
     model.stub!(:errors).and_return(errors)
 
@@ -583,8 +602,8 @@ describe "bound_check_box" do
     model.stub!(:baz).and_return("BAZ")
     model.stub!(:bat).and_return("BAT")
     errors = mock("errors")
-    errors.should_receive(:on).with(:baz).and_return(true)
-    errors.should_receive(:on).with(:bat).and_return(true)
+    errors.should_receive(:[]).with(:baz).and_return(true)
+    errors.should_receive(:[]).with(:bat).and_return(true)
 
     model.stub!(:errors).and_return(errors)
 
@@ -619,11 +638,16 @@ describe "hidden_field" do
     @c = HiddenFieldSpecs.new(Merb::Request.new({}))
   end
 
-  it "should return a basic checkbox based on the values passed in" do
+  it "should return a basic hidden field based on the values passed in" do
     r = @c.render :basic
     r.should match_tag(:input, :type => "hidden", :id => "foo", :name => "foo", :value => "bar")
   end
 
+  it "should have class 'hidden' by default" do
+    r = @c.render :basic
+    r.should match_tag(:input, :type => "hidden", :class => 'hidden')
+  end
+
   it "should not render a label if the :label option is passed in" do
     res = @c.render :label
     res.should_not match(/<label>LABEL/)
@@ -670,7 +694,7 @@ describe "bound_hidden_field" do
     model.stub!(:class).and_return("MyClass")
     model.stub!(:foo).and_return("FOO")
     errors = mock("errors")
-    errors.should_receive(:on).with(:foo).and_return(true)
+    errors.should_receive(:[]).with(:foo).and_return(true)
 
     model.stub!(:errors).and_return(errors)
 
@@ -788,7 +812,6 @@ describe "bound_radio_group" do
     r = @c.render :basic
     r.should match_tag(:input, :type => "radio", :id => "fake_model_foo_foowee", :name => "fake_model[foo]", :value => "foowee", :checked => "checked")
     r.should match_tag(:input, :type => "radio", :id => "fake_model_foo_baree", :name => "fake_model[foo]", :value => "baree")
-    r.should_not match_tag(:checked => "checked")
   end
 
   it "should provide an additional label tag for each option in array-based options" do
@@ -1093,7 +1116,7 @@ describe "option tags" do
   it "should provide selected options by value" do
     r = @c.render :selected
     r.should match_tag( :option, :value => 'rabbit', :selected => 'selected', :content => 'Rabbit' )
-    r.should_not match_tag( :option, :value => 'chicken', :selected => '', :content => 'Chicken' )
+    r.should_not match_tag( :option, :value => 'chicken', :selected => 'nil', :content => 'Chicken' )
   end
 
   it "should handle arrays for selected when :multiple is true" do
@@ -1228,7 +1251,7 @@ describe "submit" do
 
   it "should provide an additional label tag if the :label option is passed in" do
     r = @c.render :submit_with_label
-    r.should have_selector("input[type=submit][name=submit][value=Done]")
+    r.should have_selector("input[type=submit][name=form_submit][value=Done]")
     r.should have_selector("label:contains('LABEL')")
   end
 
@@ -1379,4 +1402,4 @@ describe "escaping values" do
     r.should =~ /&amp;&quot;&lt;&gt;/
   end
 
-end
+end

data/spec/merb_helpers_tag_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 # Merb::Router.prepare do
 #   default_routes

data/spec/merb_helpers_text_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "cycle" do
   include Merb::Helpers::Text

data/spec/numeric_extlib_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/spec_helper'
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
 
 describe "Numeric helpers" do