Merged from frontier.

Author: dblock

.gitignore

@@ -27,4 +27,7 @@ pkg
 dist
 Gemfile.lock
 
+## Rubinius
+.rbx
+
 ## PROJECT::SPECIFIC

Gemfile

@@ -9,4 +9,5 @@ group :development, :test do
   gem 'guard-bundler'
   gem 'rb-fsevent'
   gem 'growl'
+  gem 'json'
 end

README.markdown

@@ -4,7 +4,11 @@
 
 ## What is Grape?
 
-Grape is a REST-like API micro-framework for Ruby. It is built to complement existing web application frameworks such as Rails and Sinatra by providing a simple DSL to easily provide APIs. It has built-in support for common conventions such as multiple formats, subdomain/prefix restriction, and versioning.
+Grape is a REST-like API micro-framework for Ruby. It is built to complement
+existing web application frameworks such as Rails and Sinatra by providing a
+simple DSL to easily provide APIs. It has built-in support for common
+conventions such as multiple formats, subdomain/prefix restriction, and
+versioning.
 
 ## Project Tracking
 
@@ -19,7 +23,9 @@ Grape is available as a gem, to install it just install the gem:
 
 ## Basic Usage
 
-Grape APIs are Rack applications that are created by subclassing `Grape::API`. Below is a simple example showing some of the more common features of Grape in the context of recreating parts of the Twitter API.
+Grape APIs are Rack applications that are created by subclassing `Grape::API`.
+Below is a simple example showing some of the more common features of Grape in
+the context of recreating parts of the Twitter API.
 
 ```ruby
 class Twitter::API < Grape::API
@@ -68,7 +74,8 @@ class Twitter::API < Grape::API
 end
 ```
 
-This would create a Rack application that could be used like so (in a Rackup config.ru file):
+This would create a Rack application that could be used like so (in a Rackup
+config.ru file):
 
 ```ruby
 run Twitter::API
@@ -89,10 +96,14 @@ request:
 
     curl -H Accept=application/vnd.twitter-v1+json http://localhost:9292/statuses/public_timeline
 
-By default, the first matching version is used when no Accept header is supplied. This behavior is similar to routing in Rails.
-To circumvent this default behaviour, one could use the `:strict` option. When this option is set to `true`, a `404 Not found` error is returned when no correct Accept header is supplied.
+By default, the first matching version is used when no Accept header is
+supplied. This behavior is similar to routing in Rails.
+To circumvent this default behaviour, one could use the `:strict` option. When
+this option is set to `true`, a `404 Not found` error is returned when no
+correct Accept header is supplied.
 
-Serialization takes place automatically. For more detailed usage information, please visit the [Grape Wiki](http://github.com/intridea/grape/wiki).
+Serialization takes place automatically. For more detailed usage information,
+please visit the [Grape Wiki](http://github.com/intridea/grape/wiki).
 
 ## Helpers
 
@@ -132,7 +143,8 @@ You can raise errors explicitly.
 error!("Access Denied", 401)
 ```
 
-You can also return JSON formatted objects explicitly by raising error! and passing a hash instead of a message.
+You can also return JSON formatted objects explicitly by raising error! and
+passing a hash instead of a message.
 
 ```ruby
 error!({ "error" => "unexpected error", "detail" => "missing widget" }, 500)
@@ -157,15 +169,17 @@ class Twitter::API < Grape::API
 end
 ```
 
-The error format can be specified using `error_format`. Available formats are `:json` and `:txt` (default).
+The error format can be specified using `error_format`. Available formats are
+`:json` and `:txt` (default).
 
 ```ruby
 class Twitter::API < Grape::API
   error_format :json
 end
 ```
 
-You can rescue all exceptions with a code block. The `rack_response` wrapper automatically sets the default error code and content-type.
+You can rescue all exceptions with a code block. The `rack_response` wrapper
+automatically sets the default error code and content-type.
 
 ```ruby
 class Twitter::API < Grape::API
@@ -175,7 +189,8 @@ class Twitter::API < Grape::API
 end
 ```
 
-You can also rescue specific exceptions with a code block and handle the Rack response at the lowest level.
+You can also rescue specific exceptions with a code block and handle the Rack
+response at the lowest level.
 
 ```ruby
 class Twitter::API < Grape::API
@@ -196,7 +211,10 @@ end
 
 ## Writing Tests
 
-You can test a Grape API with RSpec. Tests make HTTP requests, therefore they must go into the `spec/request` group. You may want your API code to go into `app/api` - you can match that layout under `spec` by adding the following in `spec/spec_helper.rb`.
+You can test a Grape API with RSpec. Tests make HTTP requests, therefore they
+must go into the `spec/request` group. You may want your API code to go into
+`app/api` - you can match that layout under `spec` by adding the following in
+`spec/spec_helper.rb`.
 
 ```ruby
 RSpec.configure do |config|
@@ -224,7 +242,8 @@ end
 
 ## Describing and Inspecting an API
 
-Grape lets you add a description to an API along with any other optional elements that can also be inspected at runtime. 
+Grape lets you add a description to an API along with any other optional
+elements that can also be inspected at runtime. 
 This can be useful for generating documentation.
 
 ```ruby
@@ -246,7 +265,11 @@ class TwitterAPI < Grape::API
 end
 ```
 
-Grape then exposes arrays of API versions and compiled routes. Each route contains a `route_prefix`, `route_version`, `route_namespace`, `route_method`, `route_path` and `route_params`. The description and the optional hash that follows the API path may contain any number of keys and its values are also accessible via dynamically-generated `route_[name]` functions.
+Grape then exposes arrays of API versions and compiled routes. Each route
+contains a `route_prefix`, `route_version`, `route_namespace`, `route_method`,
+`route_path` and `route_params`. The description and the optional hash that
+follows the API path may contain any number of keys and its values are also
+accessible via dynamically-generated `route_[name]` functions.
 
 ```ruby
 TwitterAPI::versions # yields [ 'v1', 'v2' ]
@@ -268,6 +291,37 @@ StringAPI::routes[0].route_params # yields an array [ "string", "token" ]
 StringAPI::routes[0].route_optional_params # yields an array [ "limit" ]
 ```
 
+## Anchoring
+
+Grape by default anchors all request paths, which means that the request URL
+should match from start to end to match, otherwise a `404 Not Found` is
+returned.
+However, this is sometimes not what you want, because it is not always known up
+front what can be expected from the call.
+This is because Rack-mount by default anchors requests to match from the start
+to the end, or not at all. Rails solves this problem by using a `:anchor =>
+false` option in your routes.
+In Grape this option can be used as well when a method is defined.
+
+For instance when you're API needs to get part of an URL, for instance:
+
+```ruby
+class UrlAPI < Grape::API
+  namespace :urls do
+    get '/(*:url)', :anchor => false do
+      some_data
+    end
+  end
+end
+```
+
+This will match all paths starting with '/urls/'. There is one caveat though:
+the `params[:url]` parameter only holds the first part of the request url.
+Luckily this can be circumvented by using the described above syntax for path
+specification and using the `PATH_INFO` Rack environment variable, using
+`env["PATH_INFO"]`. This will hold everyting that comes after the '/urls/'
+part.
+
 ## Note on Patches/Pull Requests
 
 * Fork the project

lib/grape/endpoint.rb

@@ -48,7 +48,11 @@ def prepare_routes
       options[:method].each do |method|
         options[:path].each do |path|
           prepared_path = prepare_path(path)
-          path = compile_path(prepared_path, !options[:app])
+
+          anchor = options[:route_options][:anchor]
+          anchor = anchor.nil? ? true : anchor
+
+          path = compile_path(prepared_path, anchor && !options[:app])
           regex = Rack::Mount::RegexpWithNamedGroups.new(path)
           path_params = {}
           # named parameters in the api path

lib/grape/middleware/versioner/header.rb

@@ -35,7 +35,10 @@ def before
             env['api.subtype'] = subtype
 
             subtype.scan(/vnd\.(.+)?-(.+)?\+(.*)?/) do |vendor, version, format|
-              if options[:versions] && !options[:versions].include?(version)
+              is_vendored = options[:version_options] && options[:version_options][:vendor]
+              is_vendored_match = is_vendored ? options[:version_options][:vendor] == vendor : true
+
+              if (options[:versions] && !options[:versions].include?(version)) || !is_vendored_match
                 throw :error, :status => 404, :headers => {'X-Cascade' => 'pass'}, :message => "404 API Version Not Found"
               end
 

spec/grape/api_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'shared_versioning_examples'
+require 'shared/versioning_examples'
 
 describe Grape::API do
   subject { Class.new(Grape::API) }
@@ -448,7 +448,7 @@ def call(env)
       subject.get(:hello){ "Hello, world."}
       get '/hello'
       last_response.status.should eql 401
-      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic('allow','whatever')
+      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow','whatever')
       last_response.status.should eql 200
     end
 
@@ -476,7 +476,7 @@ def call(env)
       subject.get(:hello){ "Hello, world."}
       get '/hello'
       last_response.status.should eql 401
-      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic('allow','whatever')
+      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow','whatever')
       last_response.status.should eql 200
     end
   end

spec/grape/endpoint_spec.rb

@@ -215,4 +215,35 @@ def memoized
       end
     end
   end
+
+  context 'anchoring' do
+    verbs = %w(post get head delete put options)
+
+    verbs.each do |verb|
+      it "should allow for the anchoring option with a #{verb.upcase} method" do
+        subject.send(verb, '/example', :anchor => true) do
+          verb
+        end
+        send(verb, '/example/and/some/more')
+        last_response.status.should eql 404
+      end
+
+      it "should anchor paths by default for the #{verb.upcase} method" do
+        subject.send(verb, '/example') do
+          verb
+        end
+        send(verb, '/example/and/some/more')
+        last_response.status.should eql 404
+      end
+
+      it "should respond to /example/and/some/more for the non-anchored #{verb.upcase} method" do
+        subject.send(verb, '/example', :anchor => false) do
+          verb
+        end
+        send(verb, '/example/and/some/more')
+        last_response.status.should eql (verb == "post" ? 201 : 200)
+        last_response.body.should eql verb
+      end
+    end
+  end
 end

spec/grape/middleware/auth/basic_spec.rb

@@ -20,12 +20,12 @@ def app
   end
 
   it 'should authenticate if given valid creds' do
-    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic('admin','admin')
+    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin','admin')
     last_response.status.should == 200
   end
 
   it 'should throw a 401 is wrong auth is given' do
-    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic('admin','wrong')
+    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin','wrong')
     last_response.status.should == 401
   end
 end

spec/grape/middleware/versioner/header_spec.rb

@@ -80,6 +80,26 @@
     end
   end
 
+  context 'vendors' do
+    before do
+      @options = {
+        :version => ['v1'],
+        :version_options => {:using => :header, :vendor => 'vendor'}
+      }
+    end
+
+    it 'should match with correct vendor' do
+      status = subject.call('HTTP_ACCEPT' => accept).first
+      status.should == 200
+    end
+
+    it 'should not match with an incorrect vendor' do
+      expect {
+        env = subject.call('HTTP_ACCEPT' => 'application/vnd.othervendor-v1+json').last
+      }.to throw_symbol(:error, :status => 404, :headers => {'X-Cascade' => 'pass'}, :message => "404 API Version Not Found")
+    end
+  end
+
   context 'no matched version' do
     before do
       @options = {