open_api_parser 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27e4d239b851d27954c371b482dd7135aa608845
-  data.tar.gz: 2bb315c4b4f96d05c8dda30dfb037f2687f02626
+  metadata.gz: 673e2c745f8c364512a0c67529c03aec5d32f985
+  data.tar.gz: 7e542ca36c68a487d51639af6912a83f56a140d1
 SHA512:
-  metadata.gz: bc269a69e72466314e300a146692520d2790c71a18b108f7d1ebcbfa9b61a9ff9ca08769111c2e56217fb62d8feeab17dfe9ab6ed556c0a6cb117252ad665300
-  data.tar.gz: 76f331f7fde717fa3e5d7be02c5cfa87d735d371d392eecbe8b037ec78f37fa249bf07e2049eae24ff15833ef4bf7a59aeafbb5529d3ffaacbbe8ca8f36f8327
+  metadata.gz: c13fb008fe910d5146dab2ada1639352684e5dfb8355c7ee2253346005a61dd72ab87fca76ea5bc59a83bfbe5751dfc940ca8fb591c3eb6853a7a7db712f778c
+  data.tar.gz: a6126e71e75fd7b330c19e2e0c48b9c3415d91cb58206ea2af24119d591d640390c02fa26dc2f91c60b1b2fde35d65ab23870d7883f641b950126adeacc6d328

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.2
+
+* Match path to correct endpoint when many similar paths exist
+
 ## 1.1.1
 
 * Handle invalid URLs in `endpoint`

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Braintree, a division of PayPal, Inc.
+Copyright (c) 2017 Braintree, a division of PayPal, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/open_api_parser/specification/root.rb

@@ -11,19 +11,19 @@ module OpenApiParser
         uri = URI.parse(path)
         requested_path = uri.path.gsub(/\..+\z/, "")
 
-        path_details = @raw["paths"].detect do |path_name, path|
-          requested_path =~ to_pattern(path_name)
+        matching_path_details = @raw["paths"].detect do |path_name, path|
+          requested_path =~ to_pattern(path_name) &&
+            path.keys.any? { |method| matching_method?(method, request_method) }
         end
-        return nil if path_details.nil?
+        return nil if matching_path_details.nil?
 
-        path = path_details.last
+        matching_name, matching_path = matching_path_details
 
-        method_details = path.detect do |method, schema|
-          method.to_s == request_method.downcase
+        method_details = matching_path.detect do |method, schema|
+          matching_method?(method, request_method)
         end
-        return nil if method_details.nil?
 
-        Endpoint.new(path_details.first, method_details.first, method_details.last)
+        Endpoint.new(matching_name, method_details.first, method_details.last)
       rescue URI::InvalidURIError
         nil
       end
@@ -34,6 +34,10 @@ module OpenApiParser
 
       private
 
+      def matching_method?(method, request_method)
+        method.to_s == request_method.downcase
+      end
+
       def to_pattern(path_name)
         Regexp.new("\\A" + path_name.gsub(/\{[^}]+\}/, "[^/]+") + "\\z")
       end

data/lib/open_api_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenApiParser
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api_parser
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema