grape 0.2.3 → 0.2.4

data/spec/grape/middleware/versioner/param_spec.rb

@@ -5,29 +5,29 @@ describe Grape::Middleware::Versioner::Param do
   let(:app) { lambda{|env| [200, env, env['api.version']]} }
   subject { Grape::Middleware::Versioner::Param.new(app, @options || {}) }
 
-  it 'should set the API version based on the default param (apiver)' do
+  it 'sets the API version based on the default param (apiver)' do
     env = Rack::MockRequest.env_for("/awesome", {:params => {"apiver" => "v1"}})
     subject.call(env)[1]["api.version"].should == 'v1'
   end
 
-  it 'should cut (only) the version out of the params', :focus => true do
+  it 'cuts (only) the version out of the params', :focus => true do
     env = Rack::MockRequest.env_for("/awesome", {:params => {"apiver" => "v1", "other_param" => "5"}})
     subject.call(env)[1]['rack.request.query_hash']["apiver"].should be_nil
     subject.call(env)[1]['rack.request.query_hash']["other_param"].should == "5"
   end
 
-  it 'should provide a nil version if no version is given' do
+  it 'provides a nil version if no version is given' do
     env = Rack::MockRequest.env_for("/")
     subject.call(env).last.should be_nil
   end
 
   context 'with specified parameter name' do
     before{ @options = {:parameter => ['v']}}
-    it 'should set the API version based on the custom parameter name' do
+    it 'sets the API version based on the custom parameter name' do
       env = Rack::MockRequest.env_for("/awesome", {:params => {"v" => "v1"}})
       s = subject.call(env)[1]["api.version"] == "v1"
     end
-    it 'should not set the API version based on the default param' do
+    it 'does not set the API version based on the default param' do
       env = Rack::MockRequest.env_for("/awesome", {:params => {"apiver" => "v1"}})
       s = subject.call(env)[1]["api.version"] == nil
     end
@@ -35,18 +35,18 @@ describe Grape::Middleware::Versioner::Param do
 
   context 'with specified versions' do
     before{ @options = {:versions => ['v1', 'v2']}}
-    it 'should throw an error if a non-allowed version is specified' do
+    it 'throws an error if a non-allowed version is specified' do
       env = Rack::MockRequest.env_for("/awesome", {:params => {"apiver" => "v3"}})
       catch(:error){subject.call(env)}[:status].should == 404
     end
 
-    it 'should allow versions that have been specified' do
+    it 'allows versions that have been specified' do
       env = Rack::MockRequest.env_for("/awesome", {:params => {"apiver" => "v1"}})
       subject.call(env)[1]["api.version"].should == 'v1'
     end
   end
 
-  it 'should return a 200 when no version is set (matches the first version found)' do
+  it 'returns a 200 when no version is set (matches the first version found)' do
     @options = {
       :versions => ['v1'],
       :version_options => {:using => :header}

data/spec/grape/middleware/versioner/path_spec.rb

@@ -4,36 +4,36 @@ describe Grape::Middleware::Versioner::Path do
   let(:app) { lambda{|env| [200, env, env['api.version']]} }
   subject { Grape::Middleware::Versioner::Path.new(app, @options || {}) }
 
-  it 'should set the API version based on the first path' do
+  it 'sets the API version based on the first path' do
     subject.call('PATH_INFO' => '/v1/awesome').last.should == 'v1'
   end
 
-  it 'should cut the version out of the path' do
-    subject.call('PATH_INFO' => '/v1/awesome')[1]['PATH_INFO'].should == '/awesome'
+  it 'does not cut the version out of the path' do
+    subject.call('PATH_INFO' => '/v1/awesome')[1]['PATH_INFO'].should == '/v1/awesome'
   end
 
-  it 'should provide a nil version if no path is given' do
+  it 'provides a nil version if no path is given' do
     subject.call('PATH_INFO' => '/').last.should be_nil
   end
 
   context 'with a pattern' do
     before{ @options = {:pattern => /v./i} }
-    it 'should set the version if it matches' do
+    it 'sets the version if it matches' do
       subject.call('PATH_INFO' => '/v1/awesome').last.should == 'v1'
     end
 
-    it 'should ignore the version if it fails to match' do
+    it 'ignores the version if it fails to match' do
       subject.call('PATH_INFO' => '/awesome/radical').last.should be_nil
     end
   end
 
   context 'with specified versions' do
     before{ @options = {:versions => ['v1', 'v2']}}
-    it 'should throw an error if a non-allowed version is specified' do
+    it 'throws an error if a non-allowed version is specified' do
       catch(:error){subject.call('PATH_INFO' => '/v3/awesome')}[:status].should == 404
     end
 
-    it 'should allow versions that have been specified' do
+    it 'allows versions that have been specified' do
       subject.call('PATH_INFO' => '/v1/asoasd').last.should == 'v1'
     end
   end

data/spec/grape/middleware/versioner_spec.rb

@@ -1,16 +1,19 @@
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner do
+  
   let(:klass) { Grape::Middleware::Versioner }
-  it 'should recognize :path' do
+
+  it 'recognizes :path' do
     klass.using(:path).should == Grape::Middleware::Versioner::Path
   end
 
-  it 'should recognize :header' do
+  it 'recognizes :header' do
     klass.using(:header).should == Grape::Middleware::Versioner::Header
   end
 
-  it 'should recognize :param' do
+  it 'recognizes :param' do
     klass.using(:param).should == Grape::Middleware::Versioner::Param
   end
+
 end

data/spec/grape/util/hash_stack_spec.rb

@@ -4,19 +4,19 @@ describe Grape::Util::HashStack do
   let(:klass){ Grape::Util::HashStack }
 
   describe '#get' do
-    it 'should find the first available key' do
+    it 'finds the first available key' do
       subject[:abc] = 123
       subject.push(:abc => 345)
       subject.get(:abc).should == 345
     end
 
-    it 'should be nil if the key has not been set' do
+    it 'is nil if the key has not been set' do
       subject[:abc].should be_nil
     end
   end
 
   describe '#set' do
-    it 'should set a value on the highest frame' do
+    it 'sets a value on the highest frame' do
       subject.push
       subject.set(:abc, 123)
       subject.stack.last[:abc].should == 123
@@ -24,31 +24,31 @@ describe Grape::Util::HashStack do
   end
 
   describe '#imbue' do
-    it 'should push a new value onto the end of an array' do
+    it 'pushes a new value onto the end of an array' do
       subject[:abc] = []
       subject.imbue(:abc, [123])
       subject.imbue(:abc, [456])
       subject[:abc].should == [123, 456]
     end
 
-    it 'should merge a hash that is passed' do
+    it 'merges a hash that is passed' do
       subject[:abc] = {:foo => 'bar'}
       subject.imbue(:abc, {:baz => 'wich'})
       subject[:abc].should == {:foo => 'bar', :baz => 'wich'}
     end
 
-    it 'should set the value if not a hash or array' do
+    it 'sets the value if not a hash or array' do
       subject.imbue(:abc, 123)
       subject[:abc].should == 123
     end
 
-    it 'should be able to imbue an array without explicit setting' do
+    it 'is able to imbue an array without explicit setting' do
       subject.imbue(:arr, [1])
       subject.imbue(:arr, [2])
       subject[:arr].should == [1,2]
     end
 
-    it 'should be able to imbue a hash without explicit setting' do
+    it 'is able to imbue a hash without explicit setting' do
       subject.imbue(:hash, :foo => 'bar')
       subject.imbue(:hash, :baz => 'wich')
       subject[:hash].should == {:foo => 'bar', :baz => 'wich'}
@@ -56,16 +56,16 @@ describe Grape::Util::HashStack do
   end
 
   describe '#push' do
-    it 'should return a HashStack' do
+    it 'returns a HashStack' do
       subject.push(klass.new).should be_kind_of(klass)
     end
 
-    it 'should place the passed value on the top of the stack' do
+    it 'places the passed value on the top of the stack' do
       subject.push(:abc => 123)
       subject.stack.should == [{}, {:abc => 123}]
     end
 
-    it 'should push an empty hash by default' do
+    it 'pushes an empty hash by default' do
       subject[:abc] = 123
       subject.push
       subject.stack.should == [{:abc => 123}, {}]
@@ -73,7 +73,7 @@ describe Grape::Util::HashStack do
   end
 
   describe '#pop' do
-    it 'should remove and return the top frame' do
+    it 'removes and return the top frame' do
       subject.push(:abc => 123)
       subject.pop.should == {:abc => 123}
       subject.stack.size.should == 1
@@ -81,7 +81,7 @@ describe Grape::Util::HashStack do
   end
 
   describe '#peek' do
-    it 'should return the top frame without removing it' do
+    it 'returns the top frame without removing it' do
       subject.push(:abc => 123)
       subject.peek.should == {:abc => 123}
       subject.stack.size.should == 2
@@ -89,40 +89,40 @@ describe Grape::Util::HashStack do
   end
 
   describe '#prepend' do
-    it 'should return a HashStack' do
+    it 'returns a HashStack' do
       subject.prepend(klass.new).should be_kind_of(klass)
     end
 
-    it "should prepend a HashStack's stack onto its own stack" do
+    it "prepends a HashStack's stack onto its own stack" do
       other = klass.new.push(:abc => 123)
       subject.prepend(other).stack.should == [{}, {:abc => 123}, {}]
     end
   end
 
   describe '#concat' do
-    it 'should return a HashStack' do
+    it 'returns a HashStack' do
       subject.concat(klass.new).should be_kind_of(klass)
     end
 
-    it "should append a HashStack's stack onto its own stack" do
+    it "appends a HashStack's stack onto its own stack" do
       other = klass.new.push(:abc => 123)
       subject.concat(other).stack.should == [{}, {}, {:abc => 123}]
     end
   end
 
   describe '#update' do
-    it 'should merge! into the top frame' do
+    it 'merges! into the top frame' do
       subject.update(:abc => 123)
       subject.stack.should == [{:abc => 123}]
     end
 
-    it 'should return a HashStack' do
+    it 'returns a HashStack' do
       subject.update(:abc => 123).should be_kind_of(klass)
     end
   end
 
   describe '#clone' do
-    it 'should perform a deep copy' do
+    it 'performs a deep copy' do
       subject[:abc] = 123
       subject.push :def => 234
       clone = subject.clone

data/spec/grape/validations/presence_spec.rb

@@ -57,7 +57,7 @@ describe Grape::Validations::PresenceValidator do
     ValidationsSpec::PresenceValidatorSpec::API
   end
 
-  it "does not validate for any params" do
+  it 'does not validate for any params' do
     get("/bacons")
     last_response.status.should == 200
     last_response.body.should == "All the bacon"

data/spec/grape/validations/regexp_spec.rb

@@ -20,12 +20,12 @@ describe Grape::Validations::RegexpValidator do
     ValidationsSpec::RegexpValidatorSpec::API
   end
   
-  it 'should refuse invalid input' do
+  it 'refuses invalid input' do
     get '/', :name => "invalid name"
     last_response.status.should == 400
   end
   
-  it 'should accept valid input' do
+  it 'accepts valid input' do
     get '/', :name => "bob"
     last_response.status.should == 200
   end

data/spec/grape/validations_spec.rb

@@ -85,7 +85,7 @@ describe Grape::Validations do
           last_response.body.should == 'custom: is not custom!'
         end
 
-        it "skip validation when parameter isn't present" do
+        it "skips validation when parameter isn't present" do
           get '/optional_custom'
           last_response.status.should == 200
           last_response.body.should == 'optional with custom works!'
@@ -148,19 +148,19 @@ describe Grape::Validations do
             end
           end
           
-          specify 'the parent namespace should use the validator' do
+          specify 'the parent namespace uses the validator' do
             get '/nested/one', { :custom => 'im wrong, validate me'}
             last_response.status.should == 400
             last_response.body.should == 'custom: is not custom!'
           end
           
-          specify 'the nested namesapce should inherit the custom validator' do
+          specify 'the nested namesapce inherits the custom validator' do
             get '/nested/nested/two', { :custom => 'im wrong, validate me'}
             last_response.status.should == 400
             last_response.body.should == 'custom: is not custom!'
           end
           
-          specify 'peer namesapces should not have the validator' do
+          specify 'peer namesapces does not have the validator' do
             get '/peer/one', { :custom => 'im not validated' }
             last_response.status.should == 200
             last_response.body.should == 'no validation required'

data/spec/shared/versioning_examples.rb

@@ -1,5 +1,5 @@
-shared_examples_for "versioning" do
-  it 'should set the API version' do
+shared_examples_for 'versioning' do
+  it 'sets the API version' do
     subject.version 'v1', macro_options
     subject.get :hello do
       "Version: #{request.env['api.version']}"
@@ -8,7 +8,7 @@ shared_examples_for "versioning" do
     last_response.body.should eql "Version: v1"
   end
 
-  it 'should add the prefix before the API version' do
+  it 'adds the prefix before the API version' do
     subject.prefix 'api'
     subject.version 'v1', macro_options
     subject.get :hello do
@@ -18,7 +18,7 @@ shared_examples_for "versioning" do
     last_response.body.should eql "Version: v1"
   end
 
-  it 'should be able to specify version as a nesting' do
+  it 'is able to specify version as a nesting' do
     subject.version 'v2', macro_options
     subject.get '/awesome' do
       "Radical"
@@ -41,7 +41,7 @@ shared_examples_for "versioning" do
     last_response.status.should eql 404
   end
 
-  it 'should be able to specify multiple versions' do
+  it 'is able to specify multiple versions' do
     subject.version 'v1', 'v2', macro_options
     subject.get 'awesome' do
       "I exist"
@@ -55,23 +55,51 @@ shared_examples_for "versioning" do
     last_response.status.should eql 404
   end
 
-  it 'should allow the same endpoint to be implemented for different versions' do
-    subject.version 'v2', macro_options
-    subject.get 'version' do
-      request.env['api.version']
-    end
+  context 'with different versions for the same endpoint' do
+    context 'without a prefix' do
+      it 'allows the same endpoint to be implemented' do
+        subject.version 'v2', macro_options
+        subject.get 'version' do
+          request.env['api.version']
+        end
 
-    subject.version 'v1', macro_options do
-      get 'version' do
-        "version " + request.env['api.version']
+        subject.version 'v1', macro_options do
+          get 'version' do
+            "version " + request.env['api.version']
+          end
+        end
+
+        versioned_get '/version', 'v2', macro_options
+        last_response.status.should == 200
+        last_response.body.should == 'v2'
+        versioned_get '/version', 'v1', macro_options
+        last_response.status.should == 200
+        last_response.body.should == 'version v1'
       end
     end
 
-    versioned_get '/version', 'v2', macro_options
-    last_response.status.should == 200
-    last_response.body.should == 'v2'
-    versioned_get '/version', 'v1', macro_options
-    last_response.status.should == 200
-    last_response.body.should == 'version v1'
+    context 'with a prefix' do
+      it 'allows the same endpoint to be implemented' do        
+        subject.prefix 'api'
+        subject.version 'v2', macro_options
+        subject.get 'version' do
+          request.env['api.version']
+        end
+
+        subject.version 'v1', macro_options do
+          get 'version' do
+            "version " + request.env['api.version']
+          end
+        end
+
+        versioned_get '/version', 'v1', macro_options.merge(:prefix => subject.prefix)
+        last_response.status.should == 200
+        last_response.body.should == 'version v1'
+
+        versioned_get '/version', 'v2', macro_options.merge(:prefix => subject.prefix)
+        last_response.status.should == 200
+        last_response.body.should == 'v2'
+      end
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -258,10 +258,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
 - .gitignore
 - .rspec
 - .travis.yml
+- .yardopts
 - CHANGELOG.markdown
 - Gemfile
 - Guardfile
@@ -292,7 +292,6 @@ files:
 - lib/grape/middleware/error.rb
 - lib/grape/middleware/filter.rb
 - lib/grape/middleware/formatter.rb
-- lib/grape/middleware/prefixer.rb
 - lib/grape/middleware/versioner.rb
 - lib/grape/middleware/versioner/header.rb
 - lib/grape/middleware/versioner/param.rb
@@ -318,7 +317,6 @@ files:
 - spec/grape/middleware/error_spec.rb
 - spec/grape/middleware/exception_spec.rb
 - spec/grape/middleware/formatter_spec.rb
-- spec/grape/middleware/prefixer_spec.rb
 - spec/grape/middleware/versioner/header_spec.rb
 - spec/grape/middleware/versioner/param_spec.rb
 - spec/grape/middleware/versioner/path_spec.rb
@@ -347,7 +345,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 653936499
+      hash: -130218097
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -356,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 653936499
+      hash: -130218097
 requirements: []
 rubyforge_project: grape
 rubygems_version: 1.8.24