rat_pack_swagger 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 636889f1fad2cbfd2a10246bcd2f5f42f1de2a5a
-  data.tar.gz: 1588c5a083a32c0b46281d916628d1247f46d3e2
+  metadata.gz: 657d4dcce9e8fad06d8ea2dcd8e463f596b471aa
+  data.tar.gz: 7122d7893993c4da074f95c169cd582e41885a6f
 SHA512:
-  metadata.gz: def62fdfcce054727e3f2a44e1a65b37fdc572cef0b9f049d96a8345a4a74688edead293e65ea96a98c778ee766a20539592da6677d90e28b0410003f1a8554c
-  data.tar.gz: f9980930e52bb173ebd84f953171b9cb166fd5e2e5068c06b88df68af3bbf460fbffd3a16457e04c2d4cf49996cb7ccf0bdfb22bd3071874e3e03574e1190b29
+  metadata.gz: c43d94e4c9af930241c8b09593aaf556c5f6001ae78909e307b5099228d804c85c7eb34ad1446503700eb00f7129babf5890559b85ebabda306f3aed6f657789
+  data.tar.gz: 61eb36988c1e184160d4c566f57baefc4e5018ab0826bd93493e17eb6499047a54838b12a9fa74a31ad6c0139bde62b8a5704d7af625ade5238a89ddb5145bfa

data/lib/rat_pack_swagger/version.rb

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

data/lib/rat_pack_swagger.rb

@@ -112,14 +112,21 @@ module Sinatra
     end
 
     def tags(*args)
-      t = _spec.this_route.tags
-      args.each{|a| t << a}
+      _spec.this_route.tags.concat(args)
     end
 
     def summary(s)
       _spec.this_route.summary = s
     end
 
+    def consumes(*args)
+      _spec.this_route.consumes.concat(args)
+    end
+
+    def produces(*args)
+      _spec.this_route.produces.concat(args)
+    end
+
     def response(http_status_code, **kwargs, &block)
       _spec.this_route.responses[http_status_code] = SwaggerObject.new(**kwargs, &block).to_h
     end
@@ -138,7 +145,7 @@ module Sinatra
 
       app.before do
         @@validators ||= ::RatPackSwagger::RequestValidatorCollection.new
-        vs = @@validators.get(request.path, request.request_method.downcase)
+        vs = @@validators.get(request.path.gsub(/:(\w+)/, '{\1}'), request.request_method.downcase)
         if vs && vs[:body]
           request.body.rewind
           vs[:body].validate(request.body.read)
@@ -151,7 +158,9 @@ module Sinatra
     def self.route_added(verb, path, block)
       return if path == '/v2/swagger.json'
       verb.downcase!
+      path = path.gsub(/:(\w+)/, '{\1}')
       return unless ['get', 'post', 'put', 'delete'].include?(verb)
+      return unless @@spec.this_route.swagger?
       @@spec.register_this_route(path, verb)
 
       parameters = @@spec.resolved_spec[:paths][path][verb][:parameters]

data/lib/swagger_spec.rb

@@ -28,11 +28,16 @@ module RatPackSwagger
     def initialize
       @tags = []
       @consumes = []
+      @produces = []
       @parameters = []
       @responses = {}
       @schemes = []
       @security = []
     end
+
+    def swagger?
+      to_h != {}
+    end
   end
 
   class SwaggerSpec
@@ -56,7 +61,7 @@ module RatPackSwagger
     def route_consumes?(path, verb, mime)
       route = @spec[:paths][path][verb]
       return true if route[:consumes] && route[:consumes].include?(mime)
-      return true if @spec[:consumes].include?(mime)
+      return true if @spec[:consumes] && @spec[:consumes].include?(mime)
       return false
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rat_pack_swagger
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chris Hildebrand
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema