pakada-dispatch 0.0.3 → 0.0.4

data/lib/pakada/dispatch/controller.rb

@@ -1,6 +1,18 @@
 class Pakada
   class Dispatch
-    Action = Struct.new :block, :options
+    Action = Struct.new :name, :block, :options
+    
+    METHODS = [:get, :head, :post, :put, :delete]
+    
+    NOT_FOUND_ENDPOINT = proc do |env|
+      [404, {"X-Cascade" => "pass"}, ["Not Found"]]
+    end
+    METHOD_NOT_ALLOWED_ENDPOINT = proc do |methods|
+      proc do |env|
+        allow = methods.map {|m| m.to_s.upcase }.join(", ")
+        [405, {"Allow" => allow}, ["Method Not Allowed"]]
+      end
+    end
     
     module Controller
       include Util
@@ -20,8 +32,12 @@ class Pakada
       end
       
       def call_action(name, options = {})
-        action = self.class.actions[name]
-        raise ArgumentError, "No such action - #{name}" unless action
+        method = (request.request_method || "GET").downcase.to_sym
+        action = self.class.actions.find do |a|
+          a.name == name && (
+            a.options[:methods] == :all || a.options[:methods].include?(method))
+        end
+        raise ArgumentError, "No such action - #{name} (#{method})" unless action
         
         @options = action.options.merge options
         catch(:finish) { instance_eval &action.block }
@@ -80,21 +96,61 @@ class Pakada
       
       module ClassMethods
         def actions
-          @actions ||= {}
+          @actions ||= []
         end
         
         def action(name, options = {}, &block)
           if block
-            actions[name] = Action.new block, options
-          elsif actions[name]
-            proc do |env|
+            options[:methods] ||= :all
+            unless options[:methods].respond_to?(:each) || options[:methods] == :all
+              options[:methods] = [options[:methods]]
+            end
+            actions << Action.new(name, block, options)
+            return
+          end
+          
+          matches = actions.select {|a| a.name == name }
+          return NOT_FOUND_ENDPOINT if matches.empty?
+          
+          proc do |env|
+            method = (env["REQUEST_METHOD"] || "GET").downcase.to_sym
+            allowed = matches.select do |a|
+              a.options[:methods] == :all || a.options[:methods].include?(method)
+            end
+            
+            if allowed.empty?
+              allow = matches.inject([]) {|m, a| m.push(*a.options[:methods]); m }
+              METHOD_NOT_ALLOWED_ENDPOINT.call(allow).call(env)
+            else
               controller = new env
-              controller.call_action name, options
+              controller.call_action allowed.first.name, options
               controller.response.finish
             end
-          else
-            proc {|env| [404, {"X-Cascade" => "pass"}, []] }
           end
+          
+          # elsif actions[name]
+          #   proc do |env|
+          #     method = env["REQUEST_METHOD"]
+          #     allowed = actions[name].options[:methods]
+          #     if method && allowed != :all && !allowed.include?(method.downcase.to_sym)
+          #       [405, {"Allow" => allowed.map {|m| m.to_s.upcase }.join(", ")}, ["Method Not Allowed"]]
+          #     else
+          #       controller = new env
+          #       controller.call_action name, options
+          #       controller.response.finish
+          #     end
+          #   end
+          # else
+          #   proc {|env| [404, {"X-Cascade" => "pass"}, []] }
+          # end
+        end
+        
+        METHODS.each do |m|
+          eval <<-R, nil, __FILE__, __LINE__
+            def #{m}(name, options = {}, &block)
+              action(name, options.merge(:methods => :#{m}), &block)
+            end
+          R
         end
       end
       

data/lib/pakada/dispatch/version.rb

@@ -1,5 +1,5 @@
 class Pakada
   class Dispatch
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/controller_spec.rb

@@ -25,17 +25,31 @@ describe "SomeController" do
       it "adds an action to the controller" do
         block = proc {}
         subject.action :foo, &block
-        subject.actions[:foo].options.should == {}
-        subject.actions[:foo].block.should == block
+        subject.actions.find {|a| a.name == :foo }.block.should == block
+      end
+      
+      describe "and twice with the same name" do
+        it "adds a second action with the same name" do
+          2.times { subject.action :foo, &proc {} }
+          subject.should have(2).actions
+        end
       end
     end
     
     describe "when called with a block and a hash" do
       it "adds an action with options" do
-        options = double "options"
         block = proc {}
-        subject.action :foo, options, &block
-        subject.actions[:foo].options.should == options
+        subject.action :foo, {}, &block
+        subject.actions.find {|a| a.name == :foo }.options.should respond_to(:[])
+      end
+      
+      it "defaults the :methods option to :all" do
+        subject.action :foo, &proc {}
+        subject.actions.find {|a| a.name == :foo }.options[:methods].should == :all
+        
+        subject.actions.clear
+        subject.action :foo, {:methods => :get}, &proc {}
+        subject.actions.find {|a| a.name == :foo }.options[:methods].should == [:get]
       end
     end
     
@@ -57,12 +71,40 @@ describe "SomeController" do
         subject.action(:foo, options).call(env)
       end
       
-      describe "when called with the name of a non-existing action" do
-        it "builds an X-Cascade: pass app" do
+      describe "and with the name of a non-existing action" do
+        it "returns a 404 end-point" do
           subject.action(:foo).call({}).should == [
-            404, {"X-Cascade" => "pass"}, []]
+            404, {"X-Cascade" => "pass"}, ["Not Found"]
+          ]
         end
       end
+      
+      it "checks if the :methods constraint matches" do
+        subject.action :foo, :methods => [:get, :head], &proc {}
+        subject.action(:foo).call("REQUEST_METHOD" => "POST").should == [
+          405, {"Allow" => "GET, HEAD"}, ["Method Not Allowed"]
+        ]
+        subject.action(:foo).call("REQUEST_METHOD" => "GET")[0].should == 200
+        subject.action(:foo).call({})[0].should == 200
+        
+        subject.action :foo, :methods => :all, &proc {}
+        subject.action(:foo).call("REQUEST_METHOD" => "PUT")[0].should == 200
+      end
+      
+      it "tries the next equal-named action if the constraint doesn't match" do
+        subject.action(:foo, :methods => :get) { not_found }
+        subject.action(:foo) {}
+        subject.action(:foo).call("REQUEST_METHOD" => "POST")[0].should == 200
+      end
+    end
+  end
+  
+  Pakada::Dispatch::METHODS.each do |m|
+    describe ".#{m}" do
+      it "forwards to .action(:#{m}, ...)" do
+        subject.should_receive(:action).with(:foo, :methods => m)
+        subject.send(m, :foo, &proc {})
+      end
     end
   end
   
@@ -242,18 +284,52 @@ describe "SomeController" do
   end
 end
 
+describe Pakada::Dispatch::NOT_FOUND_ENDPOINT do
+  subject { Pakada::Dispatch::NOT_FOUND_ENDPOINT.call({}) }
+  
+  it "returns a 404 response" do
+    subject[0].should == 404
+    subject[2].join.should == "Not Found"
+  end
+  
+  it "is stackable" do
+    subject[1]["X-Cascade"].should == "pass"
+  end
+end
+
+describe Pakada::Dispatch::METHOD_NOT_ALLOWED_ENDPOINT do
+  subject do
+    Pakada::Dispatch::METHOD_NOT_ALLOWED_ENDPOINT.call([:get, :post]).call({})
+  end
+  
+  it "returns a 405 response" do
+    subject[0].should == 405
+    subject[2].join.should == "Method Not Allowed"
+  end
+  
+  it "returns an appropriate Allow header" do
+    subject[1]["Allow"].should == "GET, POST"
+  end
+end
+
 describe Pakada::Dispatch::Action do
+  describe "#name" do
+    it "returns the action's name" do
+      Pakada::Dispatch::Action.new(:asdf).name.should == :asdf
+    end
+  end
+  
   describe "#block" do
     it "returns the action's code block" do
       block = double "block"
-      Pakada::Dispatch::Action.new(block).block.should == block
+      Pakada::Dispatch::Action.new(nil, block).block.should == block
     end
   end
   
   describe "#options" do
     it "returns the actions' options hash" do
       options = double "options"
-      Pakada::Dispatch::Action.new(nil, options).options.should == options
+      Pakada::Dispatch::Action.new(nil, nil, options).options.should == options
     end
   end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pakada-dispatch
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors: 
 - Lars Gierth
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 +01:00
+date: 2011-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -37,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -50,8 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -63,8 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -76,8 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -92,7 +78,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .project
 - .rspec
 - Gemfile
 - LICENSE
@@ -124,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -572190931
+      hash: 972238593
       segments: 
       - 0
       version: "0"
@@ -133,14 +118,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -572190931
+      hash: 972238593
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Routing And Action Controllers For Pakada

data/.project

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>pakada-dispatch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-		<nature>com.aptana.ruby.core.rubynature</nature>
-	</natures>
-</projectDescription>