swagui 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae8af2d772ab074b0908b94ad69343fee386c75e
-  data.tar.gz: 4bfab776b7a9fd1879a01f4d46348d15f85b47ca
+  metadata.gz: f93905b2767639de1c3eed8fd9204495bae20b6f
+  data.tar.gz: 41a1805fcd11d68db243d4bd850c44fc74a63270
 SHA512:
-  metadata.gz: 1a149bce0d991e6e27e4e486d853ba30a4c86bd11d35610c4ebd7f40ba90c3b08fdfe0c28731f15eca9d28796bf9cd30465a91d62cab00768d0d876b78995181
-  data.tar.gz: be3c49ba8d9600b6617248ddff1d95d6c36201bca825c1c8e3f8228a27947b81266fac297c83800c18ddcc2dc51717a6406295d8325eccc3e4938eaf492e5481
+  metadata.gz: 18acef64223455a80559eb4b765e22d9ade6c02b3e66c1cf939bdee7af87c4e7c1ffffd13bb96af07ef1b30f593df00748ed9bfaaa7e577f95453b10c0272a0c
+  data.tar.gz: d2152ee4c4701b68b6d527a4a4fac813b0329b901056f67c72287890addeef2567aec00496958cf1ecdbc1ec1b18ce54cff2bb8935c251a9cf77e36c7a5fca6d

data/lib/swagui/swagger_doc_handler.rb

@@ -18,7 +18,7 @@ module Swagui
 
       first_valid_file_response = ['', '.json', '.yml'].map do |ext|
         @app_file_server.call(env.merge('PATH_INFO' => "#{path}#{ext}", 'REQUEST_METHOD' => 'GET'))
-      end.find {|res| res[0] == 200 }
+      end.find {|res| (res[0] == 200 || res[0] == 304) }
 
       first_valid_file_response || [404, {"Content-Type"=>"application/json"}, '']
     end

data/lib/swagui/version.rb

@@ -1,3 +1,3 @@
 module Swagui
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/swagui/yaml_doc_handler.rb

@@ -5,30 +5,35 @@ module Swagui
 
     def initialize(app)
       @app = app
-      @api_json_template = nil # used to store the template settings that applies to all apis
+      api_docs_content = @app.call("REQUEST_METHOD"=>"GET", "PATH_INFO"=>"/api-docs.yml")
+      v = ''; api_docs_content[2].each {|x| v = v +  x}
+      @api_json_template = YAML.load(v)['template'] # used to store the template settings that applies to all apis
     end
 
     def call(env)
       @app.call(env).tap do |response|
+        if response[0] == 200
+          response[1].merge!("Content-Type"=>"application/json")  # response is always json content
 
-        response[1].merge!("Content-Type"=>"application/json") # response is always json content
-
-        if yaml_response?(response) # yml response needs to be re=processed.
-          body = []
-          response[2].each do |f|
-            body << YAML::load(f).tap do |response_hash|
-              if response[2].path.end_with?('api-docs.yml')
-                process_api_docs_api_listing(response_hash, response[2].path )
-              else
-                process_schemas(response_hash)
-                process_base_path(response_hash, response[2].path, env)
-              end
-            end.to_json
-          end
+          if yaml_response?(response) # yml response needs to be re=processed.
+            body = []
+            response[2].each do |f|
+              body << f
+            end
+
+            json_string = YAML::load(body.join('')).tap do |response_hash|
+                            if response[2].path.end_with?('api-docs.yml')
+                              process_api_docs_api_listing(response_hash, response[2].path )
+                            else
+                              process_schemas(response_hash)
+                              process_base_path(response_hash, response[2].path, env)
+                            end
+                          end.to_json
 
-          response[2] = body
+            response[2] = [json_string]
 
-          response[1].merge!("Content-Length"=> body.first.size.to_s)
+            response[1].merge!("Content-Length"=> json_string.size.to_s)
+          end
         end
       end
     end
@@ -82,8 +87,6 @@ module Swagui
       def process_api_docs_api_listing(response_hash, doc_path)
         if response_hash['models'].nil? # requesting the root
 
-          @api_json_template = response_hash.delete('template')
-
           dir_path = File.dirname(doc_path)
           files = Dir["#{File.dirname(doc_path)}/*.yml"].map {|x| x.gsub(dir_path, '').gsub('.yml', '')}
           files.each do |file|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagui
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Jack Xu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: A rack-based swagger-ui middleware and commandline utility.