fuzzyurl 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c776f197c4a67210a4f28d6aae36964f4df56104
-  data.tar.gz: 818e98e321eb54afe95b643e368472ff7ab719ad
+  metadata.gz: 7e03c07bf920781777e67d73cee148dc4d98a9d9
+  data.tar.gz: 2bf399db13171703e3a03ef65128e5c48aba16aa
 SHA512:
-  metadata.gz: a3c90e49a699fcea3f7e9b117a52b36d5728b29179a03d6a337038101b8a2c97c6dee5d2601589c879519827df931e77fbb4aecf77bfd616e7dd08f7dcd2a50b
-  data.tar.gz: d1e34f6f08c77d3a22fc2dfbf1a3c07ab2807f98f9fcf5fbfff84a0c90fbaf1875a1e76718617b68dbce7a57e7dfc015216f1cf7a477ba529daf7e4df8fb1092
+  metadata.gz: 34d8da13ae4c79c2e2b912e085ddd3675b8b6b73dec2546f505368790b98c95b057597f636c05adab11b2228c2fdd847c7f0f0d68fba49677f06b441e6b4fa0d
+  data.tar.gz: e62e3737a82ccc2f95337b4ee06079d5e619a3e124c96f98ed052c32bd5857f6108b6922201c2d221eeb5f5bdab189ed27b54dea2e4a78cc5b2d5687db6794de

data/lib/fuzzy_url/matching.rb

@@ -19,7 +19,6 @@ class FuzzyURL
         tally.call match_hostnames(mask[:hostname], url[:hostname])
         tally.call match_protocols_and_ports(mask, url)
         tally.call match_paths(mask[:path], url[:path])
-        tally.call fuzzy_match(mask[:port], url[:port])
         tally.call fuzzy_match(mask[:query], url[:query])
         tally.call fuzzy_match(mask[:username], url[:username])
         tally.call fuzzy_match(mask[:password], url[:password])
@@ -48,15 +47,17 @@ class FuzzyURL
         end
 
         mask_port = mask_hash[:port]
-        url_port = url_hash[:port]
-        if mask_hash[:port] && mask_port != '*'
-          if mask_port == PORT_BY_PROTOCOL[url_protocol]
-            wildcard_matches += 1
-          else
-            return nil if mask_port != url_port
-          end
-        else
+        url_port = url_hash[:port] # || PORT_BY_PROTOCOL[url_protocol]
+
+        if !mask_port || mask_port == '*'
           wildcard_matches += 1
+        elsif !url_port && PORT_BY_PROTOCOL[url_protocol] == mask_port.to_i
+          wildcard_matches += 1
+        elsif mask_port == url_port
+          ## cool
+        else
+          ## not cool
+          return nil
         end
 
         (2 - wildcard_matches)
@@ -65,7 +66,6 @@ class FuzzyURL
       PORT_BY_PROTOCOL = {
         'http'  => 80,
         'https' => 443,
-        'file'  => nil,
       }
 
       ## Matches a picee of a mask against a piece of a URL.  Handles wildcards.
@@ -92,6 +92,8 @@ class FuzzyURL
       ## Returns nil for no match, 0 for a wildcard match, or 1 for an
       ## exact match.
       def match_paths(mask, path)
+        mask = '/'+mask if mask && mask.index('/') != 0
+        path = '/'+path if path && path.index('/') != 0
         mask_pieces = (mask || '*').split(%r{/})
         path_pieces = (path || '/').split(%r{/})
         return 1 if mask && path && mask_pieces==path_pieces

data/lib/fuzzy_url/version.rb

@@ -1,6 +1,6 @@
 # @private
 class FuzzyURL
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
   VERSION_DATE = '2014-04-03'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuzzyurl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Pete Gamache