alephant-broker 0.1.6 → 1.0.0

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

@@ -0,0 +1,45 @@
+require 'alephant/logger'
+require 'peach'
+
+module Alephant
+  module Broker
+    module Response
+      class Batch < Base
+        include Logger
+
+        attr_reader :components, :batch_id
+
+        def initialize(components, batch_id)
+          @components = components
+          @batch_id   = batch_id
+
+          super(200, 'application/json')
+        end
+
+        def setup
+          @content = JSON.generate({
+            "batch_id" => batch_id,
+            "components" => json
+          })
+        end
+
+        private
+
+        def json
+          logger.info("Broker: Batch load started (#{batch_id})")
+          result = components.pmap do | component |
+            {
+              'component' => component.id,
+              'options'   => component.options
+            }.merge load(component)
+          end
+          logger.info("Broker: Batch load done (#{batch_id})")
+
+          result
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,27 @@
+require 'alephant/broker/response'
+
+module Alephant
+  module Broker
+    module Response
+      class Factory
+        def self.response_for(request)
+          case request
+          when Request::Asset
+            Asset.new(request.component)
+          when Request::Batch
+            Batch.new(request.components, request.batch_id)
+          when Request::Status
+            Status.new
+          else
+            NotFound.new
+          end
+        end
+
+        def self.error
+          ServerError.new
+        end
+      end
+    end
+  end
+end
+

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "0.1.6"
+    VERSION = "1.0.0"
   end
 end

data/spec/rack_spec.rb

@@ -1,8 +1,8 @@
 ENV['RACK_ENV'] = 'test'
 
+require 'spec_helper'
 require 'rack/test'
-require 'alephant/broker/app/rack'
-require 'request_store'
+require 'alephant/broker'
 
 RSpec.configure do |conf|
   conf.include Rack::Test::Methods
@@ -10,25 +10,24 @@ end
 
 describe 'Broker Rack Application' do
   before do
-    RequestStore.store[:env] = nil
+    Alephant::Broker::Component
+      .any_instance
+      .stub(:load)
+      .and_return('Test')
 
-    Alephant::Broker::AssetResponse
+    Alephant::Broker::Component
       .any_instance
-      .stub(:initialize)
+      .stub(:version)
+      .and_return(1)
 
-    Alephant::Broker::AssetResponse
+    Alephant::Broker::Response::Asset
       .any_instance
       .stub(:status)
       .and_return(200)
-
-    Alephant::Broker::AssetResponse
-      .any_instance
-      .stub(:content)
-      .and_return('Test')
   end
 
   def app
-    Alephant::Broker::RackApplication.new({
+    Alephant::Broker::Application.new({
       :lookup_table_name  => 'test_table',
       :bucket_id          => 'test_bucket',
       :path               => 'bucket_path'
@@ -62,7 +61,7 @@ describe 'Broker Rack Application' do
   end
 
   it "Tests 404 when lookup doesn't return a valid location" do
-    Alephant::Broker::AssetResponse
+    Alephant::Broker::Response::Asset
       .any_instance
       .stub(:status)
       .and_return(404)
@@ -73,7 +72,7 @@ describe 'Broker Rack Application' do
   end
 
   it "Tests 500 when exception is raised in application" do
-    Alephant::Broker::AssetResponse
+    Alephant::Broker::Response::Asset
       .any_instance
       .stub(:status)
       .and_return(500)
@@ -85,7 +84,7 @@ describe 'Broker Rack Application' do
 
   it "Test batch asset data is returned" do
     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"},{"component":"ni_council_results_table","status":200,"body":"Test"}]}'
+    compiled_json = '{"batch_id":"baz","components":[{"component":"ni_council_results_table","options":{},"body":"Test","status":200},{"component":"ni_council_results_table","options":{},"body":"Test","status":200}]}'
 
     post '/components/batch', json, "CONTENT_TYPE" => "application/json"
 

data/spec/spec_helper.rb

@@ -3,4 +3,3 @@ $: << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'pry'
 require 'json'
 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.1.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -251,30 +251,22 @@ files:
 - Rakefile
 - alephant-broker.gemspec
 - lib/alephant/broker.rb
-- lib/alephant/broker/app.rb
-- lib/alephant/broker/app/rack.rb
-- lib/alephant/broker/call_environment.rb
+- lib/alephant/broker/component.rb
+- lib/alephant/broker/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/request.rb
+- lib/alephant/broker/request/asset.rb
+- lib/alephant/broker/request/batch.rb
+- lib/alephant/broker/request/factory.rb
+- lib/alephant/broker/request/handler.rb
+- lib/alephant/broker/response.rb
+- lib/alephant/broker/response/asset.rb
+- lib/alephant/broker/response/base.rb
+- lib/alephant/broker/response/batch.rb
+- lib/alephant/broker/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/response_factory_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/BBC-News/alephant-broker
 licenses:
@@ -301,10 +293,5 @@ signing_key:
 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/response_factory_spec.rb
 - spec/spec_helper.rb

data/lib/alephant/broker/app.rb

@@ -1,20 +0,0 @@
-$: << File.dirname(__FILE__)
-
-require 'alephant/broker'
-require 'alephant/logger'
-
-module Alephant
-  module Broker
-    class Application
-      include Logger
-
-      def initialize(config)
-        @config = config
-      end
-
-      def handle
-        Alephant::Broker.handle(@config)
-      end
-    end
-  end
-end

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

@@ -1,25 +0,0 @@
-$: << File.dirname(__FILE__)
-
-require 'alephant/broker/app'
-require 'alephant/broker/call_environment'
-
-module Alephant
-  module Broker
-    class RackApplication < Application
-
-      def call(env)
-        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 ]
-        ]
-      end
-    end
-  end
-end

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

@@ -1,41 +0,0 @@
-require 'alephant/logger'
-
-module Alephant
-  module Broker
-    class Request
-      include Logger
-      attr_reader :type
-
-      DEFAULT_EXTENSION = :html
-
-      @@extension_mapping = {
-        :html => 'text/html',
-        :json => 'application/json'
-      }
-
-      def initialize(request_type)
-        logger.info("Broker.request: Type: #{request_type}")
-        @type = request_type
-      end
-
-      def options_from(query_string)
-        query_string.split('&').reduce({}) do |object, key_pair|
-          key, value = key_pair.split('=')
-          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

@@ -1,11 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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
-        super(:asset)
-        env = RequestStore.store[:env]
-        parse requested_components(env.path, env.query)
-      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

@@ -1,11 +0,0 @@
-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

@@ -1,50 +0,0 @@
-require 'alephant/broker/models/request'
-
-module Alephant
-  module Broker
-    class PostRequest < Request
-      attr_reader :type, :renderer_id, :component_id, :options, :content_type
-
-      def initialize
-        @renderer_id  = batch_id
-        @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 env
-        @env ||= RequestStore.store[:env]
-      end
-
-      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

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