Merge pull request #6 from swistaczek/master

dapi · dapi · commit c1f342913dfa · 2013-11-04T20:34:21.000-08:00
Updated swagger version
diff --git a/README.md b/README.md
@@ -23,6 +23,9 @@ Or install it yourself as:
 Create `./config/initializer/swagger.rb` with lines:
 
     GrapeSwaggerRails.discoveryUrl = "/swagger_doc.json"
+    GrapeSwaggerRails.appName      = 'Swagger'
+    GrapeSwaggerRails.appUrl       = 'http://swagger.wordnik.com'
+
     
 ## Нюансы
 
diff --git a/app/assets/javascripts/grape_swagger_rails/swagger.js b/app/assets/javascripts/grape_swagger_rails/swagger.js
diff --git a/app/views/grape_swagger_rails/application/index.html.erb b/app/views/grape_swagger_rails/application/index.html.erb
@@ -13,7 +13,7 @@
       dom_id:"swagger-ui-container",
       supportHeaderParams: true,
       headers: "<%= GrapeSwaggerRails.headers.to_json %>",
-      supportedSubmitMethods: ['get', 'post', 'put'],
+      supportedSubmitMethods: ['get', 'post', 'put', 'patch', 'delete'],
       onComplete: function(swaggerApi, swaggerUi){
         if(console) {
           console.log("Loaded SwaggerUI")
@@ -40,7 +40,7 @@
 <body>
 <div id='header'>
     <div class="swagger-ui-wrap">
-        <a id="logo" href="http://swagger.wordnik.com">swagger</a>
+        <a id="logo" href="<%= GrapeSwaggerRails.appUrl %>"><%= GrapeSwaggerRails.appName %></a>
 
         <form id='api_selector'>
 
diff --git a/grape-swagger-rails.gemspec b/grape-swagger-rails.gemspec
@@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_dependency 'railties', '>= 3.2.12'
   spec.add_dependency 'rubyzip', '~> 0.9.9'
-  spec.add_dependency 'grape-swagger', '~> 0.5.0'
+  spec.add_dependency 'grape-swagger', '~> 0.6.0'
 end
diff --git a/lib/grape-swagger-rails.rb b/lib/grape-swagger-rails.rb
@@ -1,11 +1,13 @@
 require "grape-swagger-rails/engine"
 
 module GrapeSwaggerRails
-  mattr_accessor :discoveryUrl, :apiKey, :headers
+  mattr_accessor :discoveryUrl, :apiKey, :headers, 
+                 :appName, :appUrl
 
   self.discoveryUrl = '/swagger_doc.json'
-  self.apiKey = 'special-key'
-  self.headers = {}
-
+  self.apiKey       = 'special-key'
+  self.headers      = {}
+  self.appName      = 'Swagger'
+  self.appUrl       = 'http://swagger.wordnik.com'
 end
 
diff --git a/lib/grape-swagger-rails/version.rb b/lib/grape-swagger-rails/version.rb
@@ -1,3 +1,3 @@
 module GrapeSwaggerRails
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end
