akamai_rspec 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26b9891b50b16db2cb6b518794ee939ab864f9e4
-  data.tar.gz: 4c46663b9c2ba79788fc98a846c519585483f66e
+  metadata.gz: fb49bd44abd110079985c0b84fa3dcd5c5c792c0
+  data.tar.gz: 27e1ebf081198f4a3cd07401ea6c8850a901ef90
 SHA512:
-  metadata.gz: 34b3ec6371e11c316c90346745ef568192a5ef18f1ca7c5b09510f7add7cbd2fddd8699e82db4114fcc50c16878b7c8cbcaeb1a6d69c8b2704aa5b9dac96a772
-  data.tar.gz: 898b11a2d6c01868cfffd6594c6aa14521da6563711a9e223201ddc7d460dca904f233bff5a2bf039e0d562b7216cb981d5216ecb7dc9fb4926861eab4ab630d
+  metadata.gz: 66a85bda03be573909a293684fbd98cf41b221a2b3201ddbda984bc02801cda7915fa12b9f95aa89db5dd605f9c77f37427abb057e8016d0de25a470ea1f5571
+  data.tar.gz: 34c2714e8b34e4ef63e3795133fd5e9df6e9c44559a521d19410e7cb5f9f088f1fd38bc371f1aa28f36d5ab5ea877f03ecec3d80483aff82cc7025d6f63e812a

data/lib/akamai_rspec/matchers/caching.rb

@@ -1,55 +1,44 @@
 require 'rspec'
 require 'securerandom'
+require 'akamai_rspec/akamai_headers'
 
-RSpec::Matchers.define :be_cacheable do
+RSpec::Matchers.define :be_cacheable do |opts={request_count: 10}|
   match do |url|
-    response = AkamaiRSpec::Request.get url
-    x_check_cacheable(response, 'YES')
-    response.code == 200
+    responses = [1..opts[:request_count]].map { AkamaiRSpec::Request.get_with_debug_headers url }
+
+    responses.any? do |response|
+      fail("Error fetching #{url}: #{response}") if response.code != 200
+      (
+        (response.headers[:x_cache] =~ /TCP(\w+)?_HIT/) and not
+        (response.headers[:x_cache] =~ /TCP_REFRESH/)
+      )
+    end
   end
 end
 
 module RSpec::Matchers
   alias_method :be_cachable, :be_cacheable
+  alias_method :be_cached, :be_cacheable
+  define_negated_matcher :not_be_cached, :be_cached
 end
 
 RSpec::Matchers.define :have_no_cache_set do
   match do |url|
     response = AkamaiRSpec::Request.get url
     cache_control = response.headers[:cache_control]
-    fail('Cache-Control has been set') unless cache_control == 'no-cache'
-    true
+    return cache_control == 'no-cache'
   end
 end
 
-RSpec::Matchers.define :not_be_cached do
-  match do |url|
-    response = AkamaiRSpec::Request.get url
-    x_check_cacheable(response, 'NO')
-    response = AkamaiRSpec::Request.get url  # again to prevent spurious cache miss
-
-    not_cached = response.headers[:x_cache] =~ /TCP(\w+)?_MISS/
-    if not_cached
-      true
-    else
-      fail("x_cache header does not indicate an origin hit: '#{response.headers[:x_cache]}'")
-    end
-  end
-end
 
 RSpec::Matchers.define :be_tier_distributed do
   match do |url|
     response = AkamaiRSpec::Request.get_cache_miss(url)
-    tiered = !response.headers[:x_cache_remote].nil?
-    fail('No X-Cache-Remote header in response') unless tiered
-    response.code == 200 && tiered
+    @tiered = !response.headers[:x_cache_remote].nil?
+    response.code == 200 && @tiered
   end
-end
-
-def x_check_cacheable(response, should_be_cacheable)
-  x_check_cacheable = response.headers[:x_check_cacheable]
-  fail('No X-Check-Cacheable header?') if x_check_cacheable.nil?
-  unless (x_check_cacheable == should_be_cacheable)
-    fail("X-Check-Cacheable header is: #{x_check_cacheable} expected #{should_be_cacheable}")
+  description do
+    "be tier distributed (as indicated by the presence of an X-Cache-Remote header in response)"
   end
 end
+

data/lib/akamai_rspec/matchers/non_akamai.rb

@@ -1,6 +1,7 @@
 require 'rspec'
 require 'socket'
 require 'openssl'
+require 'uri'
 
 def check_ssl_serial(addr, port, url, serial)
   cert_serial = ssl_cert(addr, port, url).serial.to_s(16).upcase
@@ -40,11 +41,13 @@ end
 
 RSpec::Matchers.define :be_verifiably_secure do (verify = OpenSSL::SSL::VERIFY_PEER)
   match do |url|
+    return false if URI(url).scheme == "http"
+    url = "https://#{url}" unless URI(url).scheme
     begin
       RestClient::Request.execute(method: :get, url: url, verify_ssl: verify)
-      true
+      return true
     rescue => e
-      raise("#{url} could not be verified as secure, :sad_panda: #{e.message}")
+      return false
     end
   end
 end

data/lib/akamai_rspec/request.rb

@@ -71,7 +71,6 @@ module AkamaiRSpec
 
     def get(url, headers = {})
       if url.is_a? RestClient::Response
-        warn 'This functionality is deprecated and will be removed in the next release'
         return AkamaiRSpec::Response.new(url)
       end
 
@@ -82,9 +81,12 @@ module AkamaiRSpec
       req['Host'] = uri.hostname
       uri.hostname = @domain
 
-      response = Net::HTTP.start(uri.hostname, uri.port) do |http|
-        http.request(req, nil) { |http_response| http_response }
+      net = Net::HTTP.new(uri.hostname, uri.port)
+      if uri.scheme == 'https'
+        net.use_ssl = true
+        net.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
+      response = net.request(req, nil)
 
       AkamaiRSpec::Response.new(response)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akamai_rspec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Bianca Gibson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -28,32 +28,32 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 description: Test your akamai configuration with rspec
-email: bianca.gibson@rea-group.com
+email: cobweb@rea-group.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Test your akamai configuration with rspec