kestrel-client 0.2.4 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/kestrel-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kestrel-client}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Rael Dornfest"]
-  s.date = %q{2010-05-05}
+  s.date = %q{2010-05-18}
   s.description = %q{Ruby client for the Kestrel queue server}
   s.email = %q{rael@twitter.com}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/kestrel/client/envelope.rb",
      "lib/kestrel/client/json.rb",
      "lib/kestrel/client/namespace.rb",
+     "lib/kestrel/client/partitioning.rb",
      "lib/kestrel/client/proxy.rb",
      "lib/kestrel/client/unmarshal.rb",
      "lib/kestrel/config.rb",
@@ -35,6 +36,7 @@ Gem::Specification.new do |s|
      "spec/kestrel/client/envelope_spec.rb",
      "spec/kestrel/client/json_spec.rb",
      "spec/kestrel/client/namespace_spec.rb",
+     "spec/kestrel/client/partitioning_spec.rb",
      "spec/kestrel/client/unmarshal_spec.rb",
      "spec/kestrel/client_spec.rb",
      "spec/kestrel/config/kestrel.yml",
@@ -52,6 +54,7 @@ Gem::Specification.new do |s|
      "spec/kestrel/client/envelope_spec.rb",
      "spec/kestrel/client/json_spec.rb",
      "spec/kestrel/client/namespace_spec.rb",
+     "spec/kestrel/client/partitioning_spec.rb",
      "spec/kestrel/client/unmarshal_spec.rb",
      "spec/kestrel/client_spec.rb",
      "spec/kestrel/config_spec.rb",

data/lib/kestrel/client.rb

@@ -3,10 +3,12 @@ module Kestrel
     autoload :Proxy, 'kestrel/client/proxy'
     autoload :Envelope, 'kestrel/client/envelope'
     autoload :Blocking, 'kestrel/client/blocking'
+    autoload :Partitioning, 'kestrel/client/partitioning'
     autoload :Unmarshal, 'kestrel/client/unmarshal'
     autoload :Namespace, 'kestrel/client/namespace'
     autoload :Json, 'kestrel/client/json'
 
+
     QUEUE_STAT_NAMES = %w{items bytes total_items logsize expired_items mem_items mem_bytes age discarded}
 
     def flush(queue)

data/lib/kestrel/client/namespace.rb

@@ -3,22 +3,27 @@ module Kestrel
     class Namespace < Proxy
       def initialize(namespace, client)
         @namespace = namespace
+        @matcher = /\A#{Regexp.escape(@namespace)}:(.+)/
         super(client)
       end
 
-      def get(key, *args)
-        client.get(namespace(key), *args)
+      %w(set get delete flush stat).each do |method|
+        class_eval "def #{method}(key, *args); client.#{method}(namespace(key), *args) end", __FILE__, __LINE__
       end
 
-      def set(key, *args)
-        client.set(namespace(key), *args)
+      def available_queues
+        client.available_queues.map {|q| in_namespace(q) }.compact
       end
 
-      private
+      def in_namespace(key)
+        if match = @matcher.match(key)
+          match[1]
+        end
+      end
 
       def namespace(key)
         "#{@namespace}:#{key}"
       end
     end
   end
-end
+end

data/lib/kestrel/client/partitioning.rb

@@ -0,0 +1,35 @@
+module Kestrel
+  class Client
+    class Partitioning < Proxy
+
+      def initialize(client_map)
+        @clients = client_map.inject({}) do |clients, (keys, client)|
+          Array(keys).inject(clients) do |_, key|
+            clients.update(key => client)
+          end
+        end
+      end
+
+      def clients
+        @clients.values.uniq
+      end
+
+      def default_client
+        @clients[:default]
+      end
+      alias client default_client
+
+      %w(set get delete flush stat).each do |method|
+        class_eval "def #{method}(key, *args); client_for(key).#{method}(key, *args) end", __FILE__, __LINE__
+      end
+
+      def stats
+        merge_stats(clients.map {|c| c.stats })
+      end
+
+      def client_for(key)
+        @clients[key.to_s] || default_client
+      end
+    end
+  end
+end

data/spec/kestrel/client/blocking_spec.rb

@@ -3,7 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe "Kestrel::Client::Blocking" do
   describe "Instance Methods" do
     before do
-      Kestrel::Config.load TEST_CONFIG_FILE
       @raw_kestrel_client = Kestrel::Client.new(*Kestrel::Config.default)
       @kestrel = Kestrel::Client::Blocking.new(@raw_kestrel_client)
     end

data/spec/kestrel/client/envelope_spec.rb

@@ -5,7 +5,6 @@ class Envelope; end
 describe Kestrel::Client::Envelope do
   describe "Instance Methods" do
     before do
-      Kestrel::Config.load TEST_CONFIG_FILE
       @raw_kestrel_client = Kestrel::Client.new(*Kestrel::Config.default)
       @kestrel = Kestrel::Client::Envelope.new(Envelope, @raw_kestrel_client)
     end

data/spec/kestrel/client/json_spec.rb

@@ -5,7 +5,6 @@ require 'kestrel/client/json'
 describe Kestrel::Client::Json do
   describe "Instance Methods" do
     before do
-      Kestrel::Config.load TEST_CONFIG_FILE
       @raw_kestrel_client = Kestrel::Client.new(*Kestrel::Config.default)
       @kestrel = Kestrel::Client::Json.new(@raw_kestrel_client)
     end
@@ -16,6 +15,7 @@ describe Kestrel::Client::Json do
         @kestrel.get('a_queue').should == {"a" => 1, "b" => ["c" => 2]}
       end
 
+      # wtf is up with this test?
       it "uses a HashWithIndifferentAccess" do
         mock(@raw_kestrel_client).get('a_queue') { '{"a": 1, "b": [{"c": 2}]}' }
         @kestrel.get('a_queue').class.should == HashWithIndifferentAccess

data/spec/kestrel/client/namespace_spec.rb

@@ -3,22 +3,51 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe Kestrel::Client::Namespace do
   describe "Instance Methods" do
     before do
-      Kestrel::Config.load TEST_CONFIG_FILE
       @raw_kestrel_client = Kestrel::Client.new(*Kestrel::Config.default)
       @kestrel = Kestrel::Client::Namespace.new('some_namespace', @raw_kestrel_client)
     end
 
-    describe "#get and #set" do
-      describe "namespace" do
-        it "prepends a namespace to key on a set" do
-          mock(@raw_kestrel_client).set('some_namespace:a_queue', :mcguffin)
-          @kestrel.set('a_queue', :mcguffin)
-        end
-
-        it "prepends a namespace to key on a get" do
-          mock(@raw_kestrel_client).get('some_namespace:a_queue')
-          @kestrel.get('a_queue')
-        end
+    describe "#set" do
+      it "prepends a namespace to the key" do
+        mock(@raw_kestrel_client).set('some_namespace:a_queue', :mcguffin)
+        @kestrel.set('a_queue', :mcguffin)
+      end
+    end
+
+    describe "#get" do
+      it "prepends a namespace to the key" do
+        mock(@raw_kestrel_client).get('some_namespace:a_queue')
+        @kestrel.get('a_queue')
+      end
+    end
+
+    describe "#delete" do
+      it "prepends a namespace to the key" do
+        mock(@raw_kestrel_client).delete('some_namespace:a_queue')
+        @kestrel.delete('a_queue')
+      end
+    end
+
+    describe "#flush" do
+      it "prepends a namespace to the key" do
+        mock(@raw_kestrel_client).flush('some_namespace:a_queue')
+        @kestrel.flush('a_queue')
+      end
+    end
+
+    describe "#stat" do
+      it "prepends a namespace to the key" do
+        mock(@raw_kestrel_client).stat('some_namespace:a_queue')
+        @kestrel.stat('a_queue')
+      end
+    end
+
+    describe "#available_queues" do
+      it "only returns namespaced queues" do
+        @raw_kestrel_client.set('some_namespace:namespaced_queue', 'foo')
+        @raw_kestrel_client.set('unnamespaced_queue', 'foo')
+
+        @kestrel.available_queues.should == ['namespaced_queue']
       end
     end
   end

data/spec/kestrel/client/partitioning_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Kestrel::Client::Partitioning do
+  before do
+    @client_1 = Kestrel::Client.new(*Kestrel::Config.default)
+    @client_2 = Kestrel::Client.new(*Kestrel::Config.default)
+    @default_client = Kestrel::Client.new(*Kestrel::Config.default)
+
+    @kestrel = Kestrel::Client::Partitioning.new('queue1' => @client_1, ['queue2', 'queue3'] => @client_2, :default => @default_client)
+  end
+
+  %w(set get delete flush stat).each do |method|
+    describe "##{method}" do
+      it "routes to the correct client" do
+        mock(@client_1).__send__(method, 'queue1')
+        @kestrel.send(method, 'queue1')
+
+        mock(@client_2).__send__(method, 'queue2')
+        @kestrel.send(method, 'queue2')
+
+        mock(@client_2).__send__(method, 'queue3')
+        @kestrel.send(method, 'queue3')
+
+        mock(@default_client).__send__(method, 'queue4')
+        @kestrel.send(method, 'queue4')
+      end
+    end
+  end
+end

data/spec/kestrel/client/unmarshal_spec.rb

@@ -3,7 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe Kestrel::Client::Unmarshal do
   describe "Instance Methods" do
     before do
-      Kestrel::Config.load TEST_CONFIG_FILE
       @raw_kestrel_client = Kestrel::Client.new(*Kestrel::Config.default)
       @kestrel = Kestrel::Client::Unmarshal.new(@raw_kestrel_client)
     end

data/spec/kestrel/client_spec.rb

@@ -3,7 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe Kestrel::Client do
   describe "Instance Methods" do
     before do
-      Kestrel::Config.load TEST_CONFIG_FILE
       @kestrel = Kestrel::Client.new(*Kestrel::Config.default)
       stub(@kestrel).with_timing(anything) { |_, block| block.call }
     end
@@ -45,13 +44,14 @@ describe Kestrel::Client do
 
     describe "#stats" do
       it "retrieves stats" do
+        @kestrel.set("test-queue-name", 97)
+
         stats = @kestrel.stats
         %w{uptime time version curr_items total_items bytes curr_connections total_connections
            cmd_get cmd_set get_hits get_misses bytes_read bytes_written queues}.each do |stat|
           stats[stat].should_not be_nil
         end
 
-        @kestrel.set("test-queue-name", 97)
         stats['queues']["test-queue-name"].should_not be_nil
         Kestrel::Client::QUEUE_STAT_NAMES.each do |queue_stat|
           stats['queues']['test-queue-name'][queue_stat].should_not be_nil

data/spec/kestrel/config_spec.rb

@@ -2,9 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Kestrel::Config do
   before do
-    Kestrel::Config.environment = nil
-    Kestrel::Config.load TEST_CONFIG_FILE
-
     # to sniff namespace foo_space
     Kestrel::Config.config['foo_space']['development']['connect_timeout'] = 8
   end

data/spec/spec_helper.rb

@@ -12,4 +12,17 @@ TEST_CONFIG_FILE = File.expand_path("#{spec_dir}/kestrel/config/kestrel.yml")
 
 Spec::Runner.configure do |config|
   config.mock_with :rr
+
+  config.before do
+    Kestrel::Config.environment = nil
+    Kestrel::Config.load TEST_CONFIG_FILE
+  end
+
+  config.after do
+    c = Kestrel::Client.new(*Kestrel::Config.default)
+    c.available_queues.uniq.each do |q|
+      c.delete(q) rescue nil
+    end
+  end
 end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Matt Freels
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 -07:00
+date: 2010-05-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ files:
 - lib/kestrel/client/envelope.rb
 - lib/kestrel/client/json.rb
 - lib/kestrel/client/namespace.rb
+- lib/kestrel/client/partitioning.rb
 - lib/kestrel/client/proxy.rb
 - lib/kestrel/client/unmarshal.rb
 - lib/kestrel/config.rb
@@ -58,6 +59,7 @@ files:
 - spec/kestrel/client/envelope_spec.rb
 - spec/kestrel/client/json_spec.rb
 - spec/kestrel/client/namespace_spec.rb
+- spec/kestrel/client/partitioning_spec.rb
 - spec/kestrel/client/unmarshal_spec.rb
 - spec/kestrel/client_spec.rb
 - spec/kestrel/config/kestrel.yml
@@ -99,6 +101,7 @@ test_files:
 - spec/kestrel/client/envelope_spec.rb
 - spec/kestrel/client/json_spec.rb
 - spec/kestrel/client/namespace_spec.rb
+- spec/kestrel/client/partitioning_spec.rb
 - spec/kestrel/client/unmarshal_spec.rb
 - spec/kestrel/client_spec.rb
 - spec/kestrel/config_spec.rb