Active 0.0.17 → 0.0.18

data/lib/services/search.rb

@@ -239,8 +239,13 @@ module Active
             @searchTime      = parsed_json["searchTime"]
             @numberOfResults = parsed_json["numberOfResults"]
             @results         = parsed_json['_results'].collect { |a| Activity.new(GSA.new(a)) }  
+
+            begin
+              Active.CACHE.set( Digest::MD5.hexdigest(end_point), self) if Active.CACHE
+            rescue Exception => e              
+            end
+            
             
-            Active.CACHE.set( Digest::MD5.hexdigest(end_point), self) if Active.CACHE
 
           rescue JSON::ParserError => e
             raise RuntimeError, "JSON::ParserError json=#{res.body}"
@@ -302,7 +307,14 @@ module Active
 
       def self.return_cached key
         if Active.CACHE
-          cached_version = Active.CACHE.get(key)
+          begin
+            cached_version = Active.CACHE.get(key)
+          rescue Exception => e
+            return nil
+          end
+          
+          
+          
           if cached_version
             puts "Active Search [CACHE] #{key}"
             return cached_version 

data/spec/search_memcached_spec.rb

@@ -6,44 +6,37 @@ require File.join(File.dirname(__FILE__), %w[custom_matchers_spec])
 require File.join(File.dirname(__FILE__), %w[ .. lib services search])
 require File.join(File.dirname(__FILE__), %w[ .. lib services activity])
 include Active::Services
-Active.memcache_host "localhost:11211"
+
     
 describe Search do
-  include CustomMatchers
-    before(:each) do
-      Active.CACHE.flush()
+    after(:each) do
+      begin
+        Active.CACHE.flush() if Active.CACHE
+      rescue Exception => e
+      end
+      Active.memcache_host(nil)
     end
-    it "shouls search by city" do
+    it "should search by city" do
+      Active.memcache_host("localhost:11211")
       s = Search.search({:city=>"Oceanside"})
       s.city.should eql("Oceanside")
       s.results.should_not be_nil
       s.results.should have_at_least(1).items
-
       Active.CACHE.get('ce16c9ef2b618d0d5a88d46933109e4d').results.length.should eql(10)
-
       s = Search.search({:city=>"Oceanside"})
       s.city.should eql("Oceanside")
       s.results.should_not be_nil
       s.results.should have_at_least(1).items
-      
     end
-    
+    it "should be fail safe" do
+      Active.memcache_host("fake:11211")
+      s = Search.search({:city=>"Oceanside"})
+      s.city.should eql("Oceanside")      
+      s.results.should have_at_least(1).items      
+    end    
 end
 
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-

data/spec/search_spec.rb

@@ -5,7 +5,7 @@ require File.join(File.dirname(__FILE__), %w[custom_matchers_spec])
 require File.join(File.dirname(__FILE__), %w[ .. lib services search])
 require File.join(File.dirname(__FILE__), %w[ .. lib services activity])
 include Active::Services
-Active.memcache_host "localhost:11211"
+# Active.memcache_host "localhost:11211"
     
 describe Search do
   include CustomMatchers

data/version.txt

@@ -1 +1 @@
-0.0.17
+0.0.18

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Active
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Jonathan Spooner, Brian Levine