grape 0.3.2 → 0.4.0

data/spec/grape/endpoint_spec.rb

@@ -168,8 +168,6 @@ describe Grape::Endpoint do
         requires :first
         optional :second
       end
-
-
     end
 
     it 'has as many keys as there are declared params' do
@@ -246,33 +244,63 @@ describe Grape::Endpoint do
         params[:person_email]
         end
 
-        get '/rodzyn@grape.com'
-        last_response.body.should == 'rodzyn@grape.com'
+        get '/someone@example.com'
+        last_response.body.should == 'someone@example.com'
 
-        get 'rodzyn@grape.com.pl'
-        last_response.body.should == 'rodzyn@grape.com.pl'
+        get 'someone@example.com.pl'
+        last_response.body.should == 'someone@example.com.pl'
       end
 
       it 'parses many params with provided regexps' do
         subject.get('/:person_email/test/:number',
           :requirements => {
-            :person_email => /rodzyn@(.*).com/,
+            :person_email => /someone@(.*).com/,
             :number => /[0-9]/ }) do
         params[:person_email] << params[:number]
         end
 
-        get '/rodzyn@grape.com/test/1'
-        last_response.body.should == 'rodzyn@grape.com1'
+        get '/someone@example.com/test/1'
+        last_response.body.should == 'someone@example.com1'
 
-        get '/rodzyn@testing.wrong/test/1'
+        get '/someone@testing.wrong/test/1'
         last_response.status.should == 404
 
-        get 'rodzyn@test.com/test/wrong_number'
+        get 'someone@test.com/test/wrong_number'
         last_response.status.should == 404
 
-        get 'rodzyn@test.com/wrong_middle/1'
+        get 'someone@test.com/wrong_middle/1'
         last_response.status.should == 404
       end
+
+      context 'namespace requirements' do
+        before :each do
+          subject.namespace :outer, :requirements => { :person_email => /abc@(.*).com/ } do
+            get('/:person_email') do
+              params[:person_email]
+            end
+
+            namespace :inner, :requirements => {:number => /[0-9]/, :person_email => /someone@(.*).com/ }do
+              get '/:person_email/test/:number' do
+                params[:person_email] << params[:number]
+              end
+            end
+          end
+        end
+        it "parse email param with provided requirements for params" do
+          get '/outer/abc@example.com'
+          last_response.body.should == 'abc@example.com'
+        end
+
+        it "should override outer namespace's requirements" do
+          get '/outer/inner/someone@testing.wrong/test/1'
+          last_response.status.should == 404
+
+          get '/outer/inner/someone@testing.com/test/1'
+          last_response.status.should == 200
+          last_response.body.should == 'someone@testing.com1'
+        end
+
+      end
     end
 
     context 'from body parameters' do

data/spec/grape/entity_spec.rb

@@ -40,13 +40,24 @@ describe Grape::Entity do
       entity.stub!(:represent).and_return("Hiya")
 
       class TestObject; end
+      class FakeCollection
+        def first; TestObject.new; end
+      end
 
       subject.represent TestObject, :with => entity
       subject.get '/example' do
         present [TestObject.new]
       end
+
+      subject.get '/example2' do
+        present FakeCollection.new
+      end
+
       get '/example'
       last_response.body.should == "Hiya"
+
+      get '/example2'
+      last_response.body.should == "Hiya"
     end
 
     it 'pulls a representation from the class ancestor if it exists' do
@@ -197,14 +208,18 @@ XML
       last_response.body.should == '{"example":{"name":"johnnyiller"}}'
     end
 
-    it 'presents with jsonp and a custom formatter' do
+    it 'presents with jsonp utilising Rack::JSONP' do
+      require 'rack/contrib'
+
+      # Include JSONP middleware
+      subject.use Rack::JSONP
+
       entity = Class.new(Grape::Entity)
       entity.root "examples", "example"
       entity.expose :name
 
-      subject.content_type :jsonp, 'application/javascript'
-      subject.formatter :jsonp, lambda { |object, env| object.to_json }
-      subject.format :jsonp
+      # Rack::JSONP expects a standard JSON response
+      subject.format :json
 
       subject.get '/example' do
         c = Class.new do
@@ -216,10 +231,11 @@ XML
 
         present c.new({:name => "johnnyiller"}), :with => entity
       end
-      get '/example'
+
+      get '/example?callback=abcDef'
       last_response.status.should == 200
       last_response.headers['Content-type'].should == "application/javascript"
-      last_response.body.should == '{"example":{"name":"johnnyiller"}}'
+      last_response.body.should == 'abcDef({"example":{"name":"johnnyiller"}})'
     end
 
   end

data/spec/grape/validations/presence_spec.rb

@@ -17,7 +17,7 @@ describe Grape::Validations::PresenceValidator do
           requires :id, :regexp => /^[0-9]+$/
         end
         post do
-          {:ret => params[:id]}
+          { :ret => params[:id] }
         end
 
         params do
@@ -60,7 +60,7 @@ describe Grape::Validations::PresenceValidator do
   it 'does not validate for any params' do
     get("/bacons")
     last_response.status.should == 200
-    last_response.body.should == "All the bacon"
+    last_response.body.should == "All the bacon".to_json
   end
 
   it 'validates id' do
@@ -94,7 +94,7 @@ describe Grape::Validations::PresenceValidator do
 
     get('/', :name => "Bob", :company => "TestCorp")
     last_response.status.should == 200
-    last_response.body.should == "Hello"
+    last_response.body.should == "Hello".to_json
   end
 
   it 'validates nested parameters' do
@@ -108,7 +108,7 @@ describe Grape::Validations::PresenceValidator do
 
     get('/nested', :user => {:first_name => "Billy", :last_name => "Bob"})
     last_response.status.should == 200
-    last_response.body.should == "Nested"
+    last_response.body.should == "Nested".to_json
   end
 
   it 'validates triple nested parameters' do
@@ -138,7 +138,7 @@ describe Grape::Validations::PresenceValidator do
 
     get('/nested_triple', :admin => { :admin_name => 'admin', :super => {:user => {:first_name => "Billy", :last_name => "Bob"}}})
     last_response.status.should == 200
-    last_response.body.should == "Nested triple"
+    last_response.body.should == "Nested triple".to_json
   end
 
 end

data/spec/shared/versioning_examples.rb

@@ -1,5 +1,6 @@
 shared_examples_for 'versioning' do
   it 'sets the API version' do
+    subject.format :txt
     subject.version 'v1', macro_options
     subject.get :hello do
       "Version: #{request.env['api.version']}"
@@ -9,7 +10,8 @@ shared_examples_for 'versioning' do
   end
 
   it 'adds the prefix before the API version' do
-    subject.prefix 'api'
+    subject.format :txt
+    subject.prefix 'api'    
     subject.version 'v1', macro_options
     subject.get :hello do
       "Version: #{request.env['api.version']}"
@@ -58,6 +60,7 @@ shared_examples_for 'versioning' do
   context 'with different versions for the same endpoint' do
     context 'without a prefix' do
       it 'allows the same endpoint to be implemented' do
+        subject.format :txt
         subject.version 'v2', macro_options
         subject.get 'version' do
           request.env['api.version']
@@ -79,7 +82,8 @@ shared_examples_for 'versioning' do
     end
 
     context 'with a prefix' do
-      it 'allows the same endpoint to be implemented' do        
+      it 'allows the same endpoint to be implemented' do
+        subject.format :txt
         subject.prefix 'api'
         subject.version 'v2', macro_options
         subject.get 'version' do

metadata

@@ -1,294 +1,272 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.3.2
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Michael Bleigh
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rack-mount
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-accept
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: hashie
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: virtus
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: grape-entity
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: maruku
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 description: A Ruby framework for rapid API development with great conventions.
 email:
 - michael@intridea.com
@@ -296,10 +274,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .rspec
+- .travis.yml
+- .yardopts
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -342,6 +320,7 @@ files:
 - lib/grape/middleware/versioner/header.rb
 - lib/grape/middleware/versioner/param.rb
 - lib/grape/middleware/versioner/path.rb
+- lib/grape/namespace.rb
 - lib/grape/parser/base.rb
 - lib/grape/parser/json.rb
 - lib/grape/parser/xml.rb
@@ -387,65 +366,33 @@ files:
 homepage: https://github.com/intridea/grape
 licenses:
 - MIT
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 2
-      version: !binary |-
-        MA==
-  none: false
+      hash: -881959779
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 2
-      version: !binary |-
-        MA==
-  none: false
+      hash: -881959779
 requirements: []
 rubyforge_project: grape
 rubygems_version: 1.8.24
-signing_key:
+signing_key: 
 specification_version: 3
 summary: A simple Ruby framework for building REST-like APIs.
-test_files:
-- spec/grape/api_spec.rb
-- spec/grape/endpoint_spec.rb
-- spec/grape/entity_spec.rb
-- spec/grape/exceptions/invalid_formatter_spec.rb
-- spec/grape/exceptions/invalid_versioner_option_spec.rb
-- spec/grape/exceptions/missing_mime_type_spec.rb
-- spec/grape/exceptions/missing_option_spec.rb
-- spec/grape/exceptions/unknown_options_spec.rb
-- spec/grape/exceptions/unknown_validator_spec.rb
-- spec/grape/middleware/auth/basic_spec.rb
-- spec/grape/middleware/auth/digest_spec.rb
-- spec/grape/middleware/auth/oauth2_spec.rb
-- spec/grape/middleware/base_spec.rb
-- spec/grape/middleware/error_spec.rb
-- spec/grape/middleware/exception_spec.rb
-- spec/grape/middleware/formatter_spec.rb
-- spec/grape/middleware/versioner/header_spec.rb
-- spec/grape/middleware/versioner/param_spec.rb
-- spec/grape/middleware/versioner/path_spec.rb
-- spec/grape/middleware/versioner_spec.rb
-- spec/grape/util/hash_stack_spec.rb
-- spec/grape/validations/coerce_spec.rb
-- spec/grape/validations/presence_spec.rb
-- spec/grape/validations/regexp_spec.rb
-- spec/grape/validations/zh-CN.yml
-- spec/grape/validations_spec.rb
-- spec/shared/versioning_examples.rb
-- spec/spec_helper.rb
-- spec/support/basic_auth_encode_helpers.rb
-- spec/support/versioned_helpers.rb
-has_rdoc:
+test_files: []
+has_rdoc: