site-object 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a506fbc38cb4599b7d378336ea9de895cdd8fc1
-  data.tar.gz: 455778808c7d4271a3c0bf5919d4a7a41aa9a9ca
+  metadata.gz: 730db955f5d3cf13412e6fc2eef05b75197832ba
+  data.tar.gz: c1f90e003b9e2bdbd9e38aca3af9dcddb545e4d2
 SHA512:
-  metadata.gz: 84bc0c0958b1c37326177b5036e658dfdc5f0787e698353ca7b1a42a33ecf94714024194ad08016973b59f3e493e49a020f32e5ba52bdbe2252e1f02c3c90978
-  data.tar.gz: aa61c490447450fd0208c116a0b2be8bc71bd0e6cf1d435e70af40302189dcf06f67ca03efd0df9f24ffb476fad05e94f1f7c1d289fbd99b5da79186d5ea4807
+  metadata.gz: 65e33a7bfb7b8a0603e7f4db56bc81198c9ba5e9410baf7f28916fb7b1fe23f00f3a3322c1fd74174c76340a23bff66b2fb93353a97a12d91ce085f33b47cc9d
+  data.tar.gz: 844a52ce7d9c5eeb4df26d430a52bdaa292de5508f5fee0f5d0b3b8698b5d4b33931a0367bdd2231f7a83faec1c2802c238cd5ccdad90e40fe88ba73e8b2f820

data/lib/site-object/page.rb

@@ -286,7 +286,9 @@ module PageObject
 
       # 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.
-      if @required_arguments.length > 0
+      if @required_arguments.length >  0 && !args
+        raise SiteObject::PageInitError, "No object was provided when attempting to initialize #{self.class.name}. This page object requires the following arguments for initialization: :#{@required_arguments.join(', :')}.\n\n#{caller.join("\n")}"
+      elsif @required_arguments.length > 0
         @required_arguments.each do |arg| # Try to extract each URL argument from the hash or object provided, OR from the site object.
           if args.is_a?(Hash) && !args.empty?
             if args.with_indifferent_access[arg] #The hash has the required argument.
@@ -296,8 +298,6 @@ module PageObject
             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")}"
             end
-          # elsif args.is_a?(Hash) && args.empty?
-          #   raise SiteObject::PageInitError, "An attempt to initialize the #{self.class.name} page object failed because no page arguments were provided. This page object requires the following arguments for initialization: :#{@required_arguments.join(", :")}\n\n#{caller.join("\n")}."
           elsif args # Some non-hash object was provided.
             if args.respond_to?(arg) #The hash has the required argument.
               @arguments[arg]= args.send(arg)
@@ -310,10 +310,8 @@ module PageObject
             # Do nothing here.
           end
         end
-      elsif @required_arguments.length >  0 && !args
-        raise SiteObject::PageInitError, "No object was provided when attempting to initialize #{self.class.name}. This page object requires the following arguments for initialization: :#{@required_arguments.join(', :')}.\n\n#{caller.join("\n")}"
-      elsif @required_arguments.length == 0 && !args
-        unless @args.is_a?(Hash) && args.empty?
+      elsif @required_arguments.length == 0 && args # If there are no required arguments.
+        unless args.is_a?(Hash) && args.empty?     # Do this unless args is an empty hash.
           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")}"
         end
       else
@@ -378,7 +376,12 @@ module PageObject
     # 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?
-      url = @browser.url    
+      if @url_template.pattern =~ /#/ # It has a URL fragment. Don't mess with the browser URL.
+        url = @browser.url
+      else # There's no fragment in the URL template, strip the fragment out of the URL so that template matching works better.
+        url = @browser.url.split('#')[0]
+      end
+
       if @url_matcher && @url_matcher =~ url
         return true
       elsif @url_template.match(url)
@@ -395,7 +398,7 @@ module PageObject
     end
 
     # Refreshes the page.
-    def refresh # TODO: Isolate browser library-specific code so that the adding new browser
+    def refresh # TODO: Isolate browser library-specific code so that the adding a new browser library is cleaner.
       if @browser.is_a?(Watir::Browser)
         @browser.refresh
       elsif @browser.is_a?(Selenium::WebDriver::Driver)

data/lib/site-object/site.rb

@@ -178,11 +178,8 @@ module SiteObject
   #  s = SomeSite.new(hash)
   #  s.open_browser :watir, :firefox
   def open_browser(platform, browser_type, args={})
-    # puts "howdy"
-    # binding.pry
     case platform
     when :watir
-      # binding.pry
       @browser = Watir::Browser.new(browser_type, args)
     when :selenium
       @browser = Selenium::WebDriver::Driver.for(browser_type, args)

data/lib/site-object/version.rb

@@ -1,3 +1,3 @@
 module SiteObject
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site-object
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - John Fitisoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,10 +80,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: site-object
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 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: