okuyama 0.2.3 → 0.2.4

data/Gemfile

@@ -10,5 +10,9 @@ group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.1.0"
   gem "jeweler", "~> 1.8.3"
-  gem "rcov", ">= 0"
+  if RUBY_VERSION <= '1.8.7'
+    gem "rcov", ">= 0"
+  else
+    gem "simplecov", ">= 0"
+  end
 end

data/History.rdoc

@@ -1,6 +1,10 @@
-=== Version 0.2.3 / 2012-03-27
+=== Version 0.2.4 / 2012-03-31
 
-This release fixes bugs of base64 encoding
+This release supports Ruby 1.9.2 & Ruby 1.9.3.
+
+=== Version 0.2.3 / 2012-03-28
+
+This release fixes bugs of base64 encoding.
 
 === Version 0.2.2 / 2012-03-27
 

data/README.rdoc

@@ -2,6 +2,13 @@
 
 'okuyama' is a high performance pure Ruby client for accessing okuyama master nodes.
 
+== Supported Ruby versions and implementations
+okuyama should work identically on:
+
+* Ruby 1.9.3+
+* Ruby 1.9.2+
+* Ruby 1.8.7+
+
 == Install
 
 You can install okuyama by gem.

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/okuyama/client.rb

@@ -123,10 +123,11 @@ module Okuyama
         case condition
         when :and
           condition = '1'
-        else :or
+        when :or
           condition = '2'
         end
       end
+      condition ||= '1'
 
       super(query_list, condition, group, nsize)
     end

data/lib/okuyama/protocol/version1.rb

@@ -117,18 +117,16 @@ module Okuyama
         socket.puts opcode
       end
       def send_set_value(socket, opcode, key, tag_list, val, version=nil)
-        key_base64 = self.encode(key)
-        val_base64 = self.encode(val)
         dlock = '0'
         socket.print opcode
         socket.print ","
-        socket.print  key_base64
+        self.print_encode socket, key
         socket.print ","
         self.print_tag_list socket, tag_list
         socket.print ","
         socket.print  dlock
         socket.print ","
-        socket.print  val_base64
+        self.print_encode socket, val
 
         if version then
           socket.print ","
@@ -138,27 +136,25 @@ module Okuyama
       end
       
       def send_get_value(socket, opcode, key)
-        key_base64 = self.encode(key)
         socket.print opcode
         socket.print ","
-        socket.print  key_base64
+        self.print_encode socket, key
         socket.puts
       end
       
       def send_get_tag_keys(socket, opcode, tag, flag)
         socket.print opcode
         socket.print ","
-        socket.print  self.encode(tag)
+        self.print_encode socket, tag
         socket.print ","
         socket.print  flag
         socket.puts
       end
 
       def send_remove_value(socket, opcode, key, dlock='0')
-        key_base64 = self.encode(key)
         socket.print opcode
         socket.print ","
-        socket.print  key_base64
+        self.print_encode socket, key
         socket.print ","
         socket.print  dlock
         socket.puts
@@ -169,66 +165,59 @@ module Okuyama
       alias :send_set_value_version_check :send_set_value
 
       def send_incr_value(socket, opcode, key, val)
-        key_base64 = self.encode(key)
-        val_base64 = self.encode(val)
         dlock = '0'
         socket.print opcode
         socket.print ","
-        socket.print  key_base64
+        self.print_encode socket, key
         socket.print ","
         socket.print  dlock
         socket.print ","
-        socket.print  val_base64
+        self.print_encode socket, val
         socket.puts
       end
       
       alias :send_decr_value :send_incr_value
       
       def send_get_multi_value(socket, opcode, key_list)
-        keys_base64 = key_list.map{|key|self.encode(key)}.join(',')
         socket.print opcode
-        socket.print ","
-        socket.print  keys_base64
+        key_list.each do |key|
+          socket.print ","
+          self.print_encode socket, key
+        end
         socket.puts
       end
 
       def send_get_tag_values(socket, opcode, tag)
-        tag_base64 = self.encode(tag)
         socket.print opcode
         socket.print ","
-        socket.print  tag_base64
+        self.print_encode socket, tag
         socket.puts
       end
 
       def send_remove_tag_from_key(socket, opcode, tag, key)
-        tag_base64 = self.encode(tag)
-        key_base64 = self.encode(key)
         dlock = '0'
         socket.print opcode
         socket.print ","
-        socket.print  tag_base64
+        self.print_encode socket, tag
         socket.print ","
-        socket.print  key_base64
+        self.print_encode socket, key
         socket.print ","
         socket.print  dlock
         socket.puts
       end
 
       def send_set_value_and_create_index(socket, opcode, key, val, tag_list=nil, group=nil, min_index_n='1', max_index_n='3')
-        key_base64 = self.encode(key)
-        val_base64 = self.encode(val)
-
         dlock = '0'
 
         socket.print opcode
         socket.print ","
-        socket.print  key_base64
+        self.print_encode socket, key
         socket.print ","
         self.print_tag_list socket, tag_list
         socket.print ","
         socket.print  dlock
         socket.print ","
-        socket.print  val_base64
+        self.print_encode socket, val
         socket.print ","
         self.print_group socket, group
         socket.print ","
@@ -254,7 +243,7 @@ module Okuyama
       
       def print_group(socket, group)
         if group then
-          socket.print self.encode(group)
+          self.print_encode socket, group
         else
           socket.print  "(B)"
         end
@@ -271,10 +260,10 @@ module Okuyama
       def print_key_list(socket, key_list)
         lsize = key_list.size
         k = key_list[0]
-        socket.print self.encode(k) if k
+        self.print_encode socket, k if k
         (lsize-1).times do |i|
           socket.print ':'
-          socket.print self.encode(key_list[i+1])
+          self.print_encode socket, key_list[i+1]
         end
       end
       alias :print_query_list :print_key_list

data/okuyama.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "okuyama"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenji Hara"]
-  s.date = "2012-03-28"
+  s.date = "2012-03-31"
   s.description = "okuyama client for Ruby"
   s.email = "haracane@gmail.com"
   s.extra_rdoc_files = [
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Gemfile",
-    "Gemfile.lock",
     "History.rdoc",
     "LICENSE.txt",
     "README.rdoc",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: okuyama
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Kenji Hara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-28 00:00:00 Z
+date: 2012-03-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -107,7 +107,6 @@ files:
 - .document
 - .rspec
 - Gemfile
-- Gemfile.lock
 - History.rdoc
 - LICENSE.txt
 - README.rdoc

data/Gemfile.lock

@@ -1,33 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.6.5)
-    rake (0.9.2.2)
-    rcov (1.0.0)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.1.0)
-  jeweler (~> 1.8.3)
-  rcov
-  rdoc (~> 3.12)
-  rspec (~> 2.8.0)