alephant-broker 3.10.1 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8856cedd692b08b6e776d9b4df754eb8a2b04ca
-  data.tar.gz: a77885116f5c10a671450e1f250c5be91da76942
+  metadata.gz: 223acfc17ab349160c5dbf9597213a35b9cdc33a
+  data.tar.gz: abb1103b13b95e494096b531ad8c109d2c965bdc
 SHA512:
-  metadata.gz: 987b0d55ae5aa3d9ffb76c3f70abaf6a4bd01ca894a05c040fd633f26d793fcfbbf9bc607c3fee5fd2582bb60332c2e399474579f93b0cdf3f2dd2e49652e4d2
-  data.tar.gz: af6c368d7f6004575f7498543f72770b71b72a6749d1bccdbfcfd29b4da7657d0b844fd71fd3999557f960bb71dd23746e499448df76759327a3b086c5b5f326
+  metadata.gz: ec8f97f5911fef1ca5d4bfee7694fee0c9173d4c2275dec58ae3d2161b0d6b19ccf6faee403d00beaa54c7bcaec8dcbeaa80a584d0f45da1e05e0277a6856d28
+  data.tar.gz: 89841c9e7fa8bcc92e2d20da30834e0b63d80f8cca322a0e65b1ad0455390dba3161a61d5ac03ab7d585968b5b693f34ac1be6d3294cfa135359f968be608867

data/lib/alephant/broker/request/batch.rb

@@ -10,9 +10,9 @@ module Alephant
         attr_reader :batch_id, :components, :load_strategy
 
         def initialize(component_factory, env)
-          logger.info "Request::Batch#initialize: id: #{env.data['batch_id']}"
+          logger.info "Request::Batch#initialize: id: #{env.data['batch_id']}" if env.data
 
-          @batch_id          = env.data["batch_id"]
+          @batch_id          = env.data["batch_id"] if env.data
           @component_factory = component_factory
           @components        = components_for env
         end
@@ -20,7 +20,7 @@ module Alephant
         private
 
         def components_for(env)
-          env.data["components"].map do |c|
+          ((env.data || {}).fetch("components", []) || []).map do |c|
             @component_factory.create(
               c["component"],
               batch_id,

data/lib/alephant/broker/response/asset.rb

@@ -9,7 +9,7 @@ module Alephant
         def initialize(component, request_env)
           @component = component
 
-          @status = component_not_modified(@component.headers, request_env) ? 304 : component.status
+          @status = self.class.component_not_modified(@component.headers, request_env) ? NOT_MODIFIED_STATUS_CODE : component.status
 
           super @status
 

data/lib/alephant/broker/response/base.rb

@@ -12,20 +12,27 @@ module Alephant
 
         attr_reader :content, :headers, :status
 
+        NOT_MODIFIED_STATUS_CODE = 202
+
         STATUS_CODE_MAPPING = {
-          200 => "ok",
-          304 => "",
-          404 => "Not found",
-          500 => "Error retrieving content"
+          200                      => "ok",
+          NOT_MODIFIED_STATUS_CODE => "",
+          404                      => "Not found",
+          500                      => "Error retrieving content"
         }
 
         def initialize(status = 200, content_type = "text/html")
           @content = STATUS_CODE_MAPPING[status]
-          @headers = { "Content-Type" => content_type }
-          @headers.merge!(Broker.config[:headers]) if Broker.config.has_key?(:headers)
+          @headers = {
+            "Content-Type"                  => content_type,
+            "Access-Control-Allow-Headers"  => "If-None-Match",
+            "Access-Control-Allow-Origin"   => "*"
+          }
+          headers.merge!(Broker.config[:headers]) if Broker.config.has_key?(:headers)
           @status  = status
 
           add_no_cache_headers if should_add_no_cache_headers?(status)
+          add_etag_allow_header if headers.has_key?("ETag")
           setup if status == 200
         end
 
@@ -36,7 +43,7 @@ module Alephant
         private
 
         def should_add_no_cache_headers?(status)
-          status != 200 && status != 304
+          status != 200 && status != NOT_MODIFIED_STATUS_CODE
         end
 
         def add_no_cache_headers
@@ -48,10 +55,24 @@ module Alephant
           log
         end
 
-        def component_not_modified(headers, request_env)
-          return false if headers["Last-Modified"].nil? && headers["ETag"].nil?
+        def add_etag_allow_header
+          headers.merge!({
+            "Access-Control-Expose-Headers" => "ETag"
+          })
+        end
+
+        def self.component_not_modified(headers, request_env)
+          return false if request_env.if_modified_since.nil? && request_env.if_none_match.nil?
+
+          last_modified_match = !request_env.if_modified_since.nil? && headers["Last-Modified"] == request_env.if_modified_since
+          etag_match          = !request_env.if_none_match.nil? &&
+            unquote_etag(headers["ETag"]) == unquote_etag(request_env.if_none_match)
+
+          last_modified_match || etag_match
+        end
 
-          headers["Last-Modified"] == request_env.if_modified_since || headers["ETag"] == request_env.if_none_match
+        def self.unquote_etag(etag)
+          etag.to_s.gsub(/\A"|"\Z/, '')
         end
 
         def log

data/lib/alephant/broker/response/batch.rb

@@ -12,7 +12,7 @@ module Alephant
         def initialize(components, batch_id, request_env)
           @components = components
           @batch_id   = batch_id
-          @status     = component_not_modified(batch_response_headers, request_env) ? 304 : 200
+          @status     = self.class.component_not_modified(batch_response_headers, request_env) ? NOT_MODIFIED_STATUS_CODE : 200
 
           super(@status, "application/json")
 
@@ -45,6 +45,8 @@ module Alephant
         end
 
         def batch_response_headers
+          return {} unless components.count
+
           {
             "ETag"          => batch_response_etag,
             "Last-Modified" => batch_response_last_modified
@@ -53,10 +55,10 @@ module Alephant
 
         def batch_response_etag
           etags = components.map do |component|
-            component.headers["ETag"]
+            self.class.unquote_etag(component.headers["ETag"])
           end.compact.sort
 
-          Crimp.signature(etags)
+          "\"#{Crimp.signature(etags)}\""
         end
 
         def batch_response_last_modified

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "3.10.1"
+    VERSION = "3.10.2"
   end
 end

data/spec/integration/rack_spec.rb

@@ -49,6 +49,8 @@ describe Alephant::Broker::Application do
 
   let(:s3_double) { instance_double("Alephant::Storage", :get => content) }
 
+  let(:not_modified_status_code) { Alephant::Broker::Response::Base::NOT_MODIFIED_STATUS_CODE }
+
   before do
     allow_any_instance_of(Logger).to receive(:info)
     allow_any_instance_of(Logger).to receive(:debug)
@@ -106,7 +108,7 @@ describe Alephant::Broker::Application do
       )
     end
 
-    specify { expect(last_response.status).to eql 304 }
+    specify { expect(last_response.status).to eql not_modified_status_code }
     specify { expect(last_response.body).to eql "" }
     specify { expect(last_response.headers).to_not include("Cache-Control") }
     specify { expect(last_response.headers).to_not include("Pragma") }
@@ -132,7 +134,7 @@ describe Alephant::Broker::Application do
           :content_type => "test/content",
           :content      => "Test",
           :meta         => {
-            :head_ETag            => "abc",
+            :head_ETag            => "\"abc\"",
             :"head_Last-Modified" => "Mon, 11 Apr 2016 09:39:57 GMT"
           }
         )
@@ -157,7 +159,7 @@ describe Alephant::Broker::Application do
         end
 
         it "should have ETag cache header" do
-          expect(last_response.headers["ETag"]).to eq("34774567db979628363e6e865127623f")
+          expect(last_response.headers["ETag"]).to eq('"34774567db979628363e6e865127623f"')
         end
 
         it "should have most recent Last-Modified header" do
@@ -206,7 +208,7 @@ describe Alephant::Broker::Application do
     context "when requesting an unmodified response" do
       let(:path)         { "/components/batch" }
       let(:content_type) { "application/json" }
-      let(:etag)         { "34774567db979628363e6e865127623f" }
+      let(:etag)         { '"34774567db979628363e6e865127623f"' }
 
       before do
         post(path, batch_json,
@@ -214,12 +216,12 @@ describe Alephant::Broker::Application do
           "HTTP_IF_NONE_MATCH" => etag)
       end
 
-      specify { expect(last_response.status).to eql 304 }
+      specify { expect(last_response.status).to eql not_modified_status_code }
       specify { expect(last_response.body).to eq "" }
 
       describe "response should have headers" do
-        it "should NOT have a Content-Type header" do
-          expect(last_response.headers).to_not include("Content-Type")
+        it "should have a Content-Type header" do
+          expect(last_response.headers).to include("Content-Type")
         end
 
         it "should have ETag cache header" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.10.2
 platform: ruby
 authors:
 - BBC News
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement