rspec-webservice_matchers 4.9.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f930e26ec837ba1ca066f2a911608b5c58edfc09
-  data.tar.gz: 0c2be7eae06450c998838d3e1530421ee9dcb6b2
+  metadata.gz: 03bc4ee87b606016d8853436df80b164d0f4f5f4
+  data.tar.gz: 0429080abde8b75215e9ce6700e7ed6c84620a38
 SHA512:
-  metadata.gz: 702e17e06e648086ce8c75c2838eb3997a7d44ccb741af282d22b46785fc5d44862966713e788c54acbe908f2290469fb170754c0fec303b8218dab3bfa7197b
-  data.tar.gz: 88be96f4ae2de62c765bb0a9fd6bc621e0024b6513ba945700922adeb4e76031f9b3e9ab04e9ed1247cb928bf305ee335679a4c9a96128245e44ab721c7c6ec6
+  metadata.gz: 7bdddc6c091db3c310fc7ded0457a1655d9c8cc8f2fff3fbe788c91601f74d81b35a19ff62930d36c3f4843621853fa4d693e0e6648bb219fd4346abdf9bd70e
+  data.tar.gz: 6e4f6b04be911e8a6f55898dcc78bc8ea8497d82978b3f9cf387cccbeb1dd447eb9ebf93565ca37db845d6902924a347227152cf6b13c600e435b5af50ce5d5f

data/HISTORY.md

@@ -1,3 +1,7 @@
+4.10.0
+------
+Refactoring lower-level code into new namespace.
+
 4.9.0
 -----
 Adds new API for `be_fast`.

data/lib/rspec/webservice_matchers/be_fast.rb

@@ -1,59 +1,15 @@
 # frozen_string_literal: true
-require 'cgi'
-require 'json'
 require 'rspec/matchers'
-require 'rspec/webservice_matchers/util'
-require 'validated_object'
+require 'web_test/be_fast'
 
 module RSpec
   module WebserviceMatchers
     module BeFast
-
-      class TestResult < ValidatedObject::Base
-        attr_accessor :success, :score
-        alias success? success
-
-        validates :success, inclusion: [true, false]
-        validates :score, inclusion: (0..100)
-      end
-
-
-      def self.parse(json:)
-        response = JSON.parse(json)
-        unless response.key?('ruleGroups')
-          raise "Couldn't parse the PageSpeed response: #{response.inspect}"
-        end
-        score = response.fetch('ruleGroups').fetch('SPEED').fetch('score')
-        { score: score }
-      end
-
-      def self.page_speed_score(url:)
-        url_param = CGI.escape(Util.make_url(url))
-        key       = ENV['WEBSERVICE_MATCHER_INSIGHTS_KEY']
-        if key.nil?
-          raise 'be_fast requires the WEBSERVICE_MATCHER_INSIGHTS_KEY '\
-                'environment variable to be set to a Google PageSpeed '\
-                'Insights API key.'
-        end
-        endpoint  = 'https://www.googleapis.com/pagespeedonline/v2/runPagespeed'
-        api_url   = "#{endpoint}?url=#{url_param}&screenshot=false&key=#{key}"
-        response = Faraday.get(api_url)
-        BeFast.parse(json: response.body).fetch(:score)
-      end
-
-      def self.test(url:)
-        TestResult.new do |r|
-          r.score   = BeFast.page_speed_score(url: url)
-          r.success = r.score >= 85
-        end
-      end
-
-
       RSpec::Matchers.define :be_fast do
         score = nil
 
         match do |url|
-          result = BeFast.test(url: url)
+          result = WebTest::BeFast.test(url: url)
           score = result.score
           result.success?
         end

data/lib/rspec/webservice_matchers/be_status.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'rspec/webservice_matchers/util'
+require 'web_test/util'
+
 
 module RSpec
   module WebserviceMatchers
@@ -10,7 +11,7 @@ module RSpec
         actual_code = nil
         
         match do |url_or_domain_name|
-          actual_code = Util.status(url_or_domain_name)
+          actual_code = WebTest::Util.status(url_or_domain_name)
           actual_code == expected_code.to_i
         end
         

data/lib/rspec/webservice_matchers/be_up.rb

@@ -1,37 +1,16 @@
 # frozen_string_literal: true
 require 'rspec/matchers'
-require 'rspec/webservice_matchers/util'
-require 'validated_object'
+require 'web_test/be_up'
 
 # Pass when the response code is 200, following redirects if necessary.
 module RSpec
   module WebserviceMatchers
     module BeUp
-
-      class TestResult < ValidatedObject::Base
-        attr_accessor :success, :status_code
-        alias success? success
-
-        validates :success,     inclusion: [true, false]
-        validates :status_code, inclusion: 100..510
-      end
-
-
-      def self.test(url:nil, domain:nil)
-        raise 'Must specify a url or domain' if url.nil? && domain.nil?
-
-        TestResult.new do |r|
-          r.status_code = Util.status(url || domain, follow: true)
-          r.success =     (r.status_code == 200)
-        end
-      end
-
-
       RSpec::Matchers.define :be_up do
         status = nil
 
         match do |url_or_domain_name|
-          result = BeUp.test(url: url_or_domain_name)
+          result = WebTest::BeUp.test(url: url_or_domain_name)
           status = result.status_code
           result.success?
         end
@@ -40,7 +19,6 @@ module RSpec
           "Received status #{status}"
         end
       end
-
     end
   end
 end

data/lib/rspec/webservice_matchers/enforce_https_everywhere.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'faraday'
-require 'rspec/webservice_matchers/util'
+require 'web_test/util'
+
 require 'rspec/webservice_matchers/redirect_helpers'
 
 module RSpec
@@ -17,7 +18,7 @@ module RSpec
         match do |domain_name|
           begin
             status, new_url, final_protocol = get_info(domain_name)
-            meets_expectations?(status, final_protocol, Util.valid_cert?(new_url))
+            meets_expectations?(status, final_protocol, WebTest::Util.valid_cert?(new_url))
           rescue Faraday::Error::ConnectionFailed
             error_msg = 'Connection failed'
             false
@@ -25,7 +26,7 @@ module RSpec
         end
 
         def get_info(domain_name)
-          status, headers = Util.head(domain_name)
+          status, headers = WebTest::Util.head(domain_name)
           location = headers['location']
           /^(https?)/ =~ location
           protocol = Regexp.last_match(1) || nil
@@ -51,7 +52,7 @@ module RSpec
             errors << "destination uses protocol #{protocol.upcase}"
           end
           errors << "there's no valid SSL certificate" unless cert_is_valid
-          Util.error_message(errors)
+          WebTest::Util.error_message(errors)
         end
       end
     end

data/lib/rspec/webservice_matchers/have_a_valid_cert.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'rspec/webservice_matchers/util'
+require 'web_test/util'
+
 require 'rspec/matchers'
 
 module RSpec
@@ -11,7 +12,7 @@ module RSpec
 
         match do |domain_name_or_url|
           begin
-            Util.try_ssl_connection(domain_name_or_url)
+            WebTest::Util.try_ssl_connection(domain_name_or_url)
           rescue Exception => e
             error_message = fix_for_excon_bug(e.message)
             false

data/lib/rspec/webservice_matchers/redirect_helpers.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
-require 'rspec/webservice_matchers/util'
+require 'web_test/util'
+
 
 module RSpec
   module WebserviceMatchers
     module RedirectHelpers
       def redirect_failure_message(exception, status, actual_location, kind)
-        return Util.error_message(exception) if exception
+        return WebTest::Util.error_message(exception) if exception
 
         errors = []
         if redirect? status
@@ -19,7 +20,7 @@ module RSpec
           errors << "not a redirect: received status #{status}"
         end
 
-        Util.error_message(errors)
+        WebTest::Util.error_message(errors)
       end
 
       def redirects_correctly?(status, actual_loc, expected_loc, kind)
@@ -27,7 +28,7 @@ module RSpec
       end
 
       def redirect_result(url_or_domain_name)
-        status, headers = Util.head(url_or_domain_name)
+        status, headers = WebTest::Util.head(url_or_domain_name)
         [status, headers['location']]
       end
 

data/lib/rspec/webservice_matchers/redirect_permanently_to.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'rspec/webservice_matchers/util'
+require 'web_test/util'
+
 require 'rspec/webservice_matchers/redirect_helpers'
 
 module RSpec

data/lib/rspec/webservice_matchers/redirect_temporarily_to.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'rspec/webservice_matchers/util'
+require 'web_test/util'
+
 require 'rspec/webservice_matchers/redirect_helpers'
 
 module RSpec

data/lib/rspec/webservice_matchers/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module RSpec
   module WebserviceMatchers
-    VERSION = '4.9.0'
+    VERSION = '4.10.0'
   end
 end

data/lib/web_test/be_fast.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+require 'cgi'
+require 'json'
+require 'validated_object'
+require 'web_test/util'
+
+module WebTest
+  module BeFast
+    class TestResult < ValidatedObject::Base
+      attr_accessor :success, :score
+      alias success? success
+
+      validates :success, inclusion: [true, false]
+      validates :score,   inclusion: 0..100
+    end
+
+
+    def self.parse(json:)
+      response = JSON.parse(json)
+      unless response.key?('ruleGroups')
+        raise "Couldn't parse the PageSpeed response: #{response.inspect}"
+      end
+      score = response.fetch('ruleGroups').fetch('SPEED').fetch('score')
+      { score: score }
+    end
+
+    def self.page_speed_score(url:)
+      url_param = CGI.escape(WebTest::Util.make_url(url))
+      key       = ENV['WEBSERVICE_MATCHER_INSIGHTS_KEY']
+      if key.nil?
+        raise 'be_fast requires the WEBSERVICE_MATCHER_INSIGHTS_KEY '\
+              'environment variable to be set to a Google PageSpeed '\
+              'Insights API key.'
+      end
+      endpoint  = 'https://www.googleapis.com/pagespeedonline/v2/runPagespeed'
+      api_url   = "#{endpoint}?url=#{url_param}&screenshot=false&key=#{key}"
+      response = Faraday.get(api_url)
+      BeFast.parse(json: response.body).fetch(:score)
+    end
+
+    def self.test(url:)
+      TestResult.new do |r|
+        r.score   = BeFast.page_speed_score(url: url)
+        r.success = r.score >= 85
+      end
+    end
+  end
+end

data/lib/web_test/be_up.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+require 'validated_object'
+require 'web_test/util'
+
+module WebTest
+  module BeUp
+    class TestResult < ValidatedObject::Base
+      attr_accessor :success, :status_code
+      alias success? success
+
+      validates :success,     inclusion: [true, false]
+      validates :status_code, inclusion: 100..510
+    end
+
+
+    def self.test(url:nil, domain:nil)
+      raise 'Must specify a url or domain' if url.nil? && domain.nil?
+
+      TestResult.new do |r|
+        r.status_code = WebTest::Util.status(url || domain, follow: true)
+        r.success     = (r.status_code == 200)
+      end
+    end
+  end
+end

data/lib/web_test/util.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+require 'faraday'
+require 'faraday_middleware'
+
+TIMEOUT_IN_SECONDS      = 5
+OPEN_TIMEOUT_IN_SECONDS = 5
+
+module WebTest
+  module Util
+    def self.error_message(errors)
+      return errors.message if errors.respond_to?(:message)
+
+      errors
+        .map(&:to_s)
+        .join('; ')
+        .capitalize
+    end
+
+    def self.status(url_or_domain_name, follow: false)
+      code = head(url_or_domain_name, follow: follow)[0]
+      return code if code != 405
+      get(url_or_domain_name, follow: follow)[0]
+    end
+
+    def self.head(url_or_domain_name, follow: false)
+      request(:head, url_or_domain_name, follow: follow)
+    end
+
+    def self.get(url_or_domain_name, follow: false)
+      request(:get, url_or_domain_name, follow: follow)
+    end
+
+    def self.request(method, url_or_domain_name, follow: false)
+      url = make_url(url_or_domain_name)
+      response = recheck_on_timeout { connection(follow: follow).send(method, url) }
+      [response.status, response.headers]
+    end
+
+    # @return true if the given page has status 200,
+    # and follow a few redirects if necessary.
+    def self.up?(url_or_domain_name)
+      url  = make_url(url_or_domain_name)
+      conn = connection(follow: true)
+      response = recheck_on_timeout { conn.head(url) }
+      response.status == 200
+    end
+
+    def self.valid_cert?(domain_name_or_url)
+      try_ssl_connection(domain_name_or_url)
+      true
+    rescue
+      # Not serving SSL, expired, or incorrect domain name in certificate
+      false
+    end
+
+    def self.try_ssl_connection(domain_name_or_url)
+      url = "https://#{remove_protocol(domain_name_or_url)}"
+      recheck_on_timeout { connection.head(url) }
+      true
+    end
+
+    # private
+
+    def self.connection(follow: false)
+      Faraday.new do |c|
+        c.options[:timeout] = TIMEOUT_IN_SECONDS
+        c.options[:open_timeout] = OPEN_TIMEOUT_IN_SECONDS
+        c.use(FaradayMiddleware::FollowRedirects, limit: 4) if follow
+        c.adapter :net_http
+      end
+    end
+
+    # Ensure that the given string is a URL,
+    # making it into one if necessary.
+    def self.make_url(url_or_domain_name)
+      if %r{^https?://} =~ url_or_domain_name
+        url_or_domain_name
+      else
+        "http://#{url_or_domain_name}"
+      end
+    end
+
+    # Normalize the input: remove 'http(s)://' if it's there
+    def self.remove_protocol(domain_name_or_url)
+      %r{^https?://(?<name>.+)$} =~ domain_name_or_url
+      name || domain_name_or_url
+    end
+
+    def self.recheck_on_timeout
+      yield
+    rescue Faraday::Error::TimeoutError
+      yield
+    end
+  end
+end

data/rspec-webservice_matchers.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |spec|
   spec.license     = 'MIT'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.1.0'
 
@@ -27,7 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec_junit_formatter', '0.2.2'
   spec.add_development_dependency 'webmock'
 
-  spec.add_runtime_dependency 'rspec', '~> 3.0'
+  spec.add_runtime_dependency 'rspec-core', '~> 3.0'
+  spec.add_runtime_dependency 'rspec-expectations', '~> 3.0'
   spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'faraday_middleware'
   spec.add_runtime_dependency 'validated_object'

data/spec/rspec/webservice_matchers/page_speed_spec.rb

@@ -3,19 +3,12 @@
 
 require 'spec_helper'
 require 'rspec/webservice_matchers'
-require 'rspec/webservice_matchers/util'
+require 'web_test/util'
+
 
 SAMPLE_JSON_RESPONSE = 'spec/fixtures/pagespeed.json'
 
 describe RSpec::WebserviceMatchers::BeFast do
-  describe '#parse' do
-    it 'can parse the overall score' do
-      api_response = File.read(SAMPLE_JSON_RESPONSE)
-      data = RSpec::WebserviceMatchers::BeFast.parse(json: api_response)
-      expect(data[:score]).to eq(85)
-    end
-  end
-
   describe '#be_fast' do
     it 'performs a Google PageSpeed Insights API query on a fast site' do
       expect('nonstop.qa').to be_fast

data/spec/rspec/webservice_matchers/{protcol_spec.rb → protocol_spec.rb}

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 require 'spec_helper'
 require 'rspec/webservice_matchers'
-require 'rspec/webservice_matchers/util'
+require 'web_test/util'
+
 
 describe 'be_status' do
   it 'can check 200 for successful resource requests' do
@@ -50,7 +51,7 @@ describe 'be_up' do
   end
 
   it 'is available via a public API' do
-    status = RSpec::WebserviceMatchers::Util.up?('http://www.website.com/')
+    status = WebTest::Util.up?('http://www.website.com/')
     expect(status).to be true
   end
 

data/spec/rspec/webservice_matchers/public_api_spec.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 require 'spec_helper'
-require 'rspec/webservice_matchers/util'
+require 'web_test/util'
+
 include RSpec::WebserviceMatchers
 
 describe '#up?' do
   it 'follows redirects when necessary' do
-    expect(Util.up?('perm-redirector.com')).to be_truthy
-    expect(Util.up?('temp-redirector.org')).to be_truthy
+    expect(WebTest::Util.up?('perm-redirector.com')).to be_truthy
+    expect(WebTest::Util.up?('temp-redirector.org')).to be_truthy
   end
 
   it 'retries timeout errors once' do
-    expect(Util.up?('http://www.timeout-once.com')).to be_truthy
+    expect(WebTest::Util.up?('http://www.timeout-once.com')).to be_truthy
   end
 end

data/spec/web_test/be_fast_spec.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+require 'web_test/be_fast'
+
+RSpec.describe WebTest::BeFast do
+  it { is_expected.not_to be_nil }
+
+  describe '#test' do
+    it 'handles a fast site' do
+      result = WebTest::BeFast.test url: 'http://nonstop.qa'
+      expect(result.success?).to be true
+      expect(result.score).to be >= 85
+    end
+  end
+
+  describe '#parse' do
+    it 'can parse the overall score' do
+      api_response = File.read(SAMPLE_JSON_RESPONSE)
+      data = WebTest::BeFast.parse json: api_response
+      expect(data[:score]).to eq 85
+    end
+  end
+
+  describe WebTest::BeFast::TestResult do
+    it 'requires :success' do
+      expect do
+        WebTest::BeFast::TestResult.new {}
+      end.to raise_error(ArgumentError, /success/i)
+    end
+
+    it 'requires :score' do
+      expect do
+        WebTest::BeFast::TestResult.new { |r| r.success = true }
+      end.to raise_error(ArgumentError, /score/i)
+    end
+  end
+end

data/spec/web_test/be_up_spec.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'web_test/be_up'
+
+RSpec.describe WebTest::BeUp do
+  it { is_expected.not_to be_nil }
+
+  describe '#test' do
+    it 'handles a simple 200' do
+      result = WebTest::BeUp.test url: 'http://www.website.com/'
+      expect(result.success?).to be true
+      expect(result.status_code).to be 200
+    end
+
+    it 'handles a simple 200 as a domain' do
+      result = WebTest::BeUp.test domain: 'www.website.com'
+      expect(result.success?).to be true
+      expect(result.status_code).to be 200
+    end
+
+    it 'handles a 404' do
+      result = WebTest::BeUp.test url: 'http://notfound.com/no.txt'
+      expect(result.success?).to be false
+      expect(result.status_code).to be 404
+    end
+  end
+
+  describe WebTest::BeUp::TestResult do
+    it 'requires :success' do
+      expect do
+        WebTest::BeUp::TestResult.new { |r| r.status_code = 200 }
+      end.to raise_error(ArgumentError)
+    end
+
+    it 'requires :status_code' do
+      expect do
+        WebTest::BeUp::TestResult.new { |r| r.success = true }
+      end.to raise_error(ArgumentError)
+    end
+
+    it 'accepts boolean :success & integer :status_code' do
+      result = WebTest::BeUp::TestResult.new do |r|
+        r.status_code = 404
+        r.success = false
+      end
+      expect(result).to be_an_instance_of(WebTest::BeUp::TestResult)
+    end
+
+    it 'requires boolean :success' do
+      expect do
+        WebTest::BeUp::TestResult.new do |r|
+          r.status_code = 200
+          r.success = 1
+        end
+      end.to raise_error(ArgumentError)
+    end
+
+    it 'requires integer :status_code' do
+      expect do
+        WebTest::BeUp::TestResult.new do |r|
+          r.status_code = '404'
+          r.success = false
+        end
+      end.to raise_error(ArgumentError)
+    end
+
+    it 'cannot have status < 100' do
+      expect do
+        WebTest::BeUp::TestResult.new do |r|
+          r.status_code = -5
+          r.success = false
+        end
+      end.to raise_error(ArgumentError)
+    end
+
+    it 'cannot have status > 510' do
+      expect do
+        WebTest::BeUp::TestResult.new do |r|
+          r.status_code = 511
+          r.success = false
+        end
+      end.to raise_error(ArgumentError)
+    end
+
+    it 'allows status 510' do
+      result = WebTest::BeUp::TestResult.new do |r|
+        r.status_code = 510
+        r.success = false
+      end
+      expect(result).to be_an_instance_of(WebTest::BeUp::TestResult)
+    end
+  end
+end

data/spec/web_test/util_spec.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+require 'web_test/util'
+
+RSpec.describe WebTest::Util do
+  it { is_expected.not_to be_nil }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-webservice_matchers
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.10.0
 platform: ruby
 authors:
 - Robb Shecter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -173,18 +187,21 @@ files:
 - lib/rspec/webservice_matchers/redirect_helpers.rb
 - lib/rspec/webservice_matchers/redirect_permanently_to.rb
 - lib/rspec/webservice_matchers/redirect_temporarily_to.rb
-- lib/rspec/webservice_matchers/util.rb
 - lib/rspec/webservice_matchers/version.rb
+- lib/web_test/be_fast.rb
+- lib/web_test/be_up.rb
+- lib/web_test/util.rb
 - rspec-webservice_matchers.gemspec
 - spec/fixtures/pagespeed.json
-- spec/rspec/webservice_matchers/be_fast_spec.rb
-- spec/rspec/webservice_matchers/be_up_spec.rb
 - spec/rspec/webservice_matchers/page_speed_spec.rb
-- spec/rspec/webservice_matchers/protcol_spec.rb
+- spec/rspec/webservice_matchers/protocol_spec.rb
 - spec/rspec/webservice_matchers/public_api_spec.rb
 - spec/rspec/webservice_matchers/redirect_spec.rb
 - spec/rspec/webservice_matchers/ssl_spec.rb
 - spec/spec_helper.rb
+- spec/web_test/be_fast_spec.rb
+- spec/web_test/be_up_spec.rb
+- spec/web_test/util_spec.rb
 homepage: https://github.com/dogweather/rspec-webservice_matchers
 licenses:
 - MIT
@@ -205,17 +222,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Black-box web app configuration testing
 test_files:
 - spec/fixtures/pagespeed.json
-- spec/rspec/webservice_matchers/be_fast_spec.rb
-- spec/rspec/webservice_matchers/be_up_spec.rb
 - spec/rspec/webservice_matchers/page_speed_spec.rb
-- spec/rspec/webservice_matchers/protcol_spec.rb
+- spec/rspec/webservice_matchers/protocol_spec.rb
 - spec/rspec/webservice_matchers/public_api_spec.rb
 - spec/rspec/webservice_matchers/redirect_spec.rb
 - spec/rspec/webservice_matchers/ssl_spec.rb
 - spec/spec_helper.rb
+- spec/web_test/be_fast_spec.rb
+- spec/web_test/be_up_spec.rb
+- spec/web_test/util_spec.rb

data/lib/rspec/webservice_matchers/util.rb

@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-require 'faraday'
-require 'faraday_middleware'
-
-TIMEOUT_IN_SECONDS      = 5
-OPEN_TIMEOUT_IN_SECONDS = 5
-
-module RSpec
-  module WebserviceMatchers
-    module Util
-      def self.error_message(errors)
-        return errors.message if errors.respond_to?(:message)
-
-        errors
-          .map(&:to_s)
-          .join('; ')
-          .capitalize
-      end
-
-      def self.status(url_or_domain_name, follow: false)
-        code = head(url_or_domain_name, follow: follow)[0]
-        return code if code != 405
-        get(url_or_domain_name, follow: follow)[0]
-      end
-
-      def self.head(url_or_domain_name, follow: false)
-        request(:head, url_or_domain_name, follow: follow)
-      end
-
-      def self.get(url_or_domain_name, follow: false)
-        request(:get, url_or_domain_name, follow: follow)
-      end
-
-      def self.request(method, url_or_domain_name, follow: false)
-        url = make_url(url_or_domain_name)
-        response = recheck_on_timeout { connection(follow: follow).send(method, url) }
-        [response.status, response.headers]
-      end
-
-      # @return true if the given page has status 200,
-      # and follow a few redirects if necessary.
-      def self.up?(url_or_domain_name)
-        url  = make_url(url_or_domain_name)
-        conn = connection(follow: true)
-        response = recheck_on_timeout { conn.head(url) }
-        response.status == 200
-      end
-
-      def self.valid_cert?(domain_name_or_url)
-        try_ssl_connection(domain_name_or_url)
-        true
-      rescue
-        # Not serving SSL, expired, or incorrect domain name in certificate
-        false
-      end
-
-      def self.try_ssl_connection(domain_name_or_url)
-        url = "https://#{remove_protocol(domain_name_or_url)}"
-        recheck_on_timeout { connection.head(url) }
-        true
-      end
-
-      # private
-
-      def self.connection(follow: false)
-        Faraday.new do |c|
-          c.options[:timeout] = TIMEOUT_IN_SECONDS
-          c.options[:open_timeout] = OPEN_TIMEOUT_IN_SECONDS
-          c.use(FaradayMiddleware::FollowRedirects, limit: 4) if follow
-          c.adapter :net_http
-        end
-      end
-
-      # Ensure that the given string is a URL,
-      # making it into one if necessary.
-      def self.make_url(url_or_domain_name)
-        if %r{^https?://} =~ url_or_domain_name
-          url_or_domain_name
-        else
-          "http://#{url_or_domain_name}"
-        end
-      end
-
-      # Normalize the input: remove 'http(s)://' if it's there
-      def self.remove_protocol(domain_name_or_url)
-        %r{^https?://(?<name>.+)$} =~ domain_name_or_url
-        name || domain_name_or_url
-      end
-
-      def self.recheck_on_timeout
-        yield
-      rescue Faraday::Error::TimeoutError
-        yield
-      end
-    end
-  end
-end

data/spec/rspec/webservice_matchers/be_fast_spec.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-require 'rspec/webservice_matchers/be_fast'
-include RSpec::WebserviceMatchers
-
-describe BeFast do
-  describe BeFast::TestResult do
-    it 'requires :success' do
-      expect {
-        BeFast::TestResult.new {}
-      }.to raise_error(ArgumentError, /success/i)
-    end
-
-    it 'requires :score' do
-      expect {
-        BeFast::TestResult.new { |r| r.success = true }
-      }.to raise_error(ArgumentError, /score/i)
-    end
-  end
-
-  describe '#test' do
-    it 'handles a fast site' do
-      result = BeFast.test url: 'http://nonstop.qa'
-      expect( result.success? ).to be true
-      expect( result.score    ).to be >= 85
-    end
-  end
-end

data/spec/rspec/webservice_matchers/be_up_spec.rb

@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-require 'rspec/webservice_matchers/be_up'
-
-include RSpec::WebserviceMatchers
-
-describe BeUp do
-  describe '#test' do
-    it 'handles a simple 200' do
-      result = BeUp.test url: 'http://www.website.com/'
-      expect( result.success?    ).to be true
-      expect( result.status_code ).to be 200
-    end
-
-    it 'handles a simple 200 as a domain' do
-      result = BeUp.test domain: 'www.website.com'
-      expect( result.success?    ).to be true
-      expect( result.status_code ).to be 200
-    end
-
-    it 'handles a 404' do
-      result = BeUp.test url: 'http://notfound.com/no.txt'
-      expect( result.success?    ).to be false
-      expect( result.status_code ).to be 404
-    end
-  end
-
-
-  describe BeUp::TestResult do
-    it 'requires :success' do
-      expect {
-        BeUp::TestResult.new { |r| r.status_code = 200 }
-      }.to raise_error(ArgumentError)
-    end
-
-    it 'requires :status_code' do
-      expect {
-        BeUp::TestResult.new { |r| r.success = true }
-      }.to raise_error(ArgumentError)
-    end
-
-    it 'accepts boolean :success & integer :status_code' do
-      result = BeUp::TestResult.new do |r|
-        r.status_code = 404
-        r.success = false
-      end
-      expect( result ).to be_an_instance_of(BeUp::TestResult)
-    end
-
-    it 'requires boolean :success' do
-      expect {
-        BeUp::TestResult.new do |r|
-          r.status_code = 200
-          r.success = 1
-        end
-      }.to raise_error(ArgumentError)
-    end
-
-    it 'requires integer :status_code' do
-      expect {
-        BeUp::TestResult.new do |r|
-          r.status_code = '404'
-          r.success = false
-        end
-      }.to raise_error(ArgumentError)
-    end
-
-    it 'cannot have status < 100' do
-      expect {
-        BeUp::TestResult.new do |r|
-          r.status_code = -5
-          r.success = false
-        end
-      }.to raise_error(ArgumentError)
-    end
-
-    it 'cannot have status > 510' do
-      expect {
-        BeUp::TestResult.new do |r|
-          r.status_code = 511
-          r.success = false
-        end
-      }.to raise_error(ArgumentError)
-    end
-
-    it 'allows status 510' do
-      result = BeUp::TestResult.new do |r|
-        r.status_code = 510
-        r.success = false
-      end
-      expect( result ).to be_an_instance_of(BeUp::TestResult)
-    end
-  end
-end