swagui 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ada5af68f79789855e02b8739f466125d9281d6
-  data.tar.gz: 5fab5cef417da06e01af99fbdadfb44fa87c097d
+  metadata.gz: 96796f626d96d5277a24f656bf40e6edbcb1609b
+  data.tar.gz: f4f429bf1cee4358b5e5fafd5dbbfdc6efe677fc
 SHA512:
-  metadata.gz: 2724cf00bc4bf66c060829b45a0177c9c740d07bebeae0f97e16d45ef7153629a9cd192ec2289aed1cf819b2247eee7c77b1f187c6a27904428edb4466cc12f1
-  data.tar.gz: 551f0eda01c8fd4a8006a697d9f5693a109074d3a09ce44d4fc1b8e42adb32fe52757cfe16726b7459ceb5bf3a3603561ff906e10421a4521d01b4b8c6cf45a8
+  metadata.gz: aa17d33e7927c59cdc493e12646a6f1d679a441887208b025d80e29e4fa3db682b40af8c73b391d4bc469e9b534ee40ea3bc502626874fcc8b31c79f91ab7584
+  data.tar.gz: 2e1507962d3e600d29fbaccd6e1b90e86497436a6de088b7cc6952360b35fb2388e1014d3a19bbf584beb39ea58abd4a4594d9e043dcf6c5ddd9bd6af65ed013

data/lib/swagui/version.rb

@@ -1,3 +1,3 @@
 module Swagui
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/swagui/yaml_doc_handler.rb

@@ -17,9 +17,12 @@ module Swagui
           body = []
           response[2].each do |f|
             body << YAML::load(f).tap do |response_hash|
-              process_api_docs_api_listing(response_hash, response[2].path )
-              process_schemas(response_hash)
-              process_base_path(response_hash, response[2].path, env)
+              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
 
@@ -37,6 +40,9 @@ module Swagui
       end
 
       def process_schemas(response_hash)
+
+        deep_merge!(response_hash, @api_json_template) if @api_json_template
+
         (response_hash['apis'] || []).each do |api_hash|
           (api_hash['operations'] || []).each do |operations_hash|
             operation_name = operations_hash['nickname']
@@ -52,7 +58,6 @@ module Swagui
             end
           end
         end
-        deep_merge!(response_hash, @api_json_template) if @api_json_template
       end
 
       def merge_schema!(parent_hash, response_hash, name, response_model = false)
@@ -75,7 +80,7 @@ module Swagui
       end
 
       def process_api_docs_api_listing(response_hash, doc_path)
-        if doc_path.end_with?('api-docs.yml') && response_hash['models'].nil? # requesting the root
+        if response_hash['models'].nil? # requesting the root
 
           @api_json_template = response_hash.delete('template')
 
@@ -90,7 +95,7 @@ module Swagui
       end
 
       def process_base_path(response_hash, doc_path, env)
-        if !doc_path.end_with?('api-docs.yml') && response_hash['basePath'].nil?
+        if response_hash['basePath'].nil?
           request = Rack::Request.new(env)
           response_hash['basePath'] = (request.base_url + request.script_name)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagui
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jack Xu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack