kyototycoon 0.1.1 → 0.1.2

data/kyototycoon.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kyototycoon}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["uu59"]

data/lib/kyototycoon/serializer/msgpack.rb

@@ -1,7 +1,10 @@
 # -- coding: utf-8
 
 require "rubygems"
-require "msgpack"
+begin
+  require "msgpack"
+rescue LoadError
+end
 
 class KyotoTycoon
   module Serializer

data/lib/kyototycoon/serializer.rb

@@ -3,10 +3,6 @@
 class KyotoTycoon
   module Serializer
     def self.get(adaptor)
-      dir = "#{File.dirname(__FILE__)}/serializer"
-      if File.exists?(File.join(dir, "#{adaptor}.rb"))
-        require "#{dir}/#{adaptor}.rb"
-      end
       const_get(adaptor.to_s.capitalize)
     end
   end

data/lib/kyototycoon.rb

@@ -7,14 +7,38 @@ require "base64"
 require "net/http"
 require "kyototycoon/serializer.rb"
 require "kyototycoon/serializer/default.rb"
+require "kyototycoon/serializer/msgpack.rb"
 require "kyototycoon/tsvrpc.rb"
 require "kyototycoon/tsvrpc/skinny.rb"
 require "kyototycoon/tsvrpc/nethttp.rb"
 
 class KyotoTycoon
   attr_accessor :colenc, :connect_timeout, :servers
+  attr_reader :serializer, :logger, :db
 
-  def initialize(host='0.0.0.0', port=1978)
+  DEFAULT_HOST = '0.0.0.0'
+  DEFAULT_PORT = 1978
+
+  def self.configure(name, host=DEFAULT_HOST, port=DEFAULT_PORT, &block)
+    @configure ||= {}
+    if @configure[name]
+      raise "'#{name}' is registered"
+    end
+    @configure[name] = lambda{
+      kt = KyotoTycoon.new(host, port)
+      block.call(kt)
+      kt
+    }
+  end
+  
+  def self.create(name)
+    if @configure[name].nil?
+      raise "undefined configure: '#{name}'"
+    end
+    @configure[name].call
+  end
+
+  def initialize(host=DEFAULT_HOST, port=DEFAULT_PORT)
     @servers = [[host, port]]
     @serializer = KyotoTycoon::Serializer::Default
     @logger = Logger.new(nil)
@@ -88,6 +112,12 @@ class KyotoTycoon
     res = request('/rpc/increment', {:key => key, :num => num, :xt => xt})
     Tsvrpc.parse(res[:body])['num'].to_i
   end
+  alias_method :incr, :increment
+
+  def decrement(key, num=1, xt=nil)
+    increment(key, num * -1, xt)
+  end
+  alias_method :decr, :decrement
 
   def increment_double(key, num, xt=nil)
     res = request('/rpc/increment_double', {:key => key, :num => num, :xt => xt})
@@ -202,11 +232,11 @@ class KyotoTycoon
       @logger.crit(msg)
       raise msg
     end
-    @tsvrpc ||= begin
+    tsvrpc ||= begin
       host, port = *@servers.first
       Tsvrpc.new(host, port)
     end
-    res = @tsvrpc.request(path, params, @agent, @colenc)
+    res = tsvrpc.request(path, params, @agent, @colenc)
     @logger.info("#{path}: #{res[:status]} with query parameters #{params.inspect}")
     res
   end

data/spec/helper.rb

@@ -1,14 +1,24 @@
 # -- coding: utf-8
 
+=begin
+
+!!!!!!!!!!!!!
+!! CAUTION !!
+!!!!!!!!!!!!!
+
+This script access http://0.0.0.0:19999/ and destroy all records.
+Be carefully for run, and run `ktserver -port 19999 '*'` before testing.
+
+=end
+
 $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
 require "rubygems"
 require "kyototycoon.rb"
 
 describe do
   before(:all) do
-    @kt = KyotoTycoon.new
+    @kt = KyotoTycoon.new('0.0.0.0', 19999)
     @kt.serializer=:default # or :msgpack
-    @kt.db='*' # in memory
     @kt.logger=nil
   end
 
@@ -20,7 +30,7 @@ describe do
     kt = KyotoTycoon.new('www.example.com', 11111)
     kt.connect_timeout = 0.1
     kt.servers << ['example.net', 1978]
-    kt.servers << ['0.0.0.0', 1978]
+    kt.servers << ['0.0.0.0', 19999]
     kt['foo'] = 'bar'
     kt[:foo].should == 'bar'
   end
@@ -98,6 +108,9 @@ describe do
     @kt.increment('foo').should == 3
     @kt.increment('foo', 10).should == 13
     @kt.increment('foo', -10).should == 3
+    @kt.decrement('foo', 5).should == -2
+    @kt.incr('foo', 5).should == 3
+    @kt.decr('foo', 5).should == -2
   end
 
   it 'should provide status/report' do
@@ -119,4 +132,24 @@ describe do
     @kt.match_regex(/^12/).sort.should == %w!123 124 125!.sort
     @kt.match_regex(/^9+$/).sort.should == %w!999 9999!.sort
   end
+
+  it 'should configure/create method works' do
+    logger = Logger.new(STDOUT)
+    KyotoTycoon.configure(:test) do |kt|
+      kt.logger = logger
+      kt.serializer = :msgpack
+      kt.db = 'foobar'
+    end
+    KyotoTycoon.configure(:test2, 'host', 1999) do |kt|
+      kt.logger = logger
+      kt.serializer = :msgpack
+      kt.db = 'foobar'
+    end
+    %w!test test2!.each{|name|
+      kt = KyotoTycoon.create(name.to_sym)
+      kt.logger.should == logger
+      kt.serializer.should == KyotoTycoon::Serializer::Msgpack
+      kt.db.should == 'foobar'
+    }
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - uu59