alephant-broker 3.7.1 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a8414b5806729af3ea2f852c8a56ab7ebcfa3a1
-  data.tar.gz: 2da30be81a15c68d2dbaea5def3dd4e9d514e05f
+  metadata.gz: 26af20b2231cdb88d51a7ad006a5b807093d6d70
+  data.tar.gz: 947c6ffae0e64eb7a77ff013ac8d7ddb7fcee67e
 SHA512:
-  metadata.gz: e646113d61e4b2ed79e0a576f5b0d0bfc491f2356ec93f6b89aa5f7e1fa980788d1c3498a0479933e22601edc868efe5095fab1e8bc6d85707174be1753dc60a
-  data.tar.gz: 9039ca78be21c252a27cffd306e54e60959f66d82b765e5025c85adef9fa45f811f9aacb6becda238f33572317c92ccff3a3bc593a46d8e16e2b65ac2d84b716
+  metadata.gz: 49147d5e3b73712e211e5db6ec26f35efe0e99e4cea1b9e9e261aab2cdbf316968e1e627e7de2dffbc3735961870b131926203fa16423d9414be8665469b7781
+  data.tar.gz: 6dbc3c9d3bb758bfa64bf424a36adfdbe1456c018f55d7184914e3e05a6bad414ddeff8a9700db573ab7ee6bf66a3a8b6cb68e91ec4d237dbd201db6c4629d96

data/alephant-broker.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test"
 
   spec.add_runtime_dependency "alephant-lookup"
-  spec.add_runtime_dependency "alephant-cache"
+  spec.add_runtime_dependency "alephant-storage"
   spec.add_runtime_dependency "alephant-logger", "1.2.0"
   spec.add_runtime_dependency 'alephant-sequencer'
   spec.add_runtime_dependency "dalli-elasticache"

data/lib/alephant/broker/component.rb

@@ -1,5 +1,5 @@
 require "crimp"
-require "alephant/cache"
+require "alephant/storage"
 require "alephant/lookup"
 require "alephant/broker/errors/invalid_cache_key"
 require "alephant/sequencer"

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

@@ -20,7 +20,7 @@ module Alephant
         end
 
         def load(component_meta)
-          cache_object(component_meta)
+          fetch_object(component_meta)
         rescue
           logger.metric "CacheMiss"
           cache.set(component_meta.cache_key, content(component_meta))
@@ -34,7 +34,7 @@ module Alephant
           @cache ||= Cache::Client.new
         end
 
-        def cache_object(component_meta)
+        def fetch_object(component_meta)
           cache.get(component_meta.cache_key) { content component_meta }
         end
 

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

@@ -17,14 +17,14 @@ module Alephant
 
           def load(component_meta)
             add_s3_headers(
-              cache_object(component_meta),
+              fetch_object(component_meta),
               component_meta
             )
           rescue
             logger.metric "S3CacheMiss"
             add_s3_headers(
               cache.set(
-                cache_key(component_meta),
+                storage_key(component_meta),
                 retrieve_object(component_meta)
               ),
               component_meta
@@ -37,7 +37,7 @@ module Alephant
             Hash.new
           end
 
-          def cache_key(component_meta)
+          def storage_key(component_meta)
             component_meta.component_key
           end
 
@@ -65,14 +65,14 @@ module Alephant
             raise Alephant::Broker::Errors::ContentNotFound
           end
 
-          def cache_object(component_meta)
-            cache.get cache_key(component_meta) do
+          def fetch_object(component_meta)
+            cache.get storage_key(component_meta) do
               retrieve_object component_meta
             end
           end
 
           def s3
-            @s3 ||= Alephant::Cache.new(
+            @s3 ||= Alephant::Storage.new(
               Broker.config[:s3_bucket_id],
               Broker.config[:s3_object_path]
             )

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

@@ -28,7 +28,7 @@ module Alephant
             )
           end
 
-          def cache_key(component_meta)
+          def storage_key(component_meta)
             "#{super(component_meta)}/#{sequence(component_meta)}"
           end
 

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "3.7.1"
+    VERSION = "3.8.0"
   end
 end

data/spec/integration/rack_spec.rb

@@ -40,7 +40,7 @@ describe Alephant::Broker::Application do
     )
   end
 
-  let(:s3_cache_double) { instance_double("Alephant::Cache", :get => content) }
+  let(:s3_double) { instance_double("Alephant::Storage", :get => content) }
 
   before do
     allow_any_instance_of(Logger).to receive(:info)
@@ -66,7 +66,7 @@ describe Alephant::Broker::Application do
 
   describe "Component endpoint '/component/...'" do
     before do
-      allow(Alephant::Cache).to receive(:new) { s3_cache_double }
+      allow(Alephant::Storage).to receive(:new) { s3_double }
       get "/component/test_component"
     end
 
@@ -95,7 +95,7 @@ describe Alephant::Broker::Application do
     end
 
     before do
-      allow(Alephant::Cache).to receive(:new) { s3_cache_double }
+      allow(Alephant::Storage).to receive(:new) { s3_double }
     end
 
     context "when using valid batch asset data" do
@@ -115,9 +115,9 @@ describe Alephant::Broker::Application do
         :meta    => {}
       )
     end
-    let(:s3_cache_double) do
+    let(:s3_double) do
       instance_double(
-        "Alephant::Cache",
+        "Alephant::Storage",
         :get => content
       )
     end
@@ -125,7 +125,7 @@ describe Alephant::Broker::Application do
     context "with 404 status code set" do
       before do
         content[:meta]["status"] = 404
-        allow(Alephant::Cache).to receive(:new) { s3_cache_double }
+        allow(Alephant::Storage).to receive(:new) { s3_double }
         get "/component/test_component"
       end
 
@@ -140,7 +140,7 @@ describe Alephant::Broker::Application do
           "head_header_without_dash" => "bar",
           "status"                   => 200
         }
-        allow(Alephant::Cache).to receive(:new) { s3_cache_double }
+        allow(Alephant::Storage).to receive(:new) { s3_double }
         get "/component/test_component"
       end
 
@@ -184,9 +184,9 @@ describe Alephant::Broker::Application do
         :get => "<p>Some data</p>"
       )
     end
-    let(:s3_cache_double) do
+    let(:s3_double) do
       instance_double(
-        "Alephant::Cache",
+        "Alephant::Storage",
         :get => "test_content"
       )
     end
@@ -194,7 +194,7 @@ describe Alephant::Broker::Application do
     context "which is old" do
       before do
         allow(Alephant::Broker::Cache::Client).to receive(:new) { cache_double }
-        allow(Alephant::Cache).to receive(:new) { s3_cache_double }
+        allow(Alephant::Storage).to receive(:new) { s3_double }
       end
       it "should update the cache (call `.set`)" do
         expect(cache_double).to receive(:set).once

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.8.0
 platform: ruby
 authors:
 - BBC News
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: alephant-cache
+  name: alephant-storage
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement