updates

jfitisoff · Sep 19, 2016 · 2ebbc63 · 2ebbc63
1 parent a04d5d7
commit 2ebbc63
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/lib/site-object/page.rb b/lib/site-object/page.rb
@@ -436,8 +436,12 @@ def on_page?
         url = url.split(/\?/)[0]
       end
 
-      if @url_matcher && @url_matcher =~ url
-        return true
+      if @url_matcher
+        if @url_matcher =~ url
+          return true
+        else
+          return false
+        end
       elsif @url_template.match(url)
         if @arguments.empty?
           return true

diff --git a/lib/site-object/site.rb b/lib/site-object/site.rb
@@ -213,7 +213,9 @@ def page
     @pages.each do |p|
       if p.url_matcher && p.url_matcher =~ url
         found_page = p
-      elsif p.url_template.match url.split(/(\?|#)/)[0]
+      elsif p.query_arguments && p.url_template.match(url)
+        found_page = p
+      elsif !p.query_arguments && p.url_template.match(url.split(/(\?|#)/)[0])
         found_page = p
       end
 

diff --git a/lib/site-object/version.rb b/lib/site-object/version.rb
@@ -1,3 +1,3 @@
 module SiteObject
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 end