site_prism 3.7.3 → 4.0

data/lib/site_prism/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SitePrism
-  VERSION = '3.7.3'
+  VERSION = '4.0'
 end

data/lib/site_prism/waiter.rb

@@ -3,17 +3,17 @@
 module SitePrism
   # [SitePrism::Waiter]
   class Waiter
-    # @return Boolean
-    #
     # A looper that will wait until the passed in block evaluates to true
     # Alternatively it will time out once the wait_time is exceeded
-    def self.wait_until_true(wait_time = Capybara.default_max_wait_time)
+    #
+    # @return [Boolean]
+    def self.wait_until_true(wait_time = Capybara.default_max_wait_time, sleep_duration = 0.05)
       Timer.run(wait_time) do |timer|
         loop do
           return true if yield
           break if timer.done?
 
-          sleep(0.05)
+          sleep(sleep_duration)
         end
         raise SitePrism::TimeoutError, "Timed out after #{wait_time}s."
       end

data/lib/site_prism.rb

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
 require 'site_prism/error'
+require 'site_prism/all_there'
 require 'addressable/template'
+require 'forwardable'
 
 # [SitePrism] namespace
 # We autoload our files underneath here to provide a slightly more optimal load solution
 module SitePrism
   autoload :AddressableUrlMatcher, 'site_prism/addressable_url_matcher'
   autoload :DSL, 'site_prism/dsl'
+  autoload :DSLValidator, 'site_prism/dsl_validator'
   autoload :Deprecator, 'site_prism/deprecator'
   autoload :ElementChecker, 'site_prism/element_checker'
   autoload :Loadable, 'site_prism/loadable'
   autoload :Logger, 'site_prism/logger'
   autoload :Page, 'site_prism/page'
-  autoload :RecursionChecker, 'site_prism/recursion_checker'
-  autoload :RspecMatchers, 'site_prism/rspec_matchers'
+  autoload :RSpecMatchers, 'site_prism/rspec_matchers'
   autoload :Section, 'site_prism/section'
   autoload :Timer, 'site_prism/timer'
   autoload :Waiter, 'site_prism/waiter'
 
   class << self
-    attr_reader :use_all_there_gem
-
     def configure
       yield self
     end
@@ -72,13 +72,5 @@ module SitePrism
     def log_level
       %i[DEBUG INFO WARN ERROR FATAL UNKNOWN][logger.level]
     end
-
-    # Whether you wish to use the new experimental all_there dependent gem
-    #   This will be enforced from site_prism v4 onwards as this is where
-    #   the development of this functionality will be focused
-    def use_all_there_gem=(value)
-      logger.debug("Setting use_all_there_gem to #{value}")
-      @use_all_there_gem = value
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site_prism
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: '4.0'
 platform: ruby
 authors:
 - Luke Hill
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -17,186 +17,166 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.27'
 - !ruby/object:Gem::Dependency
   name: site_prism-all_there
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.49.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.19.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.13'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.13'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 description: SitePrism gives you a simple, clean and semantic DSL for describing your
   site. SitePrism implements the Page Object Model pattern on top of Capybara.
 email:
@@ -212,12 +192,12 @@ files:
 - lib/site_prism/addressable_url_matcher.rb
 - lib/site_prism/deprecator.rb
 - lib/site_prism/dsl.rb
+- lib/site_prism/dsl_validator.rb
 - lib/site_prism/element_checker.rb
 - lib/site_prism/error.rb
 - lib/site_prism/loadable.rb
 - lib/site_prism/logger.rb
 - lib/site_prism/page.rb
-- lib/site_prism/recursion_checker.rb
 - lib/site_prism/rspec_matchers.rb
 - lib/site_prism/section.rb
 - lib/site_prism/timer.rb
@@ -238,14 +218,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A Page Object Model DSL for Capybara

data/lib/site_prism/recursion_checker.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-module SitePrism
-  class RecursionChecker
-    attr_reader :instance
-
-    private :instance
-
-    def initialize(instance)
-      @instance = instance
-    end
-
-    def all_there?
-      regular_items_all_there = expected_item_map.flatten.all? { |name| there?(name) }
-      return false unless regular_items_all_there
-
-      section_all_there =
-        section_classes_to_check.all?(&:all_there?)
-      return false unless section_all_there
-
-      # Returning this final check here is fine, as the previous two checks must
-      # have returned +true+ in order to hit this part of the method-call
-      sections_classes_to_check.all?(&:all_there?)
-    end
-
-    def expected_item_map
-      [
-        expected(mapped_items, :element),
-        expected(mapped_items, :elements),
-        expected(mapped_items, :section),
-        expected(mapped_items, :sections),
-        expected(mapped_items, :iframe)
-      ]
-    end
-
-    def expected(_map, type)
-      mapped_items[type].select { |name| elements_to_check.include?(name) }
-    end
-
-    def section_classes_to_check
-      expected_item_map[2].map { |name| instance.send(name) }
-    end
-
-    def sections_classes_to_check
-      expected_item_map[3].map { |name| instance.send(name) }.flatten
-    end
-
-    private
-
-    # If the page or section has expected_items set, return expected_items that are mapped
-    # otherwise just return the list of all mapped_items
-    def elements_to_check
-      if _expected_items
-        SitePrism.logger.debug('Expected Items has been set.')
-        _mapped_items.select { |name| _expected_items.include?(name) }
-      else
-        _mapped_items
-      end
-    end
-
-    def _mapped_items
-      mapped_items.values.flatten.uniq
-    end
-
-    def _expected_items
-      instance.class.expected_items
-    end
-
-    def there?(name)
-      instance.send("has_#{name}?")
-    end
-
-    def mapped_items
-      @mapped_items ||= instance.class.mapped_items(legacy: false)
-    end
-  end
-end