tarantool 0.2 → 0.2.1

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    tarantool (0.1.1)
+    tarantool (0.2)
       activemodel (>= 3.1, < 4.0)
-      iproto (>= 0.1)
+      iproto (>= 0.2)
 
 GEM
   remote: http://rubygems.org/
@@ -23,7 +23,7 @@ GEM
       eventmachine (>= 1.0.0.beta.1)
     eventmachine (1.0.0.beta.4)
     i18n (0.6.0)
-    iproto (0.1)
+    iproto (0.2)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     multi_json (1.0.3)

data/README.md

@@ -38,15 +38,14 @@ To use EventMachine pass type: em in options:
 
 ```ruby
 require 'em-synchrony'
-DB = Tarantool.new host: 'locahost', port: 33013
-space = DB.space 0
+DB = Tarantool.new host: 'locahost', port: 33013, type: :em
 EM.synchrony do
-  Fiber.new do
-    space.insert 'prepor', 'Andrew', 'ceo@prepor.ru'
-    res = space.select 'prepor'
-    puts "Name: #{res.tuple[1].to_s}; Email: #{res.tuple[2].to_s}"
-    space.delete 'prepor'
-  end.resume
+  space = DB.space 0
+  space.insert 'prepor', 'Andrew', 'ceo@prepor.ru'
+  res = space.select 'prepor'
+  puts "Name: #{res.tuple[1].to_s}; Email: #{res.tuple[2].to_s}"
+  space.delete 'prepor'
+  EM.stop
 end
 ```
 

data/examples/em_simple.rb

@@ -5,14 +5,12 @@ Bundler.setup
 require 'tarantool'
 
 require 'em-synchrony'
-DB = Tarantool.new host: 'localhost', port: 33013
-space = DB.space 0
+DB = Tarantool.new host: 'localhost', port: 33013, type: :em
 EM.synchrony do
-  Fiber.new do
-    space.insert 'prepor', 'Andrew', 'ceo@prepor.ru'
-    res = space.select 'prepor'
-    puts "Name: #{res.tuple[1].to_s}; Email: #{res.tuple[2].to_s}"
-    space.delete 'prepor'
-    EM.stop
-  end.resume
+  space = DB.space 0
+  space.insert 'prepor', 'Andrew', 'ceo@prepor.ru'
+  res = space.select 'prepor'
+  puts "Name: #{res.tuple[1].to_s}; Email: #{res.tuple[2].to_s}"
+  space.delete 'prepor'
+  EM.stop
 end

data/lib/tarantool.rb

@@ -2,7 +2,7 @@
 require 'iproto'
 
 class Tarantool
-  VERSION = '0.2'
+  VERSION = '0.2.1'
   
   require 'tarantool/space'
   require 'tarantool/requests'

data/lib/tarantool/request.rb

@@ -47,7 +47,7 @@ class Tarantool
     end
 
     def perform
-      data = connection.send_packet request_id, make_packet(make_body)
+      data = connection.send_request self.class.request_type, make_body
       make_response data
     end
 
@@ -55,17 +55,8 @@ class Tarantool
       
     end
 
-    def request_id
-      @request_id ||= connection.next_request_id
-    end
-
-    def make_packet(body)
-      [self.class.request_type, body.size, request_id].pack('LLL') +
-      body
-    end
-
     def make_response(data)
-      return_code,  = data[0,4].unpack('L')
+      return_code, = data[0,4].unpack('L')
       if return_code == 0
         Response.new(data[4, data.size], response_params)
       else

data/spec/tarantool/em_spec.rb

@@ -9,15 +9,13 @@ describe "Tarantool with EM" do
   describe "insert, select and delete" do
     it "should insert tuple and return it" do
       EM.synchrony do
-        Fiber.new do
-          space.insert 100, 'привет', return_tuple: true
-          res = space.select 100
-          int, string = res.tuple
-          int.to_i.must_equal 100
-          string.to_s.must_equal 'привет'
-          space.delete 100
-          EM.stop
-        end.resume
+        space.insert 100, 'привет', return_tuple: true
+        res = space.select 100
+        int, string = res.tuple
+        int.to_i.must_equal 100
+        string.to_s.must_equal 'привет'
+        space.delete 100
+        EM.stop
       end
     end
   end

data/spec/tarantool/request_spec.rb

@@ -31,17 +31,6 @@ describe Tarantool::Request do
     end
   end
 
-  describe "instance" do
-    let(:request) { Tarantool::Requests::Insert.new space }
-
-    it "should make packet with right request type, body size and next request id + body" do
-      body = 'hi'
-      expect = [Tarantool::Requests::REQUEST_TYPES[:insert], body.bytesize, request.request_id].pack('LLL') + body
-      request.make_packet(body).must_equal expect
-    end
-
-  end
-
   describe "requests" do
     include Helpers::Truncate
     describe "insert and select" do

data/tarantool.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'tarantool'
-  s.version           = '0.2'
-  s.date              = '2012-01-23'
+  s.version           = '0.2.1'
+  s.date              = '2012-01-27'
   s.rubyforge_project = 'tarantool'
 
   s.summary     = "Tarantool KV-storage client."
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency('iproto', [">= 0.1"])
+  s.add_dependency('iproto', [">= 0.2"])
   s.add_dependency('activemodel', [">= 3.1", "< 4.0"])
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarantool
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-01-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iproto
-  requirement: &70163621772280 !ruby/object:Gem::Requirement
+  requirement: &70184618798480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70163621772280
+  version_requirements: *70184618798480
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70163613525100 !ruby/object:Gem::Requirement
+  requirement: &70184618796360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,7 +35,7 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163613525100
+  version_requirements: *70184618796360
 description: Tarantool KV-storage client.
 email: ceo@prepor.ru
 executables: []