@@ -1,4 +1,9 @@ -%w(rubygems extlib merb-core/dispatch/router uri).each {|dep|require dep} +%w(rubygems merb-core/core_ext merb-core/dispatch/router uri).each {|dep|require dep} + +# Merb::Router::Route#generate checks Merb::Config[:path_prefix], skipping if +# it can't find the element in the hash. Here, we've recreated Merb's config +# to ignore this. +module Merb; Config = {}; end module Halcyon class Application lib/halcyon/application/router.rb @@ -79,7 +79,7 @@ describe "Halcyon::Controller" do resource = Model.new resource.id = 1 controller = Resources.new(Rack::MockRequest.env_for("/resources/1")) - controller.uri.should == controller.url(:resource, resource) + controller.uri.should == controller.url(:resource, resource.id) end it "should accept response headers" do spec/halcyon/controller_spec.rb 59b183e39445832c81ded4e02b9aceca4aa94c30 Matt Todd chiology@gmail.com http://github.com/mtodd/halcyon/commit/c4cb414bf7b05176c844ff589a580aacf82d5748 c4cb414bf7b05176c844ff589a580aacf82d5748 2008-09-28T23:26:45-07:00 2008-09-28T23:26:45-07:00 Fixed issues with the extract_options_from_args! method missing error and fixed a spec issue with the new controller.url not automatically casting models into their respective IDs. e943fe48824c26f0e8e9960b9e98a128708b2549 Matt Todd chiology@gmail.com