akamai_rspec 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95accf56ecbd5da4dea5c91a38288a6f216607d0
-  data.tar.gz: 3491425883955d90f7a0f8122cdfbbcfba5042d6
+  metadata.gz: d43da91b99bffdb375af2895ae8c06ee21ef5c2b
+  data.tar.gz: 0e2550fbd977588675e38cdeafd3c2c2d98b3fea
 SHA512:
-  metadata.gz: 2d70621b82a1a6bbb246918c824cfb99f06236ad69c5f2f36e112cd7b46be53ecc99807157b94a449956524f4213321d1657b253fae52707c7b0282036ccc137
-  data.tar.gz: 4ef55828e09f523a8bfe1e9eabeba551be6f9d5aefa317e48406819f7c24aeb596b679aa9c48415fdf45bc32a93a2801670d6cf098c89d89e4d29f6362d473e5
+  metadata.gz: 8e830785e239ca8a42dbbd2fbbad8c3f265a2de8a8c720a04dd16ad4c03fbcc2e164583aaaa80ab01d376b5f1e483cd1f0c967b211a81b8d7a39e3ab7c6f0d0f
+  data.tar.gz: 158112f7fd65328f5804e93340412f321103045bb67f3ac4772a55591318b3a3e3ddf8e82e4cc74d00ce87e63d87b9cab2c02e2824b63c84529cf09bf9876657

data/lib/akamai_rspec/matchers/matchers.rb

@@ -6,25 +6,55 @@ require_relative 'non_akamai'
 require_relative 'honour_origin_headers'
 include AkamaiHeaders
 
+X_CACHE_HEADERS = [:x_true_cache_key, :x_cache_key]
+
 RSpec::Matchers.define :be_served_from_origin do |contents|
   match do |url|
     response = RestClient::Request.responsify url
-    fail 'No X-Cache-Key header' if response.headers[:x_cache_key].nil?
-    unless response.headers[:x_cache_key] =~ /\/#{contents}\//
-      fail("x_cache_key has value '#{response.headers[:x_cache_key]}' which doesn't match '#{contents}'")
-    end
-    response.code == 200
+    return true if x_cache_headers_from_origin(response, contents)
+    missing_x_cache_error(response, contents)
+    expect(response).to be_successful
+    has_x_cache_headers(response)
   end
 end
 
 RSpec::Matchers.define :have_cp_code do |contents|
   match do |url|
     response = RestClient::Request.responsify url
-    fail 'No X-Cache-Key header' if response.headers[:x_cache_key].nil?
-    unless response.headers[:x_cache_key].include?(contents)
-      fail("x_cache_key has value '#{response.headers[:x_cache_key]}' which doesn't include '#{contents}'")
+    has_x_cache_headers(response)
+    return true if x_cache_headers_contain(response, contents)
+    missing_x_cache_error(response, contents)
+    expect(response).to be_successful
+  end
+end
+
+def has_x_cache_headers(response)
+  unless X_CACHE_HEADERS.inject(false) { |bool, header| bool || response.headers.include?(header) }
+    fail "Response does not contain the debug headers"
+  end
+end
+
+def x_cache_headers_contain(response, contents)
+  X_CACHE_HEADERS.each do |key|
+    return true if response.headers[key] && response.headers[key].include?(contents)
+  end
+  false
+end
+
+
+def x_cache_headers_from_origin(response, contents)
+  X_CACHE_HEADERS.each do |key|
+    header = response.headers[key]
+    return true if (header && header =~ /\/#{contents}\//)
+  end
+  return false
+end
+
+def missing_x_cache_error(response, contents)
+  X_CACHE_HEADERS.each do |key|
+    if (response.headers[key])
+      fail("#{key} has value '#{response.headers[key]}' which doesn't match '#{contents}'")
     end
-    response.code == 200
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akamai_rspec
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Bianca Gibson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client