alephant-broker 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 565f5f6b0ad1c0dcfd6024bae98ce1fd1afcb21f
-  data.tar.gz: f3f17262eb4a373874951c16c1cd9a8ec0c3d19b
+  metadata.gz: cebf819da714467f9faec319d6343c6e0d086117
+  data.tar.gz: d154fe7544fb5f9f904a5f5849817547bb897629
 SHA512:
-  metadata.gz: d77b8eca85c8ee60f7dad50445e49cc93da881dd46050e53d8c609661f7312b0c3a9a68f79a0cd98209e3bbf7760e45f9ca060cd773b62ff86c2c536ece0baeb
-  data.tar.gz: ee3493fc5ceb18f301893127c6dfaf2097631bb310d110e2173b5d7c2960d8fb56ec767867ef1a86802b4c6d83a77e2419b39fefac130678f7ea570b2da672b2
+  metadata.gz: 5730739e5d7abc50fcbc385a6e06521b93a4ddd14c396abcf177bfd3a3db8da2ca0befb8fd4b18193582d54b31504d2e60253769746661dbde88d13beb83b2d6
+  data.tar.gz: 19029f98faa67945a4947cb40d31a5b296de6d52a228a2817b2f5bd264a481d9b66761c96c3243a7546b55fd25e8086911625653da7c7a34d62dd5a3d4684e92

data/lib/alephant/broker.rb

@@ -2,9 +2,11 @@ require 'alephant/broker/version'
 require 'alephant/broker/request'
 require 'alephant/broker/environment'
 require 'alephant/broker'
+require 'ostruct'
 
 module Alephant
   module Broker
+    @@poll = true
 
     def self.handle(env)
       Request::Handler.process env
@@ -18,13 +20,25 @@ module Alephant
       @@configuration = c
     end
 
+    def self.poll?
+      @@poll
+    end
+
+    def self.poll=(state)
+      @@poll = state
+    end
+
     class Application
       def initialize(c = nil)
         Broker.config = c unless c.nil?
       end
 
       def call(env)
-        send response_for(environment_for(env))
+        if ::Alephant::Broker.poll?
+          send response_for(environment_for(env))
+        else
+          send stop_poll_response
+        end
       end
 
       def environment_for(env)
@@ -42,10 +56,26 @@ module Alephant
             "Content-Type" => response.content_type,
             "X-Version"    => response.version.to_s,
             "X-Cached"     => response.cached.to_s
-          },
+          }.merge(response.headers),
           [ response.content.to_s ]
         ]
       end
+
+      private
+
+      def stop_poll_response
+        response = OpenStruct.new(
+          :status  => 420,
+          :content => "Stopped polling",
+          :cached  => false,
+          :version => 0,
+          :headers => {
+            "Content-Type"   => "plain/text",
+            "X-Cached"       => "false",
+            "X-Stop-Polling" => "true"
+          }
+        )
+      end
     end
   end
 end

data/lib/alephant/broker/component.rb

@@ -12,7 +12,7 @@ module Alephant
     class Component
       include Logger
 
-      attr_reader :id, :batch_id, :options, :content, :cached
+      attr_reader :id, :batch_id, :options, :content, :content_type, :cached
 
       def initialize(id, batch_id, options)
         @id       = id
@@ -23,10 +23,8 @@ module Alephant
       end
 
       def load
-        @content ||= @cache.get(cache_key) do
-          @cached = false
-          s3.get(s3_path)
-        end
+        @content_type = cache_object[:content_type]
+        @content      = cache_object[:content]
       end
 
       def opts_hash
@@ -39,6 +37,13 @@ module Alephant
 
       private
 
+      def cache_object
+        @cache_object ||= @cache.get(cache_key) do
+          @cached = false
+          s3.get(s3_path)
+        end
+      end
+
       def cache_key
         @cache_key ||= "#{id}/#{opts_hash}/#{version}"
       end

data/lib/alephant/broker/request.rb

@@ -5,6 +5,7 @@ module Alephant
       require 'alephant/broker/request/batch'
       require 'alephant/broker/request/factory'
       require 'alephant/broker/request/handler'
+      require 'alephant/broker/request/multi'
 
       class NotFound; end
       class Status; end

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

@@ -8,26 +8,17 @@ module Alephant
       class Asset
         include Logger
 
-        attr_reader :component
+        attr_accessor :component
 
-        def initialize(env)
-          logger.debug("Request::Asset#initialize(#{env.settings})")
-          component_id = component_id_for env.path
+        def initialize(env = nil)
+          return if env.nil?
 
-          @component = Component.new(
-            component_id,
-            nil,
-            env.options
-          )
+          component_id = env.path.split('/')[2] || nil
+          options      = env.options
 
-          logger.debug("Request::Asset#initialize: id: #{component_id}")
           raise InvalidAssetId.new("No Asset ID specified") if component_id.nil?
-        end
-
-        private
 
-        def component_id_for(path)
-          path.split('/')[2] || nil
+          @component = Component.new(component_id, nil, options)
         end
 
       end

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

@@ -9,6 +9,8 @@ module Alephant::Broker::Request
 
     def self.request_for(env)
       case request_type_from(env)
+      when 'multi'
+        Multi.new(env)
       when 'component'
         Asset.new(env)
       when 'components'

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

@@ -0,0 +1,40 @@
+require 'alephant/logger'
+require 'alephant/broker/component'
+
+module Alephant
+  module Broker
+    module Request
+      class Multi
+        include Logger
+
+        attr_reader :requests
+
+        def initialize(env)
+          logger.debug("Request::Multi#initialize(#{env.settings})")
+          @requests = requests_for env
+        end
+
+        private
+
+        def requests_for(env)
+          env.data['requests'].map do |c|
+            case c['type']
+            when 'asset'
+              asset = Asset.new
+
+              component_id = c['payload']['component_id']
+              options      = c['payload']['options']
+
+              component = Component.new(component_id, nil, options)
+              asset.tap { |a| a.component = component }
+            else
+              raise StandardError.new "request type not identified"
+            end
+          end
+        end
+
+      end
+    end
+  end
+end
+

data/lib/alephant/broker/response.rb

@@ -4,6 +4,7 @@ module Alephant
       require 'alephant/broker/response/base'
       require 'alephant/broker/response/asset'
       require 'alephant/broker/response/batch'
+      require 'alephant/broker/response/multi'
       require 'alephant/broker/response/factory'
 
       class NotFound < Base

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

@@ -15,12 +15,13 @@ module Alephant
         end
 
         def setup
+          loaded_content = load(component)
 
-          result  = load(component)
-          @status  = result['status']
-          @content = result['body']
-          @version = component.version.nil? ? 'not available' : component.version
-          @cached  = component.cached
+          @content      = loaded_content[:body]
+          @content_type = loaded_content[:content_type]
+          @status       = loaded_content[:status]
+          @version      = component.version.nil? ? 'not available' : component.version
+          @cached       = component.cached
         end
 
       end

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

@@ -1,9 +1,11 @@
 require 'aws-sdk'
+require 'ostruct'
 
 module Alephant
   module Broker
     module Response
       class Base
+        attr_reader :headers
         attr_accessor :status, :content, :content_type, :version, :cached
 
         STATUS_CODE_MAPPING = {
@@ -13,31 +15,48 @@ module Alephant
         }
 
         def initialize(status = 200, content_type = "text/html")
+          @headers      = {}
+          @version      = 'not available'
+          @cached       = false
           @content_type = content_type
-          @status  = status
-          @content = STATUS_CODE_MAPPING[status]
+          @status       = status
+          @content      = STATUS_CODE_MAPPING[status]
 
           setup
         end
 
+        def to_h
+          {
+            :status       => @status,
+            :content      => @content,
+            :content_type => @content_type,
+            :version      => @version,
+            :cached       => @cached
+          }
+        end
+
         protected
 
         def setup; end
 
         def load(component)
           begin
-            body   = component.load
-            status = 200
+
+            data = OpenStruct.new(:status => 200, :content_type => content_type)
+            component.load
+
+            data.content_type = component.content_type
+            data.body         = component.content.force_encoding('UTF-8')
           rescue AWS::S3::Errors::NoSuchKey, InvalidCacheKey => e
-            body   = "#{error_for(e)}"
-            status = 404
+            data.body   = "Not found"
+            data.status = 404
           rescue StandardError => e
-            body   = "#{error_for(e)}"
-            status = 500
+            data.body   = "#{error_for(e)}"
+            data.status = 500
           end
 
-          log(component, status, e)
-          { 'body' => body.force_encoding('UTF-8'), 'status' => status }
+          log(component, data.status, e)
+          data.marshal_dump
         end
 
         def log(c, status, e = nil)

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

@@ -10,6 +10,8 @@ module Alephant
             Asset.new(request.component)
           when Request::Batch
             Batch.new(request.components, request.batch_id)
+          when Request::Multi
+            Multi.new(request.requests)
           when Request::Status
             Status.new
           else

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

@@ -0,0 +1,49 @@
+require 'json'
+
+module Alephant
+  module Broker
+    module Response
+      class Multi < Base
+        attr_reader :requests
+
+        POLLING_DELAY = 2
+
+        def initialize(requests)
+          @requests = requests
+
+          super()
+        end
+
+        def raw_response
+          requests.reduce(:delay => POLLING_DELAY, :responses => []) do |m,request|
+            response = Factory.response_for request
+
+            case response
+            when Asset
+              m[:responses] << {
+                :type     => response.class.to_s.downcase,
+                :datatype => response.content_type,
+                :payload  => {
+                  :component_id => response.component.id,
+                  :options      => response.component.options,
+                  :body         => response.to_h
+                }
+              }
+            when NotFound
+              # Do nothing
+            else
+              raise StandardError.new "response type not identified"
+            end
+
+            m
+          end
+        end
+
+        def setup
+          @content_type = 'application/json'
+          @content      = JSON.generate(raw_response)
+        end
+      end
+    end
+  end
+end

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "1.0.5"
+    VERSION = "1.1.0"
   end
 end

data/spec/rack_spec.rb

@@ -15,6 +15,16 @@ describe 'Broker Rack Application' do
       .stub(:load)
       .and_return('Test')
 
+    Alephant::Broker::Component
+      .any_instance
+      .stub(:content)
+      .and_return('Test')
+
+    Alephant::Broker::Component
+      .any_instance
+      .stub(:content_type)
+      .and_return('foo/bar')
+
     Alephant::Broker::Component
       .any_instance
       .stub(:version)
@@ -84,7 +94,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","options":{},"body":"Test","status":200},{"component":"ni_council_results_table","options":{},"body":"Test","status":200}]}'
+    compiled_json = '{"batch_id":"baz","components":[{"component":"ni_council_results_table","options":{},"status":200,"content_type":"foo/bar","body":"Test"},{"component":"ni_council_results_table","options":{},"status":200,"content_type":"foo/bar","body":"Test"}]}'
 
     post '/components/batch', json, "CONTENT_TYPE" => "application/json"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -275,11 +275,13 @@ files:
 - lib/alephant/broker/request/batch.rb
 - lib/alephant/broker/request/factory.rb
 - lib/alephant/broker/request/handler.rb
+- lib/alephant/broker/request/multi.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/response/multi.rb
 - lib/alephant/broker/version.rb
 - spec/rack_spec.rb
 - spec/spec_helper.rb