rod 0.7.1 → 0.7.2

data/spec/property/singular_association.rb

@@ -0,0 +1,65 @@
+require 'bundler/setup'
+require 'minitest/autorun'
+require 'rod'
+
+describe Rod::Property::SingularAssociation do
+  before do
+    @klass = MiniTest::Mock.new
+    @builder = MiniTest::Mock.new
+    @klass.expect :nil?,false
+  end
+
+  after do
+    @klass.verify
+    @builder.verify
+  end
+
+  describe "a singular association" do
+    before do
+      @association = Rod::Property::SingularAssociation.new(@klass,:user,
+                                                            :polymorphic => true)
+    end
+
+    it "must not be a field" do
+      @association.field?.wont_equal true
+    end
+
+    it "must be an association" do
+      @association.association?.must_equal true
+    end
+
+    it "must be a singular association" do
+      @association.singular?.must_equal true
+    end
+
+    it "must not be a plural association" do
+      @association.plural?.wont_equal true
+    end
+
+    it "must produce proper metadata" do
+      @association.metadata.must_equal({:polymorphic => true})
+    end
+
+    it "must define C accessors" do
+      @klass.expect :struct_name, "struct_name"
+      @builder.expect :c,nil,[String]
+      @association.define_c_accessors(@builder)
+    end
+
+    it "must seal C accessors" do
+      @klass.expect :send,nil,[:private,String]
+      @association.seal_c_accessors
+    end
+
+    it "must define getter" do
+      @klass.expect :send,nil,[:define_method,"user"]
+      @klass.expect :scope_name,"Rod"
+      @association.define_getter
+    end
+
+    it "must define setter" do
+      @klass.expect :send,nil,[:define_method,"user="]
+      @association.define_setter
+    end
+  end
+end

data/tests/class_compatibility_create.rb

@@ -10,5 +10,5 @@ class TestClass < Rod::Model
   database_class TestDatabase
 end
 
-TestDatabase.instance.create_database("tmp/class_compatibility")
-TestDatabase.instance.close_database
+TestDatabase.instance.create_database("tmp/class_compatibility") do
+end

data/tests/eff1_test.rb

@@ -22,7 +22,7 @@ module RodTest
     FILENAME = "tmp/eff1"
 
 		def setup
-			Model.create_database(FILENAME)
+			Model.instance.create_database(FILENAME)
       @structs = {}
       %w{A B C D E}.each do |letter|
         @structs[letter.to_sym] = []

data/tests/eff2_test.rb

@@ -36,7 +36,7 @@ module RodTest
 
 		def main
       start_t = Time.now.to_f
-			Model.create_database(FILENAME)
+			Model.instance.create_database(FILENAME)
       %w{A B C D E}.each do |letter|
         (MAGNITUDE / 2).times {|i| @structs[letter.to_sym][i].store }
       end

data/tests/full_runs.rb

@@ -10,7 +10,7 @@ module RodTest
 		MAGNITUDE = 10000
 		def setup
 			@test_filename = "tmp/noncontinuous_pages"
-			Model.create_database(@test_filename)
+			Model.instance.create_database(@test_filename)
 			@hs = []
 			(MAGNITUDE).times do |i|
 			  @hs[i] = HisStruct.new

data/tests/generate_classes_create.rb

@@ -5,21 +5,21 @@ require File.join(".",File.dirname(__FILE__),"generate_classes_model")
 Rod::Database.development_mode = true
 
 
-Database.instance.create_database("tmp/generate_classes")
+Database.instance.create_database("tmp/generate_classes") do
 
-files = 10.times.map{|i| UserFile.new(:data => "#{i} data")}
-files.each{|f| f.store}
+  files = 10.times.map{|i| UserFile.new(:data => "#{i} data")}
+  files.each{|f| f.store}
 
-account = Account.new(:login => "john")
-account.store
-user = User.new(:name => "John", :account => account,
-                :files => [files[0],files[1],files[2]])
-user.store
+  account = Account.new(:login => "john")
+  account.store
+  user = User.new(:name => "John", :account => account,
+                  :files => [files[0],files[1],files[2]])
+  user.store
 
-account = Account.new(:login => "amanda")
-account.store
-user = User.new(:name => "Amanda", :account => account,
-                :files => [files[0],files[4],files[5],nil,files[6]])
-user.store
+  account = Account.new(:login => "amanda")
+  account.store
+  user = User.new(:name => "Amanda", :account => account,
+                  :files => [files[0],files[4],files[5],nil,files[6]])
+  user.store
 
-Database.instance.close_database
+end

data/tests/migration_create.rb

@@ -5,51 +5,51 @@ require File.join(".",File.dirname(__FILE__),"migration_model1")
 Rod::Database.development_mode = true
 
 FileUtils.rm_rf("tmp/migration")
-Database.instance.create_database("tmp/migration")
-
-count = (ARGV[0] || 10).to_i
-puts "Count in migration test: #{count}"
-
-files = count.times.map{|i| UserFile.new(:data => "#{i} data")}
-files.each{|f| f.store}
-
-users = []
-count.times do |index|
-  account = Account.new(:login => "john#{index}",
-                        :nick => "j#{index}")
-  account.store
-  user1 = User.new(:name => "John#{index}",
-                   :surname => "Smith#{index}",
-                   :city => "City#{index}",
-                   :street => "Street#{index}",
-                   :number => index,
-                   :account => account,
-                   :mother => users[index-1],
-                   :father => users[index-2],
-                   :friends => [users[index-3],users[index-4]],
-                   :files => [files[index],files[index + 1],files[index + 2]])
-  user1.store
-
-  account = Account.new(:login => "amanda#{index}",
-                        :nick => "a#{index}")
-  account.store
-  user2 = User.new(:name => "Amanda#{index}",
-                   :surname => "Amanda#{index}",
-                   :city => "Bigcity#{index}",
-                   :street => "Small street#{index}",
-                   :number => index,
-                   :account => account,
-                   :mother => users[index-1],
-                   :father => users[index-2],
-                   :friends => [users[index-5],users[index-6]],
-                   :files => [files[index],files[index+4],files[index+5],
-                     nil,files[index+6]])
-  user2.store
-  users << user1
-  users << user2
-end
-
-house = House.new(:name => "cottage house")
-house.store
+Database.instance.create_database("tmp/migration") do
+
+  count = (ARGV[0] || 10).to_i
+  puts "Count in migration test: #{count}"
+
+  files = count.times.map{|i| UserFile.new(:data => "#{i} data")}
+  files.each{|f| f.store}
+
+  users = []
+  count.times do |index|
+    account = Account.new(:login => "john#{index}",
+                          :nick => "j#{index}")
+    account.store
+    user1 = User.new(:name => "John#{index}",
+                     :surname => "Smith#{index}",
+                     :city => "City#{index}",
+                     :street => "Street#{index}",
+                     :number => index,
+                     :account => account,
+                     :mother => users[index-1],
+                     :father => users[index-2],
+                     :friends => [users[index-3],users[index-4]],
+                     :files => [files[index],files[index + 1],files[index + 2]])
+    user1.store
+
+    account = Account.new(:login => "amanda#{index}",
+                          :nick => "a#{index}")
+    account.store
+    user2 = User.new(:name => "Amanda#{index}",
+                     :surname => "Amanda#{index}",
+                     :city => "Bigcity#{index}",
+                     :street => "Small street#{index}",
+                     :number => index,
+                     :account => account,
+                     :mother => users[index-1],
+                     :father => users[index-2],
+                     :friends => [users[index-5],users[index-6]],
+                     :files => [files[index],files[index+4],files[index+5],
+                       nil,files[index+6]])
+    user2.store
+    users << user1
+    users << user2
+  end
+
+  house = House.new(:name => "cottage house")
+  house.store
 
-Database.instance.close_database
+end

data/tests/migration_verify.rb

@@ -9,7 +9,7 @@ Database.instance.open_database("tmp/migration")
 
 count = (ARGV[0] || 10).to_i
 key_count = 0
-User.index_for(:street,:index => :hash).each do |key,proxy|
+User.property(:street).index.each do |key,proxy|
   key_count += 1
   proxy.to_a.should == User.find_all_by_street(key).to_a
   proxy.count.should > 0

data/tests/missing_class_create.rb

@@ -13,9 +13,9 @@ end
 
 Rod::Database.development_mode = true
 
-Rod::Database.instance.create_database("tmp/missing_class")
-user = User.new(:name => "John")
-user.store
-item = Item.new(:name => "hammer")
-item.store
-Rod::Database.instance.close_database
+Rod::Database.instance.create_database("tmp/missing_class") do
+  user = User.new(:name => "John")
+  user.store
+  item = Item.new(:name => "hammer")
+  item.store
+end

data/tests/properties_order_create.rb

@@ -9,8 +9,8 @@ end
 
 Rod::Database.development_mode = true
 
-Rod::Database.instance.create_database("tmp/properties_order")
-user = User.new(:name => "John",:surname => "Smith")
-user.store
-Rod::Database.instance.close_database
+Rod::Database.instance.create_database("tmp/properties_order") do
+  user = User.new(:name => "John",:surname => "Smith")
+  user.store
+end
 

data/tests/read_on_create.rb

@@ -6,40 +6,39 @@ puts "-- Read data while creating DB --"
 Rod::Database.development_mode = true
 
 
-RodTest::Database.instance.create_database("tmp/read_write")
-my_structures = []
-MAGNITUDO.times do |index|
-  your_struct = RodTest::YourStruct.new
-  your_struct.counter = index
-  your_struct.title = "Title_#{index}"
-  your_struct.store
-
-  my_struct = RodTest::MyStruct.new
-  my_struct.count = index
-  my_struct.your_struct = your_struct
-  my_struct.title = "Title_#{index}"
-  my_struct.title2 = "Title2_#{index}"
-
-  my_struct.store
-  my_structures << my_struct
-end
-
-MAGNITUDO.times do |index|
-  # validate object fetched from cache
-  struct = RodTest::MyStruct[index]
-  validate(index,struct)
-  # validate object referenced previously
-  validate(index,my_structures[index])
-  # validate referential integrity
-  if struct.object_id != my_structures[index].object_id
-    raise "Object stored and recived are different #{struct.object_id} " +
-      "#{my_structures[index].object_id}"
+RodTest::Database.instance.create_database("tmp/read_write") do
+  my_structures = []
+  MAGNITUDO.times do |index|
+    your_struct = RodTest::YourStruct.new
+    your_struct.counter = index
+    your_struct.title = "Title_#{index}"
+    your_struct.store
+
+    my_struct = RodTest::MyStruct.new
+    my_struct.count = index
+    my_struct.your_struct = your_struct
+    my_struct.title = "Title_#{index}"
+    my_struct.title2 = "Title2_#{index}"
+
+    my_struct.store
+    my_structures << my_struct
   end
-  if struct != my_structures[index]
-    raise "Object stored and recived are different #{struct} " +
-      "#{my_structures[index]}"
-  end
-end
 
+  MAGNITUDO.times do |index|
+    # validate object fetched from cache
+    struct = RodTest::MyStruct[index]
+    validate(index,struct)
+    # validate object referenced previously
+    validate(index,my_structures[index])
+    # validate referential integrity
+    if struct.object_id != my_structures[index].object_id
+      raise "Object stored and recived are different #{struct.object_id} " +
+        "#{my_structures[index].object_id}"
+    end
+    if struct != my_structures[index]
+      raise "Object stored and recived are different #{struct} " +
+        "#{my_structures[index]}"
+    end
+  end
 
-RodTest::Database.instance.close_database
+end

data/tests/save_struct.rb

@@ -3,47 +3,48 @@ require 'structures'
 
 puts "-- Save sample structures test --"
 Rod::Database.development_mode = true
-RodTest::Database.instance.create_database("tmp/abc")
+RodTest::Database.instance.create_database("tmp/abc") do
 
-#MAGNITUDE = 100000
-MAGNITUDE = 50
+  #MAGNITUDE = 100000
+  MAGNITUDE = 50
 
-his = []
-(MAGNITUDE * 10).times do |i|
-  his[i] = RodTest::HisStruct.new
-  his[i].inde = i
-end
-
-ys = []
-(MAGNITUDE * 1).times do |i|
-  ys[i] = RodTest::YourStruct.new
-  ys[i].counter = 10
-  ys[i].his_structs = his[i*10...(i+1)*10]
-end
+  his = []
+  (MAGNITUDE * 10).times do |i|
+    his[i] = RodTest::HisStruct.new
+    his[i].inde = i
+  end
 
-ms = []
-(MAGNITUDE * 1).times do |i|
-  ms[i] = RodTest::MyStruct.new
-  ms[i].count = 10 * i
-  ms[i].precision = 0.1 * i
-  ms[i].identifier = i
-  ms[i].your_struct = ys[i]
-  ms[i].title = "title_#{i}"
-  ms[i].title2 = "title2_#{i}"
-  ms[i].body = "body_#{i}"
-end
+  ys = []
+  (MAGNITUDE * 1).times do |i|
+    ys[i] = RodTest::YourStruct.new
+    ys[i].counter = 10
+    ys[i].his_structs = his[i*10...(i+1)*10]
+  end
 
-RodTest::Database.instance.print_layout
-ms.each_with_index{|s,i|
-  begin
-    puts i if i % 1000 == 0
-    s.store
-  rescue Exception => e
-    puts e
-    raise
+  ms = []
+  (MAGNITUDE * 1).times do |i|
+    ms[i] = RodTest::MyStruct.new
+    ms[i].count = 10 * i
+    ms[i].precision = 0.1 * i
+    ms[i].identifier = i
+    ms[i].your_struct = ys[i]
+    ms[i].title = "title_#{i}"
+    ms[i].title2 = "title2_#{i}"
+    ms[i].body = "body_#{i}"
   end
-}
-ys.each{|y| y.store}
-his.each{|h| h.store}
-RodTest::Database.instance.print_layout
-RodTest::Database.instance.close_database
+
+  RodTest::Database.instance.print_layout
+  ms.each_with_index{|s,i|
+    begin
+      puts i if i % 1000 == 0
+      s.store
+    rescue Exception => e
+      puts e
+      raise
+    end
+  }
+  ys.each{|y| y.store}
+  his.each{|h| h.store}
+  RodTest::Database.instance.print_layout
+
+end

data/tests/unit/database.rb

@@ -19,7 +19,7 @@ class DatabaseTest < Test::Unit::TestCase
 
     Rod::VERSION.sub!(/.*/,"0.1.1")
     file = "0.1.0"
-    assert(not(@database.send(:valid_version?,file)))
+    assert !(@database.send(:valid_version?,file))
 
     Rod::VERSION.sub!(/.*/,"0.2.1")
     file = "0.2.0"