binary42-remix-stash 0.9.0 → 0.9.1

data/README.mdown

@@ -8,7 +8,6 @@ It does require memcached 1.4+ but you should be running that anyway (if you are
 
 # TODO
 
-* clear on root should do it for each host in a cluster
 * optimize option merging with cache
 * make clusters selectable per stash
 * implement the rest of the memcached 1.4 binary API
@@ -16,3 +15,4 @@ It does require memcached 1.4+ but you should be running that anyway (if you are
 * failsafe marshal load
 * support non-marshal value dumps configured per stash
 * support intersected stashes with joined vector sets
+* add jruby specific cluster implementations to work around the lack socket timeouts

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/remix/stash/cluster.rb

@@ -45,14 +45,26 @@ class Stash::Cluster
 
 private
 
-  def connect(host, port)
-    address = Socket.getaddrinfo(host, nil).first
-    socket = Socket.new(Socket.const_get(address[0]), SOCK_STREAM, 0)
-    timeout = [2,0].pack('l_2') # 2 seconds
-    socket.setsockopt(SOL_SOCKET, SO_SNDTIMEO, timeout)
-    socket.setsockopt(SOL_SOCKET, SO_RCVTIMEO, timeout)
-    socket.connect(Socket.pack_sockaddr_in(port, address[3]))
-    socket
+  if RUBY_PLATFORM =~ /java/
+
+    def connect(host, port)
+      # We currently don't support timeouts in JRuby since the socket API is
+      # incomplete.
+      TCPSocket.new(host, port)
+    end
+
+  else
+
+    def connect(host, port)
+      address = Socket.getaddrinfo(host, nil).first
+      socket = Socket.new(Socket.const_get(address[0]), SOCK_STREAM, 0)
+      timeout = [2,0].pack('l_2') # 2 seconds
+      socket.setsockopt(SOL_SOCKET, SO_SNDTIMEO, timeout)
+      socket.setsockopt(SOL_SOCKET, SO_RCVTIMEO, timeout)
+      socket.connect(Socket.pack_sockaddr_in(port, address[3]))
+      socket
+    end
+
   end
 
   def host_to_io(key, host, port)

data/lib/remix/stash.rb

@@ -74,7 +74,7 @@ class Stash
       [:dynamic, :action, :transaction].include?(opts[:coherency]) or raise ArgumentError,
         "Invalid coherency setting used (#{opts[:coherency].inspect})"
     end
-    root = @@instances[:roto] || Stash.new(:root)
+    root = @@instances[:root] || Stash.new(:root)
     self == root ?
       base :
       root.default.merge(base)
@@ -102,9 +102,9 @@ class Stash
     key = canonical_key(keys)
     cluster.select(key) {|io|
       if Protocol.get(io, key)
+        yield(*keys)
         true
       else
-        yield(*keys)
         false
       end
     }
@@ -160,7 +160,7 @@ class Stash
 private
 
   def canonical_key(keys)
-    "#{implicit_scope}#{keys.join('/')}@#@name:#{vector}"
+    "#{implicit_scope}#{keys.join('/')}#{vector}"
   end
 
   def cluster
@@ -194,7 +194,7 @@ private
         Protocol.add(io, vk, '0')
         @vector = Protocol.get(io, vk)
       end
-      @vector
+      @vector = "@#@name:#@vector"
     end
   end
 

data/remix-stash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remix-stash}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Mitchell"]
-  s.date = %q{2009-08-29}
+  s.date = %q{2009-09-02}
   s.email = %q{binary42@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/spec/stash_spec.rb

@@ -249,17 +249,17 @@ class StashSpec < Spec
 
   context '#gate' do
 
-    should 'evaluate on a key miss' do
+    should 'not evaluate on a key miss' do
       ran = false
       stash.gate(:k) {ran = true}
-      assert ran
+      assert !ran
     end
 
-    should 'not evaluate on a key hit' do
+    should 'evaluate on a key hit' do
       ran = false
       stash[:k] = :hit
       stash.gate(:k) {ran = true}
-      assert !ran
+      assert ran
     end
 
     should 'return true on hit' do
@@ -273,6 +273,7 @@ class StashSpec < Spec
 
     should 'pass keys in as optional block arguments' do
       key = nil
+      stash[42] = true
       stash.gate(42) {|k| key = k}
       assert_equal 42, key
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: binary42-remix-stash
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Brian Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-29 00:00:00 -07:00
+date: 2009-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: []