Allow higher versions of grape

This commit is contained in:
Tim Vandecasteele 2013-03-28 10:13:12 +01:00
parent 767d6fa815
commit bb9efc83f9
4 changed files with 33 additions and 21 deletions

View File

@ -3,7 +3,7 @@ source "http://rubygems.org"
# Example:
# gem "activesupport", ">= 2.3.5"
gem 'grape', '~> 0.2.0'
gem 'grape', '>= 0.2.0'
gem 'kramdown'
# Add dependencies to develop your gem here.

View File

@ -1,20 +1,27 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (3.2.6)
i18n (~> 0.6)
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
backports (2.6.7)
builder (3.2.0)
coderay (1.0.7)
descendants_tracker (0.0.1)
diff-lcs (1.1.3)
git (1.2.5)
grape (0.2.1)
hashie (~> 1.2)
multi_json
multi_xml
rack
grape (0.4.0)
activesupport
builder
hashie (>= 1.2.0)
multi_json (>= 1.3.2)
multi_xml (>= 0.5.2)
rack (>= 1.3.0)
rack-accept
rack-mount
hashie (1.2.0)
i18n (0.6.0)
virtus
hashie (2.0.3)
i18n (0.6.1)
jeweler (1.8.4)
bundler (~> 1.0)
git (>= 1.2.5)
@ -23,13 +30,15 @@ GEM
json (1.7.3)
kramdown (0.13.7)
method_source (0.8)
multi_json (1.3.6)
multi_xml (0.5.1)
multi_json (1.7.2)
multi_xml (0.5.3)
pry (0.9.10)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
rack (1.4.1)
rack (1.5.2)
rack-accept (0.4.5)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-test (0.6.1)
@ -52,13 +61,16 @@ GEM
shoulda-matchers (1.2.0)
activesupport (>= 3.0.0)
slop (3.3.2)
virtus (0.5.4)
backports (~> 2.6.1)
descendants_tracker (~> 0.0.1)
PLATFORMS
ruby
DEPENDENCIES
bundler (> 1.0.0)
grape (~> 0.2.0)
grape (>= 0.2.0)
jeweler (~> 1.8.4)
kramdown
pry

View File

@ -43,7 +43,7 @@ Gem::Specification.new do |s|
s.specification_version = 3
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<grape>, ["~> 0.2.0"])
s.add_runtime_dependency(%q<grape>, [">= 0.2.0"])
s.add_runtime_dependency(%q<kramdown>, [">= 0"])
s.add_development_dependency(%q<shoulda>, [">= 0"])
s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@ -53,7 +53,7 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<rack-test>, [">= 0"])
s.add_development_dependency(%q<rspec>, [">= 0"])
else
s.add_dependency(%q<grape>, ["~> 0.2.0"])
s.add_dependency(%q<grape>, [">= 0.2.0"])
s.add_dependency(%q<kramdown>, [">= 0"])
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<rdoc>, ["~> 3.12"])
@ -64,7 +64,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<rspec>, [">= 0"])
end
else
s.add_dependency(%q<grape>, ["~> 0.2.0"])
s.add_dependency(%q<grape>, [">= 0.2.0"])
s.add_dependency(%q<kramdown>, [">= 0"])
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<rdoc>, ["~> 3.12"])

View File

@ -210,23 +210,23 @@ describe "options: " do
{:bla => 'something'}
end
end
class SimpleApiWithProtection < Grape::API
mount ProtectedApi
add_swagger_documentation
end
end
def app; SimpleApiWithProtection; end
it "should use https schema in mount point" do
get '/swagger_doc', {}, 'rack.url_scheme' => 'https'
last_response.body.should == "{:apiVersion=>\"0.1\", :swaggerVersion=>\"1.1\", :basePath=>\"https://example.org\", :operations=>[], :apis=>[{:path=>\"/swagger_doc/something.{format}\"}, {:path=>\"/swagger_doc/swagger_doc.{format}\"}]}"
last_response.body.should == "{:apiVersion=>\"0.1\", :swaggerVersion=>\"1.1\", :basePath=>\"https://example.org:80\", :operations=>[], :apis=>[{:path=>\"/swagger_doc/something.{format}\"}, {:path=>\"/swagger_doc/swagger_doc.{format}\"}]}"
end
it "should use https schema in endpoint doc" do
get '/swagger_doc/something', {}, 'rack.url_scheme' => 'https'
last_response.body.should == "{:apiVersion=>\"0.1\", :swaggerVersion=>\"1.1\", :basePath=>\"https://example.org\", :resourcePath=>\"\", :apis=>[{:path=>\"/something.{format}\", :operations=>[{:notes=>nil, :summary=>\"this gets something\", :nickname=>\"GET-something---format-\", :httpMethod=>\"GET\", :parameters=>[]}]}]}"
last_response.body.should == "{:apiVersion=>\"0.1\", :swaggerVersion=>\"1.1\", :basePath=>\"https://example.org:80\", :resourcePath=>\"\", :apis=>[{:path=>\"/something.{format}\", :operations=>[{:notes=>nil, :summary=>\"this gets something\", :nickname=>\"GET-something---format-\", :httpMethod=>\"GET\", :parameters=>[]}]}]}"
end
end
end