Fixed Ruby 1.8.7 specs.

Author: dblock

CHANGELOG.markdown

@@ -1,6 +1,7 @@
 Next Release
 ============
 
+* [#201](https://github.com/intridea/grape/pull/201): Rewritten `params` DSL, including support for coercion and validations - [@schmurfy](https://github.com/schmurfy).
 * [#181](https://github.com/intridea/grape/pull/181): Fix: Corrected JSON serialization of nested hashes containing `Grape::Entity` instances - [@benrosenblum](https://github.com/benrosenblum).
 * [#203](https://github.com/intridea/grape/pull/203): Added a check to `Entity#serializable_hash` that verifies an entity exists on an object - [@adamgotterer](https://github.com/adamgotterer).
 

README.markdown

@@ -1,4 +1,4 @@
-# Grape [![Build Status](http://travis-ci.org/intridea/grape.png?branch=frontier)](http://travis-ci.org/intridea/grape)
+# Grape [![Build Status](http://travis-ci.org/intridea/grape.png?branch=master)](http://travis-ci.org/intridea/grape)
 
 ## What is Grape?
 
@@ -13,6 +13,11 @@ versioning.
 * [Grape Google Group](http://groups.google.com/group/ruby-grape)
 * [Grape Wiki](https://github.com/intridea/grape/wiki)
 
+## Stable Release
+
+You're reading the documentation for the next release of Grape.
+The current stable release is [0.2.1](https://github.com/intridea/grape/blob/v0.2.1/README.markdown).
+
 ## Installation
 
 Grape is available as a gem, to install it just install the gem:
@@ -192,27 +197,32 @@ post '/json_endpoint' do
 end
 ```
 
-## Validations
+## Parameter Validation and Coercion
 
-You can define validations and coercion option for your attributes:
+You can define validations and coercion options for your parameters:
 
 ```ruby
 params do
   required :id, type: Integer
   optional :name, type: String, regexp: /^[a-z]+$/
 end
-
 get ':id' do
   # params[:id] is an Integer
 end
 ```
 
-When a type is specified an implicit validation is done after the coercion to ensure the output type is what you asked.
-
+When a type is specified an implicit validation is done after the coercion to ensure the output type is the one declared.
 
 ## Headers
 
-Headers are available through the `env` hash object.
+Headers are available through the `header` helper or the `env` hash object.
+
+```ruby
+get do
+    content_type = header['Content-type']
+    ...
+end
+```
 
 ```ruby
 get do

lib/grape/api.rb

@@ -27,7 +27,7 @@ def logger(logger = nil)
           @logger ||= Logger.new($stdout)
         end
       end
-
+      
       def reset!
         @settings  = Grape::Util::HashStack.new
         @route_set = Rack::Mount::RouteSet.new

spec/grape/api_spec.rb

@@ -358,63 +358,65 @@ def app; subject end
   end
 
   context 'custom middleware' do
-    class PhonyMiddleware
-      def initialize(app, *args)
-        @args = args
-        @app = app
-        @block = true if block_given?
-      end
+    module ApiSpec
+      class PhonyMiddleware
+        def initialize(app, *args)
+          @args = args
+          @app = app
+          @block = true if block_given?
+        end
 
-      def call(env)
-        env['phony.args'] ||= []
-        env['phony.args'] << @args
-        env['phony.block'] = true if @block
-        @app.call(env)
+        def call(env)
+          env['phony.args'] ||= []
+          env['phony.args'] << @args
+          env['phony.block'] = true if @block
+          @app.call(env)
+        end
       end
     end
 
     describe '.middleware' do
       it 'should include middleware arguments from settings' do
         settings = Grape::Util::HashStack.new
-        settings.stub!(:stack).and_return([{:middleware => [[PhonyMiddleware, 'abc', 123]]}])
+        settings.stub!(:stack).and_return([{:middleware => [[ApiSpec::PhonyMiddleware, 'abc', 123]]}])
         subject.stub!(:settings).and_return(settings)
-        subject.middleware.should eql [[PhonyMiddleware, 'abc', 123]]
+        subject.middleware.should eql [[ApiSpec::PhonyMiddleware, 'abc', 123]]
       end
 
       it 'should include all middleware from stacked settings' do
         settings = Grape::Util::HashStack.new
         settings.stub!(:stack).and_return [
-          {:middleware => [[PhonyMiddleware, 123],[PhonyMiddleware, 'abc']]},
-          {:middleware => [[PhonyMiddleware, 'foo']]}
+          {:middleware => [[ApiSpec::PhonyMiddleware, 123],[ApiSpec::PhonyMiddleware, 'abc']]},
+          {:middleware => [[ApiSpec::PhonyMiddleware, 'foo']]}
         ]
         subject.stub!(:settings).and_return(settings)
 
         subject.middleware.should eql [
-          [PhonyMiddleware, 123],
-          [PhonyMiddleware, 'abc'],
-          [PhonyMiddleware, 'foo']
+          [ApiSpec::PhonyMiddleware, 123],
+          [ApiSpec::PhonyMiddleware, 'abc'],
+          [ApiSpec::PhonyMiddleware, 'foo']
         ]
       end
     end
 
     describe '.use' do
       it 'should add middleware' do
-        subject.use PhonyMiddleware, 123
-        subject.middleware.should eql [[PhonyMiddleware, 123]]
+        subject.use ApiSpec::PhonyMiddleware, 123
+        subject.middleware.should eql [[ApiSpec::PhonyMiddleware, 123]]
       end
 
       it 'should not show up outside the namespace' do
-        subject.use PhonyMiddleware, 123
+        subject.use ApiSpec::PhonyMiddleware, 123
         subject.namespace :awesome do
-          use PhonyMiddleware, 'abc'
-          middleware.should == [[PhonyMiddleware, 123],[PhonyMiddleware, 'abc']]
+          use ApiSpec::PhonyMiddleware, 'abc'
+          middleware.should == [[ApiSpec::PhonyMiddleware, 123],[ApiSpec::PhonyMiddleware, 'abc']]
         end
 
-        subject.middleware.should eql [[PhonyMiddleware, 123]]
+        subject.middleware.should eql [[ApiSpec::PhonyMiddleware, 123]]
       end
 
       it 'should actually call the middleware' do
-        subject.use PhonyMiddleware, 'hello'
+        subject.use ApiSpec::PhonyMiddleware, 'hello'
         subject.get '/' do
           env['phony.args'].first.first
         end
@@ -425,13 +427,13 @@ def call(env)
 
       it 'should add a block if one is given' do
         block = lambda{ }
-        subject.use PhonyMiddleware, &block
-        subject.middleware.should eql [[PhonyMiddleware, block]]
+        subject.use ApiSpec::PhonyMiddleware, &block
+        subject.middleware.should eql [[ApiSpec::PhonyMiddleware, block]]
       end
 
       it 'should use a block if one is given' do
         block = lambda{ }
-        subject.use PhonyMiddleware, &block
+        subject.use ApiSpec::PhonyMiddleware, &block
         subject.get '/' do
           env['phony.block'].inspect
         end
@@ -442,7 +444,7 @@ def call(env)
 
       it 'should not destroy the middleware settings on multiple runs' do
         block = lambda{ }
-        subject.use PhonyMiddleware, &block
+        subject.use ApiSpec::PhonyMiddleware, &block
         subject.get '/' do
           env['phony.block'].inspect
         end

spec/grape/validations/coerce_spec.rb

@@ -1,55 +1,53 @@
 require 'spec_helper'
 
-require 'virtus'
-
-module CoerceTest
-  class User
-    include Virtus
+describe Grape::Validations::CoerceValidator do
+  module ValidationsSpec
+    module CoerceValidatorSpec
+      class User
+        include Virtus
+        attribute :id, Integer
+        attribute :name, String
+      end
 
-    attribute :id, Integer
-    attribute :name, String
-  end
-  
-  class API < Grape::API
-    default_format :json
+      class API < Grape::API
+        default_format :json
 
+        params do
+          requires :int, :coerce => Integer
+        end
+        get '/single' do
+        end
 
-    params do
-      requires :int, :coerce => Integer
-    end
-    get '/single' do
-    end
-
-    params do
-      requires :ids, type: Array[Integer]
-    end
-    get '/arr' do
-    end
+        params do
+          requires :ids, :type => Array[Integer]
+        end
+        get '/arr' do
+        end
 
-    params do
-      requires :user, type: CoerceTest::User
-    end
-    get '/user' do
-    end
+        params do
+          requires :user, :type => ValidationsSpec::CoerceValidatorSpec::User
+        end
+        get '/user' do
+        end
 
-    params do
-      requires :int, :coerce => Integer
-      optional :arr, :coerce => Array[Integer]
-      optional :bool, :coerce => Array[Boolean]
-    end
-    get '/coerce' do
-      {
-        :int    => params[:int].class,
-        :arr    => params[:arr] ? params[:arr][0].class : nil,
-        :bool   => params[:bool] ? (params[:bool][0] == true) && (params[:bool][1] == false) : nil
-      }
+        params do
+          requires :int, :coerce => Integer
+          optional :arr, :coerce => Array[Integer]
+          optional :bool, :coerce => Array[Boolean]
+        end
+        get '/coerce' do
+          {
+            :int    => params[:int].class,
+            :arr    => params[:arr] ? params[:arr][0].class : nil,
+            :bool   => params[:bool] ? (params[:bool][0] == true) && (params[:bool][1] == false) : nil
+          }
+        end
+      end
     end
   end
-end
-
-describe Grape::Validations::CoerceValidator do
+  
   def app
-    CoerceTest::API
+    ValidationsSpec::CoerceValidatorSpec::API
   end
 
   it "should return an error on malformed input" do
@@ -73,7 +71,7 @@ def app
     get '/user', :user => "32"
     last_response.status.should == 400
 
-    get '/user', :user => {id: 32, name: "Bob"}
+    get '/user', :user => { :id => 32, :name => "Bob"}
     last_response.status.should == 200
   end
 

spec/grape/validations/presence_spec.rb

@@ -1,30 +1,31 @@
 require 'spec_helper'
 
 describe Grape::Validations::PresenceValidator do
-  def app; @app; end
-  
-  before do
-    @app = Class.new(Grape::API) do
-      default_format :json
-      
-      params do
-        requires :id, :regexp => /^[0-9]+$/
-      end
-      
-      post do
-        {:ret => params[:id]}
-      end
-      
-      params do
-        requires :name, :company
-      end
-      
-      get do
-        "Hello"
+
+  module ValidationsSpec
+    module PresenceValidatorSpec
+      class API < Grape::API
+        default_format :json
+        
+        params do
+          requires :id, :regexp => /^[0-9]+$/
+        end
+        post do
+          {:ret => params[:id]}
+        end
+        
+        params do
+          requires :name, :company
+        end
+        get do
+          "Hello"
+        end
       end
-      
     end
-    
+  end
+  
+  def app
+    ValidationsSpec::PresenceValidatorSpec::API
   end
 
   it 'validates id' do

spec/grape/validations/regexp_spec.rb

@@ -1,21 +1,23 @@
 require 'spec_helper'
 
 describe Grape::Validations::RegexpValidator do
-  def app; @app; end
-  
-  before do
-    @app = Class.new(Grape::API) do
-      default_format :json
-      
-      params do
-        requires :name, :regexp => /^[a-z]+$/
-      end
-      get do
+  module ValidationsSpec
+    module RegexpValidatorSpec
+      class API < Grape::API
+        default_format :json
 
+        params do
+          requires :name, :regexp => /^[a-z]+$/
+        end
+        get do
+          
+        end
       end
-      
     end
-    
+  end
+  
+  def app
+    ValidationsSpec::RegexpValidatorSpec::API
   end
 
   it 'should refuse invalid input' do