alephant-broker 3.3.2 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2751739d9f38c6926ca53bf4df8e7ac644cbf772
-  data.tar.gz: cf624229dc9294a967fa4df07503d674ad905cfc
+  metadata.gz: 55407571edbd3971d9cb25088a13dfd7d3f12b29
+  data.tar.gz: 47983affb51ca481661ebc44cfc126fb52b61b5f
 SHA512:
-  metadata.gz: a144aa3a3f61fdb65420951514011fce5926a0a4dabd3ecd13d0022251faf0bfded4fc9b4f6b48ef25ddb6b82bac7a5d5a45a63060156ea2f6dc3a3ab6aa5864
-  data.tar.gz: 3b4428fc19c4d8b4d2ddfb2ea3c1a9cfd280cdcfd23f455ce0aa26f972ee53a8954dfff376d88bbc085f165af9ac1b1a71e91bbcd802f5d90bf9e9ee7f1f3a31
+  metadata.gz: 206a138ba862747567bfb62461eb5553b3634cb3339ce52f39d2de769b4a661bf370cbc8dc609792960397185cf244912a41898ec07dccb6f11fcb604222aec4
+  data.tar.gz: 8f248bff62598414cec9a7889dcde5ed2a732a2ff33c12a616bcd708127dc93c45aee26f4e6c8e56ebc3d63c8aab2c5ab19c7e400fb92e673903728dcaede428

data/.travis.yml

@@ -8,3 +8,4 @@ notifications:
     on_failure: change
     on_success: never
 sudo: false
+script: bundle exec rake all

data/lib/alephant/broker/component.rb

@@ -1,9 +1,9 @@
-require 'crimp'
-require 'alephant/cache'
-require 'alephant/lookup'
-require 'alephant/broker/errors/invalid_cache_key'
-require 'alephant/sequencer'
-require 'alephant/broker/cache'
+require "crimp"
+require "alephant/cache"
+require "alephant/lookup"
+require "alephant/broker/errors/invalid_cache_key"
+require "alephant/sequencer"
+require "alephant/broker/cache"
 
 module Alephant
   module Broker
@@ -14,32 +14,42 @@ module Alephant
         @id        = meta.id
         @batch_id  = meta.batch_id
         @options   = symbolize(meta.options || {})
-        @content   = data[:content].force_encoding 'UTF-8'
+        @content   = data[:content].force_encoding "UTF-8"
         @opts_hash = meta.opts_hash
         @data      = data
         @meta      = meta
       end
 
       def content_type
-        headers['Content-Type']
+        headers["Content-Type"]
       end
 
       def headers
         {
-          'Content-Type' => data[:content_type].to_s,
-        }.merge(data[:headers] || {})
+          "Content-Type" => data[:content_type].to_s
+        }
+          .merge(data[:headers] || {})
+          .merge(stripped_headers)
       end
 
       def status
-        200
+        meta_data_headers.key?("Status") ? meta_data_headers["Status"] : 200
       end
 
       private
 
       attr_reader :meta, :data
 
+      def meta_data_headers
+        @meta_data_headers ||= data[:meta].fetch(:headers, {})
+      end
+
+      def stripped_headers
+        meta_data_headers.reject { |k, _| k == "Status" }
+      end
+
       def symbolize(hash)
-        Hash[hash.map { |k,v| [k.to_sym, v] }]
+        Hash[hash.map { |k, v| [k.to_sym, v] }]
       end
     end
   end

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "3.3.2"
+    VERSION = "3.4.0"
   end
 end

data/spec/fixtures/json/batch_compiled.json

@@ -1 +1 @@
-{"batch_id":"baz","components":[{"component":"ni_council_results_table","options":{"foo" : "bar"},"status":200,"content_type":"foo/bar","body":"Test"},{"component":"ni_council_results_table","options":{},"status":200,"content_type":"foo/bar","body":"Test"}]}
+{"batch_id":"baz","components":[{"component":"ni_council_results_table","options":{"foo":"bar"},"status":200,"content_type":"test/content","body":"Test"},{"component":"ni_council_results_table","options":{},"status":200,"content_type":"test/content","body":"Test"}]}

data/spec/integration/rack_spec.rb

@@ -0,0 +1,179 @@
+require "spec_helper"
+
+describe Alephant::Broker::Application do
+  include Rack::Test::Methods
+  let(:options) do
+    {
+      :lookup_table_name => "test_table",
+      :bucket_id         => "test_bucket",
+      :path              => "bucket_path"
+    }
+  end
+
+  let(:app) do
+    described_class.new(
+      Alephant::Broker::LoadStrategy::S3::Sequenced.new,
+      options
+    )
+  end
+  let(:content) do
+    {
+      :content_type => "test/content",
+      :content      => "Test",
+      :meta         => {}
+    }
+  end
+  let(:sequencer_double) do
+    instance_double(
+      "Alephant::Sequencer::Sequencer",
+      :get_last_seen => "111"
+    )
+  end
+
+  let(:lookup_location_double) do
+    instance_double("Alephant::Lookup::Location", :location => "test/location")
+  end
+  let(:lookup_helper_double) do
+    instance_double(
+      "Alephant::Lookup::LookupHelper",
+      :read => lookup_location_double
+    )
+  end
+
+  let(:s3_cache_double) { instance_double("Alephant::Cache", :get => content) }
+
+  before do
+    allow_any_instance_of(Logger).to receive(:info)
+    allow_any_instance_of(Logger).to receive(:debug)
+    allow(Alephant::Lookup).to receive(:create) { lookup_helper_double }
+    allow(Alephant::Sequencer).to receive(:create) { sequencer_double }
+  end
+
+  describe "Status endpoint `/status`" do
+    before { get "/status" }
+    specify { expect(last_response.status).to eql 200 }
+    specify { expect(last_response.body).to eql "ok" }
+  end
+
+  describe "404 endpoint `/banana`" do
+    before { get "/banana" }
+    specify { expect(last_response.status).to eql 404 }
+    specify { expect(last_response.body).to eq "Not found" }
+  end
+
+  describe "Component endpoint '/component/...'" do
+    before do
+      allow(Alephant::Cache).to receive(:new) { s3_cache_double }
+      get "/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 "Test" }
+    end
+
+    context "for valid URL parameters in request" do
+      before { get "/component/test_component?variant=test_variant" }
+      specify { expect(last_response.status).to eq 200 }
+      specify { expect(last_response.body).to eq "Test" }
+    end
+  end
+
+  describe "Components endpoint '/components'" do
+    let(:fixture_path) { "#{File.dirname(__FILE__)}/../fixtures/json" }
+    let(:batch_json) do
+      IO.read("#{fixture_path}/batch.json").strip
+    end
+    let(:batch_compiled_json) do
+      IO.read("#{fixture_path}/batch_compiled.json").strip
+    end
+
+    before do
+      allow(Alephant::Cache).to receive(:new) { s3_cache_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 }
+    end
+  end
+
+  describe "S3 headers" do
+    let(:content) do
+      {
+        :content => "missing_content",
+        :meta    => {
+          :headers => {}
+        }
+      }
+    end
+    let(:s3_cache_double) do
+      instance_double(
+        "Alephant::Cache",
+        :get => content
+      )
+    end
+
+    context "with 404 status code set" do
+      before do
+        content[:meta][:headers]["Status"] = 404
+        allow(Alephant::Cache).to receive(:new) { s3_cache_double }
+        get "/component/test_component"
+      end
+
+      specify { expect(last_response.status).to eq 404 }
+    end
+
+    context "with cache and additional headers set" do
+      before do
+        content[:meta][:headers] = {
+          "Cache-Control" => "max-age=60",
+          "X-Some-Header" => "foo",
+          "Status"        => 200
+        }
+        allow(Alephant::Cache).to receive(:new) { s3_cache_double }
+        get "/component/test_component"
+      end
+
+      specify { expect(last_response.headers).to include("Cache-Control") }
+      specify { expect(last_response.headers).to include("X-Some-Header") }
+      specify { expect(last_response.headers).to_not include("Status") }
+      specify { expect(last_response.status).to eq 200 }
+    end
+  end
+
+  describe "Cached data" do
+    let(:cache_double) do
+      instance_double(
+        "Alephant::Broker::Cache::Client",
+        :set => {
+          :content_type => "test/html",
+          :content      => "<p>Some data</p>",
+          :meta         => {}
+        },
+        :get => "<p>Some data</p>"
+      )
+    end
+    let(:s3_cache_double) do
+      instance_double(
+        "Alephant::Cache",
+        :get => "test_content"
+      )
+    end
+
+    context "which is old" do
+      before do
+        allow(Alephant::Broker::Cache::Client).to receive(:new) { cache_double }
+        allow(Alephant::Cache).to receive(:new) { s3_cache_double }
+      end
+      it "should update the cache (call `.set`)" do
+        expect(cache_double).to receive(:set).once
+      end
+      after { get "/component/test_component" }
+    end
+  end
+end

metadata

@@ -1,276 +1,276 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0
 platform: ruby
 authors:
 - Steven Jack
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec-nc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec-nc
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: guard
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: guard-rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry-remote
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry-nav
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-  name: rake-rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rack-test
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: alephant-lookup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: alephant-lookup
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: alephant-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: alephant-cache
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: alephant-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1'
-  name: alephant-logger
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
+  name: alephant-sequencer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: alephant-sequencer
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: dalli-elasticache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: dalli-elasticache
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: pmap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: pmap
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: faraday
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: crimp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: crimp
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -322,14 +322,14 @@ files:
 - spec/fixtures/json/batch.json
 - spec/fixtures/json/batch_compiled.json
 - spec/http_spec.rb
