url_regexp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0597b803c2c877dae434e22bd8c0e732bce5a206
-  data.tar.gz: c22828be492484b11449a3b432c265a0c8185b16
+  metadata.gz: e00ee5f39e4cd8652f37ca2cd51d3e9089217608
+  data.tar.gz: 94adfb1668385c347a8875415df91d1eac1bf426
 SHA512:
-  metadata.gz: acd92da4d537af3110eeb6c7b120f3fc0965c76beb4ec5334392c5bd25b2105087d07123be083933d8447f0103f7f140ab5a3c9a30490f8758edd2d62433d0fe
-  data.tar.gz: cecdd701dd22adb5bfece787b5ad41aa64f2062701c3a71988d66d878104172a38e5b82f6da8e5f0d17b3c65c5306b266193f405efa4dcd178662df0e15d6cf3
+  metadata.gz: 79b26aa82519dfe3d6ee5215d83c8a766e080797fb2f2f6885c8736e141a39bd03db3f92371ea806d75f60dfecb3292d76ade31550f1ccd2fb3a008251bf3b5b
+  data.tar.gz: 4d5c32620af06e77bd29d9121bfcc43da3093e8697af2a9f753eaf2731740b63ad3fe3eb35bff0ca0679910cdbcdaae8cad68bc5927b685f7245cf7154c4a22b

data/.gitignore

@@ -8,6 +8,9 @@
 /spec/reports/
 /tmp/
 
+## Gem
+*.gem
+
 ## Misc
 Gemfile.lock
 gemfiles/*.lock

data/lib/url_regexp/path.rb

@@ -13,6 +13,10 @@ module UrlRegexp
       @path_end = false
     end
 
+    def path_end?
+      @path_end
+    end
+
     def hash
       [@label, @paths.hash].hash
     end

data/lib/url_regexp/path_set.rb

@@ -24,11 +24,11 @@ module UrlRegexp
     end
 
     def to_regexp_s
-      s = if 5 < size
+      if 5 < size
         "([^#?]*)"
       elsif 1 < size
         children_paths = map(&:paths).reduce { |s1, s2| s1 & s2 }
-        if children_paths.size == 1
+        if children_paths.size == 1 && all? { |p| !p.path_end? }
           "(#{map(&:label).join("|")})/#{children_paths.to_regexp_s}"
         else
           "(#{map(&:to_regexp_s).join("|")})"

data/lib/url_regexp/version.rb

@@ -1,3 +1,3 @@
 module UrlRegexp
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: url_regexp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Daisuke Taniwaki