site_watcher 1.1.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfa1a2dfba58f7bc84fbcba7db6a696b160688f7f1fe975f69186b7dd026a1c2
-  data.tar.gz: 3480fda5101368505953fba89458fb56d04cb3c78ebabd43ce5387ed89fd02cc
+  metadata.gz: df65a9d8f51bcde0117e6202caa4bc5053e6559c24967dfff33fb6b1542d54b3
+  data.tar.gz: 675de476412013dbadd3d75cead811433f913e6be1c79ae037798621f651078e
 SHA512:
-  metadata.gz: 03aada920765c224b9776d357f8edebcd00e0a299af52cd91eb7ab4802a3918ac58f26ceee361f006d5af51d40f9580ee3d501ca9a9a50a0882460a774b5b657
-  data.tar.gz: b2930dc82e888aba5764ab8bbf4cb29c82ce7ab7eaf044904e8c4d5ee8528ef06c04af58a86f9ee6550af42a8a622cacfb4ece5705234ffb2ce6395043452012
+  metadata.gz: 28f0382fae6c8c7cf69f579dd7f0dadc27b86dac5f0b562ff4cca1bf9a80822afffb22b53e8a0cabc3a5d712168dc39d2b2de5050a28585231b8b5c6d94afe54
+  data.tar.gz: d92430b4dc7fa2de6dabf1df4fa77899ca60d8cc7206fe435279397d0be1f2709c5aa35f6acda4813f1de10ee17fcce56257c5f53b53886b5cbb8bd8e629f3c3

data/lib/site_watcher/version.rb

@@ -1,3 +1,3 @@
 class SiteWatcher
-  VERSION = "1.1.0"
+  VERSION = "1.4.0"
 end

data/lib/site_watcher.rb

@@ -8,29 +8,30 @@ require "rspec/expectations"
 
 class SiteWatcher
   def self.watch(opts={}, &block)
-    trap(:SIGINT) { abort(?\n) }
-
     dsl = DSL::Top.new
     dsl.instance_eval(&block)
 
     delay = opts.fetch(:every, 5)
-    logger = opts.fetch(:logger, ::Logger.new($stderr))
+    logger = opts.fetch(:logger, ::Logger.new($stderr, level: :warn))
+    timeout = opts.fetch(:timeout, {connect: 3, read: 10})
 
     new(
       dsl.__sw_before_hooks,
       dsl.__sw_pages,
       dsl.__sw_after_hooks,
       delay,
-      logger
+      logger,
+      timeout,
     ).watch
   end
 
-  def initialize(before_hooks, pages, after_hooks, delay, logger)
+  def initialize(before_hooks, pages, after_hooks, delay, logger, timeout)
     @before_hooks = before_hooks
     @pages = pages
     @after_hooks = after_hooks
     @delay = delay
     @logger = logger
+    @timeout = timeout
     @force = false
   end
 
@@ -44,7 +45,7 @@ class SiteWatcher
 
         @pages.each do |page|
           begin
-            page.__sw_run!(force)
+            page.__sw_run!(force, @logger, @timeout)
             @pages.delete(page) if page.__sw_remove_on_fulfillment
           rescue ::RSpec::Expectations::ExpectationNotMetError
           rescue => e
@@ -115,6 +116,7 @@ class SiteWatcher
         @__sw_headers = headers
         @__sw_http_opts = opts
         @__sw_fulfilled = nil
+        @__sw_fetch = nil
         @__sw_remove_on_fulfillment = true
       end
 
@@ -126,6 +128,10 @@ class SiteWatcher
         @__sw_fulfilled = block
       end
 
+      def fetch(&block)
+        @__sw_fetch = block
+      end
+
       def headers(hash)
         @__sw_headers = hash
       end
@@ -134,6 +140,7 @@ class SiteWatcher
         @__sw_http_method = http_method
       end
 
+      # FIXME this isn't even used?
       def body(body)
         @__sw_body = body
       end
@@ -142,20 +149,27 @@ class SiteWatcher
         @__sw_remove_on_fulfillment = !!bool
       end
 
-      def __sw_run!(force=false)
-        response = ::HTTP
+      def __sw_run!(force, logger, timeout)
+        client = ::HTTP
+          .use(logging: {logger: logger})
+          .timeout(timeout)
           .headers(@__sw_headers)
-          .request(@__sw_method, @__sw_url, **@__sw_http_opts)
 
-        case response.content_type.mime_type
-        when /json/i
-          page = ::JSON.parse(response.to_s)
+        if @__sw_fetch
+          response = @__sw_fetch.call(@__sw_url, client)
         else
-          page = ::Capybara::Node::Simple.new(response.to_s)
+          response = client.request(@__sw_method, @__sw_url, **@__sw_http_opts)
+
+          case response.content_type.mime_type
+          when /json/i
+            response = ::JSON.parse(response.to_s)
+          else
+            response = ::Capybara::Node::Simple.new(response.to_s)
+          end
         end
 
         begin
-          @__sw_tests.each { |test| test.call(page) }
+          @__sw_tests.each { |test| test.call(response) }
         rescue ::RSpec::Expectations::ExpectationNotMetError => err
           __sw_fulfilled! if force
           raise(err)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_watcher
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Alex Genco
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - alexgenco@gmail.com
 executables: []
@@ -123,7 +123,7 @@ homepage: https://github.com/alexgenco/site_watcher
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,9 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Periodically monitor a website
 test_files: []