sreeix-cache-money 0.2.27 → 0.4.1

data/lib/cache_money.rb

@@ -24,7 +24,7 @@ require 'cash/util/marshal'
 
 class ActiveRecord::Base
   def self.is_cached(options = {})
-    if (options == false || options[:repository].nil?)
+    if options == false
       include NoCash
     else
       options.assert_valid_keys(:ttl, :repository, :version)

data/lib/memcached_wrapper.rb

@@ -1,263 +1,6 @@
-# require 'memcache'
-# require 'memcached'
+require 'dalli'
+# require 'dalli/memcache-client'
 
-#typically MemCache/Memcached can be used via the following in rails/init.rb:
-#$memcache = MemCache.new(memcache_config[:servers].gsub(' ', '').split(','), memcache_config)
-#$memcache = Memcached::Rails.new(memcache_config[:servers].gsub(' ', '').split(','), memcache_config)
 
-#this wrapper lets both work.
-
-########## they have Memcached installed (do need the wrapper)
-if defined? Memcached
-Rails.logger.info("cache-money: Memcached installed") if defined? Rails
-
-class Memcached
-  alias :get_multi :get #:nodoc:
-end
-
-class MemcachedWrapper < ::Memcached
-  DEFAULTS = { :servers => '127.0.0.1:11211' }
-
-  attr_reader :logger, :default_ttl
-
-  # See Memcached#new for details.
-  def initialize(*args)
-      opts = DEFAULTS.merge(args.last.is_a?(Hash) ? args.pop : {})
-
-      if opts.respond_to?(:symbolize_keys!)
-        opts.symbolize_keys!
-      else
-        opts = symbolize_keys(opts)
-      end
-      
-      servers = Array(
-        args.any? ? args.unshift : opts.delete(:servers)
-      ).flatten.compact
-
-      opts[:prefix_key] ||= "#{opts[:namespace]}:"
-
-      @logger = opts[:logger]
-      @debug  = opts[:debug]
-
-      super(servers, opts)      
-  end
-
-  def symbolize_keys(opts)
-    # Destructively convert all keys to symbols.
-    if opts.kind_of?(Hash) && !opts.kind_of?(HashWithIndifferentAccess)
-      opts.keys.each do |key|
-        unless key.is_a?(Symbol)
-          opts[key.to_sym] = opts[key]
-          opts.delete(key)
-        end
-      end
-    end
-    opts
-  end
-  
-  def namespace
-    options[:prefix_key]
-  end
-
-  # Wraps Memcached::Rails#add to return a text string - for cache money
-  def add(key, value, ttl=@default_ttl, raw=false)
-    logger.debug("Memcached add: #{key.inspect}") if logger && @debug
-    super(key, value, ttl, !raw)
-    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
-    stored
-  rescue Memcached::NotStored
-    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
-    not_stored
-  rescue Memcached::Error
-    log_error($!) if logger
-    not_stored
-  end
-
-  def replace(key, value, ttl = @default_ttl, raw = false)
-    logger.debug("Memcached replace: #{key.inspect}") if logger && @debug
-    super(key, value, ttl, !raw)
-    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
-    stored
-  rescue Memcached::NotStored
-    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
-    not_stored
-  rescue Memcached::Error
-    log_error($!) if logger
-    not_stored
-  end
-  
-  # Wraps Memcached#get so that it doesn't raise. This has the side-effect of preventing you from 
-  # storing <tt>nil</tt> values.
-  def get(key, raw=false)
-    logger.debug("Memcached get: #{key.inspect}") if logger && @debug
-    value = super(key, !raw)
-    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
-    value
-  rescue Memcached::NotFound
-    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
-    nil
-  rescue TypeError
-    log_error($!) if logger
-    delete(key)
-    logger.debug("Memcached deleted: #{key.inspect}") if logger && @debug
-    nil
-  rescue Memcached::Error
-    log_error($!) if logger
-    nil
-  end
-
-  def fetch(key, expiry = 0, raw = false)
-    value = get(key, !raw)
-
-    if value.nil? && block_given?
-      value = yield
-      add(key, value, expiry, !raw)
-    end
-
-    value
-  end
-
-  # Wraps Memcached#cas so that it doesn't raise. Doesn't set anything if no value is present.
-  def cas(key, ttl=@default_ttl, raw=false, &block)
-    logger.debug("Memcached cas: #{key.inspect}") if logger && @debug
-    super(key, ttl, !raw, &block)
-    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
-    stored
-  rescue Memcached::NotFound
-    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
-  rescue TypeError
-    log_error($!) if logger
-    delete(key)
-    logger.debug("Memcached deleted: #{key.inspect}") if logger && @debug
-  rescue Memcached::Error
-    if $!.is_a?(Memcached::ClientError)
-      raise $!
-    end
-    log_error($!) if logger
-  end
-  
-  def get_multi(*keys)
-    keys.flatten!
-    logger.debug("Memcached get_multi: #{keys.inspect}") if logger && @debug
-    values = super(keys, true)
-    logger.debug("Memcached hit: #{keys.inspect}") if logger && @debug
-    values
-  rescue Memcached::NotFound
-    logger.debug("Memcached miss: #{keys.inspect}") if logger && @debug
-    {}
-  rescue TypeError
-    log_error($!) if logger
-    keys.each { |key| delete(key) }
-    logger.debug("Memcached deleted: #{keys.inspect}") if logger && @debug
-    {}
-  rescue Memcached::Error
-    log_error($!) if logger
-    {}
-  end
-
-  def set(key, value, ttl=@default_ttl, raw=false)
-    logger.debug("Memcached set: #{key.inspect}") if logger && @debug
-    super(key, value, ttl, !raw)
-    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
-    stored
-  rescue Memcached::Error
-    log_error($!) if logger
-    not_stored
-  end
-
-  def append(key, value)
-    logger.debug("Memcached append: #{key.inspect}") if logger && @debug
-    super(key, value)
-    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
-    stored
-  rescue Memcached::NotStored
-    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
-    not_stored
-  rescue Memcached::Error
-    log_error($!) if logger
-  end
-
-  def prepend(key, value)
-    logger.debug("Memcached prepend: #{key.inspect}") if logger && @debug
-    super(key, value)
-    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
-    stored
-  rescue Memcached::NotStored
-    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
-    not_stored
-  rescue Memcached::Error
-    log_error($!) if logger
-  end
-
-  def delete(key)
-    logger.debug("Memcached delete: #{key.inspect}") if logger && @debug
-    super(key)
-    logger.debug("Memcached hit: #{key.inspect}") if logger && @debug
-    deleted
-  rescue Memcached::NotFound
-    logger.debug("Memcached miss: #{key.inspect}") if logger && @debug
-    not_found
-  rescue Memcached::Error
-    log_error($!) if logger
-  end
-  
-  def incr(*args)
-    super
-  rescue Memcached::NotFound
-  rescue Memcached::Error
-    log_error($!) if logger
-  end
-
-  def decr(*args)
-    super
-  rescue Memcached::NotFound
-  rescue Memcached::Error
-    log_error($!) if logger
-  end
-
-  def get_server_for_key(key, options = {})
-    server_by_key(key)
-  end
-
-  alias :reset :quit
-  alias :close :quit #nodoc
-  alias :flush_all :flush
-  alias :compare_and_swap :cas
-  alias :"[]" :get
-  alias :"[]=" :set    
-
-private
-
-  def stored
-    "STORED\r\n"
-  end
-  
-  def deleted
-    "DELETED\r\n"
-  end
-  
-  def not_stored
-    "NOT_STORED\r\n"
-  end
-  
-  def not_found
-    "NOT_FOUND\r\n"
-  end
-
-  def log_error(err)
-    #logger.error("#{err}: \n\t#{err.backtrace.join("\n\t")}") if logger
-    logger.error("Memcached ERROR, #{err.class}: #{err}") if logger
-  end
-  
-end
-####### they have MemCache installed (don't need the wrapper)
-elsif defined? MemCache
-
-Rails.logger.info("cache-money: MemCache installed") if defined? Rails
-#TODO add logging?
-class MemcachedWrapper < ::MemCache
-end
-
-else
-  Rails.logger.warn 'unable to determine memcache implementation' if defined? Rails
-end #include the wraper
+class MemcachedWrapper < Dalli::Client
+end

data/rails/init.rb

@@ -1,3 +1,6 @@
+require 'dalli'
+require 'dalli/memcache-client'
+
 yml = YAML.load(IO.read(File.join(RAILS_ROOT, "config", "memcached.yml")))
 memcache_config = yml[RAILS_ENV]
 

metadata

@@ -1,10 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sreeix-cache-money
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.1
   prerelease: 
-  version: 0.2.27
 platform: ruby
-authors: 
+authors:
 - Nick Kallen
 - Ashley Martens
 - Scott Mace
@@ -12,44 +12,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-27 00:00:00 +05:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70109457090920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70109457090920
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70109457090420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *70109457090420
 description: Write-through and Read-through Cacheing for ActiveRecord
 email: teamplatform@ngmoco.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
 - README.markdown
 - TODO
-files: 
+files:
 - README
 - TODO
 - UNSUPPORTED_FEATURES
@@ -98,38 +94,35 @@ files:
 - spec/cash/write_through_spec.rb
 - spec/memcached_wrapper_test.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/sreeix/cache-money
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1254412095328383851
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4133822557448889217
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Write-through and Read-through Cacheing for ActiveRecord
-test_files: 
+test_files:
 - config/environment.rb
 - config/memcached.yml
 - db/schema.rb