alephant-broker 3.12.0 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60b6af683863285e27316bde5b7392d93439b20e
-  data.tar.gz: 7052275d91783c7b02ab1996cdced8e606b58e51
+  metadata.gz: 322bf8631f67f58a89b60648ab6b0b961a9689f9
+  data.tar.gz: b6651329e8bd41d6a5ee5da9dc2d6daa9cb0aa91
 SHA512:
-  metadata.gz: b8307c2cbe4304ebf233878d20026529e21302cec83e78132b43a6bb7da377da977f85d2f48b447c76d4e3647d2f7915659ec56cdbb9b4ecda8b4e5e26b26777
-  data.tar.gz: 0c2ba375708bfb96376954db24ab557b8bc615db013d9e85bd4ad3833d5f03861c6efc1074cd72e4a890d25ca42181f57caaf5da74ea29c458bd16ad71a7dafe
+  metadata.gz: a90d3ef9cb6e911103e32fff97933f259748961b24d7795c3a0a496b2131a6c5b1a3ace6c7055dba98fc6baa633e9621a32839994a8c377853b764add970ab00
+  data.tar.gz: 854e7f0e904af1e61389b1849d4f15aa6a83c614ed4093f40a430650a8612b4725de40caa2dd320a206fa69908500fe12aba8338e433da0ab3afd88483da05c4

data/lib/alephant/broker/environment.rb

@@ -24,6 +24,10 @@ module Alephant
         settings["REQUEST_METHOD"] == "GET"
       end
 
+      def options?
+        settings["REQUEST_METHOD"] == "OPTIONS"
+      end
+
       def query
         settings["QUERY_STRING"] || ""
       end

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

@@ -11,7 +11,7 @@ module Alephant
 
           @status = self.class.component_not_modified(@component.headers, request_env) ? NOT_MODIFIED_STATUS_CODE : component.status
 
-          super @status
+          super(@status, component.content_type, request_env)
 
           @headers.merge!(@component.headers)
         end

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

@@ -21,7 +21,7 @@ module Alephant
           500                      => "Error retrieving content"
         }
 
-        def initialize(status = 200, content_type = "text/html")
+        def initialize(status = 200, content_type = "text/html", request_env = nil)
           @content = STATUS_CODE_MAPPING[status]
           @headers = {
             "Content-Type"                  => content_type,
@@ -34,6 +34,8 @@ module Alephant
           add_no_cache_headers if should_add_no_cache_headers?(status)
           add_etag_allow_header if headers.has_key?("ETag")
           setup if status == 200
+
+          @content = "" if self.class.options?(request_env)
         end
 
         protected
@@ -61,6 +63,10 @@ module Alephant
           })
         end
 
+        def self.options?(request_env)
+          request_env && request_env.respond_to?(:options?) && request_env.options?
+        end
+
         def self.component_not_modified(headers, request_env)
           return false unless allow_not_modified_response_status
           return false if request_env.post?

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

@@ -10,11 +10,11 @@ module Alephant
         attr_reader :components, :batch_id
 
         def initialize(components, batch_id, request_env)
-          @components = components
-          @batch_id   = batch_id
-          @status     = self.class.component_not_modified(batch_response_headers, request_env) ? NOT_MODIFIED_STATUS_CODE : 200
+          @components  = components
+          @batch_id    = batch_id
+          @status      = self.class.component_not_modified(batch_response_headers, request_env) ? NOT_MODIFIED_STATUS_CODE : 200
 
-          super(@status, "application/json")
+          super(@status, "application/json", request_env)
 
           @headers.merge!(batch_response_headers)
         end

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "3.12.0"
+    VERSION = "3.13.0"
   end
 end

data/spec/integration/rack_spec.rb

@@ -4,7 +4,7 @@ require "alephant/broker"
 describe Alephant::Broker::Application do
   include Rack::Test::Methods
 
-  let(:options) do
+  let(:config) do
     {
       :lookup_table_name => "test_table",
       :bucket_id         => "test_bucket",
@@ -15,7 +15,7 @@ describe Alephant::Broker::Application do
   let(:app) do
     described_class.new(
       Alephant::Broker::LoadStrategy::S3::Sequenced.new,
-      options
+      config
     )
   end
 
@@ -73,7 +73,7 @@ describe Alephant::Broker::Application do
     specify { expect(last_response.headers).to include("Expires") }
   end
 
-  describe "Component endpoint '/component/...'" do
+  describe "Component endpoint '/component/...' GET" do
     before do
       allow(Alephant::Storage).to receive(:new) { s3_double }
       get "/component/test_component"
@@ -96,6 +96,45 @@ describe Alephant::Broker::Application do
     end
   end
 
+  describe "Component endpoint '/component/...' OPTIONS" do
+    before do
+      allow(Alephant::Storage).to receive(:new) { s3_double }
+      options "/component/test_component"
+    end
+
+    context "for a valid component ID" do
+      specify { expect(last_response.status).to eql 200 }
+      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") }
+      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") }
+      specify { expect(last_response.headers["Content-Type"]).to eq("test/content") }
+      specify { expect(last_response.headers["Content-Length"]).to eq("0") }
+    end
+
+    context "for valid URL parameters in request" do
+      before { options "/component/test_component?variant=test_variant" }
+      specify { expect(last_response.status).to eq 200 }
+      specify { expect(last_response.body).to eq "" }
+      specify { expect(last_response.headers["Content-Type"]).to eq("test/content") }
+      specify { expect(last_response.headers["Content-Length"]).to eq("0") }
+    end
+
+    context "for invalid URL parameters in request" do
+      before {
+        content[:meta]["status"] = 404
+        allow(Alephant::Storage).to receive(:new) { s3_double }
+        options "/component/invalid_component"
+      }
+      specify { expect(last_response.status).to eq 404 }
+      specify { expect(last_response.body).to eq "" }
+      specify { expect(last_response.headers["Content-Type"]).to eq("test/content") }
+      specify { expect(last_response.headers["Content-Length"]).to eq("0") }
+    end
+  end
+
   describe "Components endpoint '/components' POST" do
     let(:fixture_path) { "#{File.dirname(__FILE__)}/../fixtures/json" }
     let(:batch_json) do
@@ -197,6 +236,52 @@ describe Alephant::Broker::Application do
     end
   end
 
+  describe "Components endpoint '/components' OPTIONS" do
+    let(:fixture_path)        { "#{File.dirname(__FILE__)}/../fixtures/json" }
+    let(:s3_double_batch) { instance_double("Alephant::Storage") }
+
+    before do
+      allow(s3_double_batch).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_batch }
+    end
+
+    context "when using valid batch asset data" do
+      let(:path)         { "/components/batch?batch_id=baz&components[ni_council_results_table][component]=ni_council_results_table&components[ni_council_results_table][options][foo]=bar&components[ni_council_results_table_no_options][component]=ni_council_results_table" }
+      let(:content_type) { "application/json" }
+
+      before { options path, {}, "CONTENT_TYPE" => content_type }
+
+      specify { expect(last_response.status).to eql 200 }
+      specify { expect(last_response.body).to eq "" }
+
+      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("0")
+        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
+
   describe "S3 headers" do
     let(:content) do
       AWS::Core::Data.new(

metadata

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