gless 1.1.2 → 1.1.3
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.
- data/lib/gless/session.rb +15 -10
- data/lib/gless.rb +1 -1
- metadata +1 -1
data/lib/gless/session.rb
CHANGED
@@ -353,8 +353,11 @@ module Gless
|
|
353
353
|
|
354
354
|
if @acceptable_pages.member?( @current_page )
|
355
355
|
good_page = true
|
356
|
+
new_page = @current_page
|
356
357
|
break
|
357
358
|
else
|
359
|
+
new_page = nil
|
360
|
+
|
358
361
|
if @acceptable_pages.nil?
|
359
362
|
# If we haven't gone anywhere yet, anything is good
|
360
363
|
log.debug "Session: change_pages: no acceptable pages, so accepting the current page."
|
@@ -376,17 +379,19 @@ module Gless
|
|
376
379
|
end
|
377
380
|
end
|
378
381
|
|
379
|
-
if
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
|
382
|
+
if new_page
|
383
|
+
if not new_page.match_url(url)
|
384
|
+
good_page = false
|
385
|
+
error_message = "Current URL is #{url}, which doesn't match that expected for any of the acceptable pages: #{@acceptable_pages}"
|
386
|
+
next
|
387
|
+
end
|
384
388
|
|
385
|
-
|
386
|
-
|
387
|
-
|
388
|
-
|
389
|
-
|
389
|
+
log.debug "Session: change_pages: checking for arrival at #{new_page.class.name}"
|
390
|
+
if not new_page.arrived?
|
391
|
+
good_page = false
|
392
|
+
error_message = "The current page, at #{url}, doesn't have all of the elements for any of the acceptable pages: #{@acceptable_pages}"
|
393
|
+
next
|
394
|
+
end
|
390
395
|
end
|
391
396
|
|
392
397
|
if good_page == true
|
data/lib/gless.rb
CHANGED