rails2_libmemcached_store 0.3.2 → 0.4.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjU2YzlkOGNhMjlmNjc4MzIxMWEzYmE3MDExY2MwNzc3ZWU5OTQ0ZQ==
+  data.tar.gz: !binary |-
+    ZjI0NzE1YzY0YWE1NDI5YTE5M2U4MjJmM2IyMjUxYmFhZDkwZWQ1OA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MzUzZDdiYmMwMDA2OGY2NzMwZjI2MzEzM2NmN2JlODhhYTJhZmM5MmM4ZmQ3
+    ZjVlMDQzMDM3ZGYzODk4MWRhMTQ5ODI4MzA4NDEzNWY1ZDZhOTFhNmJlNWQ0
+    MjVjOTg0NDcyZmQwNTQ4ZmNkYjMwZDYyZTYzZDRiNDkwYmFkYzg=
+  data.tar.gz: !binary |-
+    Mjc2YTQ0NzA3NmNjZjQ4YmU2NjZlNWFmYTFhMDkyMzdlZmNmNDM1NGViNDMy
+    ZGYwOWRhZjljN2U0OWIxMzAwOWZmMjE2NzM2NjAxOWZiMjAzNGI1NzIwMTM0
+    ZmM1ZDQ5ZDdhN2E1ZDBkNDYxZDI3NTlkYTE2ZDM0YTUyNGYwMGM=

data/lib/active_support/cache/libmemcached_store.rb

@@ -15,14 +15,30 @@ end
 module ActiveSupport
   module Cache
     class LibmemcachedStore < Store
+      class FetchWithRaceConditionTTLEntry
+        attr_accessor :value, :extended
+
+        def initialize(value, expires_in)
+          @value, @extended = value, false
+          @expires_at = Time.now.to_i + expires_in
+        end
+
+        def expires_in
+          [@expires_at - Time.now.to_i, 1].max # never set to 0 -> never expires
+        end
+
+        def expired?
+          @expires_at <= Time.now.to_i
+        end
+      end
+
       attr_reader :addresses
 
       ESCAPE_KEY_CHARS = /[\x00-\x20%\x7F-\xFF]/n
 
       DEFAULT_OPTIONS = {
         :distribution => :consistent,
-        :no_block => true,
-        :failover => true
+        :no_block => true
       }
 
       def initialize(*addresses)
@@ -42,10 +58,44 @@ module ActiveSupport
         extend ActiveSupport::Cache::Strategy::LocalCache
       end
 
+      def fetch(key, options={}, &block)
+        if options && options[:race_condition_ttl]
+          fetch_with_race_condition_ttl(key, options, &block)
+        else
+          super
+        end
+      end
+
+      def fetch_with_race_condition_ttl(key, options={}, &block)
+        options = options.dup
+
+        race_ttl = options.delete(:race_condition_ttl) || raise("Use :race_condition_ttl option or normal fetch")
+        expires_in = options.fetch(:expires_in)
+        options[:expires_in] = expires_in + race_ttl
+        options[:preserve_race_condition_entry] = true
+
+        value = fetch(key, options) { FetchWithRaceConditionTTLEntry.new(yield, expires_in) }
+
+        return value unless value.is_a?(FetchWithRaceConditionTTLEntry)
+
+        if value.expired? && !value.extended
+          # we take care of refreshing the cache, all others should keep reading
+          value.extended = true
+          write(key, value, options.merge(:expires_in => value.expires_in + race_ttl))
+
+          # calculate new value and store it
+          value = FetchWithRaceConditionTTLEntry.new(yield, expires_in)
+          write(key, value, options)
+        end
+
+        value.value
+      end
+
       def read(key, options = nil)
         key = expanded_key(key)
         super
-        @cache.get(escape_and_normalize(key), marshal?(options))
+        value = @cache.get(escape_and_normalize(key), marshal?(options))
+        convert_race_condition_entry(value, options)
       rescue Memcached::NotFound
         nil
       rescue Memcached::Error => e
@@ -67,8 +117,6 @@ module ActiveSupport
           values[mapping[key]] = value
         end
         values
-      rescue Memcached::NotFound
-        {}
       rescue Memcached::Error => e
         log_error(e)
         {}
@@ -144,6 +192,14 @@ module ActiveSupport
 
       private
 
+        def convert_race_condition_entry(value, options)
+          if (!options || !options[:preserve_race_condition_entry]) && value.is_a?(FetchWithRaceConditionTTLEntry)
+            value.value
+          else
+            value
+          end
+        end
+
         def escape_and_normalize(key)
           key = key.to_s.dup.force_encoding("BINARY").gsub(ESCAPE_KEY_CHARS) { |match| "%#{match.getbyte(0).to_s(16).upcase}" }
           key_length = key.length

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rails2_libmemcached_store
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Jeffrey Hardy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,48 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: iconv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: memcached
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -54,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -73,37 +108,27 @@ files:
 - lib/active_support/cache/libmemcached_store.rb
 - lib/libmemcached_store.rb
 - lib/rails2_libmemcached_store.rb
-- README
-- test/libmemcached_store_test.rb
-homepage: http://github.com/37signals/libmemcached_store
+homepage: https://github.com/staugaard/libmemcached_store
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4269371507181365870
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4269371507181365870
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveSupport::Cache wrapper for libmemcached
-test_files:
-- test/libmemcached_store_test.rb
+test_files: []

data/README

@@ -1,47 +0,0 @@
-= LibmemcachedStore
-
-An ActiveSupport cache store that uses the C-based libmemcached client through
-Evan Weaver's Ruby/SWIG wrapper, memcached. libmemcached is fast, lightweight,
-and supports consistent hashing, non-blocking IO, and graceful server failover.
-
-== Prerequisites
-
-You'll need both the libmemcached client and the memcached gem:
-
-* http://tangent.org/552/libmemcached.html
-* http://blog.evanweaver.com/files/doc/fauna/memcached
-
-Make sure you install libmemcached first, before you try installing the gem. If
-you're using OS X, the easiest way to install libmemcached is through MacPorts:
-
-  sudo port install libmemcached
-
-For other platforms, download and extract the libmemcached tarball and install
-manually:
-
-  ./configure
-  make && sudo make install
-
-Once libmemcached is installed, install the memcached gem:
-
-  gem install memcached --no-rdoc --no-ri
-
-== Usage
-
-This is a drop-in replacement for the memcache store that ships with Rails. To
-enable, set the <tt>config.cache_store</tt> option to <tt>:libmemcached_store</tt>
-in the config for your environment
-
-  config.cache_store = :libmemcached_store
-
-If no servers are specified, localhost is assumed. You can specify a list of
-server addresses, either as hostnames or IP addresses, with or without a port
-designation. If no port is given, 11211 is assumed:
-
-  config.cache_store = :libmemcached_store, %w(cache-01 cache-02 127.0.0.1:11212)
-
-== Props
-
-Thanks to Brian Aker (http://tangent.org) for creating libmemcached, and Evan
-Weaver (http://blog.evanweaver.com) for the Ruby wrapper.
-

data/test/libmemcached_store_test.rb

@@ -1,84 +0,0 @@
-require 'test/unit'
-require 'rubygems'
-require 'active_support'
-require 'memcached'
-
-require File.dirname(__FILE__) + '/../lib/libmemcached_store'
-
-# Make it easier to get at the underlying cache options during testing.
-class ActiveSupport::Cache::LibmemcachedStore
-  delegate :options, :to => '@cache'
-end
-
-class LibmemcachedStoreTest < Test::Unit::TestCase
-  def setup
-    @store = ActiveSupport::Cache.lookup_store :libmemcached_store
-    @store.clear
-  end
-
-  def test_should_identify_cache_store
-    assert_kind_of ActiveSupport::Cache::LibmemcachedStore, @store
-  end
-
-  def test_should_set_server_addresses_to_localhost_if_none_are_given
-    assert_equal %w(localhost), @store.addresses
-  end
-
-  def test_should_set_custom_server_addresses
-    store = ActiveSupport::Cache.lookup_store :libmemcached_store, 'localhost', '192.168.1.1'
-    assert_equal %w(localhost 192.168.1.1), store.addresses
-  end
-
-  def test_should_enable_consistent_hashing_by_default
-    assert_equal :consistent, @store.options[:distribution]
-  end
-
-  def test_should_enable_non_blocking_io_by_default
-    assert_equal true, @store.options[:no_block]
-  end
-
-  def test_should_enable_server_failover_by_default
-    assert_equal true, @store.options[:auto_eject_hosts]
-  end
-
-  def test_should_allow_configuration_of_custom_options
-    options = {
-      :prefix_key => 'test',
-      :distribution => :modula,
-      :no_block => false,
-      :auto_eject_hosts => false
-    }
-
-    store = ActiveSupport::Cache.lookup_store :libmemcached_store, 'localhost', options
-
-    assert_equal 'test', store.instance_variable_get(:@cache).prefix_key
-    assert_equal :modula, store.options[:distribution]
-    assert_equal false, store.options[:no_block]
-    assert_equal false, store.options[:auto_eject_hosts]
-  end
-
-  def test_should_use_local_cache
-    @store.with_local_cache do
-      @store.write('key', 'value')
-      assert_equal 'value', @store.send(:local_cache).read('key')
-    end
-
-    assert_equal 'value', @store.read('key')
-  end
-
-  def test_should_read_multiple_keys
-     @store.write('a', 1)
-     @store.write('b', 2)
-
-     assert_equal({ 'a' => 1, 'b' => 2 }, @store.read_multi('a', 'b', 'c'))
-     assert_equal({}, @store.read_multi())
-   end
-
-  def test_should_fix_long_keys
-    key = ("0123456789" * 100).freeze
-    assert key.size > 250
-    @store.write(key, 1)
-    assert_equal 1, @store.read(key)
-  end
-
-end