tarantool 0.2.4 → 0.2.5

data/Gemfile.lock

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

data/README.md

@@ -111,7 +111,7 @@ in the tuple stored by Tarantool. By default, the primary key is field 0.
 
 # TODO
 
-# .to_config
+* .to_config
 * `#first`, `#all` without keys, batches requests via box.select_range
 * `#where` chains
 * admin-socket protocol

data/lib/tarantool/record.rb

@@ -77,20 +77,14 @@ class Tarantool
     end
 
     def detect_index_no(keys)
-      index_no = nil
-      record.indexes.each_with_index do |v, i|
+      record.indexes.each.with_index do |v, i|
         keys_inst = keys.dup
         v.each do |index_part|
-          unless keys_inst.delete(index_part)
-            break
-          end
-          if keys_inst.size == 0
-            index_no = i
-          end
+          break unless keys_inst.delete(index_part)
+          return i if keys_inst.empty?
         end
-        break if index_no
       end
-      index_no
+      nil
     end
 
     def to_records(tuples)
@@ -111,6 +105,7 @@ class Tarantool
     include ActiveModel::Serializers::Xml
 
     define_model_callbacks :save, :create, :update, :destroy
+    define_model_callbacks :initialize, :only => :after
 
     class_attribute :fields
     self.fields = {}
@@ -153,7 +148,14 @@ class Tarantool
       end
 
       def index(*fields)
-        self.indexes = (indexes.dup << fields).sort_by { |v| v.size }
+        options = {}
+        options = fields.pop if Hash === fields.last
+        if options[:primary]
+          self.indexes[0] = fields
+          self.primary_index = fields
+        else
+          self.indexes = (indexes.dup << fields)
+        end
       end
 
       def find(*keys)
@@ -184,7 +186,7 @@ class Tarantool
       end
 
       def from_server(tuple)
-        new(tuple_to_hash(tuple)).tap { |v| v.old_record! }
+        new(tuple_to_hash(tuple).merge __new_record: false)
       end
 
       def space
@@ -233,16 +235,29 @@ class Tarantool
       end
     end
 
-    attr_accessor :new_record
+    attr_accessor :__new_record
     def initialize(attributes = {})
+      run_callbacks(:initialize) do
+        init attributes
+      end
+    end
+
+    def init(attributes)
+      @__new_record = attributes.delete(:__new_record)
+      @__new_record = true if @__new_record.nil?
       attributes.each do |k, v|
         send("#{k}=", v)
-      end
-      @new_record = true
+      end      
     end
 
     def id
-      attributes[self.class.primary_index]
+      primary = self.class.primary_index
+      case primary
+      when Array
+        primary.map{ |p| attributes[p] }
+      else
+        attributes[primary]
+      end
     end
 
     def space
@@ -250,7 +265,7 @@ class Tarantool
     end
 
     def new_record?
-      @new_record
+      @__new_record
     end
 
     def attributes
@@ -258,11 +273,11 @@ class Tarantool
     end
 
     def new_record!
-      @new_record = true
+      @__new_record = true
     end
 
     def old_record!
-      @new_record = false
+      @__new_record = false
     end
 
     def save
@@ -274,6 +289,7 @@ class Tarantool
           if new_record?
             space.insert(*to_tuple)
           else
+            return true if changed.size == 0
             ops = changed.inject([]) do |memo, k|
               k = k.to_sym
               memo << [field_no(k), :set, self.class._cast(k, attributes[k])] if attributes[k]
@@ -322,9 +338,15 @@ class Tarantool
       self.class.fields[name][:field_no]
     end
 
-    # return new object, not reloading itself as AR-model
     def reload
-      self.class.find(id)
+      tuple = space.select(id).tuple
+      return false unless tuple
+      init self.class.tuple_to_hash(tuple).merge __new_record: false
+      self
+    end
+
+    def ==(other)
+      self.id == other.id
     end
 
   end

data/lib/tarantool/requests/delete.rb

@@ -11,7 +11,7 @@ class Tarantool
 
       def make_body
         [space_no, flags].pack('LL') +
-        self.class.pack_tuple(key)
+        self.class.pack_tuple(*key)
       end
     end
   end

data/lib/tarantool/requests/update.rb

@@ -26,7 +26,7 @@ class Tarantool
 
       def make_body
         [space_no, flags].pack('LL') +
-        self.class.pack_tuple(key) +
+        self.class.pack_tuple(*key) +
         [ops.size].pack('L') +
         self.class.pack_ops(ops)
       end

data/lib/tarantool.rb

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

data/spec/helpers/truncate.rb

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

data/spec/spec_helper.rb

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

data/spec/tarantool/composite_primary_key_spec.rb

@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require 'tarantool/record'
+require 'yajl'
+require 'tarantool/serializers/bson'
+describe Tarantool::Record do
+  include Helpers::Truncate
+
+  describe "primary key" do
+    def space
+      @space ||= DB.space 2
+    end
+
+    before do
+      @primary_key_size = 2
+    end
+
+    let(:address_class) do
+      Class.new(Tarantool::Record) do
+        set_tarantool DB
+        set_space_no 2
+
+        def self.name # For naming
+          "Adress"
+        end
+
+        field :city, :string
+        field :street, :string
+        field :index, :integer
+        field :name, :string
+        field :citizens, :integer, default: 1
+        index :city, :street, primary: true
+        index :index
+      end
+    end
+
+    describe "composite primary key" do
+      
+      before do
+        address_class.create city: "Moscow", street: "Leningradskii", index: 123, name: "Pedro"
+        address_class.create city: "Moscow", street: "Mohovaya", index: 123, name: "Pedro"
+      end
+
+      it "should return objects by second index" do
+        a1 = address_class.where(index: 123)
+        a1.all.size.must_equal 2
+      end
+
+      it "should work with increment" do
+        a1 = address_class.where(city: "Moscow", street: "Leningradskii").first
+        citizens = a1.citizens
+        a1.increment :citizens
+        a1.reload.citizens.must_equal(citizens+1)
+      end
+
+      it "should return all objects" do
+        a1 = address_class.where city: "Moscow"
+        a1.all.size.must_equal 2
+        a1.all.map(&:street).must_equal ["Leningradskii", "Mohovaya"]
+      end
+
+      it "should return right object" do
+        a1 = address_class.where city: "Moscow", street: "Leningradskii"
+        a1.first.street.must_equal "Leningradskii"
+      end
+
+      it "should destroy object" do
+        a1 = address_class.where city: "Moscow", street: "Leningradskii"
+        a1.first.destroy
+      end
+
+      it "should return id" do
+        a1 = address_class.where city: "Moscow", street: "Leningradskii"
+        a1.first.id.must_equal ["Moscow", "Leningradskii"]
+      end
+
+    end
+  end
+end

data/spec/tarantool/record_spec.rb

@@ -110,13 +110,13 @@ describe Tarantool::Record do
         u = user_class.create login: 'prepor', name: 'Andrew', email: 'ceo@prepor.ru', apples_count: nil
         u.info.must_be_nil
         u.apples_count.must_be_nil
-        u = u.reload
+        u.reload
         u.info.must_be_nil
         u.apples_count.must_be_nil
         u.info = {'bio' => 'hi!'}
         u.apples_count = 1
         u.save
-        u = u.reload
+        u.reload
         u.info.must_equal({ 'bio' => 'hi!' })
         u.apples_count.must_equal 1
       end
@@ -132,6 +132,7 @@ describe Tarantool::Record do
   end
 
   describe "increment" do
+    before { @truncate_fields = 2 }
     let(:user) { user_class.create login: 'prepor', name: 'Andrew', email: 'ceo@prepor.ru' }
     it "should increment apples count by 1" do
       user.increment :apples_count
@@ -148,7 +149,7 @@ describe Tarantool::Record do
     it "should destroy record" do
       u = user_class.create login: 'prepor', name: 'Andrew', email: 'ceo@prepor.ru'
       u.destroy
-      u.reload.must_be_nil
+      u.reload.must_equal false
     end
   end
 
@@ -171,15 +172,42 @@ describe Tarantool::Record do
   end
 
   describe "callbacks" do
+    let(:u) { user_class.new login: 'prepor', name: 'Andrew', email: 'ceo@prepor.ru '}
     it "should run before / after create callbackss in right places" do
       user_class.before_create :action_before_create
-      user_class.after_create :action_after_create
-
-      u = user_class.new login: 'prepor', name: 'Andrew', email: 'ceo@prepor.ru'
+      user_class.after_create :action_after_create      
       mock(u).action_before_create { u.new_record?.must_equal true }
       mock(u).action_after_create { u.new_record?.must_equal false }
       u.save
     end
+
+    describe "initialize" do
+      it "should run after_initialize after any initialization" do
+        user_class.after_initialize :action_after_initialize
+        any_instance_of(user_class) do |u|
+          mock(u).action_after_initialize.twice
+        end
+        u.save
+        user_class.find u.login
+      end
+
+      it "should not run after_initialize after reload" do        
+        user_class.after_initialize :action_after_initialize
+        any_instance_of(user_class) do |u|
+          mock(u).action_after_initialize.once
+        end
+        u.save
+        u.reload
+      end
+
+      it "should properly save record inside after_initialize" do
+        user_class.after_initialize do |u|
+          u.save
+        end
+        u
+        user_class.find u.login
+      end
+    end
   end
 
   describe "serialization" do
@@ -198,7 +226,9 @@ describe Tarantool::Record do
         info = { 'bio' => "hi!", 'age' => 23, 'hobbies' => ['mufa', 'tuka'] }
         u = user_class.create login: 'prepor', name: 'Andrew', email: 'ceo@prepor.ru', info: info
         u.info['hobbies'].must_equal ['mufa', 'tuka']
-        u = u.reload
+        u.reload
+        u.info['hobbies'].must_equal ['mufa', 'tuka']
+        u = user_class.find u.login
         u.info['hobbies'].must_equal ['mufa', 'tuka']
       end
     end
@@ -247,6 +277,27 @@ describe Tarantool::Record do
       end
     end
 
+    describe "==" do
+
+      before do
+        user_class.create login: 'prepor', name: 'Andrew', email: 'ceo@prepor.ru'
+        user_class.create login: 'petro', name: 'Petr', email: 'petro@gmail.com'
+      end
+
+      it "should return equality as true" do
+        u1 = user_class.where(login: "prepor").first
+        u2 = user_class.where(login: "prepor").first
+        (u1 == u2).must_equal true
+      end
+
+      it "should not return equality as true" do
+        u1 = user_class.where(login: "prepor")
+        u2 = user_class.where(login: "petro")
+        (u1 == u2).must_equal false
+      end
+    end
+
+
     describe "call" do
       let(:res) { user.class.select.call('box.select_range', 0, 0, 2)}
       before do

data/spec/tarantool/request_spec.rb

@@ -5,6 +5,7 @@ describe Tarantool::Request do
   def space
     @space ||= DB.space 1
   end
+  
   describe "pack method" do
     describe "for field" do
       it "should pack integer as 32 bit integer" do

data/spec/tarantool.cfg

@@ -11,13 +11,13 @@ rows_per_wal = 50
 
 space[0].enabled = 1
 
-space[0].index[0].type = "HASH"
+space[0].index[0].type = "TREE"
 space[0].index[0].unique = 1
 space[0].index[0].key_field[0].fieldno = 0
 space[0].index[0].key_field[0].type = "STR"
 
 space[0].index[1].type = "TREE"
-space[0].index[1].unique = 1
+space[0].index[1].unique = 0
 space[0].index[1].key_field[0].fieldno = 1
 space[0].index[1].key_field[0].type = "STR"
 space[0].index[1].key_field[1].fieldno = 2
@@ -29,4 +29,19 @@ space[1].enabled = 1
 space[1].index[0].type = "HASH"
 space[1].index[0].unique = 1
 space[1].index[0].key_field[0].fieldno = 0
-space[1].index[0].key_field[0].type = "NUM"
+space[1].index[0].key_field[0].type = "NUM"
+
+
+space[2].enabled = 1
+
+space[2].index[0].type = "TREE"
+space[2].index[0].unique = 1
+space[2].index[0].key_field[0].fieldno = 0
+space[2].index[0].key_field[0].type = "STR"
+space[2].index[0].key_field[1].fieldno = 1
+space[2].index[0].key_field[1].type = "STR"
+
+space[2].index[1].type = "TREE"
+space[2].index[1].unique = 0
+space[2].index[1].key_field[0].fieldno = 2
+space[2].index[1].key_field[0].type = "NUM"

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.4'
-  s.date              = '2012-05-06'
+  s.version           = '0.2.5'
+  s.date              = '2012-06-02'
   s.rubyforge_project = 'tarantool'
 
   s.summary     = "Tarantool KV-storage client."
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
     spec/helpers/truncate.rb
     spec/spec_helper.rb
     spec/tarantool.cfg
+    spec/tarantool/composite_primary_key_spec.rb
     spec/tarantool/em_spec.rb
     spec/tarantool/record_spec.rb
     spec/tarantool/request_spec.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarantool
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000Z
+date: 2012-06-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iproto
-  requirement: &70109143146600 !ruby/object:Gem::Requirement
+  requirement: &70121541108760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70109143146600
+  version_requirements: *70121541108760
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70109143145940 !ruby/object:Gem::Requirement
+  requirement: &70121541107900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,7 +35,7 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70109143145940
+  version_requirements: *70121541107900
 description: Tarantool KV-storage client.
 email: ceo@prepor.ru
 executables: []
@@ -73,6 +73,7 @@ files:
 - spec/helpers/truncate.rb
 - spec/spec_helper.rb
 - spec/tarantool.cfg
+- spec/tarantool/composite_primary_key_spec.rb
 - spec/tarantool/em_spec.rb
 - spec/tarantool/record_spec.rb
 - spec/tarantool/request_spec.rb
@@ -103,6 +104,7 @@ signing_key:
 specification_version: 2
 summary: Tarantool KV-storage client.
 test_files:
+- spec/tarantool/composite_primary_key_spec.rb
 - spec/tarantool/em_spec.rb
 - spec/tarantool/record_spec.rb
 - spec/tarantool/request_spec.rb