alephant-broker 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38bbbde873e9befab83b241a575c79c3e60bb587
-  data.tar.gz: d6d650f9cb5e9e50ff3b665cc4f9f6759110c279
+  metadata.gz: ce3d6afda8699e8e18f0988692abcd9abdc23bd5
+  data.tar.gz: 83fd6ac78a25d9d412ada73b072c48216a0a6793
 SHA512:
-  metadata.gz: faf61092ff24d4b65bbeee0dc8915662e731d8ed067ce6a789d0a663d2bc2ada0d6da2640424711decfa3500f97ec54a65a4124d918216dc28bb7bc0ab359079
-  data.tar.gz: 78132a0acdd19c4eda3ad0e3a5363bb4ec07081fd37c6364578e09baa786ffb580177b457b4c2ee3c488dd2486564d77dc9ba44d5e156094ece521c05e676519
+  metadata.gz: 8314f42ed32e235903b076ddbb0649945114e406ffb548a990aab0e47ef7ee00907c79043d5d01fd5c7fc5543371d471ed09f169f8d096fbf454e268c9708c21
+  data.tar.gz: 2d9a27867bf43318d8bc1c5490bf0e4f8c7952ec3687c8939bf148788d00888c2a5806fdf663dc5c29b9c629ee836a71c8b60031ebee60f3784bbf7b98f55e00

data/alephant-broker.gemspec

@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "alephant-cache"
   spec.add_runtime_dependency 'alephant-logger'
   spec.add_runtime_dependency 'alephant-sequencer'
+  spec.add_runtime_dependency "dalli-elasticache"
 end

data/lib/alephant/broker/cache.rb

@@ -0,0 +1,58 @@
+require 'dalli-elasticache'
+require 'alephant/logger'
+
+module Alephant
+  module Broker
+    module Cache
+
+      class Client
+        include Logger
+
+        DEFAULT_TTL  = 2592000
+
+        def initialize
+          unless config_endpoint.nil?
+            @@elasticache ||= ::Dalli::ElastiCache.new(config_endpoint, { :expires_in => ttl })
+            @client = @@elasticache.client
+          else
+            logger.info('Broker::Cache::Client#initialize: No config endpoint, NullClient used')
+            @client = NullClient.new
+          end
+        end
+
+        def config_endpoint
+          Broker.config['elasticache_config_endpoint']
+        end
+
+        def ttl
+           Broker.config['elasticache_ttl'] || DEFAULT_TTL
+        end
+
+        def get(key, &block)
+          begin
+            result = @client.get(key)
+            logger.info("Broker::Cache::Client#get key: #{key} - #{result ? 'hit' : 'miss'}")
+            result ? result : set(key, block.call)
+          rescue StandardError => e
+            block.call if block_given?
+          end
+        end
+
+        def set(key, value)
+          value.tap { |o| @client.set(key, o) }
+        end
+
+      end
+
+      class NullClient
+        def get(key); end
+
+        def set(key, value)
+          value
+        end
+      end
+
+    end
+  end
+end
+

data/lib/alephant/broker/component.rb

@@ -4,9 +4,11 @@ require 'alephant/cache'
 require 'alephant/lookup'
 require 'alephant/broker/errors/invalid_cache_key'
 require 'alephant/sequencer'
+require 'alephant/broker/cache'
 
 module Alephant
   module Broker
+
     class Component
       include Logger
 
@@ -15,11 +17,14 @@ module Alephant
       def initialize(id, batch_id, options)
         @id       = id
         @batch_id = batch_id
+        @cache    = Cache::Client.new
         @options  = symbolize(options || {})
       end
 
       def load
-        @content ||= cache.get(s3_path)
+        @content ||= @cache.get(cache_key) do
+          s3.get(s3_path)
+        end
       end
 
       def opts_hash
@@ -32,12 +37,16 @@ module Alephant
 
       private
 
+      def cache_key
+        @cache_key ||= "#{id}/#{opts_hash}/#{version}"
+      end
+
       def symbolize(hash)
         Hash[hash.map { |k,v| [k.to_sym, v] }]
       end
 
-      def cache
-        @cache ||= Alephant::Cache.new(
+      def s3
+        @s3_cache ||= Alephant::Cache.new(
           Broker.config[:s3_bucket_id],
           Broker.config[:s3_object_path]
         )

data/lib/alephant/broker/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Steven Jack
@@ -234,6 +234,20 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: dalli-elasticache
+  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: :runtime
 description: Brokers requests for alephant components
 email:
 - stevenmajack@gmail.com
@@ -251,6 +265,7 @@ files:
 - Rakefile
 - alephant-broker.gemspec
 - lib/alephant/broker.rb
+- lib/alephant/broker/cache.rb
 - lib/alephant/broker/component.rb
 - lib/alephant/broker/environment.rb
 - lib/alephant/broker/errors/invalid_asset_id.rb