merge ruby-grape#104 into frontier

Author: Jerry Cheung

README.markdown

@@ -124,39 +124,6 @@ class API < Grape::API
 end
 ````
 
-
-## Working with Entities
-
-A common problem in designing Ruby APIs is that you probably don't want
-the exact structure of your data models exposed. ActiveRecord, for
-instance, will dump all of its attributes. While you can override
-`#as_json` to alter this behavior somewhat, what is really needed is an
-intermediary layer between the model and the API. This is where the
-`Grape::Entity` class comes in.
-
-```ruby
-module Entities
-  class User < Grape::Entity
-    expose :first_name, :last_name
-    expose :email, :if => {:authenticated => true}
-    expose :name, :id => {:version => 'v1'} # deprecated
-  end
-end
-
-class API < Grape::API
-  version 'v1', 'v2'
-
-  get '/users/:id' do
-    present User.find(params[:id]),
-      :with => Entities::User,
-      :authenticated => env.key?('api.token')
-  end
-end
-```
-
-For more information about Entities, view the project's YARD
-documentation.
-
 ## Raising Errors
 
 You can raise errors explicitly.

lib/grape/api.rb

@@ -95,7 +95,7 @@ def version(*args, &block)
         if args.any?
           options = args.pop if args.last.is_a? Hash
           options ||= {}
-          options = {:using => :header}.merge!(options)
+          options = {:using => :path}.merge!(options)
           @versions = versions | args
           nest(block) do
             set(:version, args)
@@ -287,6 +287,7 @@ def post(paths = ['/'], options = {}, &block); route('POST', paths, options, &bl
       def put(paths = ['/'], options = {}, &block); route('PUT', paths, options, &block) end
       def head(paths = ['/'], options = {}, &block); route('HEAD', paths, options, &block) end
       def delete(paths = ['/'], options = {}, &block); route('DELETE', paths, options, &block) end
+      def options(paths = ['/'], options = {}, &block); route('OPTIONS', paths, options, &block) end
 
       def namespace(space = nil, &block)
         if space || block_given?

spec/grape/api_spec.rb

@@ -257,13 +257,13 @@ def app; subject end
         "lol"
       end
 
-      %w(get post put delete).each do |m|
+      %w(get post put delete options).each do |m|
         send(m, '/abc')
         last_response.body.should eql 'lol'
       end
     end
 
-    verbs = %w(post get head delete put)
+    verbs = %w(post get head delete put options)
     verbs.each do |verb|
       it "should allow and properly constrain a #{verb.upcase} method" do
         subject.send(verb, '/example') do