alephant-broker 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7188ad7416429b9e3644497b893e54d17cf18848
-  data.tar.gz: 600553f7caaceb30285b9454192211cdc8b49773
+  metadata.gz: 54b3da006e03b9b1bb3a4697ef59e5472a872481
+  data.tar.gz: b6fb65f722c3cb34f5589327dc1478244d1367fb
 SHA512:
-  metadata.gz: e880ac06f905b8d4e56b4ec9e25f601d2c0996bcd37321a25d3779c951139ab08c150499e6c5f688fa35505150b04cc7378e769c3ee6d7ea2ea8a7bb0595c4a3
-  data.tar.gz: 93191cbd238306a803f607520522d2ee02018c36fdb9d4e8c5435a2fed4a050a24ebb566a97e84a45cd1b4d834847ace817087f51ac6b6df2d9ba3096599a984
+  metadata.gz: dc7a8957b4a78a63681e211df68fb18a8bd27c48093a858afab1a394bcc07809666c36f3ac5e711e2726372c306385fb53e1099bc274753a6b7b74e3e562554c
+  data.tar.gz: 6b16b372746c156f6ec2a93c7f906985f88e25e5445df00d4539b1d0567c3408889d2b6f85ab85c99194a820af74c0f187649cb5e4b6341215cb5ae41cd6134a

data/Rakefile

@@ -3,7 +3,6 @@ $:.unshift File.join(File.dirname(__FILE__), 'lib')
 require 'rspec/core/rake_task'
 require 'bundler/gem_tasks'
 require 'alephant/broker'
-
-RSpec::Core::RakeTask.new(:spec)
+require 'rake/rspec'
 
 task :default => :spec

data/alephant-broker.gemspec

@@ -25,16 +25,16 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-remote"
   spec.add_development_dependency "pry-nav"
+  spec.add_development_dependency "rake-rspec", ">= 0.0.2"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rack-test"
 
-  spec.add_runtime_dependency "request_store"
-  spec.add_runtime_dependency "peach"
   spec.add_runtime_dependency "alephant-lookup"
   spec.add_runtime_dependency "alephant-cache"
   spec.add_runtime_dependency 'alephant-logger'
   spec.add_runtime_dependency 'alephant-sequencer'
   spec.add_runtime_dependency "dalli-elasticache"
+  spec.add_runtime_dependency 'pmap'
 end

data/lib/alephant/broker.rb

@@ -8,8 +8,8 @@ module Alephant
   module Broker
     @@poll = true
 
-    def self.handle(env)
-      Request::Handler.process env
+    def self.handle(load_strategy, env)
+      Request::Handler.process(load_strategy, env)
     end
 
     def self.config
@@ -29,8 +29,11 @@ module Alephant
     end
 
     class Application
-      def initialize(c = nil)
+      attr_reader :load_strategy
+
+      def initialize(load_strategy, c = nil)
         Broker.config = c unless c.nil?
+        @load_strategy = load_strategy
       end
 
       def call(env)
@@ -46,19 +49,16 @@ module Alephant
       end
 
       def response_for(call_environment)
-        Broker.handle call_environment
+        Broker.handle(load_strategy, call_environment)
       end
 
       def send(response)
         [
           response.status,
-          {
-            "Content-Type" => response.content_type,
-            "X-Sequence"   => response.sequence.to_s,
-            "X-Version"    => response.version.to_s,
-            "X-Cached"     => response.cached.to_s
-          }.merge(response.headers),
-          [ response.content.to_s ]
+          response.headers,
+          [
+            response.content.to_s
+          ]
         ]
       end
 

data/lib/alephant/broker/component.rb

@@ -8,89 +8,42 @@ require 'alephant/broker/cache'
 
 module Alephant
   module Broker
-
     class Component
-      include Logger
-
-      attr_reader :id, :batch_id, :options, :content, :content_type, :cached
+      attr_reader :id, :batch_id, :options, :content, :opts_hash
 
-      def initialize(id, batch_id, options)
-        @id       = id
-        @batch_id = batch_id
-        @cache    = Cache::Client.new
-        @options  = symbolize(options || {})
-        @cached   = true
+      def initialize(meta, data)
+        @id        = meta.id
+        @batch_id  = meta.batch_id
+        @options   = symbolize(meta.options || {})
+        @content   = data[:content].force_encoding 'UTF-8'
+        @opts_hash = meta.opts_hash
+        @data      = data
+        @meta      = meta
       end
 
-      def load
-        @content_type = cache_object[:content_type]
-        @content      = cache_object[:content]
-      rescue
-        content_hash  = @cache.set(cache_key, retrieve_object)
-        @content_type = content_hash[:content_type]
-        @content      = content_hash[:content]
+      def content_type
+        headers['Content-Type']
       end
 
-      def opts_hash
-        @opts_hash ||= Crimp.signature(options)
+      def headers
+        {
+          'Content-Type' => data[:content_type].to_s,
+          'X-Version'    => meta.version.to_s,
+          'X-Cached'     => meta.cached.to_s
+        }.merge(data[:headers] || {})
       end
 
-      def version
-        @version ||= sequencer.get_last_seen
+      def status
+        200
       end
 
       private
 
-      def cache_object
-        @cache_object ||= @cache.get(cache_key) { retrieve_object }
-      end
-
-      def retrieve_object
-        @cached = false
-        s3.get(s3_path)
-      end
-
-      def cache_key
-        @cache_key ||= "#{id}/#{opts_hash}/#{version}"
-      end
+      attr_reader :meta, :data
 
       def symbolize(hash)
         Hash[hash.map { |k,v| [k.to_sym, v] }]
       end
-
-      def s3
-        @s3_cache ||= Alephant::Cache.new(
-          Broker.config[:s3_bucket_id],
-          Broker.config[:s3_object_path]
-        )
-      end
-
-      def s3_path
-        lookup.read(id, options, version).tap do |lookup_object|
-          raise InvalidCacheKey if lookup_object.location.nil?
-        end.location unless version.nil?
-      end
-
-      def lookup
-        @lookup ||= Alephant::Lookup.create(Broker.config[:lookup_table_name])
-      end
-
-      def key
-        batch_id.nil? ? component_key : renderer_key
-      end
-
-      def component_key
-        "#{id}/#{opts_hash}"
-      end
-
-      def renderer_key
-        "#{batch_id}/#{opts_hash}"
-      end
-
-      def sequencer
-        @sequencer ||= Alephant::Sequencer.create(Broker.config[:sequencer_table_name], key)
-      end
-
     end
   end
 end

data/lib/alephant/broker/component_factory.rb

@@ -0,0 +1,30 @@
+require 'alephant/broker/component_meta'
+require 'alephant/broker/errors/content_not_found'
+require 'alephant/broker/error_component'
+require 'alephant/logger'
+
+module Alephant
+  module Broker
+    class ComponentFactory
+      include Logger
+
+      def initialize(load_strategy)
+        @load_strategy = load_strategy
+      end
+
+      def create(id, batch_id, options)
+        component_meta = ComponentMeta.new(id, batch_id, options)
+        Component.new(
+          component_meta,
+          @load_strategy.load(component_meta)
+        )
+      rescue Alephant::Broker::Errors::ContentNotFound
+        logger.warn 'Broker.ComponentFactory.create: Exception raised (ContentNotFound)'
+        ErrorComponent.new(component_meta, 404)
+      rescue => e
+        logger.warn("Broker.ComponentFactory.create: Exception raised (#{e.message}, #{e.backtrace.join('\n')})")
+        ErrorComponent.new(component_meta, 500, e)
+      end
+    end
+  end
+end

data/lib/alephant/broker/component_meta.rb

@@ -0,0 +1,51 @@
+module Alephant
+  module Broker
+    class ComponentMeta
+      attr_reader :id, :options, :batch_id
+      attr_accessor :cached
+
+      def initialize(id, batch_id, options)
+        @id = id
+        @batch_id = batch_id
+        @options = options
+        @cached = true
+      end
+
+      def cache_key
+        "#{id}/#{opts_hash}/#{version}"
+      end
+
+      def version
+        Broker.config.fetch(
+          'elasticache_cache_version', 'not available'
+        ).to_s
+      end
+
+      def key
+        batch_id.nil? ? component_key : renderer_key
+      end
+
+      def opts_hash
+        Crimp.signature options
+      end
+
+      private
+
+      def component_key
+        "#{id}/#{opts_hash}"
+      end
+
+      def renderer_key
+        "#{batch_id}/#{opts_hash}"
+      end
+
+      def headers(data)
+        {
+          'Content-Type' => data[:content_type].to_s,
+          'X-Version'    => version.to_s,
+          'X-Cached'     => cached.to_s
+        }.merge(data[:headers] || {})
+      end
+    end
+  end
+end

data/lib/alephant/broker/error_component.rb

@@ -0,0 +1,42 @@
+module Alephant
+  module Broker
+    class ErrorComponent
+      attr_reader :batch_id, :content, :id, :options, :status
+
+      def initialize(meta, status, body = nil)
+        @batch_id = meta.batch_id
+        @status   = status
+        @content  = content_for body
+        @id       = meta.id
+        @options  = {}
+      end
+
+      def content_type
+        headers['Content-Type']
+      end
+
+      def headers
+        {
+          'Content-Type' => 'text/plain'
+        }
+      end
+
+      private
+
+      STATUS_CODE_MAPPING = {
+        404 => 'Not found',
+        500 => 'Error retrieving content'
+      }
+
+      def content_for(body)
+        body.nil? ? STATUS_CODE_MAPPING[status]
+                  : format_content_for(body)
+      end
+
+      def format_content_for(body)
+        body.is_a? Exception ? "#{e.message}\n#{e.backtrace.join('\n')}"
+                             : body
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Alephant
+  module Broker
+    module Errors
+      class ContentNotFound < StandardError; end
+    end
+  end
+end

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

@@ -1,11 +1,9 @@
 module Alephant
   module Broker
     class InvalidCacheKey < Exception
-
       def initialize
-        super("Cache key not found based on component_id and options combination")
+        super 'Cache key not found based on component_id and options combination'
       end
-
     end
   end
 end

data/lib/alephant/broker/load_strategy/s3.rb

@@ -0,0 +1,88 @@
+require "alephant/broker/cache"
+require 'alephant/broker/errors/content_not_found'
+require 'alephant/broker/errors/invalid_cache_key'
+
+module Alephant
+  module Broker
+    module LoadStrategy
+      class S3
+        def load(component_meta)
+          add_s3_headers(
+            cache_object(component_meta),
+            component_meta
+          )
+        rescue
+          add_s3_headers(
+            cache.set(
+              component_meta.cache_key,
+              retrieve_object(component_meta)
+            ),
+            component_meta
+          )
+        end
+
+        private 
+
+        def add_s3_headers(component_data, component_meta)
+          component_data.merge(
+            { headers: headers(component_meta) }
+          )
+        end
+
+        def cache
+          @cache ||= Cache::Client.new
+        end
+
+        def headers(component_meta)
+          { 'X-Sequence' => sequence(component_meta).to_s }
+        end
+
+        def sequence(component_meta)
+          sequencer(component_meta).get_last_seen
+        end
+
+        def retrieve_object(component_meta)
+          component_meta.cached = false
+          s3.get s3_path(component_meta)
+        rescue AWS::S3::Errors::NoSuchKey, InvalidCacheKey
+          raise Alephant::Broker::Errors::ContentNotFound
+        end
+
+        def cache_object(component_meta)
+          cache.get(component_meta.cache_key) do
+            retrieve_object component_meta
+          end
+        end
+
+        def s3
+          @s3 ||= Alephant::Cache.new(
+            Broker.config[:s3_bucket_id],
+            Broker.config[:s3_object_path]
+          )
+        end
+
+        def s3_path(component_meta)
+          lookup.read(
+            component_meta.id,
+            component_meta.options,
+            sequence(component_meta)
+          ).tap do |obj|
+            raise InvalidCacheKey if obj.location.nil?
+          end.location unless sequence(component_meta).nil?
+        end
+
+        def lookup
+          @lookup ||= Alephant::Lookup.create(
+            Broker.config[:lookup_table_name]
+          )
+        end
+
+        def sequencer(component_meta)
+          Alephant::Sequencer.create(
+            Broker.config[:sequencer_table_name], component_meta.key
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Alephant
 
         attr_accessor :component
 
-        def initialize(env = nil)
+        def initialize(component_factory, env = nil)
           return if env.nil?
 
           component_id = env.path.split('/')[2] || nil
@@ -18,9 +18,8 @@ module Alephant
 
           raise InvalidAssetId.new("No Asset ID specified") if component_id.nil?
 
-          @component = Component.new(component_id, nil, options)
+          @component = component_factory.create(component_id, nil, options)
         end
-
       end
     end
   end