interlock 1.1 → 1.2

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v1.2. Add compatibility with Memcached client.
+
 v1.1. Add :perform => false option. Cache :content_for. Test nested view_cache blocks. Don't assign conventional dependency when called from the view, because we don't know what the controller might have already specified.
 
 v1.0. First release.

data/Manifest

@@ -7,7 +7,7 @@ lib/interlock/active_record.rb
 lib/interlock/config.rb
 lib/interlock/core_extensions.rb
 lib/interlock/interlock.rb
-lib/interlock/memcached.rb
+lib/interlock/lock.rb
 lib/interlock.rb
 LICENSE
 Manifest
@@ -78,5 +78,5 @@ test/setup.rb
 test/teardown.rb
 test/test_helper.rb
 test/unit/interlock_test.rb
-test/unit/memcached_test.rb
+test/unit/lock_test.rb
 TODO

data/README

@@ -5,9 +5,11 @@ A Rails plugin for maintainable and high-efficiency caching.
 
 == License
 
-Copyright 2007 Cloudburst, LLC. Licensed under the AFL 3; see the included LICENSE file. Portions copyright 2006 Chris Wanstrath and used with permission.
+Copyright 2007, 2008 Cloudburst, LLC. Licensed under the AFL 3. See the included LICENSE file. Portions copyright 2006 Chris Wanstrath and used with permission.
 
-The public certificate for the gem is at http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem.
+The public certificate for the gem is here[http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem]. 
+
+If you use this software, please {make a donation}[http://blog.evanweaver.com/donate/], or {recommend Evan}[http://www.workingwithrails.com/person/7739-evan-weaver] at Working with Rails.
 
 == Requirements
 
@@ -27,7 +29,7 @@ Interlock automatically tracks invalidation dependencies based on the model life
   
 First, compile and install memcached itself. Get a memcached server running.
 
-You also need the <tt>memcache-client</tt> gem:
+You also need either <tt>memcache-client</tt> or {memcached}[http://blog.evanweaver.com/files/doc/fauna/memcached]:
   sudo gem install memcache-client
 
 Then, install the plugin:
@@ -38,15 +40,18 @@ Lastly, configure your Rails app for memcached by creating a <tt>config/memcache
   defaults:
     namespace: myapp
     sessions: false
+    client: memcache-client
   development:
     servers: 
-      - localhost:11211 # Default port
+      - 127.0.0.1:11211 # Default host and port
   production:
     servers
       - 10.12.128.1
       - 10.12.128.2     
       
 Now you're ready to go.
+
+Note that if you have {memcached 0.7}[http://blog.evanweaver.com/files/doc/fauna/memcached], you can use <tt>client: memcached</tt> for better performance.
  
 == Usage
 
@@ -106,6 +111,6 @@ Also, Interlock obeys the <tt>ENV['RAILS_ASSET_ID']</tt> setting, so if you need
 
 == Reporting problems
 
-* http://rubyforge.org/forum/forum.php?forum_id=19835
+The support forum is here[http://rubyforge.org/forum/forum.php?forum_id=19835].
 
 Patches and contributions are very welcome. Please note that contributors are required to assign copyright for their additions to Cloudburst, LLC. 

data/examples/memcached.yml

@@ -1,9 +1,10 @@
 defaults:
   namespace: myapp
   sessions: false
+  client: memcache-client
 development:
   servers:
-    - localhost:11211
+    - 127.0.0.1:11211
 production:
   servers
     - 10.12.128.1

data/interlock.gemspec

@@ -1,28 +1,26 @@
 
-# Gem::Specification for Interlock-1.1
+# Gem::Specification for Interlock-1.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{interlock}
-  s.version = "1.1"
+  s.version = "1.2"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [""]
-  s.date = %q{2008-01-15}
+  s.date = %q{2008-02-04}
   s.description = %q{A Rails plugin for maintainable and high-efficiency caching.}
   s.email = %q{}
-  s.files = ["CHANGELOG", "examples/memcached.yml", "init.rb", "lib/interlock/action_controller.rb", "lib/interlock/action_view.rb", "lib/interlock/active_record.rb", "lib/interlock/config.rb", "lib/interlock/core_extensions.rb", "lib/interlock/interlock.rb", "lib/interlock/memcached.rb", "lib/interlock.rb", "LICENSE", "Manifest", "README", "tasks/interlock.rake", "test/integration/app/app/controllers/application.rb", "test/integration/app/app/controllers/eval_controller.rb", "test/integration/app/app/controllers/items_controller.rb", "test/integration/app/app/helpers/application_helper.rb", "test/integration/app/app/helpers/eval_helper.rb", "test/integration/app/app/helpers/items_helper.rb", "test/integration/app/app/models/item.rb", "test/integration/app/app/views/items/detail.rhtml", "test/integration/app/app/views/items/list.rhtml", "test/integration/app/app/views/items/recent.rhtml", "test/integration/app/app/views/items/show.rhtml", "test/integration/app/app/views/layouts/application.html.erb", "test/integration/app/app/views/shared/_related.rhtml", "test/integration/app/config/boot.rb", "test/integration/app/config/database.yml", "test/integration/app/config/environment.rb", "test/integration/app/config/environments/development.rb", "test/integration/app/config/environments/production.rb", "test/integration/app/config/environments/test.rb", "test/integration/app/config/initializers/inflections.rb", "test/integration/app/config/initializers/mime_types.rb", "test/integration/app/config/memcached.yml", "test/integration/app/config/routes.rb", "test/integration/app/db/migrate/001_create_items.rb", "test/integration/app/doc/README_FOR_APP", "test/integration/app/public/404.html", "test/integration/app/public/422.html", "test/integration/app/public/500.html", "test/integration/app/public/dispatch.cgi", "test/integration/app/public/dispatch.fcgi", "test/integration/app/public/dispatch.rb", "test/integration/app/public/favicon.ico", "test/integration/app/public/images/rails.png", "test/integration/app/public/index.html", "test/integration/app/public/javascripts/application.js", "test/integration/app/public/javascripts/controls.js", "test/integration/app/public/javascripts/dragdrop.js", "test/integration/app/public/javascripts/effects.js", "test/integration/app/public/javascripts/prototype.js", "test/integration/app/public/robots.txt", "test/integration/app/Rakefile", "test/integration/app/README", "test/integration/app/script/about", "test/integration/app/script/console", "test/integration/app/script/destroy", "test/integration/app/script/generate", "test/integration/app/script/performance/benchmarker", "test/integration/app/script/performance/profiler", "test/integration/app/script/performance/request", "test/integration/app/script/plugin", "test/integration/app/script/process/inspector", "test/integration/app/script/process/reaper", "test/integration/app/script/process/spawner", "test/integration/app/script/runner", "test/integration/app/script/server", "test/integration/app/test/fixtures/items.yml", "test/integration/app/test/functional/eval_controller_test.rb", "test/integration/app/test/functional/items_controller_test.rb", "test/integration/app/test/test_helper.rb", "test/integration/app/test/unit/item_test.rb", "test/integration/server_test.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/interlock_test.rb", "test/unit/memcached_test.rb", "TODO", "interlock.gemspec"]
+  s.files = ["CHANGELOG", "examples/memcached.yml", "init.rb", "lib/interlock/action_controller.rb", "lib/interlock/action_view.rb", "lib/interlock/active_record.rb", "lib/interlock/config.rb", "lib/interlock/core_extensions.rb", "lib/interlock/interlock.rb", "lib/interlock/lock.rb", "lib/interlock.rb", "LICENSE", "Manifest", "README", "tasks/interlock.rake", "test/integration/app/app/controllers/application.rb", "test/integration/app/app/controllers/eval_controller.rb", "test/integration/app/app/controllers/items_controller.rb", "test/integration/app/app/helpers/application_helper.rb", "test/integration/app/app/helpers/eval_helper.rb", "test/integration/app/app/helpers/items_helper.rb", "test/integration/app/app/models/item.rb", "test/integration/app/app/views/items/detail.rhtml", "test/integration/app/app/views/items/list.rhtml", "test/integration/app/app/views/items/recent.rhtml", "test/integration/app/app/views/items/show.rhtml", "test/integration/app/app/views/layouts/application.html.erb", "test/integration/app/app/views/shared/_related.rhtml", "test/integration/app/config/boot.rb", "test/integration/app/config/database.yml", "test/integration/app/config/environment.rb", "test/integration/app/config/environments/development.rb", "test/integration/app/config/environments/production.rb", "test/integration/app/config/environments/test.rb", "test/integration/app/config/initializers/inflections.rb", "test/integration/app/config/initializers/mime_types.rb", "test/integration/app/config/memcached.yml", "test/integration/app/config/routes.rb", "test/integration/app/db/migrate/001_create_items.rb", "test/integration/app/doc/README_FOR_APP", "test/integration/app/public/404.html", "test/integration/app/public/422.html", "test/integration/app/public/500.html", "test/integration/app/public/dispatch.cgi", "test/integration/app/public/dispatch.fcgi", "test/integration/app/public/dispatch.rb", "test/integration/app/public/favicon.ico", "test/integration/app/public/images/rails.png", "test/integration/app/public/index.html", "test/integration/app/public/javascripts/application.js", "test/integration/app/public/javascripts/controls.js", "test/integration/app/public/javascripts/dragdrop.js", "test/integration/app/public/javascripts/effects.js", "test/integration/app/public/javascripts/prototype.js", "test/integration/app/public/robots.txt", "test/integration/app/Rakefile", "test/integration/app/README", "test/integration/app/script/about", "test/integration/app/script/console", "test/integration/app/script/destroy", "test/integration/app/script/generate", "test/integration/app/script/performance/benchmarker", "test/integration/app/script/performance/profiler", "test/integration/app/script/performance/request", "test/integration/app/script/plugin", "test/integration/app/script/process/inspector", "test/integration/app/script/process/reaper", "test/integration/app/script/process/spawner", "test/integration/app/script/runner", "test/integration/app/script/server", "test/integration/app/test/fixtures/items.yml", "test/integration/app/test/functional/eval_controller_test.rb", "test/integration/app/test/functional/items_controller_test.rb", "test/integration/app/test/test_helper.rb", "test/integration/app/test/unit/item_test.rb", "test/integration/server_test.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/interlock_test.rb", "test/unit/lock_test.rb", "TODO", "interlock.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/interlock/}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
   s.rubygems_version = %q{1.0.1}
   s.summary = %q{A Rails plugin for maintainable and high-efficiency caching.}
-  s.test_files = ["test/integration/server_test.rb", "test/unit/interlock_test.rb", "test/unit/memcached_test.rb"]
-
-  s.add_dependency(%q<memcache_client>, [">= 1.5.0"])
+  s.test_files = ["test/integration/server_test.rb", "test/unit/interlock_test.rb", "test/unit/lock_test.rb"]
 end
 
 
@@ -36,7 +34,6 @@ end
 #   p.summary = "A Rails plugin for maintainable and high-efficiency caching."
 #   p.url = "http://blog.evanweaver.com/files/doc/fauna/interlock/"  
 #   p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"  
-#   p.dependencies = "memcache_client >=1.5.0"
 #   p.test_pattern = ["test/integration/*.rb", "test/unit/*.rb"]
 #   p.rdoc_pattern = ["README", "CHANGELOG", "TODO", "LICENSE", "lib/interlock/memcached.rb", "lib/interlock/interlock.rb", "lib/interlock/action_controller.rb", "lib/interlock/active_record.rb", "lib/interlock/action_view.rb", "lib/interlock/config.rb"]
 #   p.clean_pattern += ['test/integration/app/coverage', 'test/integration/app/db/schema.rb',
@@ -44,13 +41,17 @@ end
 # end
 # 
 # desc "Run all the tests in production and development mode both"
-# task "test_all" do
-#   STDERR.puts "#{'='*80}\nDevelopment mode\n#{'='*80}"
-#   system("rake test:multi_rails:all")
-# 
-#   ENV['PRODUCTION'] = '1'
-#   STDERR.puts "#{'='*80}\nProduction mode\n#{'='*80}"
-#   system("rake test:multi_rails:all")
+# task "test_all" do  
+#   ['memcache-client', 'memcached'].each do |client|
+#     ENV['CLIENT'] = client
+#     ENV['PRODUCTION'] = 'false'
+#     STDERR.puts "#{'='*80}\nDevelopment mode: #{client}\n#{'='*80}"
+#     system("rake test:multi_rails:all")
+#   
+#     ENV['PRODUCTION'] = 'true'
+#     STDERR.puts "#{'='*80}\nProduction mode: #{client}\n#{'='*80}"
+#     system("rake test:multi_rails:all")
+#   end
 # end
 # 
 # task "tail" do

data/lib/interlock/action_controller.rb

@@ -189,33 +189,41 @@ And in the <tt>show.html.erb</tt> view:
       #
       def read_fragment(key, options = nil)
         return unless perform_caching
-
-        if content = Interlock.local_cache.read(key, options)
-          # Interlock.say key, "read from local cache"
-        elsif content = fragment_cache_store.read(key, options)                    
-          raise FragmentConsistencyError, "#{key} is not an Array" unless content.is_a? Array
-          Interlock.say key, "read from memcached"
-          Interlock.local_cache.write(key, content, options)
-        else
-          # Not found
-          return nil 
-        end
         
-        raise FragmentConsistencyError, "#{key}::content is not a String" unless content.first.is_a? String
-
-        options ||= {}
-        # Note that 'nil' is considered true for :assign_content_for
-        if options[:assign_content_for] != false and content.last 
-          # Extract content_for variables
-          content.last.each do |name, value| 
-            raise FragmentConsistencyError, "#{key}::content_for(:#{name}) is not a String" unless value.is_a? String
-            # We'll just call the helper because that will handle nested view_caches properly.
-            @template.send(:content_for, name, value)
+        begin
+          if content = Interlock.local_cache.read(key, options)
+            # Interlock.say key, "read from local cache"
+          elsif content = fragment_cache_store.read(key, options)                    
+            raise Interlock::FragmentConsistencyError, "#{key} expected Array but got #{content.class}" unless content.is_a? Array
+            Interlock.say key, "read from memcached"
+            Interlock.local_cache.write(key, content, options)
+          else
+            # Not found
+            return nil 
           end
-        end
-
-        content.first        
-      end      
+          
+          raise Interlock::FragmentConsistencyError, "#{key}::content expected String but got #{content.first.class}" unless content.first.is_a? String
+  
+          options ||= {}
+          # Note that 'nil' is considered true for :assign_content_for
+          if options[:assign_content_for] != false and content.last 
+            # Extract content_for variables
+            content.last.each do |name, value| 
+              raise Interlock::FragmentConsistencyError, "#{key}::content_for(:#{name}) expected String but got #{value.class}" unless value.is_a? String
+              # We'll just call the helper because that will handle nested view_caches properly.
+              @template.send(:content_for, name, value)
+            end
+          end
+  
+          content.first
+        rescue Interlock::FragmentConsistencyError => e
+          # XXX Needs test coverage
+          # Delete the bogus key
+          begin; CACHE.delete key; rescue; end
+          # Reraise the error
+          raise e
+        end      
+      end
       
     end
   end    

data/lib/interlock/config.rb

@@ -4,8 +4,19 @@ module Interlock
   DEFAULTS = {
     :ttl => 1.day,
     :namespace => 'app',
-    :servers => ['localhost:11211']
+    :servers => ['127.0.0.1:11211'],
+    :client => 'memcache-client'
   }    
+  
+  CLIENT_KEYS = [ #:nodoc:
+    :hash,
+    :no_block,
+    :buffer_requests,
+    :support_cas,
+    :tcp_nodelay,
+    :distribution,
+    :namespace
+  ]
 
   mattr_accessor :config 
   @@config = DEFAULTS
@@ -23,7 +34,8 @@ module Interlock
       #
       def run!
         if File.exist?(CONFIG_FILE)
-          config = YAML.load_file(CONFIG_FILE)
+          template = ERB.new(File.open(CONFIG_FILE) {|f| f.read})       
+          config = YAML.load(template.result(binding))
           config.deep_symbolize_keys!
 
           Interlock.config.merge!(config[:defaults] || {})
@@ -41,12 +53,47 @@ module Interlock
         Interlock.config[:namespace] << "-#{RAILS_ENV}"
   
         unless defined? Object::CACHE
-          klass = MemCacheWithConsistentHashing rescue MemCache
-          Object.const_set('CACHE', klass.new(Interlock.config))
-          CACHE.servers = Array(Interlock.config[:servers])
+        
+          # Give people a choice of client, even though I don't like conditional dependencies.
+          klass = case Interlock.config[:client]
+            when 'memcached'
+              Memcached::Rails
+            when 'memcache-client'              
+              raise ConfigurationError, "You have the Ruby-MemCache gem installed. Please uninstall Ruby-MemCache, or otherwise guarantee that memcache-client will load instead." if MemCache.constants.include?('SVNURL')
+              MemCache              
+            else
+              raise ConfigurationError, "Invalid client name '#{Interlock.config[:client]}'"
+          end
+          
+          Object.const_set('CACHE', 
+            klass.new(
+              Interlock.config[:servers], 
+              Interlock.config.slice(*CLIENT_KEYS)
+            )
+          )
+          
+          # Mark that we're the ones who did it.
+          class << CACHE
+            def installed_by_interlock; true; end
+          end
+          
+        else
+          begin
+            CACHE.installed_by_interlock
+          rescue NoMethodError
+            RAILS_DEFAULT_LOGGER.warn "** interlock: Object::CACHE already defined; will not install a new one"
+            # Mark that somebody else installed this CACHE.
+            class << CACHE
+              def installed_by_interlock; false; end
+            end
+          end
         end
         
+        # Add the fragment cache and lock APIs to the cache singleton. This happens no matter
+        # who installed the singleton.
         class << CACHE
+          include Interlock::Lock
+          
           def read(*args)
             get args.first
           end
@@ -64,9 +111,17 @@ module Interlock
       # Configure Rails to use the memcached store for fragments, and optionally, sessions.
       #    
       def rails!
-        # Memcached fragment caching is mandatory
+        # Memcached fragment caching is mandatory        
+        ActionView::Helpers::CacheHelper.class_eval do
+          def cache(name, options = nil, &block)
+            # Things explode if options does not default to nil
+            RAILS_DEFAULT_LOGGER.debug "** fragment #{name} stored via obsolete cache() call"
+            @controller.cache_erb_fragment(block, name, options)
+          end
+        end                
         ActionController::Base.fragment_cache_store = CACHE
   
+        # Sessions are optional
         if Interlock.config[:sessions]
           ActionController::Base.session_store = :mem_cache_store
           ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS.update 'cache' => CACHE      

data/lib/interlock/core_extensions.rb

@@ -40,16 +40,26 @@ class Hash
     end
   end
   
+  # Compatibility method for Rails 1.2.6. It's also faster.
+  unless Hash.instance_methods.include? "slice"
+    def slice(*keys)
+      hash = {}
+      keys.each do |key|
+        hash[key] = self[key] if self[key]
+      end
+      hash
+    end  
+  end
+  
 end
 
 class Array  
-  unless Array.instance_methods.include? "extract_options!"
-  
+  # Compatibility method for Rails 1.2.6.
+  unless Array.instance_methods.include? "extract_options!"  
     def extract_options!
       # Method added in Rails rev 7217
       last.is_a?(Hash) ? pop : {}
-    end
-    
+    end    
   end  
 end
 

data/lib/interlock/interlock.rb

@@ -5,8 +5,12 @@ module Interlock
   end  
   class DependencyError < InterlockError #:nodoc:
   end  
+  class ConfigurationError < InterlockError #:nodoc:
+  end
   class UsageError < InterlockError #:nodoc:
   end
+  class LockAcquisitionError < InterlockError #:nodoc:
+  end
   class FragmentConsistencyError < InterlockError #:nodoc:
   end
   

data/lib/interlock/lock.rb

@@ -0,0 +1,43 @@
+
+module Interlock
+  module Lock
+  
+    #
+    # Try to acquire a global lock from memcached for a particular key. 
+    # If successful, yield and set the key to the return value, then release
+    # the lock. 
+    #
+    # Based on http://rubyurl.com/Sw7 , which I partially wrote.
+    #
+  
+    def lock(key, lock_expiry = 30, retries = 5)
+      retries.times do |count|
+      
+        # We have to be compatible with both client APIs. Eventually we can use Memcached#cas 
+        # for this.        
+        begin
+          response = CACHE.add("lock:#{key}", "Locked by #{Process.pid}", lock_expiry)
+          # Nil is a successful response for Memcached, so we'll simulate the MemCache
+          # API.
+          response ||= "STORED\r\n"
+        rescue Object => e
+          # Catch exceptions from Memcached without setting response.
+        end
+        
+        if response == "STORED\r\n"
+          begin
+            value = yield(CACHE.get(key))
+            CACHE.set(key, value)
+            return value
+          ensure 
+            CACHE.delete("lock:#{key}")
+          end
+        else
+          sleep((2**count) / 2.0)
+        end
+      end
+      raise ::Interlock::LockAcquisitionError, "Couldn't acquire lock for #{key}"
+    end
+    
+  end
+end

data/lib/interlock.rb

@@ -2,22 +2,19 @@
 module Interlock
 end
 
-unless defined? MemCache or defined? MemCacheWithConsistentHashing
-  raise "Interlock requires the memcache-client gem"
-end
-
-if MemCache.constants.include?('SVNURL')
-  raise "You have the Ruby-MemCache gem installed. Interlock uses memcache-client. Please uninstall Ruby-MemCache, or otherwise guarantee that memcache-client will load instead."
-end
-
 require 'interlock/core_extensions'
 require 'interlock/config'
 require 'interlock/interlock'
-require 'interlock/memcached'
+require 'interlock/lock'
 require 'interlock/action_controller'
 require 'interlock/action_view'
 require 'interlock/active_record'
 
+begin
+  require 'memcached'
+rescue LoadError
+end
+
 unless ActionController::Base.perform_caching
   RAILS_DEFAULT_LOGGER.warn "** interlock warning; config.perform_caching == false"
 end

data/test/integration/app/config/environments/development.rb

@@ -1,8 +1,10 @@
 
-config.cache_classes = ENV['PRODUCTION']
+production = (ENV['PRODUCTION'] == "true")
+
+config.cache_classes = production
 config.whiny_nils = true
-config.action_controller.consider_all_requests_local = !ENV['PRODUCTION']
+config.action_controller.consider_all_requests_local = !production
 config.action_controller.perform_caching = true
-config.action_view.cache_template_extensions = ENV['PRODUCTION']
-config.action_view.debug_rjs = !ENV['PRODUCTION']
+config.action_view.cache_template_extensions = production
+config.action_view.debug_rjs = !production
 config.action_mailer.raise_delivery_errors = false

data/test/integration/app/config/memcached.yml

@@ -2,8 +2,8 @@ defaults:
   ttl: 30
   namespace: interlock
   sessions: true
-
+  client: <%= ENV['CLIENT'] || 'memcached' %>
 development:
   servers: 
-    - localhost:43042
-    - localhost:43043
+    - 127.0.0.1:43042
+    - 127.0.0.1:43043

data/test/unit/{memcached_test.rb → lock_test.rb}

@@ -1,7 +1,7 @@
 
 require "#{File.dirname(__FILE__)}/../test_helper"
 
-class MemcachedTest < Test::Unit::TestCase
+class LockTest < Test::Unit::TestCase
   
   KEY = "memcached_test"
   LOCK = "lock:#{KEY}"
@@ -26,7 +26,7 @@ class MemcachedTest < Test::Unit::TestCase
   def test_locked
     CACHE.set LOCK, "Bogus"
 
-    assert_raises MemCache::MemCacheError do
+    assert_raises Interlock::LockAcquisitionError do
       CACHE.lock(KEY, 30, 2) { "A" }
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: interlock
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: "1.2"
 platform: ruby
 authors: 
 - ""
@@ -30,18 +30,10 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-01-15 00:00:00 -05:00
+date: 2008-02-04 00:00:00 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: memcache_client
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.0
-    version: 
+dependencies: []
+
 description: A Rails plugin for maintainable and high-efficiency caching.
 email: ""
 executables: []
@@ -60,7 +52,7 @@ files:
 - lib/interlock/config.rb
 - lib/interlock/core_extensions.rb
 - lib/interlock/interlock.rb
-- lib/interlock/memcached.rb
+- lib/interlock/lock.rb
 - lib/interlock.rb
 - LICENSE
 - Manifest
@@ -131,7 +123,7 @@ files:
 - test/teardown.rb
 - test/test_helper.rb
 - test/unit/interlock_test.rb
-- test/unit/memcached_test.rb
+- test/unit/lock_test.rb
 - TODO
 - interlock.gemspec
 has_rdoc: true
@@ -163,4 +155,4 @@ summary: A Rails plugin for maintainable and high-efficiency caching.
 test_files: 
 - test/integration/server_test.rb
 - test/unit/interlock_test.rb
-- test/unit/memcached_test.rb
+- test/unit/lock_test.rb

data/lib/interlock/memcached.rb

@@ -1,30 +0,0 @@
-
-class MemCache
-
-  #
-  # Try to acquire a global lock from memcached for a particular key. 
-  # If successful, yield and set the key to the return value, then release
-  # the lock. 
-  #
-  # Based on http://rubyurl.com/Sw7 , which I partially wrote.
-  #
-
-  def lock(key, lock_expiry = 30, retries = 5)
-    retries.times do |count|
-      response = CACHE.add("lock:#{key}", "Locked by #{Process.pid}", lock_expiry)
-      if response == "STORED\r\n"
-        begin
-          value = yield(CACHE.get(key))
-          CACHE.set(key, value)
-          return value
-        ensure 
-          CACHE.delete("lock:#{key}")
-        end
-      else
-        sleep((2**count) / 2.0)
-      end
-    end
-    raise MemCacheError, "Couldn't acquire lock for #{key}"
-  end
-  
-end