tarantool 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tarantool (0.2)
+    tarantool (0.2.2)
       activemodel (>= 3.1, < 4.0)
       iproto (>= 0.2)
 

data/examples/record.rb

@@ -28,6 +28,8 @@ class User < MyTarantool
   end
 end
 
+User.tarantool.call
+
 # 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'
@@ -48,6 +50,9 @@ end
 # increment field apples_count by one. Its atomic operation vie native Tarantool interface
 User.find('prepor').increment :apples_count
 
+# call lua func, which return record's tuples
+User.call('box.select_range', '0','0', '5')
+
 # update only dirty attributes
 user = User.find('prepor')
 user.name = "Petr"
@@ -59,3 +64,5 @@ user.save
 User.find('prepor').info['bio'] # => 'hi!'
 user.destroy
 puts "Ok!"
+
+

data/lib/tarantool.rb

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

data/lib/tarantool/record.rb

@@ -13,12 +13,15 @@ class Tarantool
     end
 
     def each(&blk)
-      res = record.space.select(*@tuples, index_no: @index_no, limit: @limit, offset: @offset).tuples
-      res.each do |tuple|
-        blk.call record.from_server(tuple)
+      to_records(record.space.select(*@tuples, index_no: @index_no, limit: @limit, offset: @offset).tuples).each do |r|
+        blk.call r
       end
     end
 
+    def call(proc_name, *args)
+      to_records record.space.call(proc_name: proc_name, args: args, return_tuple: true).tuples
+    end
+
     def limit(limit)
       @limit = limit
       self
@@ -89,6 +92,12 @@ class Tarantool
       end
       index_no
     end
+
+    def to_records(tuples)
+      tuples.map do |tuple|
+        record.from_server(tuple)
+      end
+    end
   end
   class Record
     extend ActiveModel::Naming
@@ -164,7 +173,7 @@ class Tarantool
         Select.new(self)
       end
 
-      %w{where limit offset}.each do |v|
+      %w{where limit offset call first}.each do |v|
         define_method v do |*args|
           select.send(v, *args)
         end

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ require 'rr'
 
 require 'tarantool'
 
-TARANTOOL_CONFIG = { host: '127.0.0.1', port: 33013, type: :block }
+TARANTOOL_CONFIG = { host: '192.168.127.128', port: 33013, type: :block }
 
 DB = Tarantool.new TARANTOOL_CONFIG
 

data/spec/tarantool/record_spec.rb

@@ -245,7 +245,20 @@ describe Tarantool::Record do
           end
         end
       end
+    end
+
+    describe "call" do
+      let(:res) { user.class.select.call('box.select_range', '0','0', '2')}
+      before do
+        user_class.create login: 'prepor', name: 'Andrew', email: 'ceo@prepor.ru'
+        user_class.create login: 'petro', name: 'Petr', email: 'petro@gmail.com'
+        user_class.create login: 'ruden', name: 'Andrew', email: 'rudenkoco@gmail.com'
+      end
 
+      it "should select 2 records and return UserClass instances" do
+        res.size.must_equal 2
+        res.any? { |v| v.is_a? user_class }
+      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.2.1'
-  s.date              = '2012-01-27'
+  s.version           = '0.2.2'
+  s.date              = '2012-01-30'
   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.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000Z
+date: 2012-01-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iproto
-  requirement: &70184618798480 !ruby/object:Gem::Requirement
+  requirement: &70164633669320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70184618798480
+  version_requirements: *70164633669320
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70184618796360 !ruby/object:Gem::Requirement
+  requirement: &70164633668620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,7 +35,7 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184618796360
+  version_requirements: *70164633668620
 description: Tarantool KV-storage client.
 email: ceo@prepor.ru
 executables: []