site-object 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15f2ae6c537d2795043ea16f265246f365686990
-  data.tar.gz: 4045598a63be0d5de8cfa22a3f73be9c8a2966aa
+  metadata.gz: 76f3e751539020ff7af4782aaa508521924d3016
+  data.tar.gz: 36d5a1a86b6b81a7651f4afbaebe580b5a51ad87
 SHA512:
-  metadata.gz: 902911293f6c86fdb7ef2db1684b8c301050ef2852edb42e8af2e9704cc4edd1172b74c1c40134515923beeb594cdc18713dd0819e8b731bf37b2ba29829a173
-  data.tar.gz: 8787cbcd6c9a25efb261d434aeacd0d6a7a91502e0fe937b5eb8d12baf6f9d72dc3204431b060074effac8f46bad95fb931a60cc34e49a07c1898ee500315109
+  metadata.gz: 88b1483f6249fcb4e4ff845d903394a11668a7252b34117b3bf2a5914fba32ad5703cccc85891a68ba2ba5f47be47f7184871e329ef45686226ea242a5a87ceb
+  data.tar.gz: 6e355f2c33218f1ba25208ef07b625254e0c4be776e43d0659bab216b88bfb5312169fa689095a7847aac2c5043c6320a9b1beee93a20a0afb2865a9f4a014a2

data/lib/site-object/page.rb

@@ -74,7 +74,7 @@ module PageObject
       Module.cattr_accessor :page_features
     end
 
-    attr_reader    :page_attributes, :page_elements, :page_url, :url_template, :url_matcher
+    attr_reader    :page_attributes, :page_elements, :page_url, :url_template, :url_matcher, :has_fragment
 
     # DEPRECATED. Use the set_attributes method instead.
     # This method can be used to disable page navigation when defining a page class (it sets an
@@ -180,8 +180,8 @@ module PageObject
       @arguments ||= @url_template.keys.map { |k| k.to_sym }
     end
 
-    def query_argument
-      required_arguments.find { |x| @url_template.pattern =~ /{\?#{x}\*}/}
+    def query_arguments
+      required_arguments.find { |x| @url_template.pattern =~ /\?.*#{x}=*/ }
     end
 
     # Used to define the full or relative URL to the page. Typically, you will *almost* *always* want to use
@@ -285,6 +285,7 @@ module PageObject
       else
         @url_template = Addressable::Template.new(Addressable::URI.parse("#{base_url}#{@page_url}"))
       end
+      @has_fragment = @url_template.pattern =~ /#/
     end
 
     # Optional. Allows you to specify a fallback mechanism for checking to see if the correct page is
@@ -320,7 +321,7 @@ module PageObject
   end
 
   module PageInstanceMethods
-    attr_reader :arguments, :browser, :page_attributes, :page_elements, :page_features, :page_url, :query_argument, :required_arguments, :site, :url_template, :url_matcher
+    attr_reader :arguments, :browser, :has_fragment, :page_attributes, :page_elements, :page_features, :page_url, :query_arguments, :required_arguments, :site, :url_template, :url_matcher
 
     # Takes the name of a page class. If the current page is of that class then it returns a page
     # object for the page. Raises a SiteObject::WrongPageError if that's not the case.
@@ -343,7 +344,9 @@ module PageObject
       @site = site
       @url_matcher = self.class.url_matcher
       @url_template = self.class.url_template
-      @query_argument = self.class.query_argument
+      @query_arguments = self.class.query_arguments
+      @has_fragment    = self.class.has_fragment
+
 
       # Try to expand the URL template if the URL has parameters.
       @arguments = {}.with_indifferent_access # Stores the param list that will expand the url_template after examining the arguments used to initialize the page.
@@ -416,45 +419,21 @@ module PageObject
       "#<#{self.class.name}:#{object_id} @url_template=#{@url_template.inspect}>"
     end
 
-    # Returns true if the page defined by the page object is currently being displayed in the browser,
-    # false if not. It does this in two different ways, which are described below.
-    #
-    # A page always has a URL defined for it. This is typically done by using the Page.set_url method
-    # to specify a URL when defining the page. You can skip using the set_url method but in that case
-    # the page URL defaults to the base URL defined for the site object.
-    #
-    # The default approach for determining if the page is being displayed relies on the URL defined for
-    # the page. This method first does a general match against the current browser URL page's URL template.
-    # If a match occurs here, and there are no required arguments for the page the method returns true.
-    # If the page's URL template does require arguments the method performs an additional check to
-    # verify that each of the arguments defined for the page match what's in the current browser URL.
-    # If all of the arguments match then the method will return true.
-    #
-    # This should work for most cases but may not always be enough. For example, there may be a redirect
-    # and the URL used to navigate to the page may not be the final page URL. There's a fallback
-    # mechanism for these sorts of situations. You can use the Page.set_url_matcher method to define a
-    # regular expression that the method will use in place of the URL template. If the regular expression
-    # matches, then the method will return true even if the URL wouldn't match the URL template.
-    #
-    # It's better to use the default URL matching if possible. But if for some reason it's not feasible
-    # you can use the alternate method to specify how to match the page.
     def on_page?
-      if @url_template.pattern =~ /#/ # It has a URL fragment. Don't mess with the browser URL.
-        if @browser.is_a? Watir::Browser
-          url = @browser.url
-        elsif @browser.is_a? Selenium::WebDriver::Driver
-          url = @browser.current_url
-        else
-          raise SiteObject::BrowserLibraryNotSupportedError, "Unsupported browser library: #{@browser.class}"
-        end
-      else # There's no fragment in the URL template, strip the fragment out of the URL so that template matching works better.
-        if @browser.is_a? Watir::Browser
-          url = @browser.url.split(/(\?|#)/)[0]
-        elsif @browser.is_a? Selenium::WebDriver::Driver
-          url = @browser.current_url.split(/(\?|#)/)[0]
-        else
-          raise SiteObject::BrowserLibraryNotSupportedError, "Unsupported browser library: #{@browser.class}"
+      if @browser.is_a? Watir::Browser
+        url = @browser.url
+      elsif @browser.is_a? Selenium::WebDriver::Driver
+        url = @browser.current_url
+      else
+        raise SiteObject::BrowserLibraryNotSupportedError, "Unsupported browser library: #{@browser.class}"
+      end
+
+      if query_arguments
+        if @has_fragment
+          url = url.split(/#/)[0]
         end
+      else
+        url = url.split(/\?/)[0]
       end
 
       if @url_matcher && @url_matcher =~ url
@@ -463,12 +442,13 @@ module PageObject
         if @arguments.empty?
           return true
         else
-          if page_args = @url_template.extract(Addressable::URI.parse(url))
-            page_args = page_args.with_indifferent_access
-            (@required_arguments - [query_argument]).all? { |k| page_args[k] == @arguments[k].to_s }
+          if pargs = @url_template.extract(Addressable::URI.parse(url))
+            pargs = pargs.with_indifferent_access
+            @required_arguments.all? { |k| pargs[k] == @arguments[k].to_s }
           end
         end
       end
+
     end
 
     def navigation_disabled?

data/lib/site-object/version.rb

@@ -1,3 +1,3 @@
 module SiteObject
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site-object
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - John Fitisoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport