pancake 0.2.0 → 0.3.0

data/spec/pancake/middleware_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Pancake::Middleware" do
   before(:all) do
@@ -37,7 +37,7 @@ describe "Pancake::Middleware" do
     end # GeneralMiddlware
 
     class ::FooApp < Pancake::Stack
-      def self.new_app_instance; self end
+      def self.new_endpoint_instance; self end
 
       def self.call(env)
         $current_env = env
@@ -48,7 +48,7 @@ describe "Pancake::Middleware" do
   end
 
   after(:each) do
-    clear_constants(:FooApp, :BarApp, :BazApp, :GeneralMiddleware, :BarMiddle, :FooMiddle, :BazMiddle, :PazMiddle)
+    clear_constants(:MasterApp, :FooApp, :BarApp, :BazApp, :GeneralMiddleware, :BarMiddle, :FooMiddle, :BazMiddle, :PazMiddle)
   end
 
   describe "pancake middlewares" do
@@ -80,17 +80,18 @@ describe "Pancake::Middleware" do
       class ::BarMiddle < GeneralMiddleware; end
       class ::BarApp < FooApp; end
       class ::BazApp < FooApp; end
+      class ::MasterApp < FooApp; end
 
       BarApp.use BarMiddle
       BazApp.use FooMiddle
       Pancake.use GeneralMiddleware
 
-      FooApp.router do |r|
+      MasterApp.router do |r|
         r.mount(BarApp, "/bar")
         r.mount(BazApp, "/baz")
       end
 
-      @app = Pancake.start(:root => @root){ FooApp.stackup }
+      @app = Pancake.start(:root => @root){ MasterApp.stackup }
       result = get "/baz"
       $current_env["p.s.c"].should == [GeneralMiddleware, FooMiddle]
       reult = get "/bar"

data/spec/pancake/middlewares/logger_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Pancake::Middlewares::Logger do
   before do

data/spec/pancake/middlewares/static_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Pancake::Middlewares::Static do
   before do

data/spec/pancake/mime_types_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "..", "spec_helper")
+require 'spec_helper'
 
 describe Pancake::MimeTypes do
   before do

data/spec/pancake/mixins/publish_spec.rb

@@ -1,85 +1,85 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe "Pancake::Controller publish declaration" do
   before(:each) do
     class ::PancakeTest
       extend Pancake::Mixins::Publish
-      
+
       provides :html
-      
+
       publish
       def simple_publish; end
-      
+
       publish :id => as(:integer)
       def integer_test; end
-      
+
       publish :start => as(:date)
       def date_test; end
-      
+
       publish :page => as(:integer, 12)
       def default_test; end
-      
+
       publish :provides => [:xml, :json]
       def provides_test; end
-      
+
       publish :only_provides => :xml
       def only_provides_test; end
-      
+
       publish :name => as(:string, :opt)
       def optional_test; end
-      
+
       publish :provides => [:json, :txt],
-              :id       => as(:integer, :req), 
-              :name     => as(:string, "Campion"), 
+              :id       => as(:integer, :req),
+              :name     => as(:string, "Campion"),
               :melon    => as(:integer, 50),
               :jam      => as(:string, :opt),
               :squeeze  => as(:string, :req)
       def complex_test; end
     end
   end
-  
-  after do 
+
+  after do
     clear_constants "PancakeTest"
   end
-  
+
   it "should publish an action" do
     PancakeTest.actions['simple_publish'].is_a?(Pancake::Mixins::Publish::ActionOptions).should == true
   end
-  
+
   it "should coerce a parameter into an integer" do
     params, missing = PancakeTest.__send__(:validate_and_coerce_params, 'integer_test', 'id' => "30")
     params['id'].should == 30
   end
-  
+
   it "should coerce a parameter into a date" do
     date = Date.parse("2009/07/05")
     params, missing = PancakeTest.__send__(:validate_and_coerce_params, 'date_test', 'start' => "2009/07/05")
     params['start'].should == date
   end
-  
+
   it "should flag required params that are missing" do
     params, missing = PancakeTest.__send__(:validate_and_coerce_params, 'integer_test', {})
     missing.include?(['id', :integer]).should == true
   end
-  
+
   it "should allow parameters to be optional" do
     params, missing = PancakeTest.__send__(:validate_and_coerce_params, 'optional_test', {})
     missing.empty?.should == true
   end
-  
+
   it "should return a default value for a parameter" do
     params, missing = PancakeTest.__send__(:validate_and_coerce_params, 'default_test', {})
     params['page'].should == 12
   end
-  
+
   it "should append formats to the list allowed for an action" do
     PancakeTest.actions['provides_test'].formats.should == [:html, :xml, :json]
   end
-  
+
   it "should replace the list of formats allowed for an action" do
     PancakeTest.actions['only_provides_test'].formats.should == [:xml]
   end
-  
+
   it "should allow complex declarations" do
     input = {'id' => "30", 'name' => "Purslane"}
     params, missing = PancakeTest.__send__(:validate_and_coerce_params, 'complex_test', input)
@@ -88,7 +88,7 @@ describe "Pancake::Controller publish declaration" do
     params['melon'].should == 50
     params['jame'].should be_nil
     missing.include?(['squeeze', :string]).should == true
-    
+
     PancakeTest.actions['complex_test'].formats.should == [:html, :json, :txt]
   end
 end

data/spec/pancake/mixins/render/template_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "..", "spec_helper")
+require 'spec_helper'
 
 describe Pancake::Mixins::Render::Template do
   before do

data/spec/pancake/mixins/render/view_context_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper")
+require 'spec_helper'
 
 describe Pancake::Mixins::Render::ViewContext do
 

data/spec/pancake/mixins/render_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Pancake::Mixins::Render do
   before do

data/spec/pancake/mixins/request_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Pancake::Mixins::RequestHelper do
   before do

data/spec/pancake/mixins/stack_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "..","..","spec_helper")
+require 'spec_helper'
 
 describe Pancake::Mixins::StackHelper do
   before do
@@ -38,9 +38,9 @@ describe Pancake::Mixins::StackHelper do
     class ::FooBar < FooStack::Bar; end
     FooBar.stack_class.should == FooStack
   end
-  
+
   it "should provide access to the stack helper from an instance of the Bar class" do
     FooStack::Bar.new.stack_class.should == FooStack
   end
-  
+
 end

data/spec/pancake/pancake_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "pancake" do
 

data/spec/pancake/paths_spec.rb

@@ -1,30 +1,30 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Pancake::Paths do
-  
+
   def fixture_root
     File.expand_path(File.join(File.dirname(__FILE__), "fixtures", "paths"))
   end
-  
+
   before(:each) do
     remove_consts!
     class ::Foo
       extend Pancake::Paths
     end
   end
-  
+
   after(:all) do
     remove_consts!
   end
-  
+
   def remove_consts!
-    Object.class_eval do 
+    Object.class_eval do
       remove_const("Foo") if defined?(Foo)
       remove_const("Bar") if defined?(Bar)
       remove_const("Baz") if defined?(Baz)
     end
   end
-  
+
   describe "setting roots" do
     it "should allow me to set roots" do
       Foo.roots.should == []
@@ -32,31 +32,31 @@ describe Pancake::Paths do
       Foo.roots.should == [fixture_root]
     end
   end
-  
+
   describe "pushing paths" do
     before do
       Foo.roots << fixture_root
     end
-    
+
     it "should push a single path" do
       Foo.push_paths(:models, "models")
       Foo.dirs_for(:models).should == [File.join(fixture_root,"models")]
     end
-    
+
     it "should give me an empty array of paths when there have been no paths added" do
       Foo.dirs_for(:models).should == []
     end
-    
+
     it "should raise and error if there are no paths specified" do
       lambda do
         Foo.push_paths(:models)
       end.should raise_error(ArgumentError)
-      
+
       lambda do
         Foo.push_paths(:models, [])
       end.should raise_error(Pancake::Paths::NoPathsGiven)
     end
-    
+
     it "should allow me to push multiple times to a single path group" do
       Foo.push_paths(:models, "models")
       Foo.push_paths(:models, "stack/models")
@@ -65,7 +65,7 @@ describe Pancake::Paths do
         File.join(fixture_root, "stack", "models")
       ]
     end
-    
+
     it "should allow me to push multiple path sets" do
       Foo.push_paths(:models,      ["models", "stack/models"])
       Foo.push_paths(:controllers, "controllers")
@@ -77,7 +77,7 @@ describe Pancake::Paths do
       Foo.dirs_for(:controllers ).should == [File.join(fixture_root, "controllers")]
       Foo.dirs_for(:views       ).should == [File.join(fixture_root, "stack", "views")]
     end
-    
+
     it "should reverse the dirs_for when specified" do
       Foo.push_paths(:models,      ["models", "stack/models"])
       Foo.dirs_for(:models, :invert => true).should == [
@@ -85,7 +85,7 @@ describe Pancake::Paths do
         File.join(fixture_root, "models")
       ]
     end
-    
+
     describe "globs" do
       it "should allow me to supply a glob to associate with the path" do
         Foo.push_paths(:models,  "models",        "**/*.rb")
@@ -95,13 +95,13 @@ describe Pancake::Paths do
           [File.join(fixture_root, "stack", "models"),  "**/*.rb"]
         ]
       end
-      
+
       it "should associate an empty glob when not specified" do
         Foo.push_paths(:models, "foo/bar")
         Foo.dirs_for(:models).should == [File.join(fixture_root, "foo/bar")]
         Foo.dirs_and_glob_for(:models).should == [[File.join(fixture_root, "foo/bar"), nil]]
       end
-      
+
       it "should revers the dirs_and_globs when requested" do
         Foo.push_paths(:models,  "models",      "**/*.rb")
         Foo.push_paths(:models,  "stack/models", "**/*.rb")
@@ -113,7 +113,7 @@ describe Pancake::Paths do
       end
     end
   end
-  
+
   describe "reading paths" do
     before(:each) do
       @model_root = File.join(fixture_root, "models")
@@ -121,7 +121,7 @@ describe Pancake::Paths do
       Foo.roots << fixture_root
       Foo.push_paths(:model, ["models", "stack/models"], "**/*.rb")
     end
-    
+
     it "should have list all the paths for :model" do
       result = Foo.paths_for(:model).should == [
         [@model_root, "/model1.rb"],
@@ -130,7 +130,7 @@ describe Pancake::Paths do
         [@stack_root, "/model3.rb"]
       ]
     end
-    
+
     it "should allow me to invert the order of the roots" do
       result = Foo.paths_for(:model, :invert => true).should == [
         [@stack_root, "/model3.rb"],
@@ -139,7 +139,7 @@ describe Pancake::Paths do
         [@model_root, "/model1.rb"]
       ]
     end
-    
+
     it "should allow me to get the unique_paths" do
       result = Foo.unique_paths_for(:model).should == [
         [@model_root, "/model1.rb"],
@@ -147,7 +147,7 @@ describe Pancake::Paths do
         [@stack_root, "/model3.rb"]
       ]
     end
-    
+
     it "should allow me to invert the order of the unique_paths" do
       result = Foo.unique_paths_for(:model, :invert => true).should == [
         [@model_root, "/model3.rb"],
@@ -156,7 +156,7 @@ describe Pancake::Paths do
       ]
     end
   end
-  
+
   describe "inherited paths" do
     before(:each) do
       Foo.push_paths(:model,      "models")
@@ -164,12 +164,12 @@ describe Pancake::Paths do
       Foo.roots << fixture_root
       class ::Bar < Foo; end
     end
-    
+
     it "should inherit paths from the parent" do
       Bar.dirs_for(:model).should       == [File.join(fixture_root, "models")]
       Bar.dirs_for(:controller).should  == [File.join(fixture_root, "controllers")]
     end
-    
+
     it "should let me add to the collection from the parent" do
       Bar.push_paths(:model, "stack/models")
       Bar.dirs_for(:model).should == [
@@ -177,12 +177,12 @@ describe Pancake::Paths do
         File.join(fixture_root, "stack/models")
       ]
     end
-    
+
     it "should not bleed paths back up to the parent" do
       Bar.push_paths(:model, "stack/models")
       Foo.dirs_for(:model).should == [File.join(fixture_root, "models")]
     end
-    
+
     it "should not bleed paths over to a sibling class" do
       class ::Baz < Foo; end
       Bar.push_paths(:model, "stack/models")
@@ -197,7 +197,7 @@ describe Pancake::Paths do
       ]
       Foo.dirs_for(:model).should == [File.join(fixture_root, "models")]
     end
-    
+
     it "should inherit multpile times" do
       class ::Baz < Bar; end
       Bar.push_paths(:model, "bar/path")
@@ -207,4 +207,4 @@ describe Pancake::Paths do
       ]
     end
   end
-end
+end

data/spec/pancake/stack/router_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe "stack router" do
   before(:all) do
@@ -14,7 +14,7 @@ describe "stack router" do
           JSON.generate({
             "SCRIPT_NAME" => e["SCRIPT_NAME"],
             "PATH_INFO"   => e["PATH_INFO"],
-            "usher.params" => e["usher.params"]
+            "router.params" => e["router.params"].to_hash
           })
         ]
       ]
@@ -34,15 +34,15 @@ describe "stack router" do
   describe "mount" do
     it "should let me setup routes for the stack" do
       FooApp.router do |r|
-        r.mount(INNER_APP, "/foo", :_defaults => {:action => "foo action"}).name(:foo)
-        r.mount(INNER_APP, "/bar", :_defaults => {:action => "bar action"}).name(:root)
+        r.mount(INNER_APP, "/foo", :default_values => {:action => "foo action"}).name(:foo)
+        r.mount(INNER_APP, "/bar", :default_values => {:action => "bar action"}).name(:root)
       end
 
       @app = FooApp.stackup
       expected = {
         "SCRIPT_NAME" => "/foo",
         "PATH_INFO"   => "",
-        "usher.params" => {"action" => "foo action"}
+        "router.params" => {"action" => "foo action"}
       }
 
       get "/foo"
@@ -50,14 +50,14 @@ describe "stack router" do
     end
 
     it "should allow me to stop the route from partially matching" do
-        FooApp.with_router do |r|
-          r.mount(INNER_APP, "/foo/bar", :_defaults => {:action => "foo/bar"}, :_exact => true).name(:foobar)
+        FooApp.router do |r|
+          r.mount(INNER_APP, "/foo/bar", :default_values => {:action => "foo/bar"}, :_exact => true).name(:foobar)
         end
         @app = FooApp.stackup
         expected = {
           "SCRIPT_NAME"   => "/foo/bar",
           "PATH_INFO"     => "",
-          "usher.params"  => {"action" => "foo/bar"}
+          "router.params"  => {"action" => "foo/bar"}
         }
         get "/foo/bar"
         JSON.parse(last_response.body).should == expected
@@ -66,7 +66,7 @@ describe "stack router" do
     end
 
     it "should not match a single segment route when only / is defined" do
-      FooApp.router.add("/", :_defaults => {:root => :var}) do |e|
+      FooApp.router.add("/", :default_values => {:root => :var}) do |e|
         Rack::Response.new("In the Root").finish
       end
       @app = FooApp.stackup
@@ -94,28 +94,18 @@ describe "stack router" do
         result = get "/stackup"
         result.body.should include("stacked up")
       end
-
-      it "should provide the rack params as a Hashie" do
-        FooApp.router.add("/hashie") do |e|
-          r = Rack::Request.new(e)
-          r.params.should be_a_kind_of(Hashie::Mash)
-          Rack::Response.new("OK").finish
-        end
-        @app = FooApp.stackup
-        get "/hashie"
-      end
     end
   end
 
   describe "generating routes" do
     before do
       FooApp.router do |r|
-        r.add("/simple/route"    ).name(:simple)
-        r.add("/var/with/:var", :_defaults => {:var => "some_var"}).name(:defaults)
-        r.add("/complex/:var"    ).name(:complex)
-        r.add("/optional(/:var)" ).name(:optional)
-        r.add("/some/:unique_var")
-        r.add("/", :_defaults => {:var => "root var"}).name(:root)
+        r.add("/simple/route"    ).name(:simple).compile
+        r.add("/var/with/:var", :default_values => {:var => "some_var"}).name(:defaults).compile
+        r.add("/complex/:var"    ).name(:complex).compile
+        r.add("/optional(/:var)" ).name(:optional).compile
+        r.add("/some/:unique_var").compile
+        r.add("/", :default_values => {:var => "root var"}).name(:root).compile
       end
     end
 
@@ -123,11 +113,6 @@ describe "stack router" do
       Pancake.url(FooApp, :simple).should == "/simple/route"
     end
 
-    it "should generate a / when / is optional" do
-      FooApp.router.add("(/)").name(:foo)
-      Pancake.url(FooApp, :foo).should == "/"
-    end
-
     it "should allow me to generate a non-named route for a stack" do
       Pancake.url(FooApp, :complex, :var => "a_variable").should == "/complex/a_variable"
     end
@@ -142,10 +127,6 @@ describe "stack router" do
       Pancake.url(FooApp, :defaults, :var => "this_is_a_var").should == "/var/with/this_is_a_var"
     end
 
-    it "should allow me to generate a route by params" do
-      Pancake.url(FooApp, :unique_var => "unique_var").should == "/some/unique_var"
-    end
-
     it "should generate a base url of '/' for the top level router" do
       FooApp.router.base_url.should == "/"
     end
@@ -155,8 +136,8 @@ describe "stack router" do
         class ::BarApp < Pancake::Stack; end
         BarApp.roots << Pancake.get_root(__FILE__)
         BarApp.router do |r|
-          r.add("/simple").name(:simple)
-          r.add("/some/:var", :_defaults => {:var => "foo"}).name(:foo)
+          r.add("/simple").name(:simple).compile
+          r.add("/some/:var", :default_values => {:var => "foo"}).name(:foo).compile
         end
         FooApp.router.mount(BarApp, "/bar")
         FooApp.router.mount_applications!
@@ -187,9 +168,9 @@ describe "stack router" do
 
   describe "internal stack routes" do
     it "should pass through to the underlying app when adding a route" do
-      FooApp.router.add("/bar", :_defaults => {:action => "bar"}).name(:gary)
+      FooApp.router.add("/bar", :default_values => {:action => "bar"}).name(:gary).compile
       class ::FooApp
-        def self.new_app_instance
+        def self.new_endpoint_instance
           INNER_APP
         end
       end
@@ -198,39 +179,28 @@ describe "stack router" do
       @app = FooApp.stackup
       get "/bar"
       result = JSON.parse(last_response.body)
-      result["usher.params"].should == {"action" => "bar"}
-    end
-
-    it "should add the usher.params to the request params" do
-      app = mock("app", :call => Rack::Response.new("OK").finish, :null_object => true)
-      app.should_receive(:call).with do |e|
-        params = Rack::Request.new(e).params
-        params[:action].should == "jackson"
-      end
-      FooApp.router.mount(app, "/foo/app", :_defaults => {:action => "jackson"})
-      @app = FooApp.stackup
-      get "/foo/app"
+      result["router.params"].should == {"action" => "bar"}
     end
   end
 
   it "should allow me to inherit routes" do
     FooApp.router do |r|
-      r.mount(INNER_APP, "/foo(/:stuff)", :_defaults => {"originator" => "FooApp"})
+      r.mount(INNER_APP, "/foo(/:stuff)", :default_values => {"originator" => "FooApp"})
     end
     class ::BarApp < FooApp; end
     BarApp.router do |r|
-      r.mount(INNER_APP, "/bar", :_defaults => {"originator" => "BarApp"})
+      r.mount(INNER_APP, "/bar", :default_values => {"originator" => "BarApp"})
     end
 
     @app = BarApp.stackup
 
     get "/bar"
     response = JSON.parse(last_response.body)
-    response["usher.params"]["originator"].should == "BarApp"
+    response["router.params"]["originator"].should == "BarApp"
 
     get "/foo/thing"
     response = JSON.parse(last_response.body)
-    response["usher.params"]["originator"].should == "FooApp"
+    response["router.params"]["originator"].should == "FooApp"
   end
 
   it "should generate an inherited route" do
@@ -243,7 +213,6 @@ describe "stack router" do
     FooApp.router.mount_applications!
 
     Pancake.url(BarApp, :simple).should == "/simple"
-    Pancake.url(BarApp, :stuff => "this_stuff").should == "/foo/this_stuff"
     Pancake.url(BarApp, :stuff, :stuff => "that_stuff").should == "/foo/that_stuff"
   end
 
@@ -267,13 +236,6 @@ describe "stack router" do
     BarApp.router.class.should == BarApp::Router
   end
 
-  it "should reset the router to the namespaced router" do
-    class ::BarApp < FooApp; end
-    BarApp.reset_router!
-    BarApp.router.class.should == BarApp::Router
-  end
-
-
   describe "generating urls inside an application" do
     before do
       class ::BarApp < FooApp;  end