ninjudd-memcache 0.9.0 → 0.9.1

data/lib/memcache/local_server.rb

@@ -50,28 +50,28 @@ class Memcache
       incr(key, -amount)
     end
 
-    def delete(key, expiry = nil)
-      if expiry
-        old_expiry = @expiry[key.to_s] || Time.now + expiry
-        @expiry[key.to_s] = [old_expiry, expiry].min
-      else
-        @data.delete(key.to_s)
-      end
+    def delete(key)
+      @data.delete(key.to_s)
     end
 
-    def set(key, value, expiry = nil)
+    def set(key, value, expiry = 0)
       key = key.to_s
-      @data[key]   = value
-      @expiry[key] = Time.now + expiry if expiry and expiry != 0
+      @data[key] = value
+      if expiry.kind_of?(Time)
+        @expiry[key] = expiry
+      else  
+        expiry = expiry.to_i
+        @expiry[key] = expiry == 0 ? nil : Time.now + expiry
+      end
       value
     end
 
-    def add(key, value, expiry = nil)
+    def add(key, value, expiry = 0)
       return nil if get(key)
       set(key, value, expiry)
     end
 
-    def replace(key, value, expiry = nil)
+    def replace(key, value, expiry = 0)
       return nil if get(key).nil?
       set(key, value, expiry)
     end

data/lib/memcache/pg_server.rb

@@ -153,7 +153,11 @@ class Memcache
     end
 
     def expiry_sql(expiry)
-      expiry == 0 ? 'NULL' : "NOW() + interval '#{expiry} seconds'"
+      if expiry.kind_of?(Time)
+        quote(expiry.to_s(:db))
+      else
+        expiry == 0 ? 'NULL' : "NOW() + interval '#{expiry} seconds'"
+      end
     end
   end
 end

data/memcache.gemspec

@@ -0,0 +1,66 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{memcache}
+  s.version = "0.9.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Justin Balthrop"]
+  s.date = %q{2009-09-16}
+  s.description = %q{Ruby client for memcached supporting advanced protocol features and pluggable architecture.}
+  s.email = %q{code@justinbalthrop.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/memcache.rb",
+     "lib/memcache/local_server.rb",
+     "lib/memcache/migration.rb",
+     "lib/memcache/null_server.rb",
+     "lib/memcache/pg_server.rb",
+     "lib/memcache/segmented_server.rb",
+     "lib/memcache/server.rb",
+     "memcache.gemspec",
+     "test/memcache_local_server_test.rb",
+     "test/memcache_null_server_test.rb",
+     "test/memcache_pg_server_test.rb",
+     "test/memcache_segmented_server_test.rb",
+     "test/memcache_server_test.rb",
+     "test/memcache_server_test_helper.rb",
+     "test/memcache_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/ninjudd/memcache}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Advanced ruby memcache client}
+  s.test_files = [
+    "test/memcache_local_server_test.rb",
+     "test/memcache_null_server_test.rb",
+     "test/memcache_pg_server_test.rb",
+     "test/memcache_segmented_server_test.rb",
+     "test/memcache_server_test.rb",
+     "test/memcache_server_test_helper.rb",
+     "test/memcache_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/test/memcache_pg_server_test.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require File.dirname(__FILE__) + '/memcache_server_test_helper'
 require File.dirname(__FILE__) + '/../lib/memcache/pg_server'
 
-class MemcacheDBServerTest < Test::Unit::TestCase
+class MemcachePGServerTest < Test::Unit::TestCase
   ActiveRecord::Base.establish_connection(
     :adapter  => "postgresql",
     :host     => "localhost",

data/test/memcache_test.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
 require File.dirname(__FILE__) + '/test_helper'
 
-class MemcacheServerTest < Test::Unit::TestCase
+class MemcacheTest < Test::Unit::TestCase
   PORTS = [11212, 11213, 11214, 11215, 11216, 11217]
 
   def m
@@ -166,10 +166,10 @@ class MemcacheServerTest < Test::Unit::TestCase
 
   def test_expiry
     100.times do |i|
-      m.set("int#{i}", i, :expiry => 2)
+      m.set("int#{i}", i, :expiry => 1)
       assert_equal i, m.get("int#{i}")
 
-      m.set("time#{i}", i, :expiry => Time.now + 2)
+      m.set("time#{i}", i, :expiry => Time.now + 1)
       assert_equal i, m.get("time#{i}")
     end
 

data/test/test_helper.rb

@@ -7,6 +7,8 @@ require 'pp'
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 require 'memcache'
 
+system 'killall memcached 2> /dev/null'
+
 class Test::Unit::TestCase
   def start_memcache(*ports)
     ports.each do |port|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ninjudd-memcache
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -23,6 +23,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
@@ -33,9 +34,7 @@ files:
 - lib/memcache/pg_server.rb
 - lib/memcache/segmented_server.rb
 - lib/memcache/server.rb
-- lib/memcache_extended.rb
-- lib/memcache_mock.rb
-- lib/memcache_util.rb
+- memcache.gemspec
 - test/memcache_local_server_test.rb
 - test/memcache_null_server_test.rb
 - test/memcache_pg_server_test.rb
@@ -44,10 +43,6 @@ files:
 - test/memcache_server_test_helper.rb
 - test/memcache_test.rb
 - test/test_helper.rb
-- test/test_mem_cache.rb
-- test/test_memcache_extended.rb
-- test/test_memcache_mock.rb
-- LICENSE
 has_rdoc: false
 homepage: http://github.com/ninjudd/memcache
 licenses: 
@@ -84,6 +79,3 @@ test_files:
 - test/memcache_server_test_helper.rb
 - test/memcache_test.rb
 - test/test_helper.rb
-- test/test_mem_cache.rb
-- test/test_memcache_extended.rb
-- test/test_memcache_mock.rb

data/lib/memcache_extended.rb

@@ -1,120 +0,0 @@
-# Need to override entire class with Justin's changes
-require File.dirname(__FILE__) + '/memcache'
-
-module MemCacheExtensions
-  LOCK_TIMEOUT    = 5     if not defined? LOCK_TIMEOUT
-  WRITE_LOCK_WAIT = 0.001 if not defined? WRITE_LOCK_WAIT
-
-  def get_some(keys, opts = {})
-    opts[:expiry] ||= default_expiry
-    keys = keys.collect {|key| key.to_s}
-
-    records = {}
-    records = self.get_multi(keys) unless opts[:disable]
-    if opts[:validation]
-      records.delete_if do |key, value|
-        not opts[:validation].call(key, value)
-      end
-    end
-    keys_to_fetch = keys - records.keys
-
-    if keys_to_fetch.any?
-      yield(keys_to_fetch).each do |key, data_item|
-        self.set(key, data_item, opts[:expiry]) unless opts[:disable] or opts[:disable_write]
-        records[key] = data_item
-      end
-    end
-    records
-  end
-
-  def in_namespace(namespace)
-    begin
-      # Temporarily change the namespace for convenience.
-      old_namespace = self.namespace
-      self.namespace = "#{old_namespace}#{namespace}"
-      yield
-    ensure
-      self.namespace = old_namespace
-    end
-  end
-
-  def get_or_set(key)
-    get(key) || begin
-      value = yield
-      set(key, value)
-      value
-    end
-  end
-
-  def get_reset_expiry(key, expiry)
-    result = get(key)
-    set(key, result, expiry) if result
-    result
-  end
-
-  def lock(key)
-    # Returns true if the lock already exists.
-    response = add(lock_key(key), true, LOCK_TIMEOUT)
-    response.index('STORED') != 0
-  end
-
-  def unlock(key)
-    response = delete(lock_key(key))
-    response.index('DELETED') == 0
-  end
-
-  def with_lock(key, flag = nil)
-    while lock(key) do
-      return if flag == :ignore
-      sleep(WRITE_LOCK_WAIT) # just wait
-    end
-    yield
-    unlock(key) unless flag == :keep
-  end
-
-  def lock_key(key)
-    "lock:#{key}"
-  end
-
-  def locked?(key)
-    not get(lock_key(key)).nil?
-  end
-
-  def set_with_lock(*args)
-    with_lock(args.first, :ignore) do
-      set(*args)
-    end
-  end
-
-  def add_with_lock(*args)
-    with_lock(args.first, :ignore) do
-      add(*args)
-    end
-  end
-
-  def delete_with_lock(*args)
-    # leave a :delete lock around to prevent someone from
-    # adding stale data for a little while
-    with_lock(args.first, :keep) do
-      delete(*args)
-    end
-  end
-
-  def clear
-    flush_all
-  end
-
-  ### To support using memcache in testing.
-  def empty?; false; end
-  ###
-end
-
-class MemCache
-  include MemCacheExtensions
-end
-
-if defined?(MemCacheMock)
-  class MemCacheMock
-    include MemCacheExtensions
-  end
-end

data/lib/memcache_mock.rb

@@ -1,137 +0,0 @@
-class MemCacheMock
-  attr_writer :namespace
-  
-  def initialize
-    @data = {}
-    @expiry = {}
-    @auto_clear = false
-  end
-  
-  def namespace
-    @namespace.to_s
-  end
-  
-  def cache_key(key)
-    "#{namespace}:#{key}"
-  end
-
-  def default_expiry
-    0
-  end
-
-  # Note:  This doesn't work exactly like memcache's incr
-  # because MemCacheMock doesn't support raw storage.
-  # This version will work on marshalled data.
-  # This is also not atomic.
-  def incr(key, amount=1)
-    oldval = get(key).to_i or return nil
-    newval = oldval + amount
-    set(key, newval) # Note: Loses the expiry.
-    return newval
-  end
-
-  def decr(key, amount=1)
-    incr(key, amount * -1)
-  end
-  
-  def set(*args)
-    do_set(*args)
-  end
-
-  # Note:  Raw not implemented.
-  def do_set(key, value, expiry = default_expiry, raw=false)
-    return '' if @auto_clear
-    key = cache_key(key)
-
-    @data[key] = Marshal.dump(value)
-    @expiry[key] = Time.now + expiry if expiry and expiry != 0
-    'STORED'
-  end
-
-  def add(key, value, expiry = 0)
-    return '' if get(key)
-    do_set(key, value, expiry)
-  end
-
-  def kind_of?(type)
-    (type == MemCache) || super
-  end
-  
-  def delete(key)
-    key = cache_key(key)
-    @data.delete(key)
-  end
-  
-  def clear
-    @data.clear
-    @expiry.clear 
-  end
-  
-  def reset
-    # do nothing
-  end
-
-  def get_multi(*keys)
-    opts = keys.last.kind_of?(Hash) ? keys.pop : {}
-    keys.flatten!
-
-    hash = {}
-    keys.each do |key|
-      val = get(key)
-      hash[key.to_s] = val if val
-    end
-    hash
-  end
-
-  # Note:  Raw not implemented.
-  def get(key, raw=false)
-    key = cache_key(key)
-    clear if @auto_clear
-    if @expiry[key] and Time.now > @expiry[key]
-      @data[key]   = nil
-      @expiry[key] = nil
-    end
-    return if not @data[key]
-    Marshal.load(@data[key])
-  end
-  
-  def [](key)
-    get(key)
-  end
-
-  def []=(key, value)
-    set(key, value)
-  end
-
-  def empty?
-    @data.empty?
-  end
-  
-  def keys
-    @data.keys
-  end
-  
-  def auto_clear_on(&block)
-    if block_given?
-      auto_clear_block(true, &block)
-    else
-      @auto_clear = true
-    end
-  end
-  
-  def auto_clear_off(&block)
-    if block_given?
-      auto_clear_block(false, &block)
-    else
-      @auto_clear = false
-    end
-  end
-
-  def auto_clear_block(value, &block)
-    old_auto_clear = @auto_clear
-    @auto_clear = value
-    block.call
-    @auto_clear = old_auto_clear
-  end
-
-end