site_prism 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99cb79c78e6dba7cac9a03b9bdc0bd5c3b68a25995ec38160e9705274ab04cfd
-  data.tar.gz: 6d91b63cd449fe3f16a364008d5178d7175bd6c4bf65297e5dfe5ae1a0673848
+  metadata.gz: a04739bded9cabec9711ba25ac5167f69b7d17e532d106060aab7c03c0c0ff1d
+  data.tar.gz: 1da22d259b1dc8490d1a185fd273df0b7a10b9e15baf72a91fecd82daa07844c
 SHA512:
-  metadata.gz: 2de60bd237a1d29d1594ba3a8db75e01a09310fe78e48a81d7ea0b1dd7fa53a36d6bdb274c4b592daa0c39a2768c7a371a2939d35177598b146d018dd6ff35f9
-  data.tar.gz: bbc12f3639fc7bfe30ab28b3dd65b68f30f4c8c6943e306ae849a3b4e16dda104f96c746f21e3b5fe8162c7a4e05388ba9aebe5fd61c024fc27abc4df0b74a16
+  metadata.gz: efce339158f4d932f118d162a1284d8237a5e20daf89610f90bb71427fdaaf049dca5b65b22dbad471405f9d3d06dda24274e1dd2ba580fb82e4aa8bca3a817a
+  data.tar.gz: 312d3a77862f801b81ad92c5d304a7f2ade43b5ce9300f4e422970a9917189a62f291c4888efcb1f617fafc5b674607e83cc9aab7f136840ae250830e2f28bb0

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2019, Nathaniel Ritmeyer & the SitePrism team
+Copyright (c) 2011-2019, The SitePrism team
 
 All rights reserved.
 

data/lib/site_prism/loadable.rb

@@ -58,11 +58,6 @@ module SitePrism
       # inside another when_loaded block.
       previously_loaded = loaded
 
-      # Ensure we have passed in a block. else stop the system.
-      # This would be because a user has not defined the load validation
-      # correctly (i.e. with a block argument)
-      throw_missing_block_error unless block_given?
-
       # Within the block, check (and cache) loaded?, to see whether the
       # page has indeed loaded according to the rules defined by the user.
       self.loaded = loaded?
@@ -71,7 +66,8 @@ module SitePrism
       # If one isn't defined, just return the Error code.
       raise SitePrism::FailedLoadValidationError, load_error unless loaded
 
-      yield self
+      # Return the yield value of the block if one was supplied.
+      yield self if block_given?
     ensure
       self.loaded = previously_loaded
     end
@@ -102,11 +98,5 @@ module SitePrism
         passed
       end
     end
-
-    def throw_missing_block_error
-      SitePrism.logger.debug('This code point should not be reachable')
-      SitePrism.logger.error('A block was expected, but none received.')
-      raise SitePrism::MissingBlockError
-    end
   end
 end

data/lib/site_prism/page.rb

@@ -3,6 +3,7 @@
 require 'site_prism/loadable'
 
 module SitePrism
+  # rubocop:disable Metrics/ClassLength
   class Page
     include Capybara::DSL
     include ElementChecker
@@ -25,13 +26,12 @@ module SitePrism
       end
     end
 
-    # When instantiating the page. A default validation will be added to all
-    # validations you define and add to the Page Class.
-    # When calling #load, all of the validations that are set will be ran
-    # in order, with the default "displayed?" validation being ran _FIRST_
-
     def page
-      @page ||= Capybara.current_session
+      if defined?(@page)
+        @page
+      else
+        Capybara.current_session
+      end
     end
 
     # Loads the page.
@@ -41,19 +41,26 @@ module SitePrism
     #
     # Executes the block, if given.
     # Runs load validations on the page, unless input is a string
+    #
+    # When calling #load, all the validations that are set will be ran in order
     def load(expansion_or_html = {}, &block)
       self.loaded = false
+      SitePrism.logger.debug("Reset loaded state on #{self.class}.")
 
-      if expansion_or_html.is_a?(String)
-        @page = Capybara.string(expansion_or_html)
-        yield self if block_given?
-      else
-        expanded_url = url(expansion_or_html)
-        raise SitePrism::NoUrlForPageError unless expanded_url
+      return_yield = if expansion_or_html.is_a?(String)
+                       load_html_string(expansion_or_html, &block)
+                     else
+                       load_html_website(expansion_or_html, &block)
+                     end
 
-        visit expanded_url
-        when_loaded(&block) if block_given?
-      end
+      # Ensure that we represent that the page we loaded is now indeed loaded!
+      # This ensures that future calls to #loaded? do not perform the
+      # instance evaluations against all load validations procs another time.
+      self.loaded = true
+
+      SitePrism.logger.info("#{self.class} loaded.")
+      # Return the yield from the block if there was one, otherwise return true
+      return_yield || true
     end
 
     def displayed?(*args)
@@ -139,5 +146,19 @@ module SitePrism
     def matcher_template
       @matcher_template ||= AddressableUrlMatcher.new(url_matcher)
     end
+
+    def load_html_string(string)
+      @page = Capybara.string(string)
+      yield self if block_given?
+    end
+
+    def load_html_website(html, &block)
+      expanded_url = url(html)
+      raise SitePrism::NoUrlForPageError unless expanded_url
+
+      visit expanded_url
+      when_loaded(&block)
+    end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/site_prism/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SitePrism
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site_prism
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Nat Ritmeyer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,14 +107,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 0.63.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 0.63.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement