usher 0.5.11 → 0.5.12

data/rails/init.rb

@@ -1,8 +1,24 @@
-if Rails::VERSION::MAJOR == 2 && Rails::VERSION::MINOR == 3
-  ActionController::Routing.module_eval "remove_const(:Routes); Routes = Usher::Interface.for(:rails2_3)"
-elsif Rails::VERSION::MAJOR == 2 && Rails::VERSION::MINOR >= 2
-  class Usher::Interface::Rails2_2Interface::Mapper
-    include ActionController::Resources
-  end
-  ActionController::Routing.module_eval "remove_const(:Routes); Routes = Usher::Interface.for(:rails2_2)"
-end
+rails_version = "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}"
+
+case rails_version
+  when '2.3'
+    ActionController::Routing.module_eval "remove_const(:Routes); Routes = Usher::Interface.for(:rails23)"
+
+  when '2.2'
+    class Usher::Interface::Rails22::Mapper
+      include ActionController::Resources
+    end
+    ActionController::Routing.module_eval "remove_const(:Routes); Routes = Usher::Interface.for(:rails22)"
+
+  when '2.0'
+    class Usher::Interface::Rails20::Mapper
+      include ActionController::Resources
+    end
+
+    ActionController::Routing.module_eval <<CODE
+      remove_const(:Routes);
+      interface = Usher::Interface.for(:rails20);
+      interface.configuration_file = File.join(RAILS_ROOT, 'config', 'routes.rb')
+      Routes = interface;
+CODE
+end

data/spec/private/generate_spec.rb

@@ -137,6 +137,122 @@ describe "Usher URL generation" do
     @route_set.generator.generate(:optionals, {:controller => "foo", :action => "bar"}).should == '/foo/bar'
   end
 
+  describe "when named route was added with string key" do
+    before :each do
+      @route_set.add_named_route 'items', '/items', :controller => 'items', :action => 'index'
+    end
+
+    it "should generate a named route by given symbolic key" do
+      @route_set.generator.generate(:items).should == '/items'
+    end
+  end
+
+  describe "#generate_start" do
+    before :all do
+      UrlParts = Usher::Util::Generators::URL::UrlParts
+      @url_parts_stub = UrlParts.new :some_path, :some_request
+      UrlParts.stub! :new => @url_parts_stub
+    end
+
+    describe "when url does not end with /" do
+      before :each do
+        @url_parts_stub.stub! :url => 'http://localhost'
+      end
+
+      it "should just return an url given by UrlParts" do
+        @route_set.generator.generate_start(:some_path, :some_request).should == 'http://localhost'
+      end
+    end
+
+    describe "when url ends with /" do
+      before :each do
+        @url_parts_stub.stub! :url => 'http://localhost/'
+      end
+
+      it "should strip trailing slash" do
+        @route_set.generator.generate_start(:some_path, :some_request).should == 'http://localhost'
+      end
+    end
+  end
+
+  describe "#generate_full" do
+    shared_examples_for "correct routes generator" do
+      describe "when request is a Rack::Request (Rails >= 2.3)" do
+        before :each do          
+          @route_set.add_named_route :items, '/items'
+          @request = Rack::Request.new(Rack::MockRequest.env_for(@url))
+        end
+
+        it "should generate an URL correctly" do
+          @route_set.generator.generate_full(:items, @request).should == @url + '/items'
+        end
+      end
+
+      describe "when request is a AbstractRequest (Rails <= 2.2)" do
+        before :each do          
+          @route_set.add_named_route :items, '/items'
+
+          @request = Struct.new(:url, :protocol, :host, :port).new(@url.dup, "#{@scheme}://", @host, @port)
+        end
+
+        it "should generate an URL correctly" do
+          @route_set.generator.generate_full(:items, @request).should == @url + '/items'
+        end
+      end
+
+      describe "when data is provided in @generated_with" do
+        before :each do
+          @route_set.add_named_route :items, '/items', :generate_with => { :scheme => @scheme, :host => @host, :port => @port }
+          @request = Rack::Request.new(Rack::MockRequest.env_for('ftp://something-another:9393'))
+        end
+
+        it "should generate an URL correctly" do
+          @route_set.generator.generate_full(:items, @request).should == @url + '/items'
+        end
+      end
+    end
+
+    describe "when protocol is http" do
+      describe "whem port is 80" do
+        before :each do
+          @scheme, @host, @port = 'http', 'localhost', 80
+          @url = 'http://localhost'
+        end
+
+        it_should_behave_like "correct routes generator"
+      end
+
+      describe "when port is custom" do
+        before :each do
+          @scheme, @host, @port = 'http', 'localhost', 8080
+          @url = 'http://localhost:8080'
+        end
+
+        it_should_behave_like "correct routes generator"
+      end
+    end
+
+    describe "when protocol is https" do
+      describe "whem port is 443 (standard)" do
+        before :each do
+          @scheme, @host, @port = 'https', 'localhost', 443
+          @url = 'https://localhost'
+        end
+
+        it_should_behave_like "correct routes generator"
+      end
+
+      describe "when port is custom" do
+        before :each do
+          @scheme, @host, @port = 'https', 'localhost', 8443
+          @url = 'https://localhost:8443'
+        end
+
+        it_should_behave_like "correct routes generator"
+      end
+    end
+  end
+
   describe "nested generation" do
     before do
       @route_set2 = Usher.new(:generator => Usher::Util::Generators::URL.new)
@@ -272,5 +388,4 @@ describe "Usher URL generation" do
       @r2.generator.generate(:route).should == "/r2"
     end
   end
-
 end

data/spec/private/generate_with_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
+require "usher"
+
+describe Usher::Route::GenerateWith, "#empty?" do
+  before :all do
+    GenerateWith = Usher::Route::GenerateWith
+  end
+
+  describe "when all fields are nil" do
+    before :each do
+      @empty_generate_with = GenerateWith.new
+    end
+
+    it "should return true" do
+      @empty_generate_with.empty?.should be_true
+    end
+  end
+
+  describe "when at least one field is filled" do
+    before :each do
+      @filled_generate_with = GenerateWith.new('http')
+    end
+
+    it "should return false" do
+      @filled_generate_with.empty?.should be_false
+    end
+  end
+end

data/spec/private/rack/dispatch_spec.rb

@@ -56,6 +56,25 @@ describe "Usher (for rack) route dispatching" do
     response.status.should eql(404)
   end
 
+  describe "shortcuts" do
+    describe "get" do
+      before(:each) do
+        route_set.reset!
+        route_set.get('/sample').to(@app)
+      end
+
+      it "should dispatch a GET request" do
+        response = route_set.call_with_mock_request("/sample", "GET")
+        response.body.should eql("Hello World!")
+      end
+
+      it "should dispatch a HEAD request" do
+        response = route_set.call_with_mock_request("/sample", "HEAD")
+        response.body.should eql("Hello World!")
+      end
+    end
+  end
+
   describe "mounted rack instances" do
     before do
       @bad_app = mock("bad_app")
@@ -181,7 +200,8 @@ describe "Usher (for rack) route dispatching" do
     it "should allow me to set a default application to use" do
       @app.should_receive(:call).with{|e| e['usher.params'].should == {:middle => :ware}}
 
-      u = Usher::Interface::RackInterface.new(@app)
+      u = Usher::Interface.for(:rack)
+      u.app = @app
       u.add("/foo", :default_values => {:middle => :ware}).name(:foo)
 
       u.call(Rack::MockRequest.env_for("/foo"))
@@ -190,7 +210,8 @@ describe "Usher (for rack) route dispatching" do
     it "should use the default application when no routes match" do
       env = Rack::MockRequest.env_for("/not_a_route")
       @app.should_receive(:call).with(env)
-      u = Usher::Interface::RackInterface.new(@app)
+      u = Usher::Interface.for(:rack)
+      u.app = @app
       u.call(env)
     end
 

data/spec/private/rack/route_spec.rb

@@ -0,0 +1,50 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+require "usher"
+
+describe "Rack interface extensions for Usher::Route" do
+  before(:each) do
+    @route_set = Usher::Interface.for(:rack)
+    @app = MockApp.new("Hello World!")
+    @env = Rack::MockRequest.env_for("/index.html")
+  end
+
+  describe "basic functinality" do
+    it "should set redirect headers" do
+      @route_set.get("/index.html").redirect("/")
+      raw_response = @route_set.call(@env)
+      response = Rack::MockResponse.new(*raw_response)
+      response.should be_redirect
+    end
+
+    it "should redirect '/index.html' to '/'" do
+      @route_set.get("/index.html").redirect("/")
+      status, headers, body = @route_set.call(@env)
+      headers["Location"].should eql("/")
+    end
+  end
+
+  describe "chaining" do
+    it "should be chainable" do
+      @route_set.get("/index.html").redirect("/").name(:root)
+      url = @route_set.router.generator.generate(:root)
+      url.should eql("/index.html")
+    end
+
+    it "should not influence actual invoking" do
+      @route_set.get("/index.html").redirect("/").name(:root)
+      @route_set.call(@env)
+    end
+  end
+
+  describe "custom status" do
+    it "should enable to set custom HTTP status" do
+      @route_set.get("/index.html").redirect("/", 303)
+      status, headers, body = @route_set.call(@env)
+      status.should eql(303)
+    end
+
+    it "should raise an exception if given HTTP code isn't a redirection" do
+      lambda { @route_set.get("/index.html").redirect("/", 200) }.should raise_error(ArgumentError)
+    end
+  end
+end

data/spec/private/rails2_2/generate_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_hel
 require File.expand_path(File.join(File.dirname(__FILE__), 'compat'))
 require "usher"
 
-route_set = Usher::Interface.for(:rails2_2)
+route_set = Usher::Interface.for(:rails22)
 
 describe "Usher (for rails 2.2) URL generation" do
   

data/spec/private/rails2_2/path_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_hel
 require File.expand_path(File.join(File.dirname(__FILE__), 'compat'))
 require "usher"
 
-route_set = Usher::Interface.for(:rails2_2)
+route_set = Usher::Interface.for(:rails22)
 
 describe "Usher (for rails 2.2) route adding" do
 

data/spec/private/rails2_2/recognize_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'compat'))
 require "usher"
 require 'action_controller'
 
-route_set = Usher::Interface.for(:rails2_2)
+route_set = Usher::Interface.for(:rails22)
 
 def build_request_mock(path, method, params)
   request = mock "Request"

data/spec/private/rails2_3/generate_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_hel
 require File.expand_path(File.join(File.dirname(__FILE__), 'compat'))
 require "usher"
 
-route_set = Usher::Interface.for(:rails2_3)
+route_set = Usher::Interface.for(:rails23)
 
 describe "Usher (for rails 2.3) URL generation" do
   

data/spec/private/rails2_3/path_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_hel
 require File.expand_path(File.join(File.dirname(__FILE__), 'compat'))
 require "usher"
 
-route_set = Usher::Interface.for(:rails2_3)
+route_set = Usher::Interface.for(:rails23)
 
 describe "Usher (for rails 2.3) route adding" do
 

data/spec/private/rails2_3/recognize_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'compat'))
 require "usher"
 require 'action_controller'
 
-route_set = Usher::Interface.for(:rails2_3)
+route_set = Usher::Interface.for(:rails23)
 
 def build_request_mock(path, method, params)
   request = mock "Request"

data/spec/private/recognize_spec.rb

@@ -64,13 +64,12 @@ describe "Usher route recognition" do
       insecure_product_show_route.should == @route_set.recognize(build_request({:method => 'get', :path => '/products/show/123', :domain => 'admin.host.com', :user_agent => false})).path.route
     end
 
-    it "should use conditionals that are arrays" do
+    it "should use flatten and use conditionals that are arrays" do
       # hijacking user_agent
-      www_product_show_route = @route_set.add_route('/products/show/:id', :id => /\d+/, :conditions => {:subdomains => ['www'], :method => 'get'})
-      admin_product_show_route = @route_set.add_route('/products/show/:id', :id => /\d+/, :conditions => {:subdomains => ['admin'], :method => 'get'})
+      www_product_show_route = @route_set.add_route('/products/show/:id', :id => /\d+/, :conditions => {:subdomains => ['www', 'admin'], :method => 'get'})
 
-      admin_product_show_route.should == @route_set.recognize(build_request({:method => 'get', :path => '/products/show/123', :subdomains => ['admin'], :user_agent => true})).path.route
-      www_product_show_route.should == @route_set.recognize(build_request({:method => 'get', :path => '/products/show/123', :subdomains => ['www'], :user_agent => false})).path.route
+      www_product_show_route.should == @route_set.recognize(build_request({:method => 'get', :path => '/products/show/123', :subdomains => 'admin', :user_agent => true})).path.route
+      www_product_show_route.should == @route_set.recognize(build_request({:method => 'get', :path => '/products/show/123', :subdomains => 'www', :user_agent => false})).path.route
     end
   end
 

data/spec/private/url_parts_spec.rb

@@ -0,0 +1,116 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
+require "usher"
+require 'rack/test'
+
+module PathAndRequestHelper
+  def stub_path_with(scheme, host, port)
+    generate_with = Usher::Route::GenerateWith.new(scheme, port, host)
+
+    route = stub 'route'
+    route.stub! :generate_with => generate_with
+
+    path = stub 'path'
+    path.stub! :route => route
+
+    path
+  end
+
+  def stub_path
+    stub_path_with nil, nil, nil
+  end
+
+  def rack_request_for(url)
+    Rack::Request.new(Rack::MockRequest.env_for(url))
+  end
+end
+
+describe Usher::Util::Generators::URL::UrlParts do
+  include PathAndRequestHelper
+
+  before :all do
+    UrlParts = Usher::Util::Generators::URL::UrlParts
+  end
+
+  describe "#url" do
+    describe "when generate_with is provided" do      
+      before :each do
+        @path = stub_path_with 'https', 'overridden', 9443
+        @request = rack_request_for 'http://localhost'
+      end
+
+      it "should return url with parts provided by generate_with" do
+        url_parts = UrlParts.new(@path, @request)
+        url_parts.url.should == "https://overridden:9443"
+      end
+
+      describe "when port is standard" do
+        describe "when scheme is https" do
+          before :each do
+            @path = stub_path_with 'https', 'overridden', 443
+            @request = rack_request_for 'http://localhost:8080'
+          end
+
+          it "should not add port to url" do
+            url_parts = UrlParts.new(@path, @request)
+            url_parts.url.should == "https://overridden"
+          end
+        end
+
+        describe "when scheme is http" do
+          before :each do
+            @path = stub_path_with 'http', 'overridden', 80
+            @request = rack_request_for 'http://localhost:8080'
+          end
+
+          it "should not add port to url" do
+            url_parts = UrlParts.new(@path, @request)
+            url_parts.url.should == "http://overridden"
+          end
+        end
+      end
+
+      describe "when scheme is not given" do
+        before :each do
+          @path = stub_path_with nil, 'overridden', 8443
+        end
+
+        describe "when request is Rack's one" do
+          before :each do
+            @request = rack_request_for 'https://localhost'
+          end
+
+          it "should extract scheme from request" do
+            url_parts = UrlParts.new(@path, @request)
+            url_parts.url.should == "https://overridden:8443"
+          end
+        end
+
+        describe "when request is an AbstractRequest (Rails < 2.3)" do
+          before :each do
+            @request = stub 'request'
+            @request.stub! :protocol => 'https://'
+          end
+
+          it "should call #protocol, not #scheme" do
+            url_parts = UrlParts.new(@path, @request)
+            url_parts.url.should == "https://overridden:8443"
+          end
+        end
+      end
+    end
+
+    describe "when generate_with is empty" do
+      before :each do
+        @path = stub_path
+        @request = mock 'request'
+      end
+
+      it "should just extract the url" do        
+        @request.should_receive(:url).and_return('http://localhost')
+
+        url_parts = UrlParts.new(@path, @request)
+        url_parts.url.should == 'http://localhost'
+      end
+    end
+  end
+end