dmc_kanye 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b682bcb0bb6c5c91b8e408a1b85c2a0aeade68f23714a706fc0116fe38a34194
-  data.tar.gz: 9a1bfd714daaf8c91fefe3a3fd49f99f0d574dddb6c24de842c4f576dcde1a86
+  metadata.gz: 25ea4799ce74fe7f6ff18f93cb71713584eb69434d7072c91077d8a57af67766
+  data.tar.gz: 7a121ed0195cc0c3ef0930743b24222b0b3da07dc16e591a9b44d6ef5edc7aa5
 SHA512:
-  metadata.gz: a54b9eb9434a5bd874898f77b0685a21d2ce30f7510057a0787ef3982101bc628927b509755aeb8014f09a117de9e85ed034e41ff712c70ce28cf52bcf533be0
-  data.tar.gz: 92b86f267b806701348a006f29f93823ee2b4c6ff9f57c717425629d14a04f59ef1ea8be1cca4b67f1eadf57de1abf1eac489087346f896da26500b1c1becf05
+  metadata.gz: 686ab35f8ed38d2b0d73bc572a708b79d594c0bd482c845805f43dbd563f694b9b4b9615c488de099ba52187010482d524a7f9c5fa262c79ab1f0aea267804b8
+  data.tar.gz: 2c7afd64412d629843850aa28422e399a6df6b7140dddc6c7a36d37f319f77c33f228998086b6f9c095a441abcfbd243dc5d2b82613e9f7fb0d1b0f93e6de3bf

data/dmc_kanye.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "capybara"
+  spec.add_dependency "capybara", "~> 3.40"
   spec.add_dependency "poltergeist"
   spec.add_development_dependency "rake"
 end

data/lib/dmc_kanye/imma_let_you_finish.rb

@@ -42,58 +42,58 @@ end
 # Here we have overridden the behavior of a method in Capybara.  The part
 # that we added is highlighted below to make it easier when upgrading
 # to a future version of Capybara.
+#
+# Original code lives here: https://github.com/teamcapybara/capybara/blob/3.40.0/lib/capybara/node/base.rb#L76
 
 ##### THIS CODE IS ORIGINAL
 module Capybara
   module Node
     class Base
+      def synchronize(seconds = nil, errors: nil)
+        return yield if session.synchronized
 ##### START PUNCHING DUCKS
 # orig code:
-#       def synchronize(seconds=Capybara.default_max_wait_time, options = {})
+#       seconds = session_options.default_max_wait_time if [nil, true].include? seconds
 # new code:
-      def synchronize(seconds = nil, options = {})
         kanye_in_the_house = session.driver.respond_to?(:kanye_invited?) && session.driver.kanye_invited?
-        if seconds
-          seconds_to_wait = seconds
-        elsif kanye_in_the_house
-          seconds_to_wait = DmcKanye::Config.default_wait_time || Capybara.default_max_wait_time
-        else
-          seconds_to_wait = Capybara.default_max_wait_time
+        if [nil, true].include? seconds
+          if kanye_in_the_house
+            seconds = DmcKanye::Config.default_wait_time || session_options.default_max_wait_time
+          else
+            seconds = session_options.default_max_wait_time
+          end
         end
 ##### STOP PUNCHING DUCKS, BACK TO ORIGINAL CODE
-        start_time = Capybara::Helpers.monotonic_time
-
-        if session.synchronized
-          yield
-        else
-          session.synchronized = true
-          begin
+        interval = session_options.default_retry_interval
+        session.synchronized = true
+        timer = Capybara::Helpers.timer(expire_in: seconds)
+        begin
 ##### START PUNCHING DUCKS
 # orig code:
-#            yield
+#         yield
 # new code:
-            session.driver.send(:imma_let_you_finish) if kanye_in_the_house
-            result = yield
-            session.driver.send(:imma_let_you_finish) if kanye_in_the_house
-            result
+          session.driver.send(:imma_let_you_finish) if kanye_in_the_house
+          result = yield
+          session.driver.send(:imma_let_you_finish) if kanye_in_the_house
+          result
 ##### STOP PUNCHING DUCKS, BACK TO ORIGINAL CODE
-          rescue => e
-            session.raise_server_error!
-            raise e unless driver.wait?
-            raise e unless catch_error?(e, options[:errors])
-##### START PUNCHING DUCKS
-# orig code:
-#            raise e if (Capybara::Helpers.monotonic_time - start_time) >= seconds
-# new code:
-            raise e if (Capybara::Helpers.monotonic_time - start_time) >= seconds_to_wait
-##### STOP PUNCHING DUCKS, BACK TO ORIGINAL CODE
-            sleep(0.05)
-            raise Capybara::FrozenInTime, "time appears to be frozen, Capybara does not work with libraries which freeze time, consider using time travelling instead" if Capybara::Helpers.monotonic_time == start_time
-            reload if Capybara.automatic_reload
-            retry
-          ensure
-            session.synchronized = false
+        rescue StandardError => e
+          session.raise_server_error!
+          raise e unless catch_error?(e, errors)
+
+          if driver.wait?
+            raise e if timer.expired?
+
+            sleep interval
+            reload if session_options.automatic_reload
+          else
+            old_base = @base
+            reload if session_options.automatic_reload
+            raise e if old_base == @base
           end
+          retry
+        ensure
+          session.synchronized = false
         end
       end
     end

data/lib/dmc_kanye/version.rb

@@ -1,3 +1,3 @@
 module DmcKanye
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"   # major version is 0; minor version is the major version of the Capybara we are overriding
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dmc_kanye
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Wyatt Greene
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-09 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.40'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.40'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement