alephant-broker 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cebf819da714467f9faec319d6343c6e0d086117
-  data.tar.gz: d154fe7544fb5f9f904a5f5849817547bb897629
+  metadata.gz: 6d7dbbfe2023708095fe2f28cd6c85e55c1b8d73
+  data.tar.gz: ffc1205fcacde38bc5c28210f798eb2d17c5c41d
 SHA512:
-  metadata.gz: 5730739e5d7abc50fcbc385a6e06521b93a4ddd14c396abcf177bfd3a3db8da2ca0befb8fd4b18193582d54b31504d2e60253769746661dbde88d13beb83b2d6
-  data.tar.gz: 19029f98faa67945a4947cb40d31a5b296de6d52a228a2817b2f5bd264a481d9b66761c96c3243a7546b55fd25e8086911625653da7c7a34d62dd5a3d4684e92
+  metadata.gz: c8295834e37a3a4bc6be091b99d5de8f3bdb6fc60b3b5cff9af8857cfb7611e229c863d62397e9899d5a6689514981058bfe0e8ea515554a4ea2a67a3270b046
+  data.tar.gz: 27142031810701e294e98805c79a592ae2e2343767434382b2e15ba5abb24cfb43ef2962b608359289f635a166c98c8b476fd1846a40718caaaa5f6f72216d88

data/lib/alephant/broker/component.rb

@@ -23,8 +23,12 @@ module Alephant
       end
 
       def load
+        # binding.pry
         @content_type = cache_object[:content_type]
         @content      = cache_object[:content]
+      rescue
+        @content_type = 'text/html'
+        @content      = @cache.set(cache_key, retrieve_object)
       end
 
       def opts_hash
@@ -38,10 +42,12 @@ module Alephant
       private
 
       def cache_object
-        @cache_object ||= @cache.get(cache_key) do
-          @cached = false
-          s3.get(s3_path)
-        end
+        @cache_object ||= @cache.get(cache_key) { retrieve_object }
+      end
+
+      def retrieve_object
+        @cached = false
+        s3.get(s3_path)
       end
 
       def cache_key

data/lib/alephant/broker/version.rb

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

data/spec/rack_spec.rb

@@ -10,29 +10,29 @@ end
 
 describe 'Broker Rack Application' do
   before do
-    Alephant::Broker::Component
-      .any_instance
-      .stub(:load)
-      .and_return('Test')
-
-    Alephant::Broker::Component
-      .any_instance
-      .stub(:content)
-      .and_return('Test')
-
-    Alephant::Broker::Component
-      .any_instance
-      .stub(:content_type)
+    cache_hash = {
+      :content_type => 'test/content',
+      :content      => 'Test'
+    }
+
+    allow_any_instance_of(Alephant::Broker::Cache::Client)
+      .to receive(:get)
+      .and_return(cache_hash)
+
+    allow_any_instance_of(Alephant::Broker::Component)
+      .to receive(:content)
+      .and_return(cache_hash[:content])
+
+    allow_any_instance_of(Alephant::Broker::Component)
+      .to receive(:content_type)
       .and_return('foo/bar')
 
-    Alephant::Broker::Component
-      .any_instance
-      .stub(:version)
+    allow_any_instance_of(Alephant::Broker::Component)
+      .to receive(:version)
       .and_return(1)
 
-    Alephant::Broker::Response::Asset
-      .any_instance
-      .stub(:status)
+    allow_any_instance_of(Alephant::Broker::Response::Asset)
+      .to receive(:status)
       .and_return(200)
   end
 
@@ -71,9 +71,8 @@ describe 'Broker Rack Application' do
   end
 
   it "Tests 404 when lookup doesn't return a valid location" do
-    Alephant::Broker::Response::Asset
-      .any_instance
-      .stub(:status)
+    allow_any_instance_of(Alephant::Broker::Response::Asset)
+      .to receive(:status)
       .and_return(404)
 
     get '/component/test_component'
@@ -82,9 +81,8 @@ describe 'Broker Rack Application' do
   end
 
   it "Tests 500 when exception is raised in application" do
-    Alephant::Broker::Response::Asset
-      .any_instance
-      .stub(:status)
+    allow_any_instance_of(Alephant::Broker::Response::Asset)
+      .to receive(:status)
       .and_return(500)
 
     get '/component/test_component'
@@ -101,4 +99,30 @@ describe 'Broker Rack Application' do
     expect(last_response).to be_ok
     expect(last_response.body).to eq(compiled_json)
   end
+
+  it "Should handle old cache data gracefully" do
+    lookup_location_double = double('Alephant::Lookup::Location', :location => 'test/location')
+    lookup_helper_double   = double('Alephant::Lookup::LookupHelper', :read => lookup_location_double)
+
+    cache_double           = double('Alephant::Broker::Cache::Client', :set => nil, :get => '<p>Some data</p>')
+    s3_cache_double        = double('Alephant::Cache', :get => 'test_content')
+
+    allow(Alephant::Lookup)
+      .to receive(:create)
+      .and_return(lookup_helper_double)
+
+    allow(Alephant::Broker::Cache::Client)
+      .to receive(:new)
+      .and_return(cache_double)
+
+    allow(Alephant::Cache)
+      .to receive(:new)
+      .and_return(s3_cache_double)
+
+    expect(cache_double).to receive(:set).once
+
+    get '/component/test_component'
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Steven Jack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec