rspec-webservice_matchers 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9f1f32a80f4f1fd30f9e7ae4d6242cf4243535f
-  data.tar.gz: bf308f90fd8b6f110a4678f0f5bc45a9cb6114bf
+  metadata.gz: 3aca3e244bcc6fba59a64f758e107b9999b4a42a
+  data.tar.gz: c6168cb912525614671e2538edc946c0be787447
 SHA512:
-  metadata.gz: 0498468205c9dd6e29278c6364c5e9ae240b1e40b18e2507260fb9a1cc332936bfe5db7a3a537bc992cc9d533a905c0da36e81c7fc088e64c5b04b645b8eeeca
-  data.tar.gz: 2d02fae806afedd97717468d530cdd0861b3f92cf81aa682a07d4dd368a18223bd0dd53b83da4656293556489d8a3d077caf6dc24c82cdddc79ab07d54cc42d2
+  metadata.gz: 3d56795b8f888bf11c74e2cbc79904b0bad918e5ea99d23f8f178d86dfe3d517bf52110dfe4e0681bea82ebd496ddc8f178eb7560956911baa25753d5ae0eeb9
+  data.tar.gz: 813f7c6dbf6bd14837135163517b2233ee559dcf1516064e92f47da139f565978107620d09705ae4600735d6ee22bddb1194d5ac7cf9c4088ffedd6af558d49f

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"

data/README.md

@@ -1,5 +1,7 @@
 # RSpec::WebserviceMatchers
 
+[![Gem Version](https://badge.fury.io/rb/rspec-webservice_matchers.png)](http://badge.fury.io/rb/rspec-webservice_matchers) [![Build Status](https://travis-ci.org/dogweather/rspec-webservice_matchers.png?branch=master)](https://travis-ci.org/dogweather/rspec-webservice_matchers)
+
 This [gem](https://rubygems.org/gems/rspec-webservice_matchers) enables you to black-box test a web app's server configuration. For example, whether its SSL certificate is correctly configured and not expired. It's a tool for doing **Test Driven Devops**. (I just made that up.)
 
 This library takes a very minimalist approach: it simply adds new RSpec matchers,
@@ -19,15 +21,17 @@ These new RSpec matchers:
 -------------------------------|------------------------------------------------
 **be_status**                  |  
 **be_up**                      | Follows redirects if necessary and checks for 200
-**have_a_valid_cert**          | Uses [lib-curl](http://curl.haxx.se/libcurl/) via [Curb](https://github.com/taf2/curb) to test validity
+**have_a_valid_cert**          | 
 **enforce_https_everywhere**   | See the [EFF project](https://www.eff.org/https-everywhere)
-**redirect_permanently_to**    | Allows 301
-**redirect_temporarily_to**    | Allows 302 or 307
+**redirect_permanently_to**    | Checks for 301
+**redirect_temporarily_to**    | Checks for 302 or 307
 
 
 Example
 -------
 
+Here's an example which uses them all:
+
 ```Ruby
 require 'rspec/webservice_matchers'
 
@@ -37,11 +41,11 @@ describe 'My app' do
     it { should have_a_valid_cert }
   end
 
-  it 'serves the about page without redirects' do
+  it 'serves the "about" page without redirecting' do
     expect('http://www.myapp.com/about').to be_status 200
   end
 
-  it 'redirects to www' do
+  it 'only serves via www' do
     expect('http://myapp.com').to redirect_permanently_to 'http://www.myapp.com/'
   end
 

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec')
+
+task :default => :spec

data/lib/rspec/webservice_matchers.rb

@@ -1,5 +1,7 @@
 require 'rspec/webservice_matchers/version'
-require 'curb'
+require 'faraday'
+require 'faraday_middleware'
+require 'pry'
 
 module RSpec
   module WebserviceMatchers
@@ -12,9 +14,10 @@ module RSpec
 
       # Test by seeing if Curl retrieves without complaining
       begin
-        Curl::Easy.http_head "https://#{domain_name_or_url}"
+        conn = Faraday.new(:url => "https://#{domain_name_or_url}")
+        response = conn.head
         return true
-      rescue Curl::Err::ConnectionFailedError, Curl::Err::SSLCACertificateError, Curl::Err::SSLPeerCertificateError
+      rescue
         # Not serving SSL, expired, or incorrect domain name in certificate
         return false
       end
@@ -34,18 +37,18 @@ module RSpec
     # Pass successfully if we get a 301 to the place we intend.
     RSpec::Matchers.define :redirect_permanently_to do |expected|
       match do |url|
-        result  = Curl::Easy.http_head(url)
-        headers = RSpec::WebserviceMatchers.parse_response_headers(result)
-        result.response_code == 301 && headers['Location'] == expected
+        conn = Faraday.new(:url => url)
+        response = conn.head
+        response.status == 301 && response.headers['Location'] == expected
       end
     end    
 
     # Pass successfully if we get a 302 or 307 to the place we intend.
     RSpec::Matchers.define :redirect_temporarily_to do |expected|
       match do |url|
-        result  = Curl::Easy.http_head(url)
-        headers = RSpec::WebserviceMatchers.parse_response_headers(result)
-        [302, 307].include?(result.response_code) && headers['Location'] == expected
+        conn = Faraday.new(:url => url)
+        response = conn.head
+        [302, 307].include?(response.status) && response.headers['Location'] == expected
       end
     end    
 
@@ -55,10 +58,10 @@ module RSpec
     # 3. which is correctly configured
     RSpec::Matchers.define :enforce_https_everywhere do
       match do |domain_name|
-        result  = Curl::Easy.http_head("http://#{domain_name}")
-        headers = RSpec::WebserviceMatchers.parse_response_headers(result)
-        new_url = headers['Location']
-        (result.response_code == 301) && (/https/ === new_url) && (RSpec::WebserviceMatchers.has_valid_ssl_cert?(new_url))
+        conn     = Faraday.new(:url => "http://#{domain_name}")
+        response = conn.head
+        new_url  = response.headers['Location']
+        (response.status == 301) && (/https/ === new_url) && (RSpec::WebserviceMatchers.has_valid_ssl_cert?(new_url))
       end
     end   
 
@@ -66,17 +69,24 @@ module RSpec
     # Codes are defined in http://www.rfc-editor.org/rfc/rfc2616.txt
     RSpec::Matchers.define :be_status do |expected|
       match do |url_or_domain_name|
-        url    = RSpec::WebserviceMatchers.make_url(url_or_domain_name)
-        result = Curl::Easy.http_head(url)
-        (result.response_code == expected.to_i)
+        url      = RSpec::WebserviceMatchers.make_url(url_or_domain_name)
+        conn     = Faraday.new(:url => url)
+        response = conn.head
+        response.status == expected
       end
     end
 
+    #Pass when the response code is 200, following redirects
+    #if necessary.
     RSpec::Matchers.define :be_up do
       match do |url_or_domain_name|        
-        url    = RSpec::WebserviceMatchers.make_url(url_or_domain_name)
-        result = Curl::Easy.http_head(url) { |curl| curl.follow_location = true }
-        (result.response_code == 200)
+        url  = RSpec::WebserviceMatchers.make_url(url_or_domain_name)
+        conn = Faraday.new(url) do |c|
+          c.use FaradayMiddleware::FollowRedirects, limit: 5
+          c.adapter :net_http
+        end
+        response = conn.head
+        response.status == 200
       end
     end
 
@@ -93,20 +103,5 @@ module RSpec
       end
     end
 
-
-    # Return a hash of response headers from the
-    # given curl result.
-    # TODO: Submit as a pull request to the Curb gem.
-    def self.parse_response_headers(curl_result)
-      header_lines = curl_result.head.split("\r\n")
-      header_lines.delete_at(0) # The first reponse header is in another format and already parsed.
-      response_headers = {}
-      header_lines.each do |line|
-        key, value = line.split(': ')
-        response_headers[key] = value
-      end
-      return response_headers
-    end
-
   end
 end

data/lib/rspec/webservice_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module WebserviceMatchers
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/rspec-webservice_matchers.gemspec

@@ -20,7 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "pry"
 
-  spec.add_runtime_dependency 'curb',  '~> 0.8'
   spec.add_runtime_dependency 'rspec', '~> 2'
+  spec.add_runtime_dependency 'faraday'
+  spec.add_runtime_dependency 'faraday_middleware'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-webservice_matchers
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Robb Shecter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  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: faraday_middleware
+  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'
 description: Black-box web app configuration testing
 email:
 - robb@weblaws.org
@@ -74,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md