ngmoco-cache-money 0.2.10 → 0.2.13

data/spec/cash/local_buffer_spec.rb

@@ -0,0 +1,9 @@
+require "spec_helper"
+
+module Cash
+  describe LocalBuffer do
+    it "should have method missing as a private method" do
+      LocalBuffer.private_instance_methods.should include("method_missing")
+    end
+  end
+end

data/spec/cash/local_spec.rb

@@ -0,0 +1,9 @@
+require "spec_helper"
+
+module Cash
+  describe Local do
+    it "should have method missing as a private method" do
+      Local.private_instance_methods.should include("method_missing")
+    end
+  end
+end

data/spec/cash/lock_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require "spec_helper"
 
 module Cash
   describe Lock do
@@ -22,7 +22,6 @@ module Cash
         $memcache.get("lock/lock_key").should == nil
         $lock.synchronize('lock_key') {}
         $memcache.get("lock/lock_key").should == nil
-
       end
 
       it "releases the lock even if the block raises" do
@@ -47,7 +46,7 @@ module Cash
 
       describe 'when given a timeout for the lock' do
         it "correctly sets timeout on memcache entries" do
-          mock($memcache).add('lock/lock_key', Process.pid, timeout = 10) { true }
+          mock($memcache).add('lock/lock_key', "#{Socket.gethostname} #{Process.pid}", timeout = 10) { true }
           # $lock.acquire_lock('lock_key', timeout)
           lambda { $lock.acquire_lock('lock_key', timeout, 1) }.should raise_error
         end
@@ -66,7 +65,7 @@ module Cash
           it "retries specified number of times" do
             $lock.acquire_lock('lock_key')
             as_another_process do
-              mock($memcache).add("lock/lock_key", Process.pid, timeout = 10) { false }.times(retries = 3)
+              mock($memcache).add("lock/lock_key", "#{Socket.gethostname} #{Process.pid}", timeout = 10) { false }.times(retries = 3)
               stub($lock).exponential_sleep
               lambda { $lock.acquire_lock('lock_key', timeout, retries) }.should raise_error
             end

data/spec/cash/order_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require "spec_helper"
 
 module Cash
   describe 'Ordering' do

data/spec/cash/transactional_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require "spec_helper"
 
 module Cash
   describe Transactional do
@@ -20,7 +20,7 @@ module Cash
       end
 
       it "increments through the real cache" do
-        @cache.set(@key, 0)
+        @cache.set(@key, 0, 0, true)
         @cache.incr(@key, 3)
 
         @cache.get(@key, true).to_i.should == 3
@@ -28,7 +28,7 @@ module Cash
       end
 
       it "decrements through the real cache" do
-        @cache.set(@key, 0)
+        @cache.set(@key, 0, 0, true)
         @cache.incr(@key, 3)
         @cache.decr(@key, 2)
 
@@ -130,7 +130,7 @@ module Cash
       describe 'Increment and Decrement' do
         describe '#incr' do
           it "works" do
-            @cache.set(@key, 0)
+            @cache.set(@key, 0, 0, true)
             @cache.incr(@key)
             @cache.transaction do
               @cache.incr(@key).should == 2
@@ -139,7 +139,7 @@ module Cash
 
           it "is buffered" do
             @cache.transaction do
-              @cache.set(@key, 0)
+              @cache.set(@key, 0, 0, true)
               @cache.incr(@key, 2).should == 2
               @cache.get(@key).should == 2
               $memcache.get(@key).should == nil
@@ -158,7 +158,7 @@ module Cash
 
         describe '#decr' do
           it "works" do
-            @cache.set(@key, 0)
+            @cache.set(@key, 0, 0, true)
             @cache.incr(@key)
             @cache.transaction do
               @cache.decr(@key).should == 0
@@ -167,7 +167,7 @@ module Cash
 
           it "is buffered" do
             @cache.transaction do
-              @cache.set(@key, 0)
+              @cache.set(@key, 0, 0, true)
               @cache.incr(@key, 3)
               @cache.decr(@key, 2).should == 1
               @cache.get(@key, true).to_i.should == 1
@@ -185,7 +185,7 @@ module Cash
 
           it "bottoms out at zero" do
             @cache.transaction do
-              @cache.set(@key, 0)
+              @cache.set(@key, 0, 0, true)
               @cache.incr(@key, 1)
               @cache.get(@key, true).should == 1
               @cache.decr(@key)
@@ -336,7 +336,7 @@ module Cash
 
       describe '#incr' do
         it "increment be atomic" do
-          @cache.set(@key, 0)
+          @cache.set(@key, 0, 0, true)
           @cache.transaction do
             @cache.incr(@key)
             $memcache.incr(@key)
@@ -346,11 +346,11 @@ module Cash
         end
 
         it "interleaved, etc. increments and sets be ordered" do
-          @cache.set(@key, 0)
+          @cache.set(@key, 0, 0, true)
           @cache.transaction do
             @cache.incr(@key)
             @cache.incr(@key)
-            @cache.set(@key, 0)
+            @cache.set(@key, 0, 0, true)
             @cache.incr(@key)
             @cache.incr(@key)
           end
@@ -361,7 +361,7 @@ module Cash
 
       describe '#decr' do
         it "decrement be atomic" do
-          @cache.set(@key, 0)
+          @cache.set(@key, 0, 0, true)
           @cache.incr(@key, 3)
           @cache.transaction do
             @cache.decr(@key)
@@ -570,5 +570,9 @@ module Cash
         end
       end
     end
+
+    it "should have method_missing as a private method" do
+      Transactional.private_instance_methods.should include("method_missing")
+    end
   end
 end

data/spec/cash/window_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require "spec_helper"
 
 module Cash
   describe 'Windows' do

data/spec/cash/write_through_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require "spec_helper"
 
 module Cash
   describe WriteThrough do

data/spec/memcached_wrapper_test.rb

@@ -0,0 +1,209 @@
+require 'test_helper'
+require 'memcache'
+
+class MemcachedWrapperTest < ActiveSupport::TestCase
+
+  context "with single memcached server" do
+
+    setup do
+      @wrapper = MemcachedWrapper.new("127.0.0.1:11211", {:namespace => "wrapper", :show_backtraces => true, :support_cas => true})
+      @memcache = MemCache.new("127.0.0.1:11211", {:namespace => "memcache"})
+      @wrapper.flush_all
+      @memcache.flush_all
+    end
+    
+    teardown do
+      @wrapper.close
+      @memcache.reset
+    end
+
+    should "add" do
+      assert_equal(@wrapper.add("blah/toe", "blah"),  @memcache.add("blah/toe", "blah"))
+      assert_equal(@wrapper.get("blah/toe"),          @memcache.get("blah/toe"))
+      assert_equal(@wrapper.add("blah/toe", "blah2"), @memcache.add("blah/toe", "blah2"))
+      assert_equal(@wrapper.get("blah/toe"),          @memcache.get("blah/toe"))
+    end
+    
+    should "replace" do
+      assert_equal(@wrapper.replace("blah/toe", "blah"),  @memcache.replace("blah/toe", "blah"))
+      assert_equal(@wrapper.add("blah/toe", "blah"),      @memcache.add("blah/toe", "blah"))
+      assert_equal(@wrapper.replace("blah/toe", "blah2"), @memcache.replace("blah/toe", "blah2"))
+      assert_equal(@wrapper.get("blah/toe"),              @memcache.get("blah/toe"))
+    end
+    
+    should "get" do
+      assert_equal(@wrapper.add("blah/toe", "blah"), @memcache.add("blah/toe", "blah"))
+      assert_equal(@wrapper.get("blah/toe"),         @memcache.get("blah/toe"))
+    end
+    
+    should "fetch" do
+      assert_equal(@wrapper.fetch("blah/toe") { "blah" },  @memcache.fetch("blah/toe") { "blah" })
+      assert_equal(@wrapper.fetch("blah/toe") { "blah2" }, @memcache.fetch("blah/toe") { "blah2" })
+    end
+    
+    should "compare and swap" do
+      assert_equal(@wrapper.cas("blah/toe") { "blah" },  @memcache.cas("blah/toe") { "blah" })
+      assert_equal(@wrapper.add("blah/toe", "blah"),     @memcache.add("blah/toe", "blah"))
+      assert_equal(@wrapper.cas("blah/toe") { "blah2" }, @memcache.cas("blah/toe") { "blah2" })
+      assert_equal(@wrapper.get("blah/toe"),             @memcache.get("blah/toe"))
+    end
+    
+    should "get multiple" do
+      assert_equal(@wrapper.add("blah/toe", "blah"),     @memcache.add("blah/toe", "blah"))
+      assert_equal(@wrapper.add("blah/finger", "blah2"), @memcache.add("blah/finger", "blah2"))
+      assert_equal(@wrapper.get_multi(["blah/toe", "blah/finger"]), @memcache.get_multi(["blah/toe", "blah/finger"]))
+    end
+    
+    should "set" do
+      assert_equal(@wrapper.set("blah/toe", "blah"), @memcache.set("blah/toe", "blah"))
+      assert_equal(@wrapper.get("blah/toe"),         @memcache.get("blah/toe"))
+    end
+    
+    should "append" do
+      assert_equal(@wrapper.append("blah/toe", "blah"), @memcache.append("blah/toe", "blah"))
+      assert_equal(@wrapper.get("blah/toe"),            @memcache.get("blah/toe"))
+
+      assert_equal(@wrapper.set("blah/toe", "blah", 0, true), @memcache.set("blah/toe", "blah", 0, true))
+      assert_equal(@wrapper.get("blah/toe", true),            @memcache.get("blah/toe", true))
+      assert_equal(@wrapper.append("blah/toe", "blah2"),      @memcache.append("blah/toe", "blah2"))
+      assert_equal(@wrapper.get("blah/toe", true),            @memcache.get("blah/toe", true))
+    end
+    
+    should "prepend" do
+      assert_equal(@wrapper.prepend("blah/toe", "blah"), @memcache.prepend("blah/toe", "blah"))
+      assert_equal(@wrapper.get("blah/toe"),             @memcache.get("blah/toe"))
+    
+      assert_equal(@wrapper.set("blah/toe", "blah", 0, true), @memcache.set("blah/toe", "blah", 0, true))
+      assert_equal(@wrapper.prepend("blah/toe", "blah2"),     @memcache.prepend("blah/toe", "blah2"))
+      assert_equal(@wrapper.get("blah/toe", true),            @memcache.get("blah/toe", true))
+    end
+    
+    should "delete" do
+      assert_equal(@wrapper.delete("blah/toe"),      @memcache.delete("blah/toe"))
+      assert_equal(@wrapper.set("blah/toe", "blah"), @memcache.set("blah/toe", "blah"))
+      assert_equal(@wrapper.delete("blah/toe"),      @memcache.delete("blah/toe"))
+    end
+    
+    should "increment" do
+      assert_equal(@wrapper.incr("blah/count"),            @memcache.incr("blah/count"))
+      assert_equal(@wrapper.set("blah/count", 0, 0, true), @memcache.set("blah/count", 0, 0, true))
+      assert_equal(@wrapper.incr("blah/count"),            @memcache.incr("blah/count"))
+    end
+    
+    should "decrement" do
+      assert_equal(@wrapper.decr("blah/count"),            @memcache.decr("blah/count")) 
+      assert_equal(@wrapper.set("blah/count", 2, 0, true), @memcache.set("blah/count", 2, 0, true))
+      assert_equal(@wrapper.decr("blah/count"),            @memcache.decr("blah/count"))
+    end
+
+    # should "stats" do
+    #   assert_equal(@wrapper.stats(), @memcache.stats())
+    # end
+
+  end
+
+  # context "with two memcached servers" do
+  # 
+  #   setup do
+  #     @wrapper = MemcachedWrapper.new(["127.0.0.1:11211", "127.0.0.1:1111"], {:show_backtraces => true, :support_cas => true})
+  #     # @wrapper = MemCache.new(["127.0.0.1:11211", "127.0.0.1:1111"], {:show_backtraces => true, :support_cas => true})
+  #     @wrapper.flush_all
+  #   end
+  #   
+  #   teardown do
+  #     # @wrapper.close
+  #   end
+  # 
+  #   should "add value" do
+  #     assert_stored(@wrapper.add("blah/toe", "blah"))
+  #     assert_equal( "blah", @wrapper.get("blah/toe"))
+  #     assert_not_stored(@wrapper.add("blah/toe", "blah2"))
+  #     assert_equal( "blah", @wrapper.get("blah/toe"))
+  #   end
+  #   
+  #   should "get value" do
+  #     assert_stored(@wrapper.add("blah/toe", "blah"))
+  #     assert_equal( "blah", @wrapper.get("blah/toe"))
+  #   end
+  #   
+  #   should "fetch value" do
+  #     assert_equal( "blah", @wrapper.fetch("blah/toe") { "blah" })
+  #     assert_equal( "blah", @wrapper.fetch("blah/toe") { "blah2" })
+  #   end
+  #   
+  #   should "check and set value" do
+  #     assert_nil(   @wrapper.cas("blah/toe") { "blah" })
+  #     assert_stored(@wrapper.add("blah/toe", "blah"))
+  #     assert_stored(@wrapper.cas("blah/toe") { "blah2" })
+  #     assert_equal( "blah2", @wrapper.get("blah/toe"))
+  #   end
+  #   
+  #   should "get multiple values" do
+  #     assert_stored(@wrapper.add("blah/toe", "blah"))
+  #     assert_stored(@wrapper.add("blah/finger", "blah2"))
+  #     assert_equal( {'blah/toe'=>'blah','blah/finger'=>'blah2'}, @wrapper.get_multi(["blah/toe", "blah/finger"]))
+  #   end
+  #   
+  #   should "set value" do
+  #     assert_stored(@wrapper.set("blah/toe", "blah"))
+  #     assert_equal( "blah", @wrapper.get("blah/toe"))
+  #   end
+  #   
+  #   should "append value" do
+  #     assert_not_stored( @wrapper.append("blah/toe", "blah"))
+  #     assert_nil( @wrapper.get("blah/toe"))
+  # 
+  #     assert_stored( @wrapper.set("blah/toe", "blah", 0, true))
+  #     assert_equal(  "blah", @wrapper.get("blah/toe", true))
+  #     assert_stored( @wrapper.append("blah/toe", "blah2"))
+  #     assert_equal(  "blahblah2", @wrapper.get("blah/toe", true))
+  #   end
+  #   
+  #   should "prepend value" do
+  #     assert_not_stored(@wrapper.prepend("blah/toe", "blah"))
+  #     assert_nil( @wrapper.get("blah/toe"))
+  #   
+  #     assert_stored( @wrapper.set("blah/toe", "blah", 0, true))
+  #     assert_stored( @wrapper.prepend("blah/toe", "blah2"))
+  #     assert_equal(  "blah2blah", @wrapper.get("blah/toe", true))
+  #   end
+  #   
+  #   should "delete value" do
+  #     assert_not_found( @wrapper.delete("blah/toe"))
+  #     assert_stored(    @wrapper.set("blah/toe", "blah"))
+  #     assert_deleted(   @wrapper.delete("blah/toe"))
+  #   end
+  #   
+  #   should "increment value" do
+  #     assert_nil(   @wrapper.incr("blah/count"))
+  #     assert_stored(@wrapper.set("blah/count", 0, 0, true))
+  #     assert_equal( 1, @wrapper.incr("blah/count"))
+  #   end
+  #   
+  #   should "decrement value" do
+  #     assert_nil(   @wrapper.decr("blah/count")) 
+  #     assert_stored(@wrapper.set("blah/count", 2, 0, true))
+  #     assert_equal( 1, @wrapper.decr("blah/count"))
+  #   end
+  # 
+  # end
+
+private
+
+  def assert_stored(val)
+    assert_equal("STORED\r\n", val)
+  end
+
+  def assert_deleted(val)
+    assert_equal("DELETED\r\n", val)
+  end
+
+  def assert_not_stored(val)
+    assert_equal("NOT_STORED\r\n", val)
+  end
+
+  def assert_not_found(val)
+    assert_equal("NOT_FOUND\r\n", val)
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../lib"
 
-require 'rubygems'
+require File.join(dir, '../config/environment')
 require 'spec'
 require 'pp'
 require 'cache_money'
@@ -9,8 +9,6 @@ require 'cache_money'
 require 'memcached'
 require 'memcached_wrapper'
 
-require File.join(dir, '../config/environment')
-
 Spec::Runner.configure do |config|
   config.mock_with :rr
   config.before :suite do
@@ -42,6 +40,11 @@ Spec::Runner.configure do |config|
       index :published
     end
 
+    Short = Class.new(Story)
+    Short.class_eval do
+      index :subtitle, :order_column => 'title'
+    end
+
     Epic = Class.new(Story)
     Oral = Class.new(Epic)
 

metadata

@@ -1,58 +1,79 @@
 --- !ruby/object:Gem::Specification 
 name: ngmoco-cache-money
 version: !ruby/object:Gem::Version 
-  version: 0.2.10
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 13
+  version: 0.2.13
 platform: ruby
 authors: 
 - Nick Kallen
 - Ashley Martens
+- Scott Mace
+- John Markos
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -08:00
+date: 2010-08-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: activerecord
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-    version: 
-description: Cache utilities.
+  prerelease: false
+  type: :runtime
+  name: activesupport
+  version_requirements: *id002
+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: 
 - README
 - TODO
 - UNSUPPORTED_FEATURES
+- init.rb
+- lib/cache_money.rb
 - lib/cash/accessor.rb
 - lib/cash/buffered.rb
 - lib/cash/config.rb
+- lib/cash/fake.rb
 - lib/cash/finders.rb
 - lib/cash/index.rb
 - lib/cash/local.rb
 - lib/cash/lock.rb
-- lib/cash/fake.rb
+- lib/cash/mock.rb
 - lib/cash/query/abstract.rb
 - lib/cash/query/calculation.rb
 - lib/cash/query/primary_key.rb
@@ -62,35 +83,39 @@ files:
 - lib/cash/util/array.rb
 - lib/cash/util/marshal.rb
 - lib/cash/write_through.rb
-- lib/cache_money.rb
+- lib/mem_cached_session_store.rb
+- lib/mem_cached_support_store.rb
 - lib/memcached_wrapper.rb
 - rails/init.rb
-- init.rb
+- LICENSE
+- README.markdown
 has_rdoc: true
 homepage: http://github.com/ngmoco/cache-money
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Write-through and Read-through Cacheing for ActiveRecord
@@ -100,12 +125,16 @@ test_files:
 - db/schema.rb
 - spec/cash/accessor_spec.rb
 - spec/cash/active_record_spec.rb
+- spec/cash/buffered_spec.rb
 - spec/cash/calculations_spec.rb
 - spec/cash/finders_spec.rb
+- spec/cash/local_buffer_spec.rb
+- spec/cash/local_spec.rb
 - spec/cash/lock_spec.rb
+- spec/cash/marshal_spec.rb
 - spec/cash/order_spec.rb
 - spec/cash/transactional_spec.rb
 - spec/cash/window_spec.rb
 - spec/cash/write_through_spec.rb
-- spec/cash/marshal_spec.rb
+- spec/memcached_wrapper_test.rb
 - spec/spec_helper.rb