lib/gitmodel.rb in gitmodel-0.0.7 vs lib/gitmodel.rb in gitmodel-0.0.8

@@ -3,13 +3,13 @@
 require 'rubygems'
 require 'bundler/setup'
 
 require 'active_model'
 require 'active_support/all' # TODO we don't really want all here, clean this up
+require 'dalli'
 require 'grit'
 require 'lockfile'
-require 'memcache'
 require 'pp'
 require 'yajl'
 
 $:.unshift(File.dirname(__FILE__))
 require 'gitmodel/errors'
@@ -97,10 +97,10 @@
   # objects.
   def self.cache(branch, key, &block)
     key = "#{key}-#{head_sha(branch)}"
     value = nil
     if memcache_servers
-      @@memcache ||= MemCache.new memcache_servers, :namespace => "#{File.basename(db_root)}-#{memcache_namespace}"
+      @@memcache ||= Dalli::Client.new memcache_servers, :namespace => "#{File.basename(db_root)}#{memcache_namespace.blank? ? '' : '-'}#{memcache_namespace}"
       value = @@memcache.get(key)
       if value.nil?
         logger.info("✗ memcache MISS for key #{key}")
         value = yield
         @@memcache.set(key, value)