alephant-broker 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55407571edbd3971d9cb25088a13dfd7d3f12b29
-  data.tar.gz: 47983affb51ca481661ebc44cfc126fb52b61b5f
+  metadata.gz: 66e7169ca6dccf162a18d99cd370e664743f7368
+  data.tar.gz: ed5178f9dc74b2f4b339ceffe9c2a1aff969c566
 SHA512:
-  metadata.gz: 206a138ba862747567bfb62461eb5553b3634cb3339ce52f39d2de769b4a661bf370cbc8dc609792960397185cf244912a41898ec07dccb6f11fcb604222aec4
-  data.tar.gz: 8f248bff62598414cec9a7889dcde5ed2a732a2ff33c12a616bcd708127dc93c45aee26f4e6c8e56ebc3d63c8aab2c5ab19c7e400fb92e673903728dcaede428
+  metadata.gz: d761eaba217f4f256ccd1544063d237624af19f4609d9880cfc09694d15c8767c80b423bc8974e6d235d9603c28e808f79d9f358a61b59bad4ca93e0674f324b
+  data.tar.gz: 12b02ddece7cdd609f018b99a080e735bc57993ec472409bc492f6a68418f0bbd95c8635e37154ec92b87c2d62d56f33c999fcce06045df17b0a32cb6ea7df49

data/lib/alephant/broker/component.rb

@@ -10,6 +10,8 @@ module Alephant
     class Component
       attr_reader :id, :batch_id, :options, :content, :opts_hash
 
+      HEADER_PREFIX = "head_"
+
       def initialize(meta, data)
         @id        = meta.id
         @batch_id  = meta.batch_id
@@ -29,11 +31,11 @@ module Alephant
           "Content-Type" => data[:content_type].to_s
         }
           .merge(data[:headers] || {})
-          .merge(stripped_headers)
+          .merge(meta_data_headers)
       end
 
       def status
-        meta_data_headers.key?("Status") ? meta_data_headers["Status"] : 200
+        data[:meta].key?("status") ? data[:meta]["status"] : 200
       end
 
       private
@@ -41,11 +43,15 @@ module Alephant
       attr_reader :meta, :data
 
       def meta_data_headers
-        @meta_data_headers ||= data[:meta].fetch(:headers, {})
+        @meta_data_headers ||= data[:meta].to_h.reduce({}) do |accum, (k, v)|
+          accum.tap do |a|
+            a[header_key(k)] = v.to_s if k.start_with?(HEADER_PREFIX)
+          end
+        end
       end
 
-      def stripped_headers
-        meta_data_headers.reject { |k, _| k == "Status" }
+      def header_key(key)
+        key.gsub(HEADER_PREFIX, "").split("-").map(&:capitalize).join("-")
       end
 
       def symbolize(hash)

data/lib/alephant/broker/version.rb

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

data/spec/integration/rack_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require_relative "spec_helper"
 
 describe Alephant::Broker::Application do
   include Rack::Test::Methods
@@ -17,11 +17,11 @@ describe Alephant::Broker::Application do
     )
   end
   let(:content) do
-    {
+    AWS::Core::Data.new(
       :content_type => "test/content",
       :content      => "Test",
       :meta         => {}
-    }
+    )
   end
   let(:sequencer_double) do
     instance_double(
@@ -104,12 +104,10 @@ describe Alephant::Broker::Application do
 
   describe "S3 headers" do
     let(:content) do
-      {
+      AWS::Core::Data.new(
         :content => "missing_content",
-        :meta    => {
-          :headers => {}
-        }
-      }
+        :meta    => {}
+      )
     end
     let(:s3_cache_double) do
       instance_double(
@@ -120,7 +118,7 @@ describe Alephant::Broker::Application do
 
     context "with 404 status code set" do
       before do
-        content[:meta][:headers]["Status"] = 404
+        content[:meta]["status"] = 404
         allow(Alephant::Cache).to receive(:new) { s3_cache_double }
         get "/component/test_component"
       end
@@ -130,17 +128,39 @@ describe Alephant::Broker::Application do
 
     context "with cache and additional headers set" do
       before do
-        content[:meta][:headers] = {
-          "Cache-Control" => "max-age=60",
-          "X-Some-Header" => "foo",
-          "Status"        => 200
+        content[:meta] = {
+          "head_cache-control"       => "max-age=60",
+          "head_x-some-header"       => "foo",
+          "head_header_without_dash" => "bar",
+          "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 do
+        expect(
+          last_response.headers
+        ).to include_case_sensitive("Cache-Control")
+      end
+      specify do
+        expect(
+          last_response.headers["Cache-Control"]
+        ).to eq(content[:meta]["head_cache-control"])
+      end
+
+      specify do
+        expect(
+          last_response.headers
+        ).to include_case_sensitive("X-Some-Header")
+      end
+
+      specify do
+        expect(
+          last_response.headers
+        ).to include_case_sensitive("Header_without_dash")
+      end
+
       specify { expect(last_response.headers).to_not include("Status") }
       specify { expect(last_response.status).to eq 200 }
     end

data/spec/integration/spec_helper.rb

@@ -1 +1,8 @@
-require_relative '../spec_helper'
+require_relative "../spec_helper"
+require "rspec/expectations"
+
+RSpec::Matchers.define :include_case_sensitive do |expected|
+  match do |actual|
+    actual.keys.one? { |k| expected == k }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec