webmachine 0.4.1 → 0.4.2

data/lib/webmachine/adapters/mongrel.rb

@@ -13,13 +13,14 @@ module Webmachine
 
       # Starts the Mongrel adapter
       def run
-        options = {
+        defaults = {
           :port => configuration.port,
-          :host => configuration.ip
+          :host => configuration.ip,
+          :dispatcher => dispatcher
         }.merge(configuration.adapter_options)
-        config = ::Mongrel::Configurator.new(options) do
+        config = ::Mongrel::Configurator.new(defaults) do
           listener do
-            uri '/', :handler => Webmachine::Adapters::Mongrel::Handler.new(dispatcher)
+            uri '/', :handler => Webmachine::Adapters::Mongrel::Handler.new(defaults[:dispatcher])
           end
           trap("INT") { stop }
           run

data/lib/webmachine/decision/flow.rb

@@ -419,7 +419,7 @@ module Webmachine
           when Fixnum
             return result
           else
-            raise InvalidResource, t('process_post_invalid', :result => result)
+            raise InvalidResource, t('process_post_invalid', :result => result.inspect)
           end
         end
         if response.is_redirect?

data/lib/webmachine/dispatcher.rb

@@ -34,8 +34,8 @@ module Webmachine
     def dispatch(request, response)
       route = @routes.find {|r| r.match?(request) }
       if route
-        resource = route.resource.new(request, response)
         route.apply(request)
+        resource = route.resource.new(request, response)
         Webmachine::Decision::FSM.new(resource, request, response).run
       else
         Webmachine.render_error(404, request, response)

data/lib/webmachine/request.rb

@@ -39,7 +39,7 @@ module Webmachine
     def has_body?
       !(body.nil? || body.empty?)
     end
-    
+
     # The root URI for the request, ignoring path and query. This is
     # useful for calculating relative paths to resources.
     # @return [URI]
@@ -58,8 +58,11 @@ module Webmachine
       unless @query
         @query = {}
         (uri.query || '').split(/&/).each do |kv|
-          k, v = CGI.unescape(kv).split(/=/)
-          @query[k] = v if k && v
+          key, value = kv.split(/=/)
+          if key && value
+            key, value = CGI.unescape(key), CGI.unescape(value)
+            @query[key] = value
+          end
         end
       end
       @query

data/lib/webmachine/version.rb

@@ -1,6 +1,6 @@
 module Webmachine
   # Library version
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 
   # String for use in "Server" HTTP response header, which includes
   # the {VERSION}.

data/spec/webmachine/adapters/mongrel_spec.rb

@@ -46,6 +46,15 @@ begin
         chunks.join.should eq("Hello, World!")
       end
     end
+
+    it "can run" do
+      # Prevent webserver thread from taking over
+      Thread.stub!(:new).and_return(stub(:join => nil))
+
+      expect {
+        adapter.run
+      }.not_to raise_error
+    end
   end
 rescue LoadError
   warn "Platform is #{RUBY_PLATFORM}: skipping mongrel adapter spec."

data/spec/webmachine/dispatcher_spec.rb

@@ -45,6 +45,19 @@ describe Webmachine::Dispatcher do
     dispatcher.dispatch(request, response)
   end
 
+  it "should apply route to request before creating the resource" do
+    route   = dispatcher.add_route ["*"], resource
+    applied = false
+    
+    route.should_receive(:apply) { applied = true }
+    resource.should_receive(:new) do
+      applied.should be_true
+      resource2.new(request, response)
+    end
+
+    dispatcher.dispatch(request, response)
+  end
+
   it "should add routes with guards" do
     dispatcher.add [], lambda {|req| req.method == "POST" }, resource
     dispatcher.add ['*'], resource2 do |req|

data/spec/webmachine/request_spec.rb

@@ -29,6 +29,11 @@ describe Webmachine::Request do
     subject.query.should == {"foo" => "bar", "baz" => "bam"}
   end
 
+  it "should handle = being encoded as a query value." do
+    subject.uri.query = "foo=bar%3D%3D"
+    subject.query.should == { "foo" => "bar=="}
+  end
+
   it "should treat '+' characters in query parameters as spaces" do
     subject.uri.query = "a%20b=foo+bar&c+d=baz%20quux"
     subject.query.should == {"a b" => "foo bar", "c d" => "baz quux"}
@@ -47,7 +52,7 @@ describe Webmachine::Request do
 
       it { should be_true }
     end
-  
+
     context "when the request was not issued via HTTPS" do
       let(:uri) { URI.parse("http://localhost.com:8080/some/resource") }
 
@@ -63,7 +68,7 @@ describe Webmachine::Request do
 
       it { should be_true }
     end
-  
+
     context "when the request method is not GET" do
       let(:http_method) { "POST" }
 
@@ -79,7 +84,7 @@ describe Webmachine::Request do
 
       it { should be_true }
     end
-  
+
     context "when the request method is not HEAD" do
       let(:http_method) { "GET" }
 
@@ -95,7 +100,7 @@ describe Webmachine::Request do
 
       it { should be_true }
     end
-  
+
     context "when the request method is not POST" do
       let(:http_method) { "GET" }
 
@@ -111,7 +116,7 @@ describe Webmachine::Request do
 
       it { should be_true }
     end
-  
+
     context "when the request method is not PUT" do
       let(:http_method) { "GET" }
 
@@ -127,7 +132,7 @@ describe Webmachine::Request do
 
       it { should be_true }
     end
-  
+
     context "when the request method is not DELETE" do
       let(:http_method) { "GET" }
 
@@ -143,7 +148,7 @@ describe Webmachine::Request do
 
       it { should be_true }
     end
-  
+
     context "when the request method is not TRACE" do
       let(:http_method) { "GET" }
 
@@ -159,7 +164,7 @@ describe Webmachine::Request do
 
       it { should be_true }
     end
-  
+
     context "when the request method is not CONNECT" do
       let(:http_method) { "GET" }
 
@@ -175,7 +180,7 @@ describe Webmachine::Request do
 
       it { should be_true }
     end
-  
+
     context "when the request method is not OPTIONS" do
       let(:http_method) { "GET" }