site_watcher 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea3cfe2850109db82c2266644fcc33cdbc566bd2
-  data.tar.gz: 8527bef8d97dc2010151c7ebd554625b03345a46
+SHA256:
+  metadata.gz: cfa1a2dfba58f7bc84fbcba7db6a696b160688f7f1fe975f69186b7dd026a1c2
+  data.tar.gz: 3480fda5101368505953fba89458fb56d04cb3c78ebabd43ce5387ed89fd02cc
 SHA512:
-  metadata.gz: 81c88964d9a96b186ffb7744a808c1046886fd4fbb8f5c4e1b9a20e2e6628b1bf5ba223b95208dcb9aaf24a56b73ed55bcebd2295513e1132ee94c15375291eb
-  data.tar.gz: 83668aa2bf42d9f9067a1c73b77cc4b24c494a9212457efd81e6470082c636a06c45e6cfe9e363404d946a480d7fb60d97056231a0c85b6624773f8925bac895
+  metadata.gz: 03aada920765c224b9776d357f8edebcd00e0a299af52cd91eb7ab4802a3918ac58f26ceee361f006d5af51d40f9580ee3d501ca9a9a50a0882460a774b5b657
+  data.tar.gz: b2930dc82e888aba5764ab8bbf4cb29c82ce7ab7eaf044904e8c4d5ee8528ef06c04af58a86f9ee6550af42a8a622cacfb4ece5705234ffb2ce6395043452012

data/README.md

@@ -49,6 +49,8 @@ end
 
 This script will block until all expectations have been fulfilled and removed. Using `remove_on_fulfillment false` will cause it to block indefinitely.
 
+See [integration specs](spec/integration/watch_spec.rb) for more up-to-date usage examples.
+
 ## Testing fulfillment
 
 You can force a `SiteWatcher.watch` process to run each of its `fulfilled` blocks by sending it the `USR1` signal. The process will continue to run as normal after each block has been called.

data/lib/site_watcher.rb

@@ -1,10 +1,10 @@
 require "site_watcher/version"
 
 require "capybara"
-require "rspec/expectations"
-require "open-uri"
+require "http"
 require "json"
 require "logger"
+require "rspec/expectations"
 
 class SiteWatcher
   def self.watch(opts={}, &block)
@@ -15,11 +15,20 @@ class SiteWatcher
 
     delay = opts.fetch(:every, 5)
     logger = opts.fetch(:logger, ::Logger.new($stderr))
-    new(dsl.__sw_pages, delay, logger).watch
+
+    new(
+      dsl.__sw_before_hooks,
+      dsl.__sw_pages,
+      dsl.__sw_after_hooks,
+      delay,
+      logger
+    ).watch
   end
 
-  def initialize(pages, delay, logger)
+  def initialize(before_hooks, pages, after_hooks, delay, logger)
+    @before_hooks = before_hooks
     @pages = pages
+    @after_hooks = after_hooks
     @delay = delay
     @logger = logger
     @force = false
@@ -61,22 +70,35 @@ class SiteWatcher
       @force = true
     end
 
+    @before_hooks.each(&:call)
     yield
   ensure
     ::Signal.trap(:INT, "DEFAULT")
     ::Signal.trap(:USR1, "DEFAULT")
+
+    @after_hooks.each(&:call)
   end
 
   module DSL
     class Top
-      attr_reader :__sw_pages
+      attr_reader :__sw_pages, :__sw_before_hooks, :__sw_after_hooks
 
       def initialize
         @__sw_pages = []
+        @__sw_before_hooks = []
+        @__sw_after_hooks = []
+      end
+
+      def before(&block)
+        @__sw_before_hooks << block
+      end
+
+      def after(&block)
+        @__sw_after_hooks << block
       end
 
-      def page(url, &block)
-        page = Page.new(url)
+      def page(url, **opts, &block)
+        page = Page.new(url, **opts)
         page.instance_eval(&block)
         @__sw_pages << page
       end
@@ -86,9 +108,13 @@ class SiteWatcher
       include ::RSpec::Matchers
       attr_reader :__sw_url, :__sw_remove_on_fulfillment
 
-      def initialize(url)
+      def initialize(url, method: :get, headers: {}, **opts)
         @__sw_url = url
         @__sw_tests = []
+        @__sw_method = method
+        @__sw_headers = headers
+        @__sw_http_opts = opts
+        @__sw_fulfilled = nil
         @__sw_remove_on_fulfillment = true
       end
 
@@ -100,28 +126,42 @@ class SiteWatcher
         @__sw_fulfilled = block
       end
 
+      def headers(hash)
+        @__sw_headers = hash
+      end
+
+      def http_method(http_method)
+        @__sw_http_method = http_method
+      end
+
+      def body(body)
+        @__sw_body = body
+      end
+
       def remove_on_fulfillment(bool)
         @__sw_remove_on_fulfillment = !!bool
       end
 
       def __sw_run!(force=false)
-        ::OpenURI.open_uri(@__sw_url) do |response|
-          case response.content_type
-          when /json/i
-            page = ::JSON.parse(response.read)
-          else
-            page = ::Capybara::Node::Simple.new(response.read)
-          end
-
-          begin
-            @__sw_tests.each { |test| test.call(page) }
-          rescue ::RSpec::Expectations::ExpectationNotMetError => err
-            __sw_fulfilled! if force
-            raise(err)
-          end
+        response = ::HTTP
+          .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)
+        else
+          page = ::Capybara::Node::Simple.new(response.to_s)
+        end
 
-          __sw_fulfilled!
+        begin
+          @__sw_tests.each { |test| test.call(page) }
+        rescue ::RSpec::Expectations::ExpectationNotMetError => err
+          __sw_fulfilled! if force
+          raise(err)
         end
+
+        __sw_fulfilled!
       end
 
       private

data/lib/site_watcher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_watcher
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Genco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !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'
 description: 
 email:
 - alexgenco@gmail.com
@@ -111,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Periodically monitor a website