morlock 0.0.3 → 0.0.4

data/lib/morlock/gem_client.rb

@@ -1,5 +1,6 @@
 class Morlock
-  class UnknownGemClient < StandardError; end
+  class UnknownGemClient < StandardError;
+  end
 
   class GemClient
     GEM_CLIENTS = []
@@ -9,6 +10,8 @@ class Morlock
     end
 
     def self.wrap(client)
+      return TestGemClient.new(nil) if client == :test
+
       GEM_CLIENTS.each do |gem, gem_client|
         if (eval(gem) rescue false) && client.is_a?(eval(gem))
           return gem_client.new(client)
@@ -18,14 +21,24 @@ class Morlock
       raise UnknownGemClient.new("You provided Morlock a memcached client of an unknown type: #{client.class}")
     end
 
-    def delete(key)
-      @client.delete(key)
+
+    def no_server_error(e)
+      STDERR.puts "WARNING: No memcached server found; Memlock was unable to create a lock. (#{e.message})"
+      true
     end
   end
 
   class DalliGemClient < GemClient
     def add(key, expiration)
       @client.add(key, 1, expiration)
+    rescue => e
+      no_server_error e
+    end
+
+    def delete(key)
+      @client.delete(key)
+    rescue => e
+      true
     end
   end
   GemClient::GEM_CLIENTS << ["Dalli::Client", DalliGemClient]
@@ -33,7 +46,26 @@ class Morlock
   class MemcacheGemClient < GemClient
     def add(key, expiration)
       @client.add(key, 1, expiration, true) !~ /NOT_STORED/
+    rescue MemCache::MemCacheError => e
+      no_server_error e
+    end
+
+    def delete(key)
+      @client.delete(key)
+    rescue MemCache::MemCacheError => e
+      true
     end
   end
   GemClient::GEM_CLIENTS << ["MemCache", MemcacheGemClient]
+
+
+  class TestGemClient < GemClient
+    def add(key, expiration)
+      true
+    end
+
+    def delete(key)
+      true
+    end
+  end
 end

data/lib/morlock/rails.rb

@@ -19,11 +19,23 @@ class Morlock
       self.setup_for_mem_cache_store
     end
 
+    def self.setup_for_test_store
+      Rails.module_eval do
+        class << self
+          def morlock
+            @@morlock ||= Morlock.new(:test)
+          end
+        end
+      end
+    end
+
     def self.detect_memcache_gem
       if defined?(ActiveSupport::Cache::MemCacheStore) && Rails.cache.is_a?(ActiveSupport::Cache::MemCacheStore)
         setup_for_mem_cache_store
       elsif defined?(ActiveSupport::Cache::DalliStore) && Rails.cache.is_a?(ActiveSupport::Cache::DalliStore)
         setup_for_dalli_store
+      elsif Rails.env.test?
+        setup_for_test_store
       else
         Rails.logger.warn "WARNING: Morlock detected that you are not using the Rails ActiveSupport::Cache::MemCacheStore.  Rails.morlock will not be setup."
       end

data/lib/morlock/version.rb

@@ -1,3 +1,3 @@
 class Morlock
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/morlock_spec.rb

@@ -57,6 +57,26 @@ describe Morlock do
           morlock.lock("some_key", :expiration => 60).should == false
         end
       end
+
+      describe "with test" do
+        before do
+          @mock_client = :test
+          @morlock = Morlock.new(@mock_client)
+        end
+
+        it "should make a test client" do
+          @morlock.client.is_a?(Morlock::TestGemClient).should == true
+        end
+
+        it "should yield and return true when trying to lock" do
+          yielded = false
+          result = @morlock.lock("some_key") do
+            yielded = true
+          end
+          yielded.should be_true
+          result.should be_true
+        end
+      end
     end
 
     context "general behavior" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morlock
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70342324414200 !ruby/object:Gem::Requirement
+  requirement: &70284346550040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342324414200
+  version_requirements: *70284346550040
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70342324413700 !ruby/object:Gem::Requirement
+  requirement: &70284346549520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342324413700
+  version_requirements: *70284346549520
 description: ''
 email:
 - pair+andrew+chris@mavenlink.com