fdoc 0.2.2 → 0.2.3

data/lib/fdoc/presenters/endpoint_presenter.rb

@@ -145,6 +145,12 @@ class Fdoc::EndpointPresenter < Fdoc::HtmlPresenter
         example << example_from_schema(item)
       end
       example
+    elsif (array["items"] || {})["type"].kind_of? Array
+      example = []
+      array["items"]["type"].each do |item|
+        example << example_from_schema(item)
+      end
+      example
     else
       [ example_from_schema(array["items"]) ]
     end

data/lib/fdoc/presenters/schema_presenter.rb

@@ -37,9 +37,9 @@ class Fdoc::SchemaPresenter < Fdoc::HtmlPresenter
 
     html << '<ul>'
     begin
+      html << '<li>Required: %s</li>' % required? if nested?
       html << '<li>Type: %s</li>' % type if type
       html << '<li>Format: %s</li>' % format if format
-      html << '<li>Required: %s</li>' % required? if nested?
       html << '<li>Example: %s</li>' % example if example
       html << enum_html
 
@@ -61,7 +61,15 @@ class Fdoc::SchemaPresenter < Fdoc::HtmlPresenter
   def type
     t = @schema["type"]
     if t.kind_of? Array
-      t.join(", ")
+      types = t.map do |type|
+        if type.kind_of? Hash
+          '<li>%s</li>' % self.class.new(type, options).to_html
+        else
+          '<li>%s</li>' % type
+        end
+      end.join('')
+
+      '<ul>%s</ul>' % types
     elsif t != "object"
       t
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fdoc
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70290789895620 !ruby/object:Gem::Requirement
+  requirement: &70216151455820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290789895620
+  version_requirements: *70216151455820
 - !ruby/object:Gem::Dependency
   name: json-schema
-  requirement: &70290789911300 !ruby/object:Gem::Requirement
+  requirement: &70216151455000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70290789911300
+  version_requirements: *70216151455000
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &70290789910780 !ruby/object:Gem::Requirement
+  requirement: &70216151454100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290789910780
+  version_requirements: *70216151454100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70290789910100 !ruby/object:Gem::Requirement
+  requirement: &70216151469400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70290789910100
+  version_requirements: *70216151469400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70290789909420 !ruby/object:Gem::Requirement
+  requirement: &70216151468660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70290789909420
+  version_requirements: *70216151468660
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70290789908980 !ruby/object:Gem::Requirement
+  requirement: &70216151468000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70290789908980
+  version_requirements: *70216151468000
 - !ruby/object:Gem::Dependency
   name: cane
-  requirement: &70290789908380 !ruby/object:Gem::Requirement
+  requirement: &70216151467240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70290789908380
+  version_requirements: *70216151467240
 description: A tool for documenting API endpoints.
 email: support@squareup.com
 executables: