alephant-broker 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62ea8a88fdcc92e2e8d8cacf3b7b35e4dc3077d0
-  data.tar.gz: e58c67bdb11c2b4028bb897337f795ca13e9a48f
+  metadata.gz: 88c15819c22cfcde769e9b1b1406d9563ddd11f8
+  data.tar.gz: f1ed322acae0dc5740f6a965e3d790e1fca99dfd
 SHA512:
-  metadata.gz: f4a00e454e3dd9ea1b6ca4bfd8c62e99df6791891c30873153a1546254e29c679e4145751cb7371f46da59f317c583f5a35231650d954fb863b97d7a6dcbef99
-  data.tar.gz: 2dbbb0dbdd399039794d5e72f120d1901087506e544384ada28c627422e7e2639dc1eee9b507e68925e06e82d0ffa8fba5b6db05eaa5f3f32f44cd49492bb8e0
+  metadata.gz: c3360481c1f7707c893d55635660cf3a5c56894c71aba9d87d80e73c549338ed47b9cede9a36233dbe5f0459b8405d7dbd39824819b4f2d42fcfc06aba0448c8
+  data.tar.gz: 2192c4157e16662cf51d26645d9cb0e9c1f859d487669926a87ab68bba3a78046de9eb49cc1cf8fa2dba60db5e579baf7c5e265b8cf2a3a5944119baa5913600

data/alephant-broker.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rack-test"
+  spec.add_development_dependency "request_store"
 
   spec.add_runtime_dependency "alephant-lookup"
   spec.add_runtime_dependency "alephant-cache"

data/lib/alephant/broker.rb

@@ -4,9 +4,8 @@ require "alephant/broker/models/request_handler"
 module Alephant
   module Broker
 
-    def self.handle(request, config = {})
-      @@request_handler ||= RequestHandler.new(config)
-      @@request_handler.process(request)
+    def self.handle(config = {})
+      RequestHandler.new(config).process
     end
   end
 

data/lib/alephant/broker/app.rb

@@ -1,7 +1,6 @@
 $: << File.dirname(__FILE__)
 
 require 'alephant/broker'
-require 'alephant/broker/models/request'
 require 'alephant/logger'
 
 module Alephant
@@ -13,14 +12,9 @@ module Alephant
         @config = config
       end
 
-      def handle(request)
-        Alephant::Broker.handle(request, @config)
+      def handle
+        Alephant::Broker.handle(@config)
       end
-
-      def request_from(path, querystring)
-        Request.new(path, querystring)
-      end
-
     end
   end
 end

data/lib/alephant/broker/app/rack.rb

@@ -1,23 +1,23 @@
 $: << File.dirname(__FILE__)
 
 require 'alephant/broker/app'
+require 'alephant/broker/call_environment'
 
 module Alephant
   module Broker
     class RackApplication < Application
 
       def call(env)
-        response = handle(
-          request_from(env['PATH_INFO'], env['QUERY_STRING'])
-        )
+        RequestStore.store[:env] ||= CallEnvironment.new(env)
+        response = handle
         send response
       end
 
       def send(response)
         [
           response.status,
-          {"Content-Type" => response.content_type},
-          [response.content.to_s]
+          { "Content-Type" => response.content_type },
+          [ response.content.to_s ]
         ]
       end
     end

data/lib/alephant/broker/call_environment.rb

@@ -0,0 +1,51 @@
+module Alephant
+  module Broker
+    class CallEnvironment
+      include Logger
+      attr_reader :settings
+
+      def initialize(env)
+        @settings = env
+      end
+
+      def method
+        @settings['REQUEST_METHOD']
+      end
+
+      def post?
+        @settings['REQUEST_METHOD'] == 'POST'
+      end
+
+      def get?
+        @settings['REQUEST_METHOD'] == 'GET'
+      end
+
+      def query
+        @settings['QUERY_STRING']
+      end
+
+      def path
+        @settings['PATH_INFO']
+      end
+
+      def data
+        parse(rack_input) if post?
+      end
+
+      private
+
+      def rack_input
+          (@settings['rack.input'].read).tap { @settings['rack.input'].rewind } # http://rack.rubyforge.org/doc/SPEC.html
+      end
+
+      def parse(json)
+        begin
+          JSON.parse(json)
+        rescue JSON::ParserError => e
+          logger.info("Broker.environment#data: ParserError")
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/alephant/broker/errors/invalid_asset_id.rb

@@ -0,0 +1,11 @@
+module Alephant
+  module Broker
+    class InvalidAssetId < Exception
+
+      def initialize(msg)
+        super
+      end
+
+    end
+  end
+end

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

@@ -4,8 +4,7 @@ module Alephant
   module Broker
     class Request
       include Logger
-
-      attr_reader :type, :component_id, :options, :extension, :content_type
+      attr_reader :type
 
       DEFAULT_EXTENSION = :html
 
@@ -14,39 +13,9 @@ module Alephant
         :json => 'application/json'
       }
 
-      def initialize(path, querystring)
-        request = request_components(path, querystring)
-        case request[:type]
-        when "component"
-          logger.info("Broker.request: Type: component, Asset ID: #{request[:component_id]}, Options: #{request[:options].inspect}")
-          @type = :asset
-
-          @component_id = request[:component_id]
-          raise Errors::InvalidAssetId.new("No Asset ID specified") if @component_id.nil?
-
-          @options = request[:options]
-          @extension = request[:extension]
-          @content_type = @@extension_mapping[@extension.to_sym] || @@extension_mapping[DEFAULT_EXTENSION]
-        when "status"
-          logger.info("Broker.request: Type: status")
-          @type = :status
-        else
-          logger.info("Broker.request: Type: notfound")
-          @type = :notfound
-        end
-      end
-
-      private
-
-      def request_components(path, query_string)
-        request_parts = path.split('/')
-        extension = path.split('.')[1] ? path.split('.')[1].to_sym : DEFAULT_EXTENSION
-        {
-          :type         => request_parts[1],
-          :component_id => (request_parts[2] || '').split('.')[0],
-          :extension    => extension,
-          :options      => options_from(query_string)
-        }
+      def initialize(request_type)
+        logger.info("Broker.request: Type: #{request_type}")
+        @type = request_type
       end
 
       def options_from(query_string)
@@ -55,6 +24,18 @@ module Alephant
           object.tap { |o| o.store(key.to_sym, value) }
         end
       end
+
+      def get_type_from(request_parts)
+        request_parts[1]
+      end
+
+      def get_extension_for(path)
+        path.split('.')[1] ? path.split('.')[1].to_sym : DEFAULT_EXTENSION
+      end
+
+      def get_component_id_from(request_parts)
+        (request_parts[2] || '').split('.')[0]
+      end
     end
   end
 end

data/lib/alephant/broker/models/request/error_request.rb

@@ -0,0 +1,11 @@
+require 'alephant/broker/models/request'
+
+module Alephant
+  module Broker
+    class ErrorRequest < Request
+      def initialize
+        super(:error)
+      end
+    end
+  end
+end

data/lib/alephant/broker/models/request/get_request.rb

@@ -0,0 +1,38 @@
+require 'alephant/broker/errors/invalid_asset_id'
+require 'alephant/broker/models/request'
+
+module Alephant
+  module Broker
+    class GetRequest < Request
+      attr_reader :type, :component_id, :extension, :options, :content_type
+
+      def initialize
+        env = RequestStore.store[:env]
+        parse requested_components(env.path, env.query)
+        super(:asset)
+      end
+
+      def requested_components(path, query_string)
+        request_parts = path.split('/')
+
+        {
+          :type         => get_type_from(request_parts),
+          :component_id => get_component_id_from(request_parts),
+          :extension    => get_extension_for(path),
+          :options      => options_from(query_string)
+        }
+      end
+
+      def parse(request)
+        @component_id = request[:component_id]
+        @extension    = request[:extension]
+        @options      = request[:options]
+        @content_type = @@extension_mapping[@extension.to_sym] || @@extension_mapping[DEFAULT_EXTENSION]
+
+        logger.info("Broker.request: Type: #{@type}, Asset ID: #{@component_id}, Options: #{@options.inspect}")
+
+        raise InvalidAssetId.new("No Asset ID specified") if @component_id.nil?
+      end
+    end
+  end
+end

data/lib/alephant/broker/models/request/notfound_request.rb

@@ -0,0 +1,11 @@
+require 'alephant/broker/models/request'
+
+module Alephant
+  module Broker
+    class NotFoundRequest < Request
+      def initialize
+        super(:notfound)
+      end
+    end
+  end
+end

data/lib/alephant/broker/models/request/post_request.rb

@@ -0,0 +1,46 @@
+require 'alephant/broker/models/request'
+
+module Alephant
+  module Broker
+    class PostRequest < Request
+      attr_reader :type, :component_id, :options, :content_type
+
+      def initialize
+        @env = RequestStore.store[:env]
+        @content_type = 'application/json'
+        super(:batch)
+      end
+
+      def components
+        @requested_components ||= components_for @env.path
+      end
+
+      def set_component(id, options)
+        @component_id = id
+        @options      = options
+      end
+
+      private
+
+      def components_for(path)
+        request_parts = path.split('/')
+
+        {
+          :batch_id     => batch_id,
+          :type         => get_type_from(request_parts),
+          :component_id => get_component_id_from(request_parts)
+        }.merge! batched
+      end
+
+      def batch_id
+        @env.data['batch_id']
+      end
+
+      def batched
+        @env.data['components'].reduce({ :components => [] }) do |obj, component|
+          obj.tap { |o| o[:components].push(component) }
+        end
+      end
+    end
+  end
+end

data/lib/alephant/broker/models/request/status_request.rb

@@ -0,0 +1,11 @@
+require 'alephant/broker/models/request'
+
+module Alephant
+  module Broker
+    class StatusRequest < Request
+      def initialize
+        super(:status)
+      end
+    end
+  end
+end

data/lib/alephant/broker/models/request_factory.rb

@@ -0,0 +1,26 @@
+require 'alephant/broker/models/request/error_request.rb'
+require 'alephant/broker/models/request/get_request.rb'
+require 'alephant/broker/models/request/notfound_request.rb'
+require 'alephant/broker/models/request/post_request.rb'
+require 'alephant/broker/models/request/status_request.rb'
+
+module Alephant
+  module Broker
+    class RequestFactory
+      def self.process(type)
+        case type
+        when :component
+          GetRequest.new
+        when :component_batch
+          PostRequest.new
+        when :status
+          StatusRequest.new
+        when :notfound
+          NotFoundRequest.new
+        when :error
+          ErrorRequest.new
+        end
+      end
+    end
+  end
+end

data/lib/alephant/broker/models/request_handler.rb

@@ -1,4 +1,4 @@
-require 'alephant/broker/models/request'
+require 'alephant/broker/models/request_factory'
 require 'alephant/broker/models/response_factory'
 
 module Alephant
@@ -7,18 +7,41 @@ module Alephant
       include Logger
 
       def initialize(config)
+        @env = RequestStore.store[:env]
+        @request = RequestFactory.process(request_type)
         @response_factory = ResponseFactory.new(config)
       end
 
-      def process(request)
+      def process
         begin
-          @response_factory.response_from(request)
+          @response_factory.response_from(@request)
         rescue Exception => e
           logger.info("Broker.requestHandler.process: Exception raised (#{e.message})")
           @response_factory.response(500)
         end
       end
 
+      private
+
+      def request_type
+        case @env.path.split('/')[1]
+        when 'components'
+          component_type
+        when 'status'
+          :status
+        else
+          :notfound
+        end
+      end
+
+      def component_type
+        case @env.method
+        when 'POST'
+          :component_batch
+        when 'GET'
+          :component
+        end
+      end
     end
   end
 end

data/lib/alephant/broker/models/response/asset_response.rb

@@ -25,7 +25,6 @@ module Alephant
         rescue Exception => e
           set_error_for(e, 500)
         end
-
       end
 
       private
@@ -39,9 +38,6 @@ module Alephant
       def cache_id
         @lookup.read(request.options).tap { |cache_id| raise InvalidCacheKey if cache_id.nil? }
       end
-
     end
   end
 end
-
-

data/lib/alephant/broker/models/response/batch_response.rb

@@ -0,0 +1,58 @@
+require 'alephant/logger'
+
+module Alephant
+  module Broker
+    class BatchResponse
+      include Logger
+      attr_reader :status, :content_type, :content
+
+      def initialize(request, config)
+        @request      = request
+        @config       = config
+        @status       = 200
+        @content_type = request.content_type
+      end
+
+      def process
+        @content = JSON.generate({ "batch_id" => batch_id, "components" => json })
+        self
+      end
+
+      private
+
+      def json
+        get_components.each do |component|
+          id      = component['component']
+          options = set_keys_to_symbols component.fetch('options', {})
+
+          @request.set_component(id, options)
+
+          asset = AssetResponse.new(@request, @config)
+          component.store('status', asset.status)
+          component.store('body', asset.content) if valid_status_for asset
+        end
+      end
+
+      def set_keys_to_symbols(hash)
+        Hash[hash.map { |k,v| [k.to_sym, v] }]
+      end
+
+      def batch_id
+        @request.components.fetch(:batch_id)
+      end
+
+      def get_components
+        @request.components.fetch(:components) do |key|
+          logger.info("Broker::BatchResponse.process: Received request object but no valid key was found")
+          []
+        end
+      end
+
+      def valid_status_for(asset)
+        asset.status == 200
+      end
+    end
+  end
+end
+
+

data/lib/alephant/broker/models/response_factory.rb

@@ -1,5 +1,6 @@
 require 'alephant/broker/models/response'
 require 'alephant/broker/models/response/asset_response'
+require 'alephant/broker/models/response/batch_response'
 
 module Alephant
   module Broker
@@ -13,6 +14,8 @@ module Alephant
           case request.type
           when :asset
             AssetResponse.new(request, @config)
+          when :batch
+            BatchResponse.new(request, @config).process
           when :status
             response(200)
           when :notfound

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/spec/asset_response_spec.rb

@@ -1,21 +1,42 @@
 require 'spec_helper'
 
 describe Alephant::Broker::AssetResponse do
-
   describe "#initialize(request, config)" do
-    let(:config) { { :lookup_table_name => 'test_table', :bucket_id => 'test_bucket', :path => 'test_path' } }
-    let(:request) { double("Alephant::Broker::Request", :component_id => 'test', :content_type => 'text/html', :options => {:variant => 'test_variant'} ) }
     let(:location) { 'test_location' }
+    let(:config) {{
+      :lookup_table_name => 'test_table',
+      :bucket_id => 'test_bucket',
+      :path => 'test_path'
+    }}
+    let(:request) { double(
+                      "Alephant::Broker::Request",
+                      :component_id => 'test',
+                      :content_type => 'text/html',
+                      :options      => { :variant => 'test_variant' }
+                    )
+                  }
 
-    before {
+    before do
       @lookup_table = double('Alephant::Lookup::LookupTable')
       Alephant::Lookup.stub(:create).and_return(@lookup_table)
-    }
+    end
 
     it "Should return the content from a successful cache lookup" do
-      allow(@lookup_table).to receive(:read).with(request.options).and_return(location)
-      Alephant::Cache.any_instance.stub(:initialize)
-      Alephant::Cache.any_instance.stub(:get).with(location).and_return('Test cache content')
+      allow(@lookup_table)
+        .to receive(:read)
+        .with(request.options)
+        .and_return(location)
+
+      Alephant::Cache
+        .any_instance
+        .stub(:initialize)
+
+      Alephant::Cache
+        .any_instance
+        .stub(:get)
+        .with(location)
+        .and_return('Test cache content')
+
       instance = Alephant::Broker::AssetResponse.new(request, config)
 
       expect(instance.content).to eq('Test cache content')
@@ -23,8 +44,15 @@ describe Alephant::Broker::AssetResponse do
     end
 
     it "should return a 404 if lookup can't find a valid location" do
-      allow(@lookup_table).to receive(:read).with(request.options).and_return(nil)
-      Alephant::Cache.any_instance.stub(:initialize)
+      allow(@lookup_table)
+        .to receive(:read)
+        .with(request.options)
+        .and_return(nil)
+
+      Alephant::Cache
+        .any_instance
+        .stub(:initialize)
+
       instance = Alephant::Broker::AssetResponse.new(request, config)
 
       expect(instance.content).to eq('Cache key not found based on component_id and options combination')
@@ -32,15 +60,17 @@ describe Alephant::Broker::AssetResponse do
     end
 
     it "should return a 500 for any other exceptions" do
-      allow(@lookup_table).to receive(:read).with(request.options).and_raise(Exception)
+      allow(@lookup_table)
+        .to receive(:read)
+        .with(request.options)
+        .and_raise(Exception)
+
       instance = Alephant::Broker::AssetResponse.new(request, config)
 
       expect(instance.status).to eq(500)
-
     end
-
   end
-
 end
 
 
+

data/spec/batch_response_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe Alephant::Broker::BatchResponse do
+  let (:config) {{
+    :lookup_table_name => 'test_table',
+    :bucket_id => 'test_bucket',
+    :path => 'test_path'
+  }}
+
+  let (:post_request) {
+    double(
+      'Alephant::Broker::PostRequest',
+      :options       => {},
+      :type          => :batch,
+      :content_type  => 'application/json',
+      :set_component => nil,
+      :component_id  => nil,
+      :components    => {
+        :batch_id   => :baz,
+        :components => [
+          { 'component' => 'foo1', 'options' => { 'variant' => 'bar1' } },
+          { 'component' => 'foo2', 'options' => { 'variant' => 'bar2' } }
+        ]}
+    )
+  }
+
+  before do
+    @lookup_table = double('Alephant::Lookup::LookupTable', :read => 'test_location')
+
+    Alephant::Lookup
+      .stub(:create)
+      .and_return(@lookup_table)
+
+    Alephant::Cache
+      .any_instance
+      .stub(:initialize)
+
+    Alephant::Cache
+      .any_instance
+      .stub(:get)
+      .and_return('Test response')
+  end
+
+  describe "#process" do
+    context "if a component is unrecognised" do
+      before(:each) do
+        Alephant::Cache
+          .any_instance
+          .stub(:get)
+          .and_raise(Alephant::Broker::InvalidCacheKey)
+
+        instance       = Alephant::Broker::BatchResponse.new(post_request, config)
+        json           = JSON.parse(instance.process.content)
+        @bad_component = json.fetch('components')[1]
+      end
+
+      it "set status to 404" do
+        expect(@bad_component['status']).to eq(404)
+      end
+
+      it "remove 'body' key" do
+        expect(@bad_component['body']).to eq(nil)
+      end
+    end
+
+    context "if a component is recognised" do
+      before(:each) do
+        @instance = Alephant::Broker::BatchResponse.new(post_request, config)
+        @content  = @instance.process.content
+        @json     = JSON.parse(@content)
+      end
+
+      it "set status to 200" do
+        @json.fetch('components').each do |component|
+          expect(component['status']).to eq(200)
+        end
+      end
+
+      it "set @content to be JSON string containing retrieved components" do
+        compiled_json = '{"batch_id":"baz","components":[{"component":"foo1","options":{"variant":"bar1"},"status":200,"body":"Test response"},{"component":"foo2","options":{"variant":"bar2"},"status":200,"body":"Test response"}]}'
+        expect(@content).to eq(compiled_json)
+      end
+    end
+  end
+end

data/spec/get_request_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Alephant::Broker::GetRequest do
+  subject { Alephant::Broker::GetRequest }
+
+  before(:each) do
+    subject.any_instance.stub(:initialize)
+  end
+
+  describe "#requested_components" do
+    it "returns hash of component parts" do
+      result = subject.new.requested_components('/foo/bar', 'baz=qux')
+      hash   = {
+        :type         => "foo",
+        :component_id => "bar",
+        :extension    => :html,
+        :options      => { :baz => "qux" }
+      }
+
+      expect(result).to eq(hash)
+    end
+  end
+
+  describe "#parse" do
+    context "when component_id is nil" do
+      it "raise error" do
+        expect {
+          subject.new.parse :extension => :foobar
+        }.to raise_exception
+      end
+    end
+
+    context "when component_id is not nil" do
+      it "sets values for attr_reader's" do
+        request = {
+          :component_id => 'foo',
+          :extension => 'bar',
+          :options => 'baz'
+        }
+
+        instance = subject.new
+        instance.parse(request)
+
+        expect(instance.component_id).to eq('foo')
+        expect(instance.extension).to    eq('bar')
+        expect(instance.options).to      eq('baz')
+      end
+
+      context "and extension is recognised" do
+        it "sets appropriate value for instance attribute" do
+          request = { :extension => 'json', :component_id => 'foo' }
+
+          instance = subject.new
+          instance.parse(request)
+
+          expect(instance.content_type).to eq('application/json')
+        end
+      end
+
+      context "and extension is not recognised" do
+        it "sets default value for instance attribute" do
+          request = { :extension => 'foobar', :component_id => 'foo' }
+
+          instance = subject.new
+          instance.parse(request)
+
+          expect(instance.content_type).to eq('text/html')
+        end
+      end
+    end
+  end
+end

data/spec/post_request_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Alephant::Broker::PostRequest do
+  subject { Alephant::Broker::PostRequest }
+
+  describe "#components" do
+    it "returns hash of component parts + sub components" do
+      components = [{
+        "component" => "qux",
+        "options"   => { "variant" => "cor" }
+      }]
+
+      env = (Struct.new(:path, :data)).new("/foo/bar", {
+        'batch_id'    => :foobar,
+        'components'  => components
+      })
+
+      hash = {
+        :batch_id     => :foobar,
+        :type         => "foo",
+        :component_id => "bar",
+        :components   => components
+      }
+
+      RequestStore
+        .stub(:store)
+        .and_return({
+          :env => env
+        })
+
+      instance = subject.new
+      expect(instance.components).to eq(hash)
+    end
+  end
+
+  describe "#set_component(id, options)" do
+    it "sets instance attribute values" do
+      subject
+        .any_instance
+        .stub(:initialize)
+
+      instance = subject.new
+      instance.set_component(:foo, :bar)
+
+      expect(instance.component_id).to eq(:foo)
+      expect(instance.options).to eq(:bar)
+    end
+  end
+end

data/spec/rack_spec.rb

@@ -2,20 +2,22 @@ ENV['RACK_ENV'] = 'test'
 
 require 'rack/test'
 require 'alephant/broker/app/rack'
+require 'request_store'
 
 RSpec.configure do |conf|
   conf.include Rack::Test::Methods
 end
 
-describe 'Broker rack app tests' do
+describe 'Broker Rack Application' do
+  before do
+    RequestStore.store[:env] = nil
 
-  before {
     @lookup_table = double('Alephant::Lookup::LookupTable')
     Alephant::Lookup.stub(:create).and_return(@lookup_table)
 
     Alephant::Cache.any_instance.stub(:initialize)
     Alephant::Cache.any_instance.stub(:get).and_return('Test response')
-  }
+  end
 
   def app
     Alephant::Broker::RackApplication.new({
@@ -25,7 +27,7 @@ describe 'Broker rack app tests' do
     })
   end
 
-  it "Tests status page" do
+  it 'Tests status page' do
     get '/status'
     expect(last_response).to be_ok
     expect(last_response.body).to eq('ok')
@@ -40,7 +42,7 @@ describe 'Broker rack app tests' do
   it "Test asset data is returned" do
     allow(@lookup_table).to receive(:read).and_return('some_location')
 
-    get '/component/test_component'
+    get '/components/test_component'
     expect(last_response).to be_ok
     expect(last_response.body).to eq('Test response')
   end
@@ -49,7 +51,7 @@ describe 'Broker rack app tests' do
     variant = {:variant => 'test_variant'}
     allow(@lookup_table).to receive(:read).with(variant).and_return('some_location')
 
-    get '/component/test_component?variant=test_variant'
+    get '/components/test_component?variant=test_variant'
     expect(last_response).to be_ok
     expect(last_response.body).to eq('Test response')
   end
@@ -57,16 +59,26 @@ describe 'Broker rack app tests' do
   it "Tests 404 when lookup doesn't return a valid location" do
     allow(@lookup_table).to receive(:read).and_return(nil)
 
-    get '/component/test_component'
+    get '/components/test_component'
     expect(last_response.status).to eq(404)
-
   end
 
   it "Tests 500 when exception is raised in application" do
     allow(@lookup_table).to receive(:read).and_raise(Exception)
 
-    get '/component/test_component'
+    get '/components/test_component'
     expect(last_response.status).to eq(500)
   end
 
+  it "Test batch asset data is returned" do
+    allow(@lookup_table).to receive(:read).and_return('some_location')
+
+    json          = '{"batch_id":"baz","components":[{"component":"ni_council_results_table"},{"component":"ni_council_results_table"}]}'
+    compiled_json = '{"batch_id":"baz","components":[{"component":"ni_council_results_table","status":200,"body":"Test response"},{"component":"ni_council_results_table","status":200,"body":"Test response"}]}'
+
+    post '/components/batch', json, "CONTENT_TYPE" => "application/json"
+
+    expect(last_response).to be_ok
+    expect(last_response.body).to eq(compiled_json)
+  end
 end

data/spec/response_factory_spec.rb

@@ -1,35 +1,61 @@
 require 'spec_helper'
 
 describe Alephant::Broker::ResponseFactory do
-
   describe "#response_from(request)" do
     let (:request) { double("Alephant::Broker::Request") }
+    let (:post_request) { double("Alephant::Broker::PostRequest") }
 
-    it "should return as asset response" do
+    it "should return asset response" do
       instance = Alephant::Broker::ResponseFactory.new({})
       allow(request).to receive(:type).and_return(:asset)
 
-      Alephant::Broker::AssetResponse.any_instance.stub(:initialize).with(request, {})
-      expect(instance.response_from(request)).to be_a Alephant::Broker::AssetResponse
+      Alephant::Broker::AssetResponse
+        .any_instance
+        .stub(:initialize)
+        .with(request, {})
+
+      expect(instance.response_from(request))
+        .to be_a Alephant::Broker::AssetResponse
+    end
+
+    it "should return batched response" do
+      instance = Alephant::Broker::ResponseFactory.new({})
+      allow(post_request).to receive(:type).and_return(:batch)
+      allow(post_request).to receive(:content_type).and_return('application/json')
+      allow(post_request).to receive(:set_component)
+      allow(post_request).to receive(:components).and_return({
+        :batch_id   => 'baz',
+        :components => [
+          { 'component' => 'foo1', 'variant'   => 'bar1' },
+          { 'component' => 'foo2', 'variant'   => 'bar2' }
+        ]
+      })
+
+      Alephant::Broker::AssetResponse
+        .any_instance
+        .stub(:initialize)
+        .with(post_request, {})
+
+      expect(instance.response_from(post_request))
+        .to be_a Alephant::Broker::BatchResponse
     end
 
-    it "should return a status response" do
+    it "should return status response" do
       allow(request).to receive(:type).and_return(:status)
       response = subject.response_from(request)
       expect(response.status).to eq(200)
     end
 
-    it "should return a 404 response" do
+    it "should return 404 response" do
       allow(request).to receive(:type).and_return(:notfound)
       response = subject.response_from(request)
       expect(response.status).to eq(404)
     end
 
-    it "should return a 500 response" do
+    it "should return 500 response" do
       allow(request).to receive(:type).and_return(:error)
       response = subject.response_from(request)
       expect(response.status).to eq(500)
     end
-
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-$: << File.join(File.dirname(__FILE__),"..", "lib")
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
 
+require 'pry'
 require 'alephant/broker'
-
-
+require 'request_store'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -150,6 +150,20 @@ dependencies:
         version: '0'
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: request_store
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: alephant-lookup
   version_requirements: !ruby/object:Gem::Requirement
@@ -211,16 +225,27 @@ files:
 - lib/alephant/broker.rb
 - lib/alephant/broker/app.rb
 - lib/alephant/broker/app/rack.rb
+- lib/alephant/broker/call_environment.rb
+- lib/alephant/broker/errors/invalid_asset_id.rb
 - lib/alephant/broker/errors/invalid_cache_key.rb
 - lib/alephant/broker/models/request.rb
+- lib/alephant/broker/models/request/error_request.rb
+- lib/alephant/broker/models/request/get_request.rb
+- lib/alephant/broker/models/request/notfound_request.rb
+- lib/alephant/broker/models/request/post_request.rb
+- lib/alephant/broker/models/request/status_request.rb
+- lib/alephant/broker/models/request_factory.rb
 - lib/alephant/broker/models/request_handler.rb
 - lib/alephant/broker/models/response.rb
 - lib/alephant/broker/models/response/asset_response.rb
+- lib/alephant/broker/models/response/batch_response.rb
 - lib/alephant/broker/models/response_factory.rb
 - lib/alephant/broker/version.rb
 - spec/asset_response_spec.rb
+- spec/batch_response_spec.rb
+- spec/get_request_spec.rb
+- spec/post_request_spec.rb
 - spec/rack_spec.rb
-- spec/request_spec.rb
 - spec/response_factory_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/BBC-News/alephant-broker
@@ -249,7 +274,10 @@ specification_version: 4
 summary: Brokers requests for alephant components
 test_files:
 - spec/asset_response_spec.rb
+- spec/batch_response_spec.rb
+- spec/get_request_spec.rb
+- spec/post_request_spec.rb
 - spec/rack_spec.rb
-- spec/request_spec.rb
 - spec/response_factory_spec.rb
 - spec/spec_helper.rb
+has_rdoc:

data/spec/request_spec.rb

@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe Alephant::Broker::Request do
-
-  describe "#initialize(path, querystring)" do
-    let(:component_id) { 'foo' }
-    let(:querystring) { 'variant=test' }
-
-
-    it "Sets the component id" do
-
-      instance = Alephant::Broker::Request.new("/component/#{component_id}", '')
-      expect(instance.component_id).to eq(component_id)
-    end
-
-    it "Sets the request type to asset" do
-
-      instance = Alephant::Broker::Request.new("/component/#{component_id}", '')
-      expect(instance.type).to eq(:asset)
-      expect(instance.options).to eq({})
-    end
-
-    it "Sets the request type to asset with parsed options" do
-      instance = Alephant::Broker::Request.new("/component/#{component_id}", querystring)
-      expect(instance.type).to eq(:asset)
-      expect(instance.options).to eq({ :variant => 'test' })
-
-    end
-
-    it "Sets the request type to status" do
-      instance = Alephant::Broker::Request.new("/status", '')
-      expect(instance.type).to eq(:status)
-    end
-
-    it "Sets the default extension" do
-      instance = Alephant::Broker::Request.new("/component/blah", '')
-      expect(instance.extension).to eq(:html)
-    end
-
-    it "Sets the extension from the path" do
-      instance = Alephant::Broker::Request.new("/component/blah.json", '')
-      expect(instance.extension).to eq(:json)
-    end
-
-    it "Sets the content type to default if the extension does not exist" do
-      instance = Alephant::Broker::Request.new("/component/blah.test", '')
-      expect(instance.content_type).to eq('text/html')
-    end
-
-  end
-end