akamai_rspec 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7d0d25f07249dc9449d8745ef64bdff88179da
-  data.tar.gz: 6c792c083bc7ba702842035d68e202f81219f07a
+  metadata.gz: b838b063b3c410a172becfed5baf405a63f1a8ce
+  data.tar.gz: 9a3f78d72d254edf06b87eae7336b1f3a764a67f
 SHA512:
-  metadata.gz: f7b7382b0992947fa6f30dbedc42487b1441c9182f571a236db3653288b21ba8b6640b7b316a6a04db185090a747c23847eac94686cbc154998d9a4e388d57b8
-  data.tar.gz: cb95c3ca5e7ea8610201ccce9307a01d74336fc0db3c90ae8b2ea76b9256876f6ce5b0ee317d6d9561b37274c4d9bf55f34729df44abf931e724559d7e6264e3
+  metadata.gz: 002b45ff3aeb01872e98d84d1b4fde4c81acee696f80068a167d5a231deb6404656aa678d828570ae69725edd13700b271fa7defab5aaff36084f027984c37ce
+  data.tar.gz: fb59777170ccafbf8fa11c7b37d6f6277adf285a7bfda8b5bfe1359fdcaa395d56e09a3dc59312e89516e64917b66cd4a0f40d6226bcaa816a36ab3f071b9c3a

data/lib/akamai_rspec/matchers/forward_to_index.rb

@@ -1,7 +1,7 @@
 
 module AkamaiRSpec
   module Matchers
-    define :be_forwarded_to_index do |channel|
+    define :be_forwarded_to_path do |channel|
       match do |url|
         response = Request.get(url)
         session_info = response.headers[:x_akamai_session_info]
@@ -16,5 +16,7 @@ module AkamaiRSpec
         response.code == 200 && outcome_url == channel
       end
     end
+
+    alias_method :be_forwarded_to_index, :be_forwarded_to_path
   end
 end

data/lib/akamai_rspec/matchers/honour_origin_headers.rb

@@ -6,11 +6,12 @@ require 'uri'
 module AkamaiRSpec
   module Matchers
 
-    define :honour_origin_cache_headers do |origin, headers=:both|
+    define :honour_origin_cache_headers do |origin, headers=:both, max_clock_skew: 10|
       header_options = [:cache_control, :expires, :both]
       fail("Headers must be one of: #{header_options}") unless header_options.include? headers
 
       match do |url|
+        @max_clock_skew = max_clock_skew
         akamai_response = AkamaiRSpec::Request.get url
         url = "http://" + url unless url =~ /^http/
         origin_url = URI(url)
@@ -64,7 +65,7 @@ module AkamaiRSpec
       end
 
       def max_age_to_num(max_age)
-        max_age.split('=').last.to_i
+        max_age.split('=').last.to_i rescue nil
       end
 
       def clean_max_age(cc_directives)
@@ -76,7 +77,9 @@ module AkamaiRSpec
       def check_max_age(origin_cc_directives, akamai_cc_directives)
         origin_max_age, origin_cc_directives = clean_max_age(origin_cc_directives)
         akamai_max_age, akamai_cc_directives = clean_max_age(akamai_cc_directives)
-        if akamai_max_age > origin_max_age
+        fail "Akamai sent a max-age but Origin did not" if akamai_max_age && origin_max_age.nil?
+
+        if (akamai_max_age && origin_max_age) && (akamai_max_age > origin_max_age)
           fail "Akamai sent a max-age greater than Origin's: #{akamai_max_age} > #{origin_max_age}"
         end
         return origin_cc_directives, akamai_cc_directives
@@ -108,14 +111,25 @@ module AkamaiRSpec
       def check_expires(origin_response, akamai_response, headers)
         if [:both, :expires].include? headers
           origin_expires, akamai_expires = expires(origin_response, akamai_response)
-          validate_expires(origin_expires, akamai_expires)
+
+          fail "Origin sent 'Expires: #{
+            origin_response.headers[:expires]
+          }' but Akamai sent 'Expires: #{
+            akamai_response.headers[:expires]
+          }', varies by #{
+            expires_diff origin_expires, akamai_expires
+          } seconds" unless expires_match?(origin_expires, akamai_expires)
+
         end
       end
 
-      def validate_expires(origin, akamai)
-        unless akamai.to_i == origin.to_i
-          fail "Origin sent 'Expires: #{origin}' but Akamai sent 'Expires: #{akamai}'"
-        end
+      def expires_match?(origin, akamai)
+        # Allow some clock skew
+         expires_diff(origin, akamai) <= @max_clock_skew
+      end
+
+      def expires_diff(origin, akamai)
+        ((akamai || Time.now).to_i - (origin || Time.now).to_i).abs
       end
 
       def expires(origin_response, akamai_response)

data/lib/akamai_rspec/matchers/non_akamai.rb

@@ -28,8 +28,8 @@ module AkamaiRSpec
 
     define :be_verifiably_secure do
       match do |url|
-        return false if URI(url).scheme == "http"
         url = "https://#{url}" unless URI(url).scheme
+        url = url.gsub(/^http:/, 'https:')
         begin
           # Avoid AkamaiRspec::Request as it turns off SSL checking
           @response = RestClient::Request.execute(
@@ -41,14 +41,14 @@ module AkamaiRSpec
           return true
         rescue RestClient::MaxRedirectsReached
           return true # Securely sent a redirect
-        rescue => e
+        rescue Exception => e
           @error = e
           return false
         end
       end
 
       failure_message do |url|
-        "got error #{@error} fetching #{@response}"
+        "got error #{@error.inspect} fetching #{@response}"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akamai_rspec
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Bianca Gibson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client