sinatra-docdsl 0.7.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 SHA1:
   metadata.gz: !binary |-
-    Y2FiZDQ3OGRlY2VhYTBjNDBmODQ1ZTUzYWI2MTNkZTc1ZDUyYjNjMA==
+    MWY4NjBmZDg4ZGEzODliNTdlNmNlNzMxNTVkNDI1YTg2OThkYmQ1ZA==
   data.tar.gz: !binary |-
-    NGZmODVlYjdmN2Q2ZmUwNWU2Nzg3MTYyMTMwZTNiNDBkMjdiNDE1NA==
+    OWNlYzA5OGYzZDkzNGQ5MDVhZmYxZGYyMDEyYjM5MDQ1NWVmY2JkMA==
 SHA512:
   metadata.gz: !binary |-
-    ZjRkZTE1Yzk0YWQyOGFmNTRiZWMxMzgyZDM2ZDQwNDliODMxYzM1MWRjZTBm
-    MTIwMDRkNTgzYjY5M2FiNGEzZmE2YWE0YmJjNWFkOGJkNjJmNmMxMWJkNzQw
-    NDExYzVmOGY0ZjVmZmI2NjAxZTQyMzU2ODNjZTU2YmM4ZDNjYzY=
+    YjQ4MmExYWM3ZDExZTZjMWFkNGEyYTU3N2MxZmRjYjQ1MGJiMTI0YTM0MzJi
+    ZTRlMGU0ZDA0M2ZmNWYyODA0M2NhN2QwZTU5OGQ2NmRjZmEyMTkxODljYzI2
+    YzkwYzA5M2I4Mjc1ODRhZWNhZmVmZDQ2NTlhZjUzNTNkYjRhYzQ=
   data.tar.gz: !binary |-
-    OTQ4ZDJlODczOGZkNWU1NDU4ZjJmYTA1NzY1OWUyMmIzNjMzMmE3MDZmODRh
-    ODZmY2I2YTFhMTgyNzIzNzVhZTg0YTljMmI5YjA5NDNiMDRhMTYzMmFjMWM0
-    YzQ4OTIxZWQ5ZDM4NGJmNzA1NjhmODE3ZTgxZTNjZmNjMzZhMjY=
+    YTllMmM0MGIxYzY1ZDhkMThkMTRjMzFhNTc2MmI1NGE0OGZkZDRjMTZmYTlk
+    NDg4ZmI4ZThmZjQ1MzYwNzUxYzQzMTI0NzQ1Y2I0NGRiZGRjNjUxNjE2NDg5
+    M2U1YjIxYzFkMDJkY2IyNDlkYzNmZmRjZTdkOTU1ZDRhN2IzNDY=

data/lib/docdsl.rb

@@ -113,16 +113,6 @@ HTML
 #{@the_introduction}
 
 "
-# :description=>@desc, 
-# :url_parameters=>@params, 
-# :paths=>@paths, 
-# :query_parameters=>@query_params, 
-# :headers=>@headers, 
-# :payload=>@the_payload, 
-# :sample_request=>@sample_request,
-# :response=>@the_response,
-# :status_codes=>@status_codes,
-# :sample_response=>@sample_response
         markdown = @entries.inject(markdown) do | md, entry |
           path = entry.paths.join(', ')
           params = definition_list("Url Parameters", entry.params)
@@ -410,23 +400,21 @@ HTML
         }
       end
     end  
-    
-    def self.registered(app)
-      app.get '/doc' do
+        
+    def doc_endpoint(path) 
+      page_doc=@page_doc
+      get path do     
         begin
-          app.instance_eval { 
-            @page_doc ||= PageDoc.new             
-            @page_doc.render
-          }
+          page_doc.render
         rescue Exception=>e
           puts e.message, e.backtrace.inspect
           [500,@page_doc.render]
         end
       end      
     end
-        
+                  
     def page(&block)
-      @page_doc ||= PageDoc.new(&block)
+      @page_doc = PageDoc.new(&block)
     end
     
     def documentation(description,&block)
@@ -436,10 +424,8 @@ HTML
     end
     
     def method_added(method)
-      # don't document /doc
-      return if method.to_s =~ /(^(GET|HEAD) \/doc\z)/
       # document the method and nullify last_doc so that a new one gets created for the next method
-      if method.to_s =~ /(GET|POST|PUT|DELETE|UPDATE|HEAD)/ && @last_doc
+      if @last_doc
         @last_doc << method
         @last_doc = nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-docdsl
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jilles van Gurp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -24,7 +24,7 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
-description: A simple DSL for documenting Sinatra apps and generating a /doc endpoint in a sinatra resource
+description: A simple DSL for generating documentation for Sinatra REST applications
 email: incoming@jillesvangurp.xom
 executables: []
 extensions: []