tarantool 0.1 → 0.1.1

data/README.md

@@ -1,6 +1,6 @@
 # About
 
-Its asynchronyous EventMachine ruby client for [Tarantool Key-Value Storage](github.com/mailru/tarantool).
+Its asynchronyous EventMachine ruby client for [Tarantool Key-Value Storage](http://github.com/mailru/tarantool).
 
 # Install
 
@@ -18,13 +18,14 @@ require 'tarantool/record'
 
 # Usage
 
-Before all requests you must configure client:
+To be able to send requests to the server, you must
+configure and establish a client connection:
 
 ```ruby
 Tarantool.configure host: 'locahost', port: 33013, space_no: 0
 ```
 
-Low level part of client can work in two mode: EM deferrables and EM-Synchrony.
+The driver internals can work in two modes: EM deferrables and EM-Synchrony.
 
 EM deferrables:
 
@@ -41,7 +42,7 @@ req.errback do |err|
 end
 ```
 
-Synchrony mode:
+'Synchrony' mode:
 
 ```ruby
 require 'tarantool/synchrony'
@@ -51,7 +52,9 @@ res = Tarantool.select 'prepor'
 puts "Name: #{res.tuple[1].to_s}; Email: #{res.tuple[2].to_s}"
 ```
 
-High level part of client implements ActiveModel API: Callbacks, Validations, Serialization, Dirty. Its autocast types, choose right index for query and something more. So code looks like this:
+The driver itself provides ActiveModel API: Callbacks, Validations, Serialization, Dirty. 
+Type casting is automatic, based on the index type chosen to process the query.
+For example:
 
 ```ruby
 require 'tarantool/record'
@@ -104,7 +107,10 @@ User.find('prepor').info['bio'] # => 'hi!'
 user.destroy
 ```
 
-On record definition step, fields order are important, in that order they will be store in Tarantool. By default primary key is first field. `index` method just mapping to your Tarantool schema, client doesn't modify schema for you.
+When definining a record, field order is important: this is the order of fields
+in the tuple stored by Tarantool. By default, the primary key is field 0. 
+
+`index` method just mapping to your Tarantool schema, client doesn't modify schema for you.
 
 # TODO
 

data/lib/tarantool/connection.rb

@@ -6,12 +6,12 @@ module Tarantool
     header_size 12
 
     def next_request_id
-      @request_id ||= 0
-      @request_id += 1
-      if @request_id > 0xffffffff
-        @request_id = 0
+      @next_request_id ||= 0
+      @next_request_id += 1
+      if @next_request_id > 0xffffffff
+        @next_request_id = 0
       end
-      @request_id
+      @next_request_id
     end
 
     def connection_completed
@@ -28,8 +28,8 @@ module Tarantool
     end
 
     def receive_body(data)
-      clb = waiting_requests[@request_id]
-      raise UnexpectedResponse.new("For request id #{request_id}") unless clb
+      clb = waiting_requests.delete @request_id
+      raise UnexpectedResponse.new("For request id #{@request_id}") unless clb
       clb.call data
     end
     # end FixedHeaderAndBody API

data/lib/tarantool/request.rb

@@ -76,7 +76,7 @@ module Tarantool
       if return_code == 0
         succeed Response.new(data[4, data.size], response_params)
       else
-        msg = data[4, data.size].unpack('a*')
+        msg = data[4, data.size].unpack('A*')
         fail BadReturnCode.new("Error code #{return_code}: #{msg}")
       end
     end

data/lib/tarantool/space.rb

@@ -32,7 +32,7 @@ module Tarantool
       request Requests::Ping, args
     end
 
-    def request(cls, args)      
+    def request(cls, args)
       cls.new(self, *args).perform
     end
   end

data/lib/tarantool.rb

@@ -3,7 +3,7 @@ require 'eventmachine'
 require 'em-synchrony'
 
 module Tarantool
-  VERSION = '0.1'
+  VERSION = '0.1.1'
   extend self
   require 'tarantool/space'
   require 'tarantool/connection'
@@ -13,21 +13,27 @@ module Tarantool
   require 'tarantool/serializers'
 
   def singleton_space
-    @singleton_space ||= Space.new connection, @config[:space_no]
+    @singleton_space ||= space
   end
 
-  def connection    
+  def connection
     @connection ||= begin
       raise "Tarantool.configure before connect" unless @config
       EM.connect @config[:host], @config[:port], Tarantool::Connection
     end
   end
 
+  def reset_connection
+    @connection = nil
+    @singleton_space = nil
+  end
+
   def space(no = nil)
     Space.new connection, no || @config[:space_no]
   end
 
   def configure(config = {})
+    EM.add_shutdown_hook { reset_connection }
     @config = config
   end
 

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ require 'rr'
 
 require 'tarantool/synchrony'
 
-config = { host: '10.211.55.3', port: 33013, space_no: 0 }
+config = { host: '192.168.127.128', port: 33013, space_no: 0 }
 
 Tarantool.configure config
 

data/spec/tarantool/request_spec.rb

@@ -109,6 +109,5 @@ describe Tarantool::Request do
         res.must_be_kind_of Numeric
       end
     end
-
   end
 end

data/tarantool.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'tarantool'
-  s.version           = '0.1'
-  s.date              = '2011-12-05'
+  s.version           = '0.1.1'
+  s.date              = '2011-12-13'
   s.rubyforge_project = 'tarantool'
 
   s.summary     = "Tarantool KV-storage client."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarantool
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70160133311300 !ruby/object:Gem::Requirement
+  requirement: &70194702023280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70160133311300
+  version_requirements: *70194702023280
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70160133310540 !ruby/object:Gem::Requirement
+  requirement: &70194702022400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160133310540
+  version_requirements: *70194702022400
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70160133309780 !ruby/object:Gem::Requirement
+  requirement: &70194702021400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -52,7 +52,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160133309780
+  version_requirements: *70194702021400
 description: Tarantool KV-storage client.
 email: ceo@prepor.ru
 executables: []