site-object 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52fbfe67ec3e98f7ef7f8f0fb8165c4e5ec1ddd8
-  data.tar.gz: 279c13969c26dfecab7e2768a029d96e96b0c59d
+  metadata.gz: 1a4df6ed4be703a9c8cd7412e4aaced525646eaf
+  data.tar.gz: 3bc242ec4569efa77de95d11a2fe5487898932a4
 SHA512:
-  metadata.gz: ad42895bba2352c1e2d70557d7384e70126fa9082c35a6ec81d652e82c50303d6bb6305453205d6dfafc9289e5f8615dfe91fda0acb559e8249b5709faaa4f30
-  data.tar.gz: 4ce4c9f68c5407ee6fa286f1f8126975f14fecbfe034d86ce0890cc1fa3fc2820d1376a1b9015bb44057b59f01425a6efc08e0d330fa28cb6ae9706546f8ec31
+  metadata.gz: 2fc776cefa54ab25f230f57937d2b3f7c5f947d8b8d73df846176541d8780e8190dbad35cec9dad298ff080ae6a4d502a9809ad011de7b864bec0858c84914f7
+  data.tar.gz: fcac3de77151044e37b6b79fd72488140d97ebe1fa78bc91fc26ff88534a55d5cf7c73737ec364d7f81cbbb7447e94fce3d44874b48e29e9a6a75eb4ccfdd67c

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, :has_fragment
+    attr_reader :page_attributes, :page_elements, :page_url, :url_template, :url_matcher, :has_fragment, :template_arguments, :required_arguments, :query_arguments
 
     # DEPRECATED. Use the set_attributes method instead.
     # This method can be used to disable page navigation when defining a page class (it sets an
@@ -175,14 +175,27 @@ module PageObject
       @page_attributes.include? :page_template
     end
 
+    # def template_arguments
+    #   all = @url_template.keys.map { |k| k.to_sym }
+    #   optional = all.find_all { |x| @url_template.pattern =~ /(\?#{x}|\/#{x})/ }
+    #   required = all - optional
+    #   query    = all.find_all { |x| @url_template.pattern =~ /\?#{x}/ }
+    #   @template_arguments = {
+    #     all:      all,
+    #     optional: optional,
+    #     required: required,
+    #     query:    query
+    #   }
+    # end
+
     # Returns an array of symbols representing the required arguments for the page's page URL.
-    def required_arguments
-      @arguments ||= @url_template.keys.map { |k| k.to_sym }
-    end
+    # def required_arguments
+      # @arguments ||= @url_template.keys.map { |k| k.to_sym }
+    # end
 
-    def query_arguments
-      required_arguments.find { |x| @url_template.pattern =~ /\?.*#{x}=*/ }
-    end
+    # def query_arguments
+      # required_arguments.find_all { |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
@@ -285,7 +298,20 @@ module PageObject
       else
         @url_template = Addressable::Template.new(Addressable::URI.parse("#{base_url}#{@page_url}"))
       end
-      @has_fragment = @url_template.pattern =~ /#/
+
+      all = @url_template.keys.map { |k| k.to_sym }
+      optional = all.find_all { |x| @url_template.pattern =~ /(\?#{x}|\/#{x})/ }
+      required = all - optional
+      query    = all.find_all { |x| @url_template.pattern =~ /\?#{x}/ }
+      @template_arguments = {
+        all:      all,
+        optional: optional,
+        required: required,
+        query:    query
+      }
+      @required_arguments = @template_arguments[:required]
+      @query_arguments    = @template_arguments[:query]
+      @has_fragment       = @url_template.pattern =~ /#/
     end
 
     # Optional. Allows you to specify a fallback mechanism for checking to see if the correct page is
@@ -340,7 +366,8 @@ module PageObject
       @page_url = self.class.page_url
       @page_elements = self.class.page_elements
       @page_features = self.class.page_features
-      @required_arguments = self.class.required_arguments
+      @template_arguments = self.class.template_arguments
+      @required_arguments = @template_arguments[:required]
       @site = site
       @url_matcher = self.class.url_matcher
       @url_template = self.class.url_template
@@ -382,12 +409,36 @@ module PageObject
             # Do nothing here yet.
           end
         end
-      elsif @required_arguments.empty? && args # If there are no required arguments then nothing should be provided.
+      elsif @template_arguments[:all].empty? && args # If there are no required/optional 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 yet.
       end
 
+      if @template_arguments[:optional].present? && args
+        @template_arguments[:optional].each do |arg|
+          if args.is_a?(Hash) && args.present?
+            args = args.with_indifferent_access
+
+            if args[arg] #The hash has the required argument.
+              @arguments[arg]= args[arg]
+            elsif @site.respond_to?(arg)
+              @arguments[arg]= site.send(arg)
+            else
+              # Do nothing.
+            end
+          elsif args # Some non-hash object was provided.
+            if args.respond_to?(arg) #The hash has the required argument.
+              @arguments[arg]= args.send(arg)
+            elsif @site.respond_to?(arg)
+              @arguments[arg]= site.send(arg)
+            else
+              # Do nothing.
+            end
+          end
+        end
+      end
+
       @url = @url_template.expand(@arguments).to_s
       @page_features ||= []
       @page_features.each do |arg|
@@ -428,17 +479,11 @@ module PageObject
         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
         if @url_matcher =~ url
           return true
+        elsif @url_matcher =~ url.split(/(#|\?)/)[0]
+          return true
         else
           return false
         end

data/lib/site-object/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site-object
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - John Fitisoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,4 +81,3 @@ summary: Wraps page objects up into a site object, which provides some introspec
   and navigation capabilities that page objects don't provide. Works with Watir and
   Selenium.
 test_files: []
-has_rdoc: