tarantool16 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1e48342e0d480e5d5083e9c2d606e801867a302
-  data.tar.gz: 14efa0034189d0f8810fecc010353a4de1e60da7
+  metadata.gz: a32fa448b9f723a683ca2eed5fcdcffb978684ae
+  data.tar.gz: cf785fd5ad492f3a7f0b2c845e84648958df2ea7
 SHA512:
-  metadata.gz: 78a6cdd4aad5a4494f0b769fffd92ea51c44f567a76cfd9d1b293399115c7a21854fb9b21d56eeb7548266f4c30e218b2e32e8e8afb6f3784dd78be353a2afe8
-  data.tar.gz: b2176218401af3c9eba21b2699f0b3441a89ef7f27f63dede6fb48767a061893699584e6357688107339e0c29ba71cf78605f1ac58adc822962418c7df309ccd
+  metadata.gz: e7d3f686ea033c9cad8e6fe6bfc66d031b52ba25732413c467fde64bf3bca3e465f2fb347ad4ab8c9ec2662f23db5cfcf4e8fc407c6e73a6c281e0a37f675672
+  data.tar.gz: 73758e4cc1a1d447d90b8b81320ba2eae5ca71fc06394d92892ecdfdec29c3ac0e27e3f3497c297ec648025d26bef3d07279070731cc68727b89dbe3748dbd90

data/README.md

@@ -1,6 +1,6 @@
 # Tarantool16
 
-This is adapter for [tarantool](http://tarantool.org) version 1.6.
+This is adapter for [tarantool](http://tarantool.org) version 1.6 and 1.7.
 
 (adapter for version <=1.5 is called [tarantool](https://github.org/tarantoool/tarantool-ruby))
 
@@ -74,6 +74,9 @@ tar.update(:_space, {name: 'test'}, {format: [:=, [{name: :id, type: :num}, {nam
 
 ## Changelog
 
+0.1.0 - breaking change: call now issues request in Tarantool17 format.
+        use call16 to issue `call` request to Tarantool16.
+	see tests for difference in returned results.
 0.0.11 - change a way of unix socket option.
         since previos scheme were introduced 12 hours ago,
         i think it is still safe to change it.

data/lib/tarantool16/connection/common.rb

@@ -217,7 +217,13 @@ module Tarantool16
       def _call(name, args, cb)
         req = {IPROTO_FUNCTION_NAME => name,
                IPROTO_TUPLE => args}
-        send_request(REQUEST_TYPE_CALL, req, cb)
+        send_request(REQUEST_TYPE_CALL17, req, cb)
+      end
+
+      def _call16(name, args, cb)
+        req = {IPROTO_FUNCTION_NAME => name,
+               IPROTO_TUPLE => args}
+        send_request(REQUEST_TYPE_CALL16, req, cb)
       end
 
       def _eval(expr, args, cb)

data/lib/tarantool16/consts.rb

@@ -24,10 +24,11 @@ module Tarantool16
   REQUEST_TYPE_REPLACE = 3
   REQUEST_TYPE_UPDATE = 4
   REQUEST_TYPE_DELETE = 5
-  REQUEST_TYPE_CALL = 6
+  REQUEST_TYPE_CALL16 = 6
   REQUEST_TYPE_AUTHENTICATE = 7
   REQUEST_TYPE_EVAL = 8
   REQUEST_TYPE_UPSERT = 9
+  REQUEST_TYPE_CALL17 = 10
   REQUEST_TYPE_ERROR = 1 << 15
 
 

data/lib/tarantool16/db.rb

@@ -211,6 +211,10 @@ module Tarantool16
       conn._call(name, args, cb)
     end
 
+    def _call16(name, args, cb)
+      conn._call16(name, args, cb)
+    end
+
     def _eval(expr, args, cb)
       conn._eval(expr, args, cb)
     end

data/lib/tarantool16/dumb_db.rb

@@ -69,6 +69,10 @@ module Tarantool16
       _call(name, args, RETURN_OR_RAISE)
     end
 
+    def call16(name, args)
+      _call16(name, args, RETURN_OR_RAISE)
+    end
+
     def eval(expr, args)
       _eval(expr, args, RETURN_OR_RAISE)
     end

data/lib/tarantool16/version.rb

@@ -1,3 +1,3 @@
 module Tarantool16
-  VERSION = "0.0.12"
+  VERSION = "0.1.0"
 end

data/test/config.lua

@@ -3,18 +3,16 @@ box.cfg{
     listen = 33013,
     wal_dir='.',
     snap_dir='.',
+    wal_mode='none',
 }
-if not box.space.test then
-    local s1 = box.schema.space.create('test', {id = 513, if_not_exists = true})
-    local ip = s1:create_index('primary', {type = 'hash', parts = {1, 'NUM'}, if_not_exists = true})
-    local iname = s1:create_index('name', {type = 'tree', parts = {2, 'STR'}, if_not_exists = true})
-    local irtree = s1:create_index('point', {type = 'rtree', unique=false, parts = {3, 'ARRAY'}, if_not_exists = true})
-    local ipname = s1:create_index('id_name', {type = 'tree', parts = {1, 'NUM', 2, 'STR'}})
-end
-if not box.space.test1 then
-    local s2 = box.schema.space.create('test1', {id = 514, if_not_exists = true})
-    local ip = s2:create_index('primary', {type = 'hash', parts = {1, 'NUM'}, if_not_exists = true})
-end
+box.once('initbox', function()
+local s1 = box.schema.space.create('test', {id = 513, if_not_exists = true})
+local ip = s1:create_index('primary', {type = 'hash', parts = {1, 'NUM'}, if_not_exists = true})
+local iname = s1:create_index('name', {type = 'tree', parts = {2, 'STR'}, if_not_exists = true})
+local irtree = s1:create_index('point', {type = 'rtree', unique=false, parts = {3, 'ARRAY'}, if_not_exists = true})
+local ipname = s1:create_index('id_name', {type = 'tree', parts = {1, 'NUM', 2, 'STR'}})
+local s2 = box.schema.space.create('test1', {id = 514, if_not_exists = true})
+local ip = s2:create_index('primary', {type = 'hash', parts = {1, 'NUM'}, if_not_exists = true})
 
 function reseed()
     local s1 = box.space.test
@@ -27,15 +25,15 @@ function reseed()
     s2:insert{2, "world", {3, 4}, 200}
 end
 
-pcall(function()
+function func1(i)
+    return i+1
+end
+
 box.schema.user.grant('guest', 'read,write,execute', 'universe')
+box.schema.user.create('tester', {password='testpass'})
+box.schema.user.grant('tester', 'read,write,execute', 'universe')
 end)
 
-if not box.schema.user.exists('tester') then
-    box.schema.user.create('tester', {password='testpass'})
-    box.schema.user.grant('tester', 'read,write,execute', 'universe')
-end
-
 local console = require 'console'
 console.listen '0.0.0.0:33015'
 

data/test/test_dumb.rb

@@ -71,6 +71,11 @@ describe 'DumbConnection' do
     db.delete(:test, "world", index: 1).must_equal [r2]
   end
 
+  it "should call" do
+    db.call("func1", [1]).must_equal [2]
+    db.call16("func1", [1]).must_equal [[2]]
+  end
+
   it "should eval" do
     db.eval("local a, b = ... ; return a + b", [1, 2]).must_equal [3]
   end
@@ -118,7 +123,7 @@ describe 'DumbConnection' do
       Spawn.with_pause do
         proc {
           db.get(:test, 1)
-        }.must_raise Tarantool16::Connection::CouldNotConnect
+        }.must_raise ::Tarantool16::Connection::CouldNotConnect
       end
     end
 
@@ -127,7 +132,7 @@ describe 'DumbConnection' do
       Spawn.with_pause do
         proc {
           db.get(:test, 1)
-        }.must_raise Tarantool16::Connection::Timeout
+        }.must_raise ::Tarantool16::Connection::Timeout
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tarantool16
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - Sokolov Yura aka funny_falcon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: adapter for Tarantool 1.6