site_prism 4.0.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de1db2cfa8b40510768bbea0bee96e548ae949149428d669e1a038c83e2b7f8d
-  data.tar.gz: 3862848b777a9fbafb8c1640df914313b6deac6da942a3859ff2dfe6dbafb214
+  metadata.gz: 31d906cda08dd376f6e81fe3ed760b954cf172d2037dcee25d91c01b3b8ace24
+  data.tar.gz: aefc0ed612cf57548101505e46c92845ef9fa2f7482b23e5d6b38cc7c37cf9f7
 SHA512:
-  metadata.gz: 8deff2edc00b2b4c0fab86c96e10bc184ed2afc8276b7daf9f69b97a9f7ab4b105ece138f6901456d76e57d508f546971f0262e6cec90787e64ea89bac904047
-  data.tar.gz: 505eb15872469490ab314497737e04eda896f14e7b98c631efae658d42eedb09d8a8aefa53fd5d845fa0a11936951aaf5cd9e6bc99563b4f454251eb212126d9
+  metadata.gz: 9eda5c088201fe6055d67d92cdd3a5f08a90ffe9ccbd2788ac1b4da6e6a0dff32e000c59819e113b4091fc33d2c38d875c9b3d36bd4d2dc549d42d4e1f071ac3
+  data.tar.gz: 5f926bac135af87939fc52ce5d110dd806ed7e3708bad8b885670a71e75065057d58de506547389ac11f2216ffcc043031262c4eeb5d11697ff38f114d1685f9

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2022, The SitePrism team
+Copyright (c) 2011-2023, The SitePrism team
 
 All rights reserved.
 

data/lib/site_prism/element_checker.rb

@@ -39,7 +39,7 @@ module SitePrism
     #
     # @return [Array]
     def elements_present
-      _mapped_items.select { |name| there?(name) }
+      elements_to_check.select { |name| there?(name) }
     end
 
     # Returns each element that is not currently present inside the scope being tested
@@ -52,20 +52,7 @@ module SitePrism
     private
 
     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
-      self.class.mapped_items.values.flatten.uniq
-    end
-
-    def _expected_items
-      self.class.expected_items
+      SitePrism::AllThere::ExpectedItems.new(self).send(:mapped_checklist)
     end
 
     def there?(name)

data/lib/site_prism/rspec_matchers.rb

@@ -22,17 +22,30 @@ module SitePrism
     private
 
     def create_rspec_existence_matchers(matcher, object_method, negated_object_method, warning)
-      RSpec::Matchers.define(matcher) do |*args|
-        match { |actual| actual.public_send(object_method, *args) }
+      forward = forwarder(object_method)
+
+      RSpec::Matchers.define(matcher) do |*args, **options|
+        match { |actual| forward.call(actual, args, options) }
         match_when_negated do |actual|
-          return actual.public_send(negated_object_method, *args) if actual.respond_to?(negated_object_method)
+          return forward.call(actual, args, options, negated_object_method) if actual.respond_to?(negated_object_method)
 
           SitePrism.logger.debug(warning)
-          !actual.public_send(object_method, *args)
+          !forward.call(actual, args, options)
         end
       end
     end
 
+    def forwarder(object_method)
+      lambda do |actual, args, options, method_name = object_method|
+        # To support Ruby 2.6. Otherwise methods that expect no arguments would fail with
+        # "wrong number of arguments (given 1, expected 0)" because Ruby 2.6 considers `method(**{})` the
+        # same as `method({})` (passing the empty Hash as an argument)
+        next actual.public_send(method_name, *args) if options.empty?
+
+        actual.public_send(method_name, *args, **options)
+      end
+    end
+
     def matcher
       "have_#{element_name}"
     end

data/lib/site_prism/version.rb

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

data/lib/site_prism.rb

@@ -4,6 +4,7 @@ require 'site_prism/error'
 require 'site_prism/all_there'
 
 require 'addressable/template'
+require 'capybara/dsl'
 require 'forwardable'
 
 require 'site_prism/addressable_url_matcher'
@@ -42,14 +43,10 @@ module SitePrism
       @logger ||= SitePrism::Logger.new.create
     end
 
-    # `Logger#reopen` was added in Ruby 2.3 - Which is now the minimum version
-    # for the site_prism gem
+    # Configure where you want the output of the site_prism logs to go (Default is $stdout)
     #
-    # This writer method allows you to configure where you want the output of
-    # the site_prism logs to go (Default is $stdout)
-    #
-    # example: SitePrism.log_path = 'site_prism.log' would save all
-    # log messages to `./site_prism.log`
+    # To save all logs to a specific output file
+    #   SitePrism.log_path = 'site_prism.log'
     def log_path=(logdev)
       logger.reopen(logdev)
     end
@@ -67,8 +64,7 @@ module SitePrism
     end
 
     # To query what level is being logged
-    #   SitePrism.log_level
-    #   => :UNKNOWN # By default
+    #   SitePrism.log_level # => :UNKNOWN # By default
     def log_level
       %i[DEBUG INFO WARN ERROR FATAL UNKNOWN][logger.level]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site_prism
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.3
 platform: ruby
 authors:
 - Luke Hill
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: A Page Object Model DSL for Capybara