doc_my_routes 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f789a0b78d494649c621e36704e917d37d72cf5
-  data.tar.gz: 6374b29644c863962118ce3c76d0eecfff645a66
+  metadata.gz: 5754250c62eeed9d55718249942377648af6d039
+  data.tar.gz: 88aa69f93adc8ed23b07a4fff9526f4cc70daeec
 SHA512:
-  metadata.gz: 61418fb9e733596422b95254798a1885b91411be88fdae64a8369d6790d7848797cbca11bc6e72dbd2b183b2897cc85e9dd9a2eeef7d2577432b4b1396521118
-  data.tar.gz: 05b3f7978092608493e1c189cec8d1b1974bcbd541f3d7a092e61ada04eb8db64ace13ce688c1f49fce7d3d02b8cc017a15c5c4e7d36fc7213ccfa02b097e9d8
+  metadata.gz: 77eeab5d932ec11aa670ee4defc0ce9787d0da9b9c7632513aad36c1dbb31984de99e9bf651ebbc73c253e22b54a0df1f0c0a981b78a7b98f8e4c6a68dc3c9d8
+  data.tar.gz: 224a8c919c47995a4263b6865b4e60b01dd4bcba6a8424b1c72a33f30eed84e5aca3d0bcfe774209c56641dde758585d22a62e847b993cd44252561634f7828a

data/lib/doc_my_routes/doc/mixins/annotatable.rb

@@ -18,10 +18,21 @@ module DocMyRoutes
       # features are enabled
       def extended(mod)
         # Wrap sinatra's route method to register the defined routes
-        mod.define_singleton_method(:route) do
-                                |verb, route_pattern, conditions = {}, &block|
-          result = super(verb, route_pattern, conditions, &block)
-          track_route(self, verb, route_pattern, conditions)
+        mod.define_singleton_method(:route) do |*args, &block|
+          result = super(*args, &block)
+          
+          options = args.last.is_a?(Hash) ? args.pop : {}
+          routes = [*args.pop].map(&:to_s) # ensure routes are strings
+          verbs = args.map { |verb| verb.is_a?(Symbol) ? verb.to_s.upcase : verb }
+          
+          verbs.each do |verb|
+            routes.each do |route_pattern|
+              reset_doc = verb.equal?(verbs.last) && route_pattern.equal?(routes.last)
+
+              track_route(self, verb, route_pattern, options, reset_doc, &block)
+            end
+          end
+
           result
         end
 
@@ -93,7 +104,7 @@ module DocMyRoutes
 
     private
 
-    def track_route(resource, verb, route_pattern, conditions)
+    def track_route(resource, verb, route_pattern, conditions, reset_doc)
       unless route_documentation.hidden? || skip_route(verb)
         route = Route.new(resource, verb, route_pattern, conditions,
                           route_documentation)
@@ -102,7 +113,7 @@ module DocMyRoutes
       end
 
       # Ensure values are reset
-      reset_doc_values
+      reset_doc_values if reset_doc
     end
 
     # The summary, notes and status codes are only valid for one route

data/lib/doc_my_routes/version.rb

@@ -1,4 +1,4 @@
 # DocMyRoutes version
 module DocMyRoutes
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doc_my_routes
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Workday, Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement