akamai_rspec 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07fe4b6c45db380b71ff544f77ae226a4cc74809
-  data.tar.gz: b1f5f15809c6003669937c1466db669c6b9a4c27
+  metadata.gz: 6a7d0d25f07249dc9449d8745ef64bdff88179da
+  data.tar.gz: 6c792c083bc7ba702842035d68e202f81219f07a
 SHA512:
-  metadata.gz: a1c3e9b1f6bfa2ad4aa0c1b72f0775c1dae149e20dac1ac07b306b2763b2b240285b1e1af7eb470a9f740e2d7be16bf5de8617f2170f44d34b00131d511dabf2
-  data.tar.gz: 8116ec3976984834df9d42218aa284960cd2aed54b1379f6b47dfba0524acb28b348fbb3dc2a17298073e69caa6fd9d54395347c57212bf3c86123db7f32ee66
+  metadata.gz: f7b7382b0992947fa6f30dbedc42487b1441c9182f571a236db3653288b21ba8b6640b7b316a6a04db185090a747c23847eac94686cbc154998d9a4e388d57b8
+  data.tar.gz: cb95c3ca5e7ea8610201ccce9307a01d74336fc0db3c90ae8b2ea76b9256876f6ce5b0ee317d6d9561b37274c4d9bf55f34729df44abf931e724559d7e6264e3

data/lib/akamai_rspec/matchers/caching.rb

@@ -4,17 +4,26 @@ require 'akamai_rspec/request'
 
 module AkamaiRSpec
   module Matchers
-    define :be_cacheable do |request_count: 4, headers: {}, allow_refresh: false|
+    define :be_cacheable do |request_count: :until_same_server, headers: {}, allow_refresh: false|
       match do |url|
         @responses = []
         fail("URL must be a string") unless url.is_a? String
 
-        @responses = (1..request_count).map {
-          AkamaiRSpec::Request.get url, headers
-        }
+        if request_count == :until_same_server
+          while response = AkamaiRSpec::Request.get(url, headers) do
+            if cache_servers.include?(cache_server response.headers[:x_cache])
+              @responses.push response
+              break
+            end
+            @responses.push response
+          end
+        else
+          @responses = (1..request_count).map {
+            AkamaiRSpec::Request.get url, headers
+          }
+        end
 
         @responses.any? do |response|
-          fail("Error fetching #{url}: #{response}") if response.code != 200
           if refresh_hit? response
             allow_refresh
           else
@@ -46,6 +55,14 @@ module AkamaiRSpec
       def cache_headers
         @responses.map {|response| response.headers[:x_cache] }
       end
+
+      def cache_servers
+        cache_headers.map &method(:cache_server)
+      end
+
+      def cache_server(header)
+        header.split(" ")[2]
+      end
     end
 
     alias_method :be_cachable, :be_cacheable

data/lib/akamai_rspec/matchers/forward_to_index.rb

@@ -13,7 +13,7 @@ module AkamaiRSpec
           fail("AKA_PM_FWD_URL not found in the x-akamai-session-info header '#{session_info}'")
         end
         outcome_url = outcome_attribute.split('value=')[1]
-        response.code == 200 && outcome_url == "#{channel}"
+        response.code == 200 && outcome_url == channel
       end
     end
   end

data/lib/akamai_rspec/matchers/honour_origin_headers.rb

@@ -119,14 +119,17 @@ module AkamaiRSpec
       end
 
       def expires(origin_response, akamai_response)
-        return origin_expires(origin_response), Time.httpdate(akamai_response.headers[:expires])
+        return origin_expires(origin_response), httpdate(akamai_response.headers[:expires])
       end
 
       def origin_expires(origin_response)
         expires = origin_response.headers[:expires]
-        expires == '0' ? Time.httpdate(origin_response.headers[:date]) : Time.httpdate(expires)
+        expires == '0' ? httpdate(origin_response.headers[:date]) : httpdate(expires)
       end
 
+      def httpdate(header)
+        Time.httpdate(header) rescue nil
+      end
     end
   end
 end

data/lib/akamai_rspec/request.rb

@@ -5,20 +5,10 @@ module AkamaiRSpec
   class Request
     extend Forwardable
 
-    @@akamai_stg_domain = nil
-    @@akamai_prod_domain = nil
-
-    def self.stg_domain=(domain)
-      @@akamai_stg_domain = domain
-    end
-
-    def self.prod_domain=(domain)
-      @@akamai_prod_domain = domain
-    end
-
-    def self.network=(env)
-      @@env = env
+    class << self
+      attr_accessor :stg_domain, :prod_domain, :network
     end
+    self.network = 'prod'
 
     def self.get(url, headers={})
       new.get(url, headers.merge(debug_headers))
@@ -57,30 +47,22 @@ module AkamaiRSpec
     end
 
     def initialize
-      @@env ||= 'prod'
-
-      @domain = case @@env.downcase
-                when 'staging'
-                  if @@akamai_stg_domain.nil?
-                    raise ArgumentError.new(
-                      "You must set the staging domain: AkamaiRSpec::Request.stg_domain = 'www.example.com.edgesuite.net'"
-                    )
-                  end
-
-                  @@akamai_stg_domain
-                else
-                  if @@akamai_prod_domain.nil?
-                    raise ArgumentError.new(
-                      "You must set the prod domain: AkamaiRSpec::Request.prod_domain = 'www.example.com.edgesuite.net'"
-                    )
-                  end
-
-                  @@akamai_prod_domain
-                end
-
-      @rest_client = RestClient::Request.new(method: :get,
-                                              url: 'fakeurl.com',
-                                              verify_ssl: false)
+      @domain = case self.class.network.downcase
+      when 'staging'
+        self.class.stg_domain or raise ArgumentError.new(
+          "You must set the staging domain: AkamaiRSpec::Request.stg_domain = 'www.example.com.edgesuite.net'"
+        )
+      else
+        self.class.prod_domain or raise ArgumentError.new(
+          "You must set the prod domain: AkamaiRSpec::Request.prod_domain = 'www.example.com.edgesuite.net'"
+        )
+      end
+
+      @rest_client = RestClient::Request.new(
+        method: :get,
+        url: 'fakeurl.com',
+        verify_ssl: false
+      )
     end
 
     delegate [:parse_url_with_auth, :stringify_headers] => :@rest_client
@@ -115,8 +97,7 @@ module AkamaiRSpec
 
     def build_request(uri, headers)
       req = Net::HTTP::Get.new(uri)
-      headers.each { |key, value| req.send(:[]=, key, value) }
-
+      headers.each { |key, value| req[key] = value }
       req
     end
   end

metadata

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