binary42-remix-stash 0.9.3 → 0.9.4

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/lib/remix/stash/cluster.rb

@@ -23,7 +23,7 @@ class Remix::Stash::Cluster
       rescue Errno::EPIPE, Errno::ECONNRESET
         io.close
         retry
-      rescue Stash::ProtocolError, Errno::EAGAIN
+      rescue Remix::Stash::ProtocolError, Errno::EAGAIN
         next
       end
     end
@@ -47,10 +47,10 @@ class Remix::Stash::Cluster
       rescue Errno::EPIPE, Errno::ECONNRESET
         io.close
         retry
-      rescue Stash::ProtocolError, Errno::EAGAIN
+      rescue Remix::Stash::ProtocolError, Errno::EAGAIN
         next
       end
-      raise Stash::ClusterError,
+      raise Remix::Stash::ClusterError,
         "Unable to find suitable host to communicate with for #{key.inspect} (MD5-32=#{hash})"
     end
   end
@@ -60,9 +60,9 @@ private
   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)
+      socket = TCPSocket.new(host, port)
+      set_timeout(socket)
+      socket
     end
 
   else
@@ -70,9 +70,7 @@ 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)
+      set_timeout(socket)
       socket.connect(Socket.pack_sockaddr_in(port, address[3]))
       socket
     end
@@ -86,4 +84,10 @@ private
     host_to_io(key, host, port)
   end
 
+  def set_timeout(socket)
+    timeout = [2,0].pack('l_2') # 2 seconds
+    socket.setsockopt(SOL_SOCKET, SO_SNDTIMEO, timeout)
+    socket.setsockopt(SOL_SOCKET, SO_RCVTIMEO, timeout)
+  end
+
 end

data/lib/remix/stash.rb

@@ -21,7 +21,7 @@ class Remix::Stash
 
   def self.define_cluster(clusters)
     clusters.each do |k,v|
-      @@clusters[k] = Cluster.new(v)
+      @@clusters[k] = Cluster === v ? v : Cluster.new(v)
     end
   end
 
@@ -38,17 +38,18 @@ class Remix::Stash
   def add(*keys)
     opts = default_opts(keys)
     value = keys.pop
-    key = canonical_key(keys)
-    cluster.select(key) {|io| Protocol.add(io, key, value, opts[:ttl])}
+    key = canonical_key(keys, opts)
+    cluster(opts).select(key) {|io| Protocol.add(io, key, value, opts[:ttl])}
   end
 
   def clear(*keys)
+    opts = default_opts(keys)
     if keys.empty?
       if @name == :root
-        cluster.each {|io| Protocol.flush(io)}
+        cluster(opts).each {|io| Protocol.flush(io)}
       else
         vk = vector_key
-        cluster.select(vk) {|io|
+        cluster(opts).select(vk) {|io|
           unless Protocol.incr(io, vk, 1)
             Protocol.add(io, vk, '0')
             Protocol.incr(io, vk, 1)
@@ -58,8 +59,8 @@ class Remix::Stash
       cycle
     else
       # remove a specific key
-      key = canonical_key(keys)
-      cluster.select(key) {|io| Protocol.delete(io, key)}
+      key = canonical_key(keys, opts)
+      cluster(opts).select(key) {|io| Protocol.delete(io, key)}
     end
   end
 
@@ -72,9 +73,10 @@ class Remix::Stash
   end
 
   def decr(*keys)
+    opts = default_opts(keys)
     step = keys.pop
-    key = canonical_key(keys)
-    cluster.select(key) {|io| Protocol.decr(io, key, step)}
+    key = canonical_key(keys, opts)
+    cluster(opts).select(key) {|io| Protocol.decr(io, key, step)}
   end
 
   def default(opts = {})
@@ -90,14 +92,15 @@ class Remix::Stash
   end
 
   def delete(*keys)
-    key = canonical_key(keys)
-    cluster.select(key) {|io| Protocol.delete(io, key)}
+    opts = default_opts(keys)
+    key = canonical_key(keys, opts)
+    cluster(opts).select(key) {|io| Protocol.delete(io, key)}
   end
 
   def eval(*keys)
     opts = default_opts(keys)
-    key = canonical_key(keys)
-    cluster.select(key) {|io|
+    key = canonical_key(keys, opts)
+    cluster(opts).select(key) {|io|
       value = Protocol.get(io, key)
       if value
         Marshal.load(value)
@@ -110,8 +113,9 @@ class Remix::Stash
   end
 
   def gate(*keys)
-    key = canonical_key(keys)
-    cluster.select(key) {|io|
+    opts = default_opts(keys)
+    key = canonical_key(keys, opts)
+    cluster(opts).select(key) {|io|
       if Protocol.get(io, key)
         yield(*keys)
         true
@@ -122,20 +126,23 @@ class Remix::Stash
   end
 
   def get(*keys)
-    key = canonical_key(keys)
-    cluster.select(key) {|io| load_value(Protocol.get(io, key))}
+    opts = default_opts(keys)
+    key = canonical_key(keys, opts)
+    cluster(opts).select(key) {|io| load_value(Protocol.get(io, key))}
   end
   alias [] get
 
   def incr(*keys)
+    opts = default_opts(keys)
     step = keys.pop
-    key = canonical_key(keys)
-    cluster.select(key) {|io| Protocol.incr(io, key, step)}
+    key = canonical_key(keys, opts)
+    cluster(opts).select(key) {|io| Protocol.incr(io, key, step)}
   end
 
   def read(*keys)
-    key = canonical_key(keys)
-    cluster.select(key) {|io| Protocol.get(io, key)}
+    opts = default_opts(keys)
+    key = canonical_key(keys, opts)
+    cluster(opts).select(key) {|io| Protocol.get(io, key)}
   end
 
   def release
@@ -150,8 +157,8 @@ class Remix::Stash
   def set(*keys)
     opts = default_opts(keys)
     value = keys.pop
-    key = canonical_key(keys)
-    cluster.select(key) {|io| Protocol.set(io, key, dump_value(value), opts[:ttl])}
+    key = canonical_key(keys, opts)
+    cluster(opts).select(key) {|io| Protocol.set(io, key, dump_value(value), opts[:ttl])}
   end
   alias []= set
 
@@ -164,19 +171,19 @@ class Remix::Stash
   def write(*keys)
     opts = default_opts(keys)
     value = keys.pop
-    key = canonical_key(keys)
-    cluster.select(key) {|io| Protocol.set(io, key, value, opts[:ttl])}
+    key = canonical_key(keys, opts)
+    cluster(opts).select(key) {|io| Protocol.set(io, key, value, opts[:ttl])}
   end
 
 private
 
   KEY_SEPARATOR = '/'
-  def canonical_key(keys)
-    "#{implicit_scope}#{keys.join(KEY_SEPARATOR)}#{vector}"
+  def canonical_key(keys, opts = default_opts)
+    "#{implicit_scope}#{keys.join(KEY_SEPARATOR)}#{vector(opts)}"
   end
 
-  def cluster
-    @@clusters[:default]
+  def cluster(opts = {})
+    @@clusters[opts[:cluster] || :default]
   end
 
   def coherency
@@ -209,11 +216,11 @@ private
     nil
   end
 
-  def vector
+  def vector(opts)
     return if @name == :root
     return @vector if @vector && coherency != :dynamic
     vk = vector_key
-    cluster.select(vk) do |io|
+    cluster(opts).select(vk) do |io|
       @vector = Protocol.get(io, vk)
       unless @vector
         Protocol.add(io, vk, '0')

data/remix-stash.gemspec

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

data/spec/stash_spec.rb

@@ -103,6 +103,12 @@ class StashSpec < Spec
       assert_equal [['default', 'default', 11211]], Stash.cluster(:default_port).hosts
     end
 
+    should 'allow Cluster object to be passed in' do
+      cluster = Stash::Cluster.new(%w[localhost:11211])
+      Stash.define_cluster(:object => cluster)
+      assert_equal cluster, Stash.cluster(:object)
+    end
+
   end
 
   context '#add' do

metadata

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