memcache 1.2.13 → 1.3.0

data/.gitignore

@@ -1,7 +1,9 @@
 pkg
+*~
 *.bundle
 *.so
 *.o
+Gemfile.lock
 Makefile
 mkmf.log
 *.gem

data/.rbenv-gemsets

@@ -0,0 +1 @@
+memcache

data/.rbenv-version

@@ -0,0 +1 @@
+ree-1.8.7-2012.02

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://www.rubygems.org"
+
+gemspec

data/README.rdoc

@@ -120,7 +120,7 @@ alternate backend server implementations. Right now, there are three basic, alte
                 duration of a request.
 
 [+PGServer+] This is an implementation of memcached functionality using SQL. It stores all
-             data in a single postgres table and uses +PGConn+ to select and update this
+             data in a single postgres table and uses +PGconn+ to select and update this
              table. This works well as a permanent cache or in the case when your objects
              are very large. It can also be used in a multi-level cache setup with
              <tt>Memcache::Server</tt> to provide persistence without sacrificing speed.

data/Rakefile

@@ -1,72 +1,16 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "memcache"
-    gem.summary = %Q{Advanced ruby memcache client}
-    gem.description = %Q{Ruby client for memcached supporting advanced protocol features and pluggable architecture.}
-    gem.email = "code@justinbalthrop.com"
-    gem.homepage = "http://github.com/ninjudd/memcache"
-    gem.authors = ["Justin Balthrop"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
 require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
+require 'bundler/gem_tasks'
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+Rake::TestTask.new do |t|
+  t.libs = ['lib', 'test']
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
 end
 
-task :test => :check_dependencies
-
-task :default => :test
-
-task :clean do
-  `rm -rf ext/lib ext/bin ext/share ext/include`
-end
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "memcache #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-namespace :test => 'lib/memcache/native_server.o' do
-  Rake::TestTask.new(:native) do |t|
-    t.libs << 'test'
-    t.pattern = 'test/memcache_*native_server_test.rb'
-    t.verbose
-  end
-end
+task :test => 'lib/memcache/native_server.o'
 
 file 'lib/memcache/native_server.o' do
   `cd ext && ruby extconf.rb && make && cp native_server.bundle native_server.o ../lib/memcache/`
 end
+
+task :default => :test

data/VERSION

@@ -0,0 +1 @@
+1.3.0

data/ext/extconf.rb

@@ -40,15 +40,31 @@ if !ENV["EXTERNAL_LIB"]
       system("rm -rf #{BUNDLE_PATH}") unless ENV['DEBUG'] or ENV['DEV']
     end
   end
-
+  
   # Absolutely prevent the linker from picking up any other libmemcached
-  Dir.chdir("#{HERE}/lib") do
-    system('cp -f libmemcached.a  libmemcached_gem.a')
-    system('cp -f libmemcached.la libmemcached_gem.la')
+  if File.exists?("#{HERE}/lib/amd64/libmemcached.a")
+    # fix linking issue under solaris
+    # https://github.com/ninjudd/memcache/issues/5
+    Dir.chdir("#{HERE}/lib/amd64") do
+      system('cp -f libmemcached.a  ../libmemcached_gem.a')
+      system('cp -f libmemcached.la ../libmemcached_gem.la')
+    end
+  else
+    Dir.chdir("#{HERE}/lib") do
+      system('cp -f libmemcached.a  libmemcached_gem.a')
+      system('cp -f libmemcached.la libmemcached_gem.la')
+    end
   end
-
+  
   $LIBS << " -lmemcached_gem"
 end
 
+# ------------------------------------------------------
+# thanks to: https://gist.github.com/IanVaughan/5489431
 $CPPFLAGS += " -DRUBY_19" if RUBY_VERSION =~ /1.9/
+$CPPFLAGS += " -DRUBY_20" if RUBY_VERSION =~ /2.0/
+ 
+puts "*** Using Ruby version: #{RUBY_VERSION}"
+puts "*** with CPPFLAGS: #{$CPPFLAGS}"
+# ------------------------------------------------------
 create_makefile('memcache/native_server')

data/ext/native_server.c

@@ -124,7 +124,7 @@ static VALUE mc_initialize(VALUE self, VALUE opts) {
     memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, true);
 
   if (!NIL_P(prefixv))
-    memcached_callback_set(mc, MEMCACHED_CALLBACK_PREFIX_KEY, STR2CSTR(prefixv));
+    memcached_callback_set(mc, MEMCACHED_CALLBACK_PREFIX_KEY, StringValuePtr(prefixv));
 
   if (!NIL_P(servers_aryv)) {
     char* server;
@@ -152,7 +152,7 @@ static VALUE mc_initialize(VALUE self, VALUE opts) {
   return self;
 }
 
-#ifdef RUBY_19
+#if defined(RUBY_19) || defined(RUBY_20)
 #define RSTRING_SET_LEN(str, newlen) (rb_str_set_len(str, new_len))
 #else
 #define RSTRING_SET_LEN(str, newlen) (RSTRING(str)->len = new_len)
@@ -555,7 +555,7 @@ VALUE mc_set_prefix(VALUE self, VALUE prefix) {
     result = memcached_callback_set(mc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL);
   } else {
     prefix = StringValue(prefix);
-    result = memcached_callback_set(mc, MEMCACHED_CALLBACK_PREFIX_KEY, STR2CSTR(prefix));
+    result = memcached_callback_set(mc, MEMCACHED_CALLBACK_PREFIX_KEY, StringValuePtr(prefix));
   }
   return prefix;
 }

data/lib/memcache.rb

@@ -201,12 +201,16 @@ class Memcache
   end
 
   def incr(key, amount = 1)
+    return decr(key, -amount) if amount < 0
+
     key = key.to_s
     backup.incr(key, amount) if backup
     server(key).incr(key, amount)
   end
 
   def decr(key, amount = 1)
+    return incr(key, -amount) if amount < 0
+
     key = key.to_s
     backup.decr(key, amount) if backup
     server(key).decr(key, amount)
@@ -260,11 +264,10 @@ class Memcache
     end
 
     keys_to_fetch = keys - records.keys
-    method = opts[:overwrite] ? :set : :add
     if keys_to_fetch.any?
       yield(keys_to_fetch).each do |key, value|
         begin
-          self.send(method, key, value, opts) unless opts[:disable] or opts[:disable_write]
+          set(key, value, {}) unless opts[:disable] or opts[:disable_write]
         rescue Memcache::Error => e
           raise if opts[:strict_write]
           $stderr.puts "Memcache error in get_some: #{e.class} #{e.to_s} on key '#{key}' while storing value: #{value}"
@@ -347,7 +350,7 @@ class Memcache
   end
 
   def self.init(yaml_file = nil)
-    yaml_file = File.join(Rails.root, 'config', 'memcached.yml')
+    yaml_file ||= File.join(Rails.root, 'config', 'memcached.yml')
 
     if File.exists?(yaml_file)
       yaml = YAML.load_file(yaml_file)
@@ -361,7 +364,9 @@ class Memcache
         else
           config.each do |connection, opts|
             opts = defaults.merge(opts.symbolize_keys)
-            Memcache.pool[connection] = Memcache.new(opts)
+            if not opts.empty? and not opts[:disabled]
+              Memcache.pool[connection] = Memcache.new(opts)
+            end
           end
         end
       end
@@ -421,6 +426,7 @@ protected
     object
   rescue Exception => e
     $stderr.puts "Memcache read error: #{e.class} #{e.to_s} on key '#{key}' while unmarshalling value: #{value}"
+    $stderr.puts caller
     nil
   end
 

data/lib/memcache/pg_server.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'memcache/migration'
+require 'pg'
 
 class PGconn
   def self.quote_ident(name)
@@ -36,9 +37,10 @@ class Memcache
         SELECT key, value FROM #{table}
           WHERE key IN (#{keys}) AND #{prefix_clause} AND #{expiry_clause}
       }
+
       results = {}
-      db.query(sql).each do |key, value|
-        results[key] = value
+      db.query(sql).each do |row|
+        results[row['key']] = row['value']
       end
       results
     end

data/memcache.gemspec

@@ -1,81 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-Gem::Specification.new do |s|
-  s.name = %q{memcache}
-  s.version = "1.2.13"
+Gem::Specification.new do |gem|
+  gem.name          = "memcache"
+  gem.version       = IO.read('VERSION')
+  gem.authors       = ["Justin Balthrop"]
+  gem.email         = ["git@justinbalthrop.com"]
+  gem.description   = %q{Ruby client for memcached supporting advanced protocol features and pluggable architecture.}
+  gem.summary       = gem.description
+  gem.homepage      = "https://github.com/ninjudd/memcache"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Justin Balthrop"]
-  s.date = %q{2010-08-31}
-  s.description = %q{Ruby client for memcached supporting advanced protocol features and pluggable architecture.}
-  s.email = %q{code@justinbalthrop.com}
-  s.extensions = ["ext/extconf.rb"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "bench/benchmark.rb",
-     "ext/LICENSE_AFL3",
-     "ext/extconf.rb",
-     "ext/libmemcached-0.38.tar.gz",
-     "ext/native_server.c",
-     "lib/memcache.rb",
-     "lib/memcache/base.rb",
-     "lib/memcache/local_server.rb",
-     "lib/memcache/migration.rb",
-     "lib/memcache/null_server.rb",
-     "lib/memcache/pg_server.rb",
-     "lib/memcache/segmented.rb",
-     "lib/memcache/server.rb",
-     "memcache.gemspec",
-     "test/memcache_local_server_test.rb",
-     "test/memcache_native_server_test.rb",
-     "test/memcache_null_server_test.rb",
-     "test/memcache_pg_server_test.rb",
-     "test/memcache_segmented_native_server_test.rb",
-     "test/memcache_segmented_server_test.rb",
-     "test/memcache_segmented_test_helper.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.7}
-  s.summary = %q{Advanced ruby memcache client}
-  s.test_files = [
-    "test/memcache_local_server_test.rb",
-     "test/memcache_native_server_test.rb",
-     "test/memcache_null_server_test.rb",
-     "test/memcache_pg_server_test.rb",
-     "test/memcache_segmented_native_server_test.rb",
-     "test/memcache_segmented_server_test.rb",
-     "test/memcache_segmented_test_helper.rb",
-     "test/memcache_server_test.rb",
-     "test/memcache_server_test_helper.rb",
-     "test/memcache_test.rb",
-     "test/test_helper.rb"
-  ]
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'shoulda', '3.0.1'
+  gem.add_development_dependency 'mocha'
+  gem.add_development_dependency 'activerecord'
+  gem.add_development_dependency 'activerecord-postgresql-adapter'
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 end
-

data/test/memcache_local_server_test.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/memcache_server_test_helper'
+require 'memcache_server_test_helper'
 
 class MemcacheLocalServerTest < Test::Unit::TestCase
   include MemcacheServerTestHelper

data/test/memcache_native_server_test.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/memcache_server_test_helper'
+require 'memcache_server_test_helper'
 
 class MemcacheNativeServerTest < Test::Unit::TestCase
   include MemcacheServerTestHelper

data/test/memcache_null_server_test.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/memcache/base'
-require File.dirname(__FILE__) + '/../lib/memcache/null_server'
+require 'memcache/base'
+require 'memcache/null_server'
 
 class MemcacheNullServerTest < Test::Unit::TestCase
   def setup

data/test/memcache_pg_server_test.rb

@@ -1,13 +1,11 @@
-require 'test/unit'
-require 'rubygems'
-require File.dirname(__FILE__) + '/memcache_server_test_helper'
-require File.dirname(__FILE__) + '/../lib/memcache/pg_server'
+require 'memcache_server_test_helper'
+require 'memcache/pg_server'
 
 class MemcachePGServerTest < Test::Unit::TestCase
   ActiveRecord::Base.establish_connection(
     :adapter  => "postgresql",
     :host     => "localhost",
-    :username => "postgres",
+    :username => `whoami`.chomp,
     :password => "",
     :database => "memcache_test"
   )

data/test/memcache_server_test.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require File.dirname(__FILE__) + '/memcache_server_test_helper'
+require 'memcache_server_test_helper'
 
 class MemcacheServerTest < Test::Unit::TestCase
   include MemcacheServerTestHelper

data/test/memcache_server_test_helper.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 module MemcacheServerTestHelper
   def test_prefix

data/test/memcache_test.rb

@@ -157,6 +157,31 @@ class MemcacheTest < Test::Unit::TestCase
     end
   end
 
+  def test_get_some_with_validation
+    100.times do |i|
+      m.set(i.to_s, i.odd? ? -i : i)
+    end
+    keys = (0...100).collect {|key| key.to_s}
+
+    results = m.get_some(keys, :validation => lambda {|k,v| k.to_i == v}) do |missing_keys|
+      assert_equal 50, missing_keys.size
+      r = {}
+      missing_keys.each do |key|
+        r[key] = key.to_i
+      end
+      r
+    end
+    assert_equal 100, results.size
+
+    results.each do |key, value|
+      assert_equal key.to_i, value
+    end
+
+    results = m.get_some(keys, :validation => lambda {|k,v| k.to_i == v}) do |missing_keys|
+      flunk "no values should be invalid"
+    end
+  end
+
   def test_get_with_reset_expiry
     m.add('foo', 'quick brown fox', :expiry => 1)
     assert_equal 'quick brown fox', m.get('foo', :expiry => 2)

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
+require 'mocha/setup'
 require 'pp'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memcache
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
-  - 2
-  - 13
-  version: 1.2.13
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -15,29 +15,104 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -07:00
+date: 2013-06-03 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activerecord-postgresql-adapter
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Ruby client for memcached supporting advanced protocol features and pluggable architecture.
-email: code@justinbalthrop.com
+email: 
+- git@justinbalthrop.com
 executables: []
 
-extensions: 
-- ext/extconf.rb
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - .gitignore
+- .rbenv-gemsets
+- .rbenv-version
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION.yml
+- VERSION
 - bench/benchmark.rb
 - ext/LICENSE_AFL3
 - ext/extconf.rb
 - ext/libmemcached-0.38.tar.gz
+- ext/libmemcached-0.51.tar.gz
 - ext/native_server.c
 - lib/memcache.rb
 - lib/memcache/base.rb
@@ -60,12 +135,12 @@ files:
 - test/memcache_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/ninjudd/memcache
+homepage: https://github.com/ninjudd/memcache
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -89,10 +164,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Advanced ruby memcache client
+summary: Ruby client for memcached supporting advanced protocol features and pluggable architecture.
 test_files: 
 - test/memcache_local_server_test.rb
 - test/memcache_native_server_test.rb

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:minor: 2
-:patch: 13
-:build: 
-:major: 1