memcache 1.2.8 → 1.2.9

data/README.rdoc

@@ -3,7 +3,9 @@
 This is the Geni memcached client. It started out as a fork of fiveruns/memcache-client,
 which was a fork of seattle.rb's memcache-client, but over time, our client has diverged,
 and I've rewritten the majority of the code. Of course, a lot of credit is due to those
-whose code served as a starting point for this code.
+whose code served as a starting point for this code. Also, thanks to Evan Weaver for the
+idea to include the libmemcached source and the code to make it compile when installing
+the gem.
 
 == Usage
 
@@ -65,14 +67,6 @@ changes:
    cache.get('foo', :raw => true).memcache_flags.to_s(2)
    => "1111111100001000"
 
-- +incr+ and +decr+ automatically initialize the value to 0 if the key doesn't
-  exist. The +count+ method returns the integer count associated with a given key.
-
-   cache.count('hits')    # => 0
-   cache.incr('hits', 52) # => 52
-   cache.decr('hits', 9)  # => 43
-   cache.count('hits')    # => 43
-
 - In addition to +add+, which was already supported, support has been added for +replace+,
   +append+ and +prepend+ from the memcached protocol.
 
@@ -105,7 +99,7 @@ changes:
    => "modified"
 
 - Several additional convenience methods have been added including +get_or_add+,
-  +get_or_set+, +update+, +get_some+, +lock+, +unlock+, and +with_lock+.
+  +get_or_set+, +add_or_get+, +update+, +get_some+, +lock+, +unlock+, and +with_lock+.
 
 === Implementation
 
@@ -230,9 +224,9 @@ NativeServer also accepts a few other options:
                  is an alias for <tt>:ketama</tt>, and <tt>:ketama_spy</tt> provides
                  compatibility with the SPY Memcached client for Java.
 
-[+ketama] Sets the default distribution to <tt>:ketama</tt> and hash to <tt>:md5</tt>.
+[+ketama+] Sets the default distribution to <tt>:ketama</tt> and hash to <tt>:md5</tt>.
 
-[+ketama_wieghted] Enables ketama weighting and sets the default distribution to <tt>:ketama</tt> and hash to <tt>:md5</tt>.
+[+ketama_wieghted+] Enables ketama weighting and sets the default distribution to <tt>:ketama</tt> and hash to <tt>:md5</tt>.
 
 [+binary+] A boolean value specifying whether to use memcached's binary protocol instead
            of the default ascii protocol. This is slightly slower, but should allow you to use unicode keys.
@@ -243,4 +237,6 @@ NativeServer also accepts a few other options:
 
 == License:
 
-Copyright (c) 2010 Justin Balthrop, Geni.com; Published under The MIT License, see LICENSE
+Copyright (c) 2010 Justin Balthrop, Geni.com; Published under The MIT License, see the LICENSE file.
+
+ext/extconf.rb Copyright (c) 2010 Cloudburst, LLC, licensed under the AFL3 license, and used with permission; see the ext/LICENSE_AFL3 file.

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 2
-:patch: 8
+:patch: 9
 :major: 1

data/ext/LICENSE_AFL3

@@ -0,0 +1,184 @@
+Academic Free License (AFL) v. 3.0
+
+This Academic Free License (the "License") applies to any original work
+of authorship (the "Original Work") whose owner (the "Licensor") has
+placed the following licensing notice adjacent to the copyright notice
+for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+1) Grant of Copyright License. Licensor grants You a worldwide,
+royalty-free, non-exclusive, sublicensable license, for the duration of
+the copyright, to do the following:
+
+a) to reproduce the Original Work in copies, either alone or as part of
+a collective work;
+
+b) to translate, adapt, alter, transform, modify, or arrange the
+Original Work, thereby creating derivative works ("Derivative Works")
+based upon the Original Work;
+
+c) to distribute or communicate copies of the Original Work and
+Derivative Works to the public, under any license of your choice that
+does not contradict the terms and conditions, including Licensor's
+reserved rights and remedies, in this Academic Free License;
+
+d) to perform the Original Work publicly; and
+
+e) to display the Original Work publicly.
+
+2) Grant of Patent License. Licensor grants You a worldwide,
+royalty-free, non-exclusive, sublicensable license, under patent claims
+owned or controlled by the Licensor that are embodied in the Original
+Work as furnished by the Licensor, for the duration of the patents, to
+make, use, sell, offer for sale, have made, and import the Original Work
+and Derivative Works.
+
+3) Grant of Source Code License. The term "Source Code" means the
+preferred form of the Original Work for making modifications to it and
+all available documentation describing how to modify the Original Work.
+Licensor agrees to provide a machine-readable copy of the Source Code of
+the Original Work along with each copy of the Original Work that
+Licensor distributes. Licensor reserves the right to satisfy this
+obligation by placing a machine-readable copy of the Source Code in an
+information repository reasonably calculated to permit inexpensive and
+convenient access by You for as long as Licensor continues to distribute
+the Original Work.
+
+4) Exclusions From License Grant. Neither the names of Licensor, nor the
+names of any contributors to the Original Work, nor any of their
+trademarks or service marks, may be used to endorse or promote products
+derived from this Original Work without express prior permission of the
+Licensor. Except as expressly stated herein, nothing in this License
+grants any license to Licensor's trademarks, copyrights, patents, trade
+secrets or any other intellectual property. No patent license is granted
+to make, use, sell, offer for sale, have made, or import embodiments of
+any patent claims other than the licensed claims defined in Section 2.
+No license is granted to the trademarks of Licensor even if such marks
+are included in the Original Work. Nothing in this License shall be
+interpreted to prohibit Licensor from licensing under terms different
+from this License any Original Work that Licensor otherwise would have a
+right to license.
+
+5) External Deployment. The term "External Deployment" means the use,
+distribution, or communication of the Original Work or Derivative Works
+in any way such that the Original Work or Derivative Works may be used
+by anyone other than You, whether those works are distributed or
+communicated to those persons or made available as an application
+intended for use over a network. As an express condition for the grants
+of license hereunder, You must treat any External Deployment by You of
+the Original Work or a Derivative Work as a distribution under section
+1(c).
+
+6) Attribution Rights. You must retain, in the Source Code of any
+Derivative Works that You create, all copyright, patent, or trademark
+notices from the Source Code of the Original Work, as well as any
+notices of licensing and any descriptive text identified therein as an
+"Attribution Notice." You must cause the Source Code for any Derivative
+Works that You create to carry a prominent Attribution Notice reasonably
+calculated to inform recipients that You have modified the Original
+Work.
+
+7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants
+that the copyright in and to the Original Work and the patent rights
+granted herein by Licensor are owned by the Licensor or are sublicensed
+to You under the terms of this License with the permission of the
+contributor(s) of those copyrights and patent rights. Except as
+expressly stated in the immediately preceding sentence, the Original
+Work is provided under this License on an "AS IS" BASIS and WITHOUT
+WARRANTY, either express or implied, including, without limitation, the
+warranties of non-infringement, merchantability or fitness for a
+particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL
+WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential
+part of this License. No license to the Original Work is granted by this
+License except under this disclaimer.
+
+8) Limitation of Liability. Under no circumstances and under no legal
+theory, whether in tort (including negligence), contract, or otherwise,
+shall the Licensor be liable to anyone for any indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or the use of the Original Work including,
+without limitation, damages for loss of goodwill, work stoppage,
+computer failure or malfunction, or any and all other commercial damages
+or losses. This limitation of liability shall not apply to the extent
+applicable law prohibits such limitation.
+
+9) Acceptance and Termination. If, at any time, You expressly assented
+to this License, that assent indicates your clear and irrevocable
+acceptance of this License and all of its terms and conditions. If You
+distribute or communicate copies of the Original Work or a Derivative
+Work, You must make a reasonable effort under the circumstances to
+obtain the express assent of recipients to the terms of this License.
+This License conditions your rights to undertake the activities listed
+in Section 1, including your right to create Derivative Works based upon
+the Original Work, and doing so without honoring these terms and
+conditions is prohibited by copyright law and international treaty.
+Nothing in this License is intended to affect copyright exceptions and
+limitations (including "fair use" or "fair dealing"). This License shall
+terminate immediately and You may no longer exercise any of the rights
+granted to You by this License upon your failure to honor the conditions
+in Section 1(c).
+
+10) Termination for Patent Action. This License shall terminate
+automatically and You may no longer exercise any of the rights granted
+to You by this License as of the date You commence an action, including
+a cross-claim or counterclaim, against Licensor or any licensee alleging
+that the Original Work infringes a patent. This termination provision
+shall not apply for an action alleging patent infringement by
+combinations of the Original Work with other software or hardware.
+
+11) Jurisdiction, Venue and Governing Law. Any action or suit relating
+to this License may be brought only in the courts of a jurisdiction
+wherein the Licensor resides or in which Licensor conducts its primary
+business, and under the laws of that jurisdiction excluding its
+conflict-of-law provisions. The application of the United Nations
+Convention on Contracts for the International Sale of Goods is expressly
+excluded. Any use of the Original Work outside the scope of this License
+or after its termination shall be subject to the requirements and
+penalties of copyright or patent law in the appropriate jurisdiction.
+This section shall survive the termination of this License.
+
+12) Attorneys' Fees. In any action to enforce the terms of this License
+or seeking damages relating thereto, the prevailing party shall be
+entitled to recover its costs and expenses, including, without
+limitation, reasonable attorneys' fees and costs incurred in connection
+with such action, including any appeal of such action. This section
+shall survive the termination of this License.
+
+13) Miscellaneous. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable.
+
+14) Definition of "You" in This License. "You" throughout this License,
+whether in upper or lower case, means an individual or a legal entity
+exercising rights under, and complying with all of the terms of, this
+License. For legal entities, "You" includes any entity that controls, is
+controlled by, or is under common control with you. For purposes of this
+definition, "control" means (i) the power, direct or indirect, to cause
+the direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+15) Right to Use. You may use the Original Work in all ways not
+otherwise restricted or conditioned by this License or by law, and
+Licensor promises not to interfere with or be responsible for such uses
+by You.
+
+16) Modification of This License. This License is Copyright (c) 2005
+Lawrence Rosen. Permission is granted to copy, distribute, or
+communicate this License without modification. Nothing in this License
+permits You to modify this License as applied to the Original Work or to
+Derivative Works. However, You may modify the text of this License and
+copy, distribute or communicate your modified version (the "Modified
+License") and apply it to other original works of authorship subject to
+the following conditions: (i) You may not indicate in any way that your
+Modified License is the "Academic Free License" or "AFL" and you may not
+use those names in the name of your Modified License; (ii) You must
+replace the notice specified in the first paragraph above with the
+notice "Licensed under <insert your license name here>" or with a notice
+of your own that is not confusingly similar to the notice in this
+License; and (iii) You may not claim that your original works are open
+source software unless your Modified License has been approved by Open
+Source Initiative (OSI) and You comply with its license review and
+certification process.
+

data/ext/extconf.rb

@@ -1,8 +1,9 @@
+# This file was derived from Evan's Weaver memcached library: http://github.com/fauna/memcached
+# See the ext/LICENSE_AFL3 file.
+
 require 'mkmf'
 require 'rbconfig'
 
-# Code taken from Evan's Weaver memcached library: http://github.com/fauna/memcached
-
 HERE        = File.expand_path(File.dirname(__FILE__))
 BUNDLE      = Dir.glob("libmemcached-*.tar.gz").first
 BUNDLE_PATH = BUNDLE.sub(".tar.gz", "")
@@ -24,8 +25,8 @@ if !ENV["EXTERNAL_LIB"]
       puts "Building libmemcached."
       puts(cmd = "tar xzf #{BUNDLE} 2>&1")
       raise "'#{cmd}' failed" unless system(cmd)
-      
-      Dir.chdir(BUNDLE_PATH) do        
+
+      Dir.chdir(BUNDLE_PATH) do
         puts(cmd = "env CFLAGS='-fPIC' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils --disable-dependency-tracking #{$EXTRA_CONF} 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
 
@@ -39,14 +40,14 @@ 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') 
+    system('cp -f libmemcached.a  libmemcached_gem.a')
+    system('cp -f libmemcached.la libmemcached_gem.la')
   end
 
   $LIBS << " -lmemcached_gem"
 end
 
-create_makefile('memcache/native_server')
+create_makefile('memcache/native_server')

data/lib/memcache.rb

@@ -417,7 +417,7 @@ protected
   def server(key)
     return @server if @server
 
-    key = "#{namespace}:#{key}" if @hash_with_prefix
+    key = "#{namespace}:#{key}" if @hash_with_prefix and namespace
     hash = (Zlib.crc32(key) >> 16) & 0x7fff
     servers[hash % servers.length]
   end

data/memcache.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcache}
-  s.version = "1.2.8"
+  s.version = "1.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Balthrop"]
-  s.date = %q{2010-03-23}
+  s.date = %q{2010-04-05}
   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"]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION.yml",
      "bench/benchmark.rb",
+     "ext/LICENSE_AFL3",
      "ext/extconf.rb",
      "ext/libmemcached-0.38.tar.gz",
      "ext/native_server.c",

data/test/memcache_native_server_test.rb

@@ -6,7 +6,7 @@ class MemcacheNativeServerTest < Test::Unit::TestCase
   include MemcacheServerTestHelper::AdvancedMethods
   with_prefixes nil, "foo:", "bar:"
 
-  PORTS = [11212, 11213, 11214]
+  PORTS = [11212, 11213, 11214, 11215, 11216]
   def setup
     init_memcache(*PORTS) do
       Memcache::NativeServer.new(:servers => PORTS.collect {|p| "localhost:#{p}"})

data/test/memcache_null_server_test.rb

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

data/test/memcache_test.rb

@@ -222,4 +222,15 @@ class MemcacheTest < Test::Unit::TestCase
     assert_not_equal m.servers.collect {|s| s.send(:socket)},
                      c.servers.collect {|s| s.send(:socket)}
   end
+
+  def test_native_hashing
+    n = Memcache.new(:servers => PORTS.collect {|p| "localhost:#{p}"}, :native => true)
+    n.namespace = m.namespace
+
+    1000.times do |i|
+      i = i.to_s
+      n.set(i, i, :raw => true)
+      assert_equal i, m.get(i, :raw => true)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcache
 version: !ruby/object:Gem::Version 
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -07:00
+date: 2010-04-05 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,7 @@ files:
 - Rakefile
 - VERSION.yml
 - bench/benchmark.rb
+- ext/LICENSE_AFL3
 - ext/extconf.rb
 - ext/libmemcached-0.38.tar.gz
 - ext/native_server.c