Use URL scheme in default base path

Author: cutalion

lib/grape-swagger.rb

@@ -70,7 +70,7 @@ def self.setup(options)
               {
                 apiVersion: api_version,
                 swaggerVersion: "1.1",
-                basePath: base_path || "http://#{env['HTTP_HOST']}",
+                basePath: base_path || "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}",
                 operations:[],
                 apis: routes_array
               }
@@ -102,7 +102,7 @@ def self.setup(options)
               {
                 apiVersion: api_version,
                 swaggerVersion: "1.1",
-                basePath: base_path || "http://#{env['HTTP_HOST']}",
+                basePath: base_path || "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}",
                 resourcePath: "",
                 apis: routes_array
               }

spec/non_default_api_spec.rb

@@ -170,5 +170,31 @@ def app; SimpleApiWithVersion end
     end
   end
 
+  context "protected API" do
+    before(:all) do
+      class ProtectedApi < Grape::API
+        desc 'this gets something'
+        get '/something' 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}\"}]}" 
+    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=>[]}]}]}"
+    end
+  end
 end