tarantool 0.1.1 → 0.2

data/Gemfile

@@ -1,7 +1,5 @@
 source "http://rubygems.org"
 
-gem "eventmachine"
-gem "em-synchrony"
 gem "activemodel"
 
 gem "rr"
@@ -11,4 +9,6 @@ gem "bson_ext"
 
 gem "ruby-debug19"
 
+gem "em-synchrony"
+
 gemspec

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    tarantool (0.1)
+    tarantool (0.1.1)
       activemodel (>= 3.1, < 4.0)
-      em-synchrony (>= 1.0.0, < 2.0)
-      eventmachine (>= 1.0.0.beta.4, < 2.0.0)
+      iproto (>= 0.1)
 
 GEM
   remote: http://rubygems.org/
@@ -24,6 +23,7 @@ GEM
       eventmachine (>= 1.0.0.beta.1)
     eventmachine (1.0.0.beta.4)
     i18n (0.6.0)
+    iproto (0.1)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     multi_json (1.0.3)
@@ -48,7 +48,6 @@ DEPENDENCIES
   bson
   bson_ext
   em-synchrony
-  eventmachine
   rr
   ruby-debug19
   tarantool!

data/README.md

@@ -1,6 +1,6 @@
 # About
 
-Its asynchronyous EventMachine ruby client for [Tarantool Key-Value Storage](http://github.com/mailru/tarantool).
+Its ruby client for [Tarantool Key-Value Storage](http://github.com/mailru/tarantool).
 
 # Install
 
@@ -8,48 +8,46 @@ Its asynchronyous EventMachine ruby client for [Tarantool Key-Value Storage](htt
 gem install tarantool
 ```
 
+# Usage
+
 ```ruby
 require 'tarantool'
-# or
-require 'tarantool/synchrony'
-# or
-require 'tarantool/record'
 ```
 
-# Usage
-
 To be able to send requests to the server, you must
-configure and establish a client connection:
+initialize Tarantool and Tarantool space:
 
 ```ruby
-Tarantool.configure host: 'locahost', port: 33013, space_no: 0
+DB = Tarantool.new host: 'locahost', port: 33013
+space = DB.space 0
 ```
 
-The driver internals can work in two modes: EM deferrables and EM-Synchrony.
+The driver internals can work in two modes: block via TCPSocket and non block via EventMachine and fibers. By default it uses block mode. 
 
-EM deferrables:
 
 ```ruby
-req = Tarantool.insert 'prepor', 'Andrew', 'ceo@prepor.ru'
-req.callback do
-    req = Tarantool.select 'prepor'
-    req.callback do |res|
-        puts "Name: #{res.tuple[1].to_s}; Email: #{res.tuple[2].to_s}"
-    end
-end
-req.errback do |err|
-    puts "Error while insert: #{err}"
-end
+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'
 ```
 
-'Synchrony' mode:
+**Notice** `Tarantool` instances (connections actually) are not threadsafe. So, you should create `Tarantool` instance per thread.
 
-```ruby
-require 'tarantool/synchrony'
+To use EventMachine pass type: em in options:
 
-Tarantool.insert 'prepor', 'Andrew', 'ceo@prepor.ru'
-res = Tarantool.select 'prepor'
-puts "Name: #{res.tuple[1].to_s}; Email: #{res.tuple[2].to_s}"
+```ruby
+require 'em-synchrony'
+DB = Tarantool.new host: 'locahost', port: 33013
+space = DB.space 0
+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
+end
 ```
 
 The driver itself provides ActiveModel API: Callbacks, Validations, Serialization, Dirty. 

data/Rakefile

@@ -78,7 +78,7 @@ task :release => :build do
     puts "You must be on the master branch to release!"
     exit!
   end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git commit --allow-empty -m 'Release #{version}'"
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"

data/examples/em_simple.rb

@@ -4,18 +4,15 @@ Bundler.setup
 
 require 'tarantool'
 
-EM.run do
-  Tarantool.configure host: 'localhost', port: 33013, space_no: 0
-  req = Tarantool.insert 'prepor', 'Andrew', 'ceo@prepor.ru'
-  req.callback do
-    req = Tarantool.select 'prepor'
-    req.callback do |res|
-      puts "Name: #{res.tuple[1].to_s}; Email: #{res.tuple[2].to_s}"
-      EM.stop
-    end
-  end
-  req.errback do |err|
-    puts "Error while insert: #{err}"
+require 'em-synchrony'
+DB = Tarantool.new host: 'localhost', port: 33013
+space = DB.space 0
+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
+  end.resume
 end

data/examples/record.rb

@@ -4,7 +4,16 @@ Bundler.setup
 
 require 'tarantool/record'
 require 'tarantool/serializers/bson'
-class User < Tarantool::Record
+
+DB = Tarantool.new host: 'localhost', port: 33013
+
+class MyTarantool < Tarantool::Record
+  set_tarantool DB
+end
+
+class User < MyTarantool
+  set_space_no 0
+  
   field :login, :string
   field :name, :string
   field :email, :string      
@@ -19,38 +28,34 @@ class User < Tarantool::Record
   end
 end
 
-EM.synchrony do
-  Tarantool.configure host: 'localhost', port: 33013, space_no: 0
-  # Now attribute positions are not important.
-  User.create login: 'prepor', email: 'ceo@prepor.ru', name: 'Andrew'
-  User.create login: 'ruden', name: 'Andrew', email: 'rudenkoco@gmail.com'
-
-  # find by primary key login
-  User.find 'prepor' 
-  # first 2 users with name Andrew
-  User.where(name: 'Andrew').limit(2).all 
-  # second user with name Andrew
-  User.where(name: 'Andrew').offset(1).limit(1).all 
-  # user with name Andrew and email ceo@prepor.ru
-  User.where(name: 'Andrew', email: 'ceo@prepor.ru').first
-  # raise exception, becouse we can't select from not first part of index
-  begin
-    User.where(email: 'ceo@prepor.ru') 
-  rescue Tarantool::ArgumentError => e
-  end
-  # increment field apples_count by one. Its atomic operation vie native Tarantool interface
-  User.find('prepor').increment :apples_count
-
-  # update only dirty attributes
-  user = User.find('prepor')
-  user.name = "Petr"
-  user.save
-
-  # field serialization to bson
-  user.info = { 'bio' => "hi!", 'age' => 23, 'hobbies' => ['mufa', 'tuka'] }
-  user.save
-  User.find('prepor').info['bio'] # => 'hi!'
-  user.destroy
-  puts "Ok!"
-  EM.stop
-end
+# Now attribute positions are not important.
+User.create login: 'prepor', email: 'ceo@prepor.ru', name: 'Andrew'
+User.create login: 'ruden', name: 'Andrew', email: 'rudenkoco@gmail.com'
+
+# find by primary key login
+User.find 'prepor' 
+# first 2 users with name Andrew
+User.where(name: 'Andrew').limit(2).all 
+# second user with name Andrew
+User.where(name: 'Andrew').offset(1).limit(1).all 
+# user with name Andrew and email ceo@prepor.ru
+User.where(name: 'Andrew', email: 'ceo@prepor.ru').first
+# raise exception, becouse we can't select from not first part of index
+begin
+  User.where(email: 'ceo@prepor.ru') 
+rescue Tarantool::ArgumentError => e
+end
+# increment field apples_count by one. Its atomic operation vie native Tarantool interface
+User.find('prepor').increment :apples_count
+
+# update only dirty attributes
+user = User.find('prepor')
+user.name = "Petr"
+user.save
+
+# field serialization to bson
+user.info = { 'bio' => "hi!", 'age' => 23, 'hobbies' => ['mufa', 'tuka'] }
+user.save
+User.find('prepor').info['bio'] # => 'hi!'
+user.destroy
+puts "Ok!"

data/examples/simple.rb

@@ -0,0 +1,13 @@
+require 'bundler'
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
+Bundler.setup
+
+require 'tarantool'
+
+DB = Tarantool.new host: 'localhost', port: 33013
+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'

data/lib/tarantool.rb

@@ -1,50 +1,36 @@
 # -*- coding: utf-8 -*-
-require 'eventmachine'
-require 'em-synchrony'
+require 'iproto'
 
-module Tarantool
-  VERSION = '0.1.1'
-  extend self
+class Tarantool
+  VERSION = '0.2'
+  
   require 'tarantool/space'
-  require 'tarantool/connection'
   require 'tarantool/requests'
   require 'tarantool/response'
   require 'tarantool/exceptions'
   require 'tarantool/serializers'
 
-  def singleton_space
-    @singleton_space ||= space
-  end
-
-  def connection
-    @connection ||= begin
-      raise "Tarantool.configure before connect" unless @config
-      EM.connect @config[:host], @config[:port], Tarantool::Connection
-    end
+  attr_reader :config
+  def initialize(config = {})
+    @config = config
   end
 
-  def reset_connection
-    @connection = nil
-    @singleton_space = nil
+  def configure(config)
+    @config.merge! config
   end
 
-  def space(no = nil)
-    Space.new connection, no || @config[:space_no]
+  def connection(c = config)
+    @connection ||= begin
+      raise "Tarantool.configure before connect" unless c
+      IProto.get_connection c[:host], c[:port], c[:type] || :block
+    end
   end
 
-  def configure(config = {})
-    EM.add_shutdown_hook { reset_connection }
-    @config = config
+  def space(no, conn = connection)
+    Space.new conn, no
   end
 
-  def hexdump(string)
+  def self.hexdump(string)
     string.unpack('C*').map{ |c| "%02x" % c }.join(' ')
   end
-
-  [:select, :update, :insert, :delete, :call, :ping].each do |v|
-    define_method v do |*params|
-      singleton_space.send v, *params
-    end
-  end
-
 end

data/lib/tarantool/exceptions.rb

@@ -1,11 +1,9 @@
-module Tarantool
+class Tarantool
   class TarantoolError < StandardError; end
   class UndefinedRequestType < TarantoolError; end
-  class CouldNotConnect < TarantoolError; end
   class BadReturnCode < TarantoolError; end
   class StringTooLong < TarantoolError; end
   class ArgumentError < TarantoolError; end
-  class UnexpectedResponse < TarantoolError; end
   class UndefinedSpace < TarantoolError; end
   class ValueError < TarantoolError; end
 end

data/lib/tarantool/record.rb

@@ -1,6 +1,6 @@
 require 'active_model'
-require 'tarantool/synchrony'
-module Tarantool
+require 'tarantool'
+class Tarantool
   class Select
     include Enumerable
     attr_reader :record
@@ -13,7 +13,7 @@ module Tarantool
     end
 
     def each(&blk)
-      res = Tarantool.select(*@tuples, index_no: @index_no, limit: @limit, offset: @offset).tuples
+      res = record.space.select(*@tuples, index_no: @index_no, limit: @limit, offset: @offset).tuples
       res.each do |tuple|
         blk.call record.from_server(tuple)
       end
@@ -114,10 +114,16 @@ module Tarantool
     self.indexes = []
 
     class_attribute :space_no
-    define_attr_method :space_no do
-      original_space_no || 0
-    end
+    class_attribute :tarantool
     class << self
+      def set_space_no(val)
+        self.space_no = val
+      end
+
+      def set_tarantool(val)
+        self.tarantool = val
+      end
+
       def field(name, type, params = {})
         define_attribute_method name
         self.fields = fields.merge name => { type: type, field_no: fields.size, params: params }
@@ -173,7 +179,7 @@ module Tarantool
       end
 
       def space
-        @space ||= Tarantool.space space_no
+        @space ||= tarantool.space(space_no)
       end
 
       def tuple_to_hash(tuple)

data/lib/tarantool/request.rb

@@ -1,6 +1,5 @@
-module Tarantool
+class Tarantool
   class Request
-    include EM::Deferrable
 
     class << self
       def request_type(name = nil)
@@ -48,8 +47,8 @@ module Tarantool
     end
 
     def perform
-      send_packet(make_packet(make_body))
-      self
+      data = connection.send_packet request_id, make_packet(make_body)
+      make_response data
     end
 
     def parse_args
@@ -65,19 +64,13 @@ module Tarantool
       body
     end
 
-    def send_packet(packet)
-      connection.send_packet request_id, packet do |data|
-        make_response data
-      end
-    end
-
     def make_response(data)
       return_code,  = data[0,4].unpack('L')
       if return_code == 0
-        succeed Response.new(data[4, data.size], response_params)
+        Response.new(data[4, data.size], response_params)
       else
         msg = data[4, data.size].unpack('A*')
-        fail BadReturnCode.new("Error code #{return_code}: #{msg}")
+        raise BadReturnCode.new("Error code #{return_code}: #{msg}")
       end
     end
 

data/lib/tarantool/requests.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   require 'tarantool/request'
   module Requests
     REQUEST_TYPES = {

data/lib/tarantool/requests/call.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   module Requests
     class Call < Request
       request_type :call

data/lib/tarantool/requests/delete.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   module Requests
     class Delete < Request
       request_type :delete

data/lib/tarantool/requests/insert.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   module Requests
     class Insert < Request
       request_type :insert

data/lib/tarantool/requests/ping.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   module Requests
     class Ping < Request
       request_type :ping
@@ -9,7 +9,7 @@ module Tarantool
       end
 
       def make_response(data)
-        succeed(Time.now - @start_time)
+        Time.now - @start_time
       end
     end
   end

data/lib/tarantool/requests/select.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   module Requests
     class Select < Request
       request_type :select

data/lib/tarantool/requests/update.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   module Requests
     class Update < Request
       request_type :update

data/lib/tarantool/response.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   class Field
     attr_reader :data
     def initialize(data)

data/lib/tarantool/serializers.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   module Serializers
     MAP = {}
     %w{string integer}.each do |v|

data/lib/tarantool/serializers/bson.rb

@@ -1,5 +1,5 @@
 require 'bson'
-module Tarantool
+class Tarantool
   module Serializers
     class BSON
       Serializers::MAP[:bson] = self

data/lib/tarantool/serializers/integer.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   module Serializers
     class Integer
       Serializers::MAP[:integer] = self

data/lib/tarantool/serializers/string.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   module Serializers
     class String
       Serializers::MAP[:string] = self

data/lib/tarantool/space.rb

@@ -1,4 +1,4 @@
-module Tarantool
+class Tarantool
   class Space
     attr_accessor :space_no
     attr_reader :connection

data/spec/helpers/truncate.rb

@@ -1,9 +1,9 @@
 module Helpers
   module Truncate
     def teardown       
-      while (res = Tarantool.call(proc_name: 'box.select_range', args: [Tarantool.singleton_space.space_no.to_s, '0', '100'], return_tuple: true)) && res.tuples.size > 0
+      while (res = space.call(proc_name: 'box.select_range', args: [space.space_no.to_s, '0', '100'], return_tuple: true)) && res.tuples.size > 0
         res.tuples.each do |k, *_|
-          Tarantool.delete key: k
+          space.delete key: k
         end
       end
       super

data/spec/spec_helper.rb

@@ -3,26 +3,19 @@ ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
 Bundler.setup
 
 require 'minitest/spec'
+require 'minitest/autorun'
 
 require 'helpers/let'
 require 'helpers/truncate'
 require 'rr'
 
-require 'tarantool/synchrony'
+require 'tarantool'
 
-config = { host: '192.168.127.128', port: 33013, space_no: 0 }
+TARANTOOL_CONFIG = { host: '127.0.0.1', port: 33013, type: :block }
 
-Tarantool.configure config
+DB = Tarantool.new TARANTOOL_CONFIG
 
 class MiniTest::Unit::TestCase
   extend Helpers::Let
   include RR::Adapters::MiniTest
-end
-
-at_exit {
-  EM.synchrony do
-    exit_code = MiniTest::Unit.new.run(ARGV)
-    EM.stop
-    exit_code
-  end
-}
+end

data/spec/tarantool/em_spec.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require "em-synchrony"
+describe "Tarantool with EM" do
+  def space
+    @space ||= Tarantool.new(TARANTOOL_CONFIG.merge(type: :em)).space 1
+  end
+
+  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
+      end
+    end
+  end
+end

data/spec/tarantool/record_spec.rb

@@ -5,11 +5,16 @@ require 'yajl'
 require 'tarantool/serializers/bson'
 describe Tarantool::Record do
   include Helpers::Truncate
-  before do
-    Tarantool.singleton_space.space_no = 0
+
+  def space
+    @space ||= DB.space 0
   end
+
   let(:user_class) do
     Class.new(Tarantool::Record) do
+      set_tarantool DB
+      set_space_no 0
+
       def self.name # For naming
         "User"
       end

data/spec/tarantool/request_spec.rb

@@ -2,8 +2,8 @@
 require 'spec_helper'
 
 describe Tarantool::Request do
-  before do
-    Tarantool.singleton_space.space_no = 1
+  def space
+    @space ||= DB.space 1
   end
   describe "pack method" do
     describe "for field" do
@@ -32,7 +32,7 @@ describe Tarantool::Request do
   end
 
   describe "instance" do
-    let(:request) { Tarantool::Requests::Insert.new Tarantool.space }
+    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'
@@ -46,8 +46,8 @@ describe Tarantool::Request do
     include Helpers::Truncate
     describe "insert and select" do
       it "should insert tuple and return it" do
-        Tarantool.insert 100, 'привет', return_tuple: true
-        res = Tarantool.select 100
+        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 'привет'
@@ -55,40 +55,40 @@ describe Tarantool::Request do
 
       describe "with equal ids" do
         it "should raise error" do
-          Tarantool.insert 100, 'lala'
-          lambda { Tarantool.insert 100, 'yo' }.must_raise(Tarantool::BadReturnCode)
+          space.insert 100, 'lala'
+          lambda { space.insert 100, 'yo' }.must_raise(Tarantool::BadReturnCode)
         end
       end
     end
 
     describe "select" do
       it "should select multiple tuples" do
-        Tarantool.insert 100, 'привет'
-        Tarantool.insert 101, 'hi'
-        res = Tarantool.select 100, 101
+        space.insert 100, 'привет'
+        space.insert 101, 'hi'
+        res = space.select 100, 101
         res.tuples.map { |v| v.last.to_s }.must_equal ['привет', 'hi']
       end
     end
 
     describe "call" do
       it "should call lua proc" do
-        res = Tarantool.call proc_name: 'box.pack', args: ['i', '100'], return_tuple: true
+        res = space.call proc_name: 'box.pack', args: ['i', '100'], return_tuple: true
         res.tuple[0].to_i.must_equal 100
       end
 
       it "should return batches via select_range" do
-        Tarantool.insert 100, 'привет'
-        Tarantool.insert 101, 'hi'
-        res = Tarantool.call proc_name: 'box.select_range', args: ['1', '0', '100'], return_tuple: true
+        space.insert 100, 'привет'
+        space.insert 101, 'hi'
+        res = space.call proc_name: 'box.select_range', args: ['1', '0', '100'], return_tuple: true
         res.tuples.size.must_equal 2
       end
     end
 
     describe "update" do
       it "should update tuple" do
-        Tarantool.insert 100, 'привет'
-        Tarantool.update 100, ops: [[1, :set, 'yo!']]
-        res = Tarantool.select 100
+        space.insert 100, 'привет'
+        space.update 100, ops: [[1, :set, 'yo!']]
+        res = space.select 100
         int, string = res.tuple
         string.to_s.must_equal 'yo!'
       end
@@ -96,16 +96,16 @@ describe Tarantool::Request do
 
     describe "delete" do
       it "should delete record" do
-        inserted = Tarantool.insert 100, 'привет', return_tuple: true
-        Tarantool.delete inserted.tuple[0], return_tuple: true
-        res = Tarantool.select 100
+        inserted = space.insert 100, 'привет', return_tuple: true
+        space.delete inserted.tuple[0], return_tuple: true
+        res = space.select 100
         res.tuple.must_be_nil
       end
     end
 
     describe "ping" do
       it "should ping without exceptions" do
-        res = Tarantool.ping
+        res = space.ping
         res.must_be_kind_of Numeric
       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.1'
-  s.date              = '2011-12-13'
+  s.version           = '0.2'
+  s.date              = '2012-01-23'
   s.rubyforge_project = 'tarantool'
 
   s.summary     = "Tarantool KV-storage client."
@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency('eventmachine', [">= 1.0.0.beta.4", "< 2.0.0"])
+  s.add_dependency('iproto', [">= 0.1"])
   s.add_dependency('activemodel', [">= 3.1", "< 4.0"])
-  s.add_dependency('em-synchrony', [">= 1.0.0", "< 2.0"])
+
 
   # = MANIFEST =
   s.files = %w[
@@ -33,10 +33,8 @@ Gem::Specification.new do |s|
     Rakefile
     examples/em_simple.rb
     examples/record.rb
-    examples/synchrony_simple.rb
-    lib/em/protocols/fixed_header_and_body.rb
+    examples/simple.rb
     lib/tarantool.rb
-    lib/tarantool/connection.rb
     lib/tarantool/exceptions.rb
     lib/tarantool/record.rb
     lib/tarantool/request.rb
@@ -53,11 +51,11 @@ Gem::Specification.new do |s|
     lib/tarantool/serializers/integer.rb
     lib/tarantool/serializers/string.rb
     lib/tarantool/space.rb
-    lib/tarantool/synchrony.rb
     spec/helpers/let.rb
     spec/helpers/truncate.rb
     spec/spec_helper.rb
     spec/tarantool.cfg
+    spec/tarantool/em_spec.rb
     spec/tarantool/record_spec.rb
     spec/tarantool/request_spec.rb
     tarantool.gemspec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarantool
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,25 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &70194702023280 !ruby/object:Gem::Requirement
+  name: iproto
+  requirement: &70163621772280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70194702023280
+  version_requirements: *70163621772280
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70194702022400 !ruby/object:Gem::Requirement
+  requirement: &70163613525100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,21 +35,7 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194702022400
-- !ruby/object:Gem::Dependency
-  name: em-synchrony
-  requirement: &70194702021400 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70194702021400
+  version_requirements: *70163613525100
 description: Tarantool KV-storage client.
 email: ceo@prepor.ru
 executables: []
@@ -68,10 +51,8 @@ files:
 - Rakefile
 - examples/em_simple.rb
 - examples/record.rb
-- examples/synchrony_simple.rb
-- lib/em/protocols/fixed_header_and_body.rb
+- examples/simple.rb
 - lib/tarantool.rb
-- lib/tarantool/connection.rb
 - lib/tarantool/exceptions.rb
 - lib/tarantool/record.rb
 - lib/tarantool/request.rb
@@ -88,11 +69,11 @@ files:
 - lib/tarantool/serializers/integer.rb
 - lib/tarantool/serializers/string.rb
 - lib/tarantool/space.rb
-- lib/tarantool/synchrony.rb
 - spec/helpers/let.rb
 - spec/helpers/truncate.rb
 - spec/spec_helper.rb
 - spec/tarantool.cfg
+- spec/tarantool/em_spec.rb
 - spec/tarantool/record_spec.rb
 - spec/tarantool/request_spec.rb
 - tarantool.gemspec
@@ -122,5 +103,6 @@ signing_key:
 specification_version: 2
 summary: Tarantool KV-storage client.
 test_files:
+- spec/tarantool/em_spec.rb
 - spec/tarantool/record_spec.rb
 - spec/tarantool/request_spec.rb

data/examples/synchrony_simple.rb

@@ -1,13 +0,0 @@
-require 'bundler'
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
-Bundler.setup
-
-require 'tarantool/synchrony'
-
-EM.synchrony do
-  Tarantool.configure host: 'localhost', port: 33013, space_no: 0
-  Tarantool.insert 'prepor', 'Andrew', 'ceo@prepor.ru'
-  res = Tarantool.select 'prepor'
-  puts "Name: #{res.tuple[1].to_s}; Email: #{res.tuple[2].to_s}"
-  EM.stop
-end

data/lib/em/protocols/fixed_header_and_body.rb

@@ -1,67 +0,0 @@
-module EventMachine
-  module Protocols
-    module FixedHeaderAndBody
-
-      def self.included(base)
-        base.extend ClassMethods
-      end
-
-      module ClassMethods
-        def header_size(size = nil)
-          if size
-            @_header_size = size
-          else
-            @_header_size
-          end
-        end
-      end
-
-      attr_accessor :header, :body
-
-      def receive_data(data)
-        @buffer ||= ''
-        offset = 0
-        while (chunk = data[offset, _needed_size - @buffer.size]).size > 0 || _needed_size == 0
-          @buffer += chunk
-          offset += chunk.size
-          if @buffer.size == _needed_size
-            case _state
-            when :receive_header
-              @_state = :receive_body
-              receive_header @buffer
-            when :receive_body
-              @_state = :receive_header
-              receive_body @buffer
-            end
-            @buffer = ''
-          end
-        end 
-      end
-
-      def receive_header(header)
-        # for override
-      end
-
-      def body_size
-        # for override
-      end
-
-      def receive_body(body)
-        # for override
-      end
-
-      def _needed_size
-        case _state
-        when :receive_header
-          self.class.header_size
-        when :receive_body
-          body_size
-        end
-      end
-
-      def _state
-        @_state ||= :receive_header
-      end
-    end
-  end
-end

data/lib/tarantool/connection.rb

@@ -1,54 +0,0 @@
-require 'em/protocols/fixed_header_and_body'
-module Tarantool
-  class Connection < EM::Connection
-    include EM::Protocols::FixedHeaderAndBody
-
-    header_size 12
-
-    def next_request_id
-      @next_request_id ||= 0
-      @next_request_id += 1
-      if @next_request_id > 0xffffffff
-        @next_request_id = 0
-      end
-      @next_request_id
-    end
-
-    def connection_completed
-      @connected = true
-    end
-
-    # begin FixedHeaderAndBody API
-    def body_size
-      @body_size
-    end
-
-    def receive_header(header)
-      @type, @body_size, @request_id = header.unpack('L3')
-    end
-
-    def receive_body(data)
-      clb = waiting_requests.delete @request_id
-      raise UnexpectedResponse.new("For request id #{@request_id}") unless clb
-      clb.call data
-    end
-    # end FixedHeaderAndBody API
-
-    def waiting_requests
-      @waiting_requests ||= {}
-    end
-
-    def send_packet(request_id, data, &clb)
-      send_data data
-      waiting_requests[request_id] = clb
-    end
-
-    def close_connection(*args)
-      super(*args)
-    end
-
-    def unbind
-      raise CouldNotConnect.new unless @connected
-    end
-  end
-end

data/lib/tarantool/synchrony.rb

@@ -1,13 +0,0 @@
-require 'tarantool'
-require 'em-synchrony'
-
-module Tarantool
-  class Space
-    alias :deffered_request :request
-    def request(*args)
-      EM::Synchrony.sync(deffered_request(*args)).tap do |v|
-        raise v if v.is_a?(Exception)        
-      end
-    end
-  end
-end