+- spec/integration/rack_spec.rb
 - spec/integration/spec_helper.rb
-- spec/rack_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/BBC-News/alephant-broker
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -344,9 +344,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.0.14
+signing_key: 
 specification_version: 4
 summary: Brokers requests for alephant components
 test_files:
@@ -355,6 +355,6 @@ test_files:
 - spec/fixtures/json/batch.json
 - spec/fixtures/json/batch_compiled.json
 - spec/http_spec.rb
+- spec/integration/rack_spec.rb
 - spec/integration/spec_helper.rb
-- spec/rack_spec.rb
 - spec/spec_helper.rb

data/spec/rack_spec.rb

@@ -1,124 +0,0 @@
-require 'spec_helper'
-
-describe Alephant::Broker::Application do
-  include Rack::Test::Methods
-
-  let(:app) do
-    described_class.new(
-      Alephant::Broker::LoadStrategy::S3::Sequenced.new,
-      {
-        :lookup_table_name => 'test_table',
-        :bucket_id         => 'test_bucket',
-        :path              => 'bucket_path'
-      }
-    )
-  end
-  let(:cache_hash) do
-    {
-      :content_type => 'test/content',
-      :content      => 'Test'
-    }
-  end
-  let(:sequencer_double) do
-    instance_double(
-      'Alephant::Sequencer::Sequencer',
-      :get_last_seen => '111'
-    )
-  end
-
-  before do
-    allow_any_instance_of(Logger).to receive(:info)
-    allow_any_instance_of(Logger).to receive(:debug)
-
-    allow_any_instance_of(Alephant::Broker::Cache::Client)
-      .to receive(:get).and_return(cache_hash)
-
-    allow_any_instance_of(Alephant::Broker::Component)
-      .to receive_messages(
-        :content      => cache_hash[:content],
-        :content_type => 'foo/bar',
-        :version      => 1
-      )
-
-    allow_any_instance_of(Alephant::Broker::Response::Asset)
-      .to receive(:status).and_return(200)
-
-    allow(Alephant::Sequencer).to receive(:create) { sequencer_double }
-  end
-
-  describe 'Status endpoint `/status`' do
-    before { get '/status' }
-    specify { expect(last_response.status).to eql 200 }
-    specify { expect(last_response.body).to eql 'ok' }
-  end
-
-  describe '404 endpoint `/banana`' do
-    before { get '/banana' }
-    specify { expect(last_response.status).to eql 404 }
-    specify { expect(last_response.body).to eq 'Not found' }
-  end
-
-  describe 'Component endpoint `/component/...`' do
-    let(:batch_json) do
-      IO.read("#{File.dirname(__FILE__)}/fixtures/json/batch.json").strip
-    end
-    let(:batch_compiled_json) do
-      IO.read("#{File.dirname(__FILE__)}/fixtures/json/batch_compiled.json").strip
-    end
-
-    context 'for a valid component ID' do
-      before { get '/component/test_component' }
-      specify { expect(last_response.status).to eql 200 }
-      specify { expect(last_response.body).to eql 'Test' }
-    end
-
-    context 'for valid URL parameters in request' do
-      before { get '/component/test_component?variant=test_variant' }
-      specify { expect(last_response.status).to eq 200 }
-      specify { expect(last_response.body).to eq 'Test' }
-    end
-
-    context 'when using valid batch asset data' do
-      before { post '/components/batch', batch_json, 'CONTENT_TYPE' => 'application/json' }
-      specify { expect(last_response.status).to eql 200 }
-      specify { expect(JSON.parse last_response.body).to eq JSON.parse(batch_compiled_json) }
-    end
-  end
-
-  describe 'Cached data' do
-    let(:cache_double) do
-      instance_double(
-        'Alephant::Broker::Cache::Client',
-        :set => {
-          :content_type => 'test/html',
-          :content => '<p>Some data</p>'
-        },
-        :get => '<p>Some data</p>'
-      )
-    end
-    let(:lookup_location_double) do
-      instance_double('Alephant::Lookup::Location', location: 'test/location')
-    end
-    let(:lookup_helper_double) do
-      instance_double('Alephant::Lookup::LookupHelper', read: lookup_location_double)
-    end
-    let(:s3_cache_double) do
-      instance_double(
-        'Alephant::Cache',
-        :get => 'test_content'
-      )
-    end
-
-    context 'which is old' do
-      before do
-        allow(Alephant::Lookup).to receive(:create) { lookup_helper_double }
-        allow(Alephant::Broker::Cache::Client).to receive(:new) { cache_double }
-        allow(Alephant::Cache).to receive(:new) { s3_cache_double }
-      end
-      it 'should update the cache (call `.set`)' do
-        expect(cache_double).to receive(:set).once
-      end
-      after { get '/component/test_component' }
-    end
-  end
-end