site-object 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd67d9861ad4201b16e2c8e6233da9b1082732de
-  data.tar.gz: 801c55f9b2f7b0dd1cb7c58659ae32e9c897b1ab
+  metadata.gz: 424ea70dcf85238cbe36bed27c8801eb9bc235ce
+  data.tar.gz: 7ac183c3a3656d194229f24987b96560da309e59
 SHA512:
-  metadata.gz: 9630d70637309cd5d386ffc1925f136995841aabcce0548c9f1b06f8894e6dc688973522dd7b16080a4c9a5104b38a3e3836f9095902959ab6baef09022518f4
-  data.tar.gz: b76644d7f40f2fa3b06b834baf08f930e6c3d08e8a3c2ff1916744c3ceb00dd6086b922f7e1fc0d39a68d68d840bca8736eb0083f60c4cf96a7a3c4f5f1b9b49
+  metadata.gz: 75f1d9c95cac8e1c6f7f5d505b101d66a1401cbe5d0c1c2af888ff9acdc8d13094960fcd18b2e67a1a0abf458b4bc80bfc204b807670b533e4d390a27e1d2dbc
+  data.tar.gz: 29bf796128a07e3506667aa870dce0a0167e36890bf8164da59d530b61b94777238d7a6e5a8c256788d02880546e9325aba66cf7ec60c8704b3aab1e9ddde26c

data/lib/site-object/page.rb

@@ -169,6 +169,10 @@ module PageObject
       @arguments ||= @url_template.keys.map { |k| k.to_sym }
     end
 
+    def query_argument
+      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
     # this method when defining a page object (but see notes below.) The URL can be defined in a number
     # of different ways. Here are some examples using Google News:
@@ -305,7 +309,7 @@ module PageObject
   end
 
   module PageInstanceMethods
-    attr_reader :arguments, :browser, :page_attributes, :page_elements, :page_features, :page_url, :required_arguments, :site, :url_template, :url_matcher
+    attr_reader :arguments, :browser, :page_attributes, :page_elements, :page_features, :page_url, :query_argument, :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.
@@ -328,6 +332,7 @@ module PageObject
       @site = site
       @url_matcher = self.class.url_matcher
       @url_template = self.class.url_template
+      @query_argument = self.class.query_argument
 
       # 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.
@@ -349,7 +354,7 @@ module PageObject
             elsif @site.respond_to?(arg)
               @arguments[arg]= site.send(arg)
             else
-              raise SiteObject::PageInitError, "#{args.class} was provided, but this object did not respond to :#{arg}, which is necessary to build an URL for the #{self.class.name} page.\n\n#{caller.join("\n")}"
+              raise SiteObject::PageInitError, "A required page argument is missing. #{args.class} was provided, but this object did not respond to :#{arg}, which is necessary to build an URL for the #{self.class.name} page.\n\n#{caller.join("\n")}"
             end
           elsif args # Some non-hash object was provided.
             if args.respond_to?(arg) #The hash has the required argument.
@@ -357,16 +362,16 @@ module PageObject
             elsif @site.respond_to?(arg)
               @arguments[arg]= site.send(arg)
             else
-              raise SiteObject::PageInitError, "#{args.class} was provided, but this object did not respond to :#{arg}, which is necessary to build an URL for the #{self.class.name} page.\n\n#{caller.join("\n")}"
+              raise SiteObject::PageInitError, "A required page argument is missing. #{args.class} was provided, but this object did not respond to :#{arg}, which is necessary to build an URL for the #{self.class.name} page.\n\n#{caller.join("\n")}"
             end
           else
-           # No need to do anything here.
+            # Do nothing here yet.
           end
         end
       elsif @required_arguments.empty? && args # If there are no required arguments then nothing should be provided.
         raise SiteObject::PageInitError, "#{args.class} was provided as a #{self.class.name} initialization argument, but the page URL doesn't require any arguments.\n\n#{caller.join("\n")}"
       else
-        # Do nothing here.
+        # Do nothing here yet.
       end
 
       @url = @url_template.expand(@arguments).to_s
@@ -449,11 +454,10 @@ module PageObject
         else
           if page_args = @url_template.extract(Addressable::URI.parse(url))
             page_args = page_args.with_indifferent_access
-            return true if @arguments.all? { |k, v| page_args[k] == v.to_s }
+            (@required_arguments - [query_argument]).all? { |k| page_args[k] == @arguments[k].to_s }
           end
         end
       end
-      false
     end
 
     def navigation_disabled?

data/lib/site-object/version.rb

@@ -1,3 +1,3 @@
 module SiteObject
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site-object
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - John Fitisoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: 2.4.0
 description: Wraps page objects up into a site object, which provides some introspection
   and navigation capabilities that page objects don't provide. Works with Watir and
   Selenium.
@@ -80,10 +80,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: site-object
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Wraps page objects up into a site object, which provides some introspection
   and navigation capabilities that page objects don't provide. Works with Watir and
   Selenium.
 test_files: []
+has_rdoc: