site-object 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cf792bb721e1f92c10455e37891bae5346975da
-  data.tar.gz: 4aa90bbedff85533112007fff0b6bde40e56694c
+  metadata.gz: 52fbfe67ec3e98f7ef7f8f0fb8165c4e5ec1ddd8
+  data.tar.gz: 279c13969c26dfecab7e2768a029d96e96b0c59d
 SHA512:
-  metadata.gz: f5c10ffca7a92a68dac1b25258c8121528322a626a81030925aba58de2127631c22ffa1d1e0459869a3e9f9a0e8fc8b3f746a65299c79a459dffbc6d9e24a69a
-  data.tar.gz: a2c5ab65360a7b058e4e382cab3c1a83bc4c38cc9a4f706fcdb5586333d00bc5e07337ee69b75d83b5140659a2dfe0a853e0764bc553664dd72a50331516a365
+  metadata.gz: ad42895bba2352c1e2d70557d7384e70126fa9082c35a6ec81d652e82c50303d6bb6305453205d6dfafc9289e5f8615dfe91fda0acb559e8249b5709faaa4f30
+  data.tar.gz: 4ce4c9f68c5407ee6fa286f1f8126975f14fecbfe034d86ce0890cc1fa3fc2820d1376a1b9015bb44057b59f01425a6efc08e0d330fa28cb6ae9706546f8ec31

data/lib/site-object/page.rb

@@ -436,8 +436,12 @@ module PageObject
         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

data/lib/site-object/site.rb

@@ -213,7 +213,9 @@ module SiteObject
     @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
 

data/lib/site-object/version.rb

@@ -1,3 +1,3 @@
 module SiteObject
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site-object
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - John Fitisoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport