alephant-broker 3.8.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26af20b2231cdb88d51a7ad006a5b807093d6d70
-  data.tar.gz: 947c6ffae0e64eb7a77ff013ac8d7ddb7fcee67e
+  metadata.gz: 4250980c2dff335870765123e880080637deca3e
+  data.tar.gz: 29f174d321cf7b3807f6822500f6708c60f1752b
 SHA512:
-  metadata.gz: 49147d5e3b73712e211e5db6ec26f35efe0e99e4cea1b9e9e261aab2cdbf316968e1e627e7de2dffbc3735961870b131926203fa16423d9414be8665469b7781
-  data.tar.gz: 6dbc3c9d3bb758bfa64bf424a36adfdbe1456c018f55d7184914e3e05a6bad414ddeff8a9700db573ab7ee6bf66a3a8b6cb68e91ec4d237dbd201db6c4629d96
+  metadata.gz: 90837f01e54ecd028a680aef5907f2dd516f1c91e760c83ba9ec76f39815d5fdb02ba63b7cb29ac003729fdb04e4932c7f7f149a7552b11c457aa7c6bc82d637
+  data.tar.gz: 1d81181f2b962eab42c609d1065dc6fa361467e2f520fb20b7e9b06121b881cbbd8257ec8e2036dae89b0ee2cf66b0868e6318f2b03cec1ddd6d029f03a56d53

data/alephant-broker.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test"
 
   spec.add_runtime_dependency "alephant-lookup"
-  spec.add_runtime_dependency "alephant-storage"
+  spec.add_runtime_dependency "alephant-storage", ">= 1.1.0"
   spec.add_runtime_dependency "alephant-logger", "1.2.0"
   spec.add_runtime_dependency 'alephant-sequencer'
   spec.add_runtime_dependency "dalli-elasticache"

data/lib/alephant/broker/component.rb

@@ -51,7 +51,10 @@ module Alephant
       end
 
       def header_key(key)
-        key.gsub(HEADER_PREFIX, "").split("-").map(&:capitalize).join("-")
+        key = key.gsub(HEADER_PREFIX, "")
+        return key if key == "ETag"
+
+        key.split("-").map(&:capitalize).join("-")
       end
 
       def symbolize(hash)

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

@@ -1,4 +1,5 @@
-require 'alephant/logger'
+require "alephant/logger"
+require "crimp"
 
 module Alephant
   module Broker
@@ -12,7 +13,7 @@ module Alephant
           @components = components
           @batch_id   = batch_id
 
-          super(200, 'application/json')
+          super(200, "application/json")
         end
 
         def setup
@@ -20,6 +21,8 @@ module Alephant
             'batch_id' => batch_id,
             'components' => json
           })
+
+          @headers.merge!(batch_response_headers)
         end
 
         private
@@ -28,18 +31,40 @@ module Alephant
           logger.info "Broker: Batch load started (#{batch_id})"
           components.map do |component|
             {
-              'component'    => component.id,
-              'options'      => component.options,
-              'status'       => component.status,
-              'content_type' => component.content_type,
-              'body'         => component.content
+              "component"    => component.id,
+              "options"      => component.options,
+              "status"       => component.status,
+              "content_type" => component.content_type,
+              "body"         => component.content
             }
-          end.tap { 
-            logger.info "Broker: Batch load done (#{batch_id})" 
+          end.tap {
+            logger.info "Broker: Batch load done (#{batch_id})"
             logger.metric "BrokerBatchLoadCount"
           }
         end
 
+        def batch_response_headers
+          {
+            "ETag"          => batch_response_etag,
+            "Last-Modified" => batch_response_last_modified
+          }
+        end
+
+        def batch_response_etag
+          etags = components.map do |component|
+            component.headers["ETag"]
+          end.compact
+
+          Crimp.signature(etags)
+        end
+
+        def batch_response_last_modified
+          last_modifieds  = components.map do |component|
+            component.headers["Last-Modified"]
+          end.compact
+
+          last_modifieds.max
+        end
       end
     end
   end

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "3.8.0"
+    VERSION = "3.9.0"
   end
 end

data/spec/integration/rack_spec.rb

@@ -20,7 +20,10 @@ describe Alephant::Broker::Application do
     AWS::Core::Data.new(
       :content_type => "test/content",
       :content      => "Test",
-      :meta         => {}
+      :meta         => {
+        "head_ETag" => "123",
+        "head_Last-Modified" => "Mon, 11 Apr 2016 10:39:57 GMT"
+      }
     )
   end
   let(:sequencer_double) do
@@ -76,6 +79,8 @@ describe Alephant::Broker::Application do
       specify { expect(last_response.headers).to_not include("Cache-Control") }
       specify { expect(last_response.headers).to_not include("Pragma") }
       specify { expect(last_response.headers).to_not include("Expires") }
+      specify { expect(last_response.headers["ETag"]).to eq("123") }
+      specify { expect(last_response.headers["Last-Modified"]).to eq("Mon, 11 Apr 2016 10:39:57 GMT") }
     end
 
     context "for valid URL parameters in request" do
@@ -95,16 +100,44 @@ describe Alephant::Broker::Application do
     end
 
     before do
+      allow(s3_double).to receive(:get).and_return(
+        content,
+        AWS::Core::Data.new(
+          :content_type => "test/content",
+          :content      => "Test",
+          :meta         => {
+            "head_ETag" => "abc",
+            "head_Last-Modified" => "Mon, 11 Apr 2016 09:39:57 GMT"
+          }
+        )
+      )
+
       allow(Alephant::Storage).to receive(:new) { s3_double }
     end
 
     context "when using valid batch asset data" do
       let(:path) { "/components/batch" }
       let(:content_type) { "application/json" }
+
       before { post path, batch_json, "CONTENT_TYPE" => content_type }
 
       specify { expect(last_response.status).to eql 200 }
       specify { expect(last_response.body).to eq batch_compiled_json }
+
+      describe "response should have headers" do
+        it "should have content headers" do
+          expect(last_response.headers["Content-Type"]).to eq("application/json")
+          expect(last_response.headers["Content-Length"]).to eq("266")
+        end
+
+        it "should have ETag cache header" do
+          expect(last_response.headers["ETag"]).to eq("34774567db979628363e6e865127623f")
+        end
+
+        it "should have most recent Last-Modified header" do
+          expect(last_response.headers["Last-Modified"]).to eq("Mon, 11 Apr 2016 10:39:57 GMT")
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.0
 platform: ruby
 authors:
 - BBC News
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +183,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   name: alephant-storage
   prerelease: false
   type: :runtime
@@ -191,7 +191,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: