.gitignore @@ -7,17 +7,26 @@ module Rack autoload :Condition, 'rack/router/condition' autoload :Builder, 'rack/router/builders' + attr_reader :routes + attr_reader :named_routes + def initialize(app, options = {}, &block) - @app = app || lambda { |env| [ 404, { 'Content-Type' => 'text/html' }, "Not Found" ] } - @builder = options.delete(:builder) || Builder::Simple - @routes = @builder.run(options, &block) + @app = app || fallback + @builder = options.delete(:builder) || Builder::Simple + @routes = @builder.run(options, &block) + @named_routes = {} - @routes.each { |route| route.compile } + @routes.each do |route| + route.compile + @named_routes[route.name] = route if route.name + end end def call(env) + request = Rack::Request.new(env) + for route in @routes - if args = route.match(env) + if args = route.match(request) # The routing args are destructively merged into the rack # environment so that they can be used by any application # called by the router or any app downstream. @@ -34,8 +43,20 @@ module Rack @app.call(env) end + def url(name, params = {}) + unless route = named_routes[name] + raise ArgumentError, "Cannot find route named '#{name}'" + end + + route.generate(params) + end + def end_points @end_points ||= @routes.map { |r| r.app }.uniq end + + def fallback + lambda { |env| [ 404, { 'Content-Type' => 'text/html' }, "Not Found" ] } + end end end \ No newline at end of file lib/rack/router.rb @@ -1,6 +1,10 @@ class Rack::Router::Builder class Simple + # Route format: + # --- + # :scheme :// :subdomain . :domain / :path + # { :scheme => :scheme, :host => :host, :subdomain => :subdomain, :domain => :domain, :path => :path } def self.run(options = {}) builder = new yield builder @@ -20,7 +24,10 @@ class Rack::Router::Builder conditions[:path_info] = path if path conditions[:request_method] = upcase_method(args.last) if args.last - @routes << Rack::Router::Route.new(options[:to], conditions.reject { |k,v| k == :id }, conditions.dup, options[:with] || {}) + route = Rack::Router::Route.new(options[:to], conditions.reject { |k,v| k == :id }, conditions.dup, options[:with] || {}) + route.name = options[:name].to_sym if options[:name] + + @routes << route end private lib/rack/router/builders/simple.rb @@ -13,6 +13,8 @@ class Rack::Router @captures = {} @conditions = conditions + @conditions.default = /#{SEGMENT_CHARACTERS}+/ + case pattern when String @segments = parse_segments_with_optionals(pattern.dup) @@ -33,6 +35,10 @@ class Rack::Router end end + def generate(params) + generate_from_segments(@segments, params) or raise ArgumentError, "Condition cannot be generated with #{params.inspect}" + end + def inspect @pattern.inspect end @@ -86,7 +92,7 @@ class Rack::Router when String Regexp.escape(segment) when Symbol - condition = @conditions[segment] || /#{SEGMENT_CHARACTERS}+/ + condition = @conditions[segment] condition = Regexp.escape(condition) unless condition.is_a?(Regexp) "(#{condition})" when Array @@ -113,6 +119,20 @@ class Rack::Router end end + def generate_from_segments(segments, params) + segments.map do |segment| + case segment + when String + segment + when Symbol + return unless params[segment] && params[segment].to_s =~ @conditions[segment] + params[segment] + when Array + generate_from_segments(segment, params) || "" + end + end.join + end + # ==== UTILITIES ==== def convert_to_regexp(item) lib/rack/router/condition.rb @@ -23,8 +23,7 @@ class Rack::Router @keys ||= [@request_conditions.map { |c| c.captures }, @params.keys].flatten.uniq end - def match(env) - request = Rack::Request.new(env) + def match(request) params = @params.dup return unless request_conditions.all? do |method_name, condition| @@ -35,5 +34,9 @@ class Rack::Router params end + def generate(params) + @request_conditions[:path_info].generate(params) + end + end end \ No newline at end of file lib/rack/router/route.rb @@ -10,6 +10,52 @@ describe "When generating URLs" do end end + it "generates with no parameters" do + @app.url(:simple).should == "/hello/world" + end + + it "appends any parameters to the query string" do + pending do + @app.url(:simple, :foo => "bar").should == "/hello/world?foo=bar" + end + end + + end + + describe "a named route with a variable and no conditions" do + + before(:each) do + prepare do |r| + r.map "/:account/welcome", :to => FooApp, :name => :welcome + end + end + + it "generates a URL with a paramter passed for the variable" do + @app.url(:welcome, :account => "walruses").should == "/walruses/welcome" + end + + it "appends any extra parameters to the query string" do + pending do + @app.url(:welcome, :account => "seagulls", :like_walruses => "true").should == "/seagulls/welcome?like_walruses=true" + end + end + + it "raises an error if no parameters are passed" do + lambda { @app.url(:welcome) }.should raise_error(ArgumentError) + end + + it "raises an error if a nil parameter is passed" do + lambda { @app.url(:welcome, :account => nil) }.should raise_error(ArgumentError) + end + + it "raises an error if a blank parameter is passed" do + lambda { @app.url(:welcome, :account => "") }.should raise_error(ArgumentError) + end + + it "raises an error if parameters are passed without :account" do + lambda { @app.url(:welcome, :foo => "bar") }.should raise_error(ArgumentError) + end + end end \ No newline at end of file spec/generation/string_spec.rb @@ -68,7 +68,11 @@ Object.instance_eval do Object.instance_eval %{ class ::#{name} def self.call(env) - [ 200, { "Content-Type" => 'text/yaml' }, YAML.dump(env.merge("app" => "#{name}")) ] + resp = {} + resp['rack.routing_args'] = env['rack.routing_args'] + resp['app'] = '#{name}' + + [ 200, { "Content-Type" => 'text/yaml' }, YAML.dump(resp) ] end end ::#{name} spec/spec_helper.rb 1a7b7d670d6ecf5975fb312877909c57e501f689 Carl Lerche carllerche@mac.com http://github.com/carllerche/rack-router/commit/10ca081cd90bf05b1b552eaaf31b49496756af87 10ca081cd90bf05b1b552eaaf31b49496756af87 2009-03-26T13:54:26-07:00 2009-03-26T13:54:26-07:00 Started writing route generation 20cd73cfa5abaf83f941760db242cf71e65be8bc Carl Lerche carllerche@mac.com