Merge pull request #4 from gerbal/master

Scope JSON to global ruby ::JSON, prevents conflicts with Sinatra::JSON
archiloque · Jul 12, 2016 · 9281468 · 9281468
2 parents 14f90ca + e915d7f
commit 9281468
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/sinatra/swagger-exposer/processing/swagger-response-processor.rb b/lib/sinatra/swagger-exposer/processing/swagger-response-processor.rb
@@ -32,8 +32,8 @@ def useful?
         def validate_response(response_body)
           parsed_response_body = nil
           begin
-            parsed_response_body = JSON.parse(response_body)
-          rescue JSON::ParserError => e
+            parsed_response_body = ::JSON.parse(response_body)
+          rescue ::JSON::ParserError => e
             raise SwaggerInvalidException.new("Response is not a valid json [#{response_body}]")
           end
           if @processor
@@ -44,4 +44,4 @@ def validate_response(response_body)
       end
     end
   end
-end
+end