site-object 0.4.7 → 0.4.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/site-object/page.rb +6 -2
- data/lib/site-object/site.rb +3 -1
- data/lib/site-object/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 52fbfe67ec3e98f7ef7f8f0fb8165c4e5ec1ddd8
|
|
4
|
+
data.tar.gz: 279c13969c26dfecab7e2768a029d96e96b0c59d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ad42895bba2352c1e2d70557d7384e70126fa9082c35a6ec81d652e82c50303d6bb6305453205d6dfafc9289e5f8615dfe91fda0acb559e8249b5709faaa4f30
|
|
7
|
+
data.tar.gz: 4ce4c9f68c5407ee6fa286f1f8126975f14fecbfe034d86ce0890cc1fa3fc2820d1376a1b9015bb44057b59f01425a6efc08e0d330fa28cb6ae9706546f8ec31
|
data/lib/site-object/page.rb
CHANGED
|
@@ -436,8 +436,12 @@ module PageObject
|
|
|
436
436
|
url = url.split(/\?/)[0]
|
|
437
437
|
end
|
|
438
438
|
|
|
439
|
-
if @url_matcher
|
|
440
|
-
|
|
439
|
+
if @url_matcher
|
|
440
|
+
if @url_matcher =~ url
|
|
441
|
+
return true
|
|
442
|
+
else
|
|
443
|
+
return false
|
|
444
|
+
end
|
|
441
445
|
elsif @url_template.match(url)
|
|
442
446
|
if @arguments.empty?
|
|
443
447
|
return true
|
data/lib/site-object/site.rb
CHANGED
|
@@ -213,7 +213,9 @@ module SiteObject
|
|
|
213
213
|
@pages.each do |p|
|
|
214
214
|
if p.url_matcher && p.url_matcher =~ url
|
|
215
215
|
found_page = p
|
|
216
|
-
elsif p.url_template.match
|
|
216
|
+
elsif p.query_arguments && p.url_template.match(url)
|
|
217
|
+
found_page = p
|
|
218
|
+
elsif !p.query_arguments && p.url_template.match(url.split(/(\?|#)/)[0])
|
|
217
219
|
found_page = p
|
|
218
220
|
end
|
|
219
221
|
|
data/lib/site-object/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: site-object
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- John Fitisoff
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-09-
|
|
11
|
+
date: 2016-09-19 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activesupport
|