Added pathless routing, header and status declarers for inside blocks.

Author: Michael Bleigh

Gemfile

@@ -1,5 +1,5 @@
 gem 'rack'
-gem 'rack-mount'
+gem 'rack-mount', '~> 0.6.13'
 gem 'rack-jsonp'
 
 gem 'multi_json'

Gemfile.lock

@@ -21,7 +21,7 @@ GEM
     multi_xml (0.0.1)
     rack (1.2.1)
     rack-jsonp (1.0.0)
-    rack-mount (0.6.9)
+    rack-mount (0.6.13)
       rack (>= 1.0.0)
     rack-test (0.5.4)
       rack (>= 1.0)
@@ -49,7 +49,7 @@ DEPENDENCIES
   multi_xml
   rack
   rack-jsonp
-  rack-mount
+  rack-mount (~> 0.6.13)
   rack-test
   rake
   rspec (>= 2.1.0)

lib/grape/api.rb

@@ -74,7 +74,10 @@ def compile_path(path)
       end
 
       def route(method, path_info, &block)
-        route_set.add_route(build_endpoint(&block), :path_info => compile_path(path_info))
+        route_set.add_route(build_endpoint(&block), 
+          :path_info => compile_path(path_info), 
+          :request_method => method
+        )
       end
 
       def build_endpoint(&block)
@@ -88,11 +91,11 @@ def build_endpoint(&block)
         b.to_app
       end
 
-      def get(path_info, &block); route('GET', path_info, &block) end
-      def post(path_info, &block); route('POST', path_info, &block) end
-      def put(path_info, &block); route('PUT', path_info, &block) end
-      def head(path_info, &block); route('HEAD', path_info, &block) end
-      def delete(path_info, &block); route('DELETE', path_info, &block) end
+      def get(path_info = '', &block); route('GET', path_info, &block) end
+      def post(path_info = '', &block); route('POST', path_info, &block) end
+      def put(path_info = '', &block); route('PUT', path_info, &block) end
+      def head(path_info = '', &block); route('HEAD', path_info, &block) end
+      def delete(path_info = '', &block); route('DELETE', path_info, &block) end
 
       def namespace(space = nil, &block)
         if space || block_given?

lib/grape/endpoint.rb

@@ -8,14 +8,37 @@ def initialize(&block)
     end
 
     attr_reader :env, :request
-        
+    
+    def status(status = nil)
+      if status
+        @status = status
+      else
+        return @status if @status
+        case request.request_method.to_s.upcase
+          when 'POST'
+            201
+          else
+            200
+        end
+      end        
+    end
+    
+    def header(key = nil, val = nil)
+      if key
+        val ? @header[key.to_s] = val : @header.delete(key.to_s)
+      else
+        @header
+      end
+    end
+    
     def call(env)
       @env = env
       @request = Rack::Request.new(@env)
-      @headers = {}
+      @header = {}
 
       response_text = instance_eval &@block
-      [200, {}, [response_text]]
+      
+      [status, header, [response_text]]
     end
   end
 end

lib/grape/middleware/formatter.rb

@@ -75,16 +75,17 @@ def mime_array
 
       def after
         status, headers, bodies = *@app_response
-        bodies.map! do |body|
-          case env['api.format']
+        bodymap = []
+        bodies.each do |body|
+          bodymap << case env['api.format']
             when :json
               MultiJson.encode(body)
             when :txt
               body.to_s
           end
         end
         headers['Content-Type'] = 'application/json'
-        [status, headers, bodies]
+        Rack::Response.new(bodymap, status, headers).to_a
       end
     end
   end

spec/grape/api_spec.rb

@@ -95,6 +95,49 @@ def app; subject end
     end
   end
 
+  describe '.route' do
+    it 'should allow for no path' do
+      subject.namespace :votes do
+        get do
+          "Votes"
+        end
+        
+        post do
+          "Created a Vote"
+        end
+      end
+      
+      get '/votes'
+      last_response.body.should == 'Votes'
+      post '/votes'
+      last_response.body.should == 'Created a Vote'
+    end
+    
+    verbs = %w(post get head delete put)
+    verbs.each do |verb|
+      it "should allow and properly constrain a #{verb.upcase} method" do
+        subject.send(verb, '/example') do
+          verb
+        end
+        send(verb, '/example')
+        last_response.body.should == verb
+        # Call it with a method other than the properly constrained one.
+        send(verbs[(verbs.index(verb) + 1) % verbs.size], '/example')
+        last_response.status.should == 404
+      end
+    end
+    
+    it 'should return a 201 response code for POST by default' do
+      subject.post('example') do
+        "Created"
+      end
+      
+      post '/example'
+      last_response.status.should == 201
+      last_response.body.should == 'Created'
+    end
+  end
+  
   describe '.basic' do
     it 'should protect any resources on the same scope' do
       subject.http_basic do |u,p|

spec/grape/endpoint_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Grape::Endpoint do
+  subject { Class.new(Grape::API) }
+  before { subject.default_format :txt }
+  def app; subject end
+  
+  describe '#status' do
+    it 'should be callable from within a block' do
+      subject.get('/home') do
+        status 206
+        "Hello"
+      end
+      
+      get '/home'
+      last_response.status.should == 206
+      last_response.body.should == "Hello"
+    end
+  end
+  
+  describe '#header' do
+    it 'should be callable from within a block' do
+      subject.get('/hey') do
+        header 'X-Awesome', 'true'
+        "Awesome"
+      end
+      
+      get '/hey'
+      last_response.headers['X-Awesome'].should == 'true'
+    end
+  end
+end

spec/grape/middleware/formatter_spec.rb

@@ -10,7 +10,7 @@
     it 'should look at the bodies for possibly serializable data' do
       @body = {"abc" => "def"}
       status, headers, bodies = *subject.call({'PATH_INFO' => '/somewhere'})
-      bodies.first.should == MultiJson.encode(@body)
+      bodies.each{|b| b.should == MultiJson.encode(@body) }
     end
   end