rod 0.7.1 → 0.7.2

data/tests/unit/model_tests.rb

@@ -31,86 +31,94 @@ module RodTest
 
   end
 
-	class ModuleTests < Test::Unit::TestCase
-    def setup
-      Database.instance.create_database("tmp/test_stored_instances")
+  class ModuleTests < Test::Unit::TestCase
+    def create_db
+      @database = Database.instance
+
+      @database.create_database("tmp/test_stored_instances") do
+        yield
+      end
     end
 
-    def teardown
-      Database.instance.close_database
+    def create_db_without_block
+      @database = Database.instance
+      @database.create_database("tmp/test_stored_instances")
     end
 
-		def test_reflection
+    def test_reflection
       # A
-
-      assert AStruct.fields.has_key?(:a1)
-      assert AStruct.fields[:a1].has_key?(:type)
-      assert AStruct.fields[:a1][:type] == :integer
-
-      assert AStruct.fields.has_key?(:a2)
-      assert AStruct.fields[:a2].has_key?(:type)
-      assert AStruct.fields[:a2][:type] == :ulong
-      assert AStruct.fields[:a2].has_key?(:index)
-      assert AStruct.fields[:a2][:index] == :flat
-
-      assert AStruct.fields.has_key?("rod_id")
-
-      assert AStruct.plural_associations.has_key?(:b_structs)
-      assert AStruct.plural_associations[:b_structs].has_key?(:class_name)
-      assert AStruct.plural_associations[:b_structs][:class_name] == "RodTest::BStruct"
-
-      # B
-      assert BStruct.singular_associations.has_key?(:a_struct)
-
-      assert BStruct.fields.has_key?("rod_id")
-		end
+      create_db do
+        assert AStruct.property(:a1)
+        assert AStruct.property(:a1).type
+        assert AStruct.property(:a1).type == :integer
+
+        assert AStruct.property(:a2)
+        assert AStruct.property(:a2).type
+        assert AStruct.property(:a2).type == :ulong
+        assert AStruct.property(:a2).options[:index]
+        assert AStruct.property(:a2).options[:index] == :flat
+
+        assert AStruct.property(:rod_id)
+
+        assert AStruct.property(:b_structs)
+        assert AStruct.property(:b_structs).options[:class_name]
+        assert AStruct.property(:b_structs).options[:class_name] == "RodTest::BStruct"
+
+        # B
+        assert BStruct.property(:a_struct)
+        assert BStruct.property(:rod_id)
+      end
+    end
 
     def test_instances
-      a1 = AStruct.new
-      a2 = AStruct.new
-      a3 = AStruct.new
-
-      b1 = BStruct.new
-      b2 = BStruct.new
-
-      # these are generated, non-trivial accessors, so they need to be tested
-      a1.a1 = 2
-      a1.a2 = 2000000000
-      assert a1.a1 == 2
-      assert a1.a2 == 2000000000
-
-      assert a1.b_structs_count == a1.b_structs.count
-      a1.b_structs = [b1, b2]
-      assert a1.b_structs.to_a == [b1, b2]
-      assert a1.b_structs_count == a1.b_structs.count
-
-      b1.b = "tead-only database"
-      assert b1.b == "tead-only database"
+      create_db do
+        a1 = AStruct.new
+        a2 = AStruct.new
+        a3 = AStruct.new
+
+        b1 = BStruct.new
+        b2 = BStruct.new
+
+        # these are generated, non-trivial accessors, so they need to be tested
+        a1.a1 = 2
+        a1.a2 = 2000000000
+        assert a1.a1 == 2
+        assert a1.a2 == 2000000000
+
+        assert a1.b_structs_count == a1.b_structs.count
+        a1.b_structs = [b1, b2]
+        assert a1.b_structs.to_a == [b1, b2]
+        assert a1.b_structs_count == a1.b_structs.count
+
+        b1.b = "tead-only database"
+        assert b1.b == "tead-only database"
+      end
     end
 
     def test_stored_instances
+      create_db do
+        a1 = AStruct.new
+        a2 = AStruct.new
+        a3 = AStruct.new
 
-      a1 = AStruct.new
-      a2 = AStruct.new
-      a3 = AStruct.new
+        b1 = BStruct.new
+        b2 = BStruct.new
 
-      b1 = BStruct.new
-      b2 = BStruct.new
+        a1.b_structs = [b1, b2]
+        a2.b_structs = [b1]
+        a3.b_structs = []
 
-      a1.b_structs = [b1, b2]
-      a2.b_structs = [b1]
-      a3.b_structs = []
+        a1.store
+        a2.store
+        a3.store
 
-      a1.store
-      a2.store
-      a3.store
+        b1.store
+        b2.store
 
-      b1.store
-      b2.store
-
-      assert a1.b_structs_count == a1.b_structs.count
-      #p "AStruct.count: #{AStruct.count}" <- should throw a more relevant exception
+        assert a1.b_structs_count == a1.b_structs.count
+        #p "AStruct.count: #{AStruct.count}" <- should throw a more relevant exception
+      end
     end
-	end
+  end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: rod
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Aleksander Pohl
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 Z
+date: 2012-07-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RubyInline
@@ -46,12 +46,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.0.7
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0
+        version: 3.2.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,12 +71,9 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.9.8
-    - - <
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -121,7 +115,18 @@ dependencies:
         version: 1.0.0
   type: :development
   version_requirements: *id008
-description: Ruby object database is designed for large amount of data, whose structure rarely changes.
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.7.0
+  type: :development
+  version_requirements: *id009
+description: Ruby Object Database is designed for large amounts of data, whose structure rarely changes.
 email: 
 - apohllo@o2.pl
 executables: []
@@ -138,7 +143,24 @@ files:
 - Rakefile
 - changelog.txt
 - contributors.txt
+- data/backward/0.7.0/_join_element.dat
+- data/backward/0.7.0/_polymorphic_join_element.dat
+- data/backward/0.7.0/char.dat
+- data/backward/0.7.0/database.yml
+- data/backward/0.7.0/rod_test__automobile.dat
+- data/backward/0.7.0/rod_test__caveman.dat
+- data/backward/0.7.0/rod_test__dog.dat
+- data/backward/0.7.0/rod_test__test_model.dat
+- data/portability/_join_element.dat
+- data/portability/_polymorphic_join_element.dat
+- data/portability/char.dat
+- data/portability/database.yml
+- data/portability/rod_test__automobile.dat
+- data/portability/rod_test__caveman.dat
+- data/portability/rod_test__dog.dat
+- data/portability/rod_test__test_model.dat
 - features/append.feature
+- features/backward.feature
 - features/basic.feature
 - features/collection.feature
 - features/collection_proxy.feature
@@ -147,6 +169,7 @@ files:
 - features/inheritence.feature
 - features/muliple_db.feature
 - features/persistence.feature
+- features/portability.feature
 - features/relationship_indexing.feature
 - features/relationships.feature
 - features/segmented_indexing.feature
@@ -159,6 +182,11 @@ files:
 - lib/rod.rb
 - lib/rod/abstract_database.rb
 - lib/rod/abstract_model.rb
+- lib/rod/berkeley/collection_proxy.rb
+- lib/rod/berkeley/database.rb
+- lib/rod/berkeley/environment.rb
+- lib/rod/berkeley/sequence.rb
+- lib/rod/berkeley/transaction.rb
 - lib/rod/cache.rb
 - lib/rod/collection_proxy.rb
 - lib/rod/constants.rb
@@ -170,11 +198,26 @@ files:
 - lib/rod/index/segmented_index.rb
 - lib/rod/join_element.rb
 - lib/rod/model.rb
+- lib/rod/property/base.rb
+- lib/rod/property/field.rb
+- lib/rod/property/plural_association.rb
+- lib/rod/property/singular_association.rb
 - lib/rod/reference_updater.rb
 - lib/rod/string_element.rb
 - lib/rod/string_ex.rb
 - lib/rod/utils.rb
 - rod.gemspec
+- spec/berkeley/database.rb
+- spec/berkeley/environment.rb
+- spec/berkeley/sequence.rb
+- spec/berkeley/transaction.rb
+- spec/collection_proxy.rb
+- spec/database.rb
+- spec/model.rb
+- spec/property/base.rb
+- spec/property/field.rb
+- spec/property/plural_association.rb
+- spec/property/singular_association.rb
 - tests/check_strings.rb
 - tests/class_compatibility_create.rb
 - tests/class_compatibility_verify.rb
@@ -201,7 +244,6 @@ files:
 - tests/structures.rb
 - tests/unit/abstract_database.rb
 - tests/unit/database.rb
-- tests/unit/model.rb
 - tests/unit/model_tests.rb
 - tests/validate_read_on_create.rb
 - utils/convert_index.rb
@@ -229,12 +271,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rod
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Ruby object database
+summary: Ruby Object Database
 test_files: 
 - features/append.feature
+- features/backward.feature
 - features/basic.feature
 - features/collection.feature
 - features/collection_proxy.feature
@@ -243,6 +286,7 @@ test_files:
 - features/inheritence.feature
 - features/muliple_db.feature
 - features/persistence.feature
+- features/portability.feature
 - features/relationship_indexing.feature
 - features/relationships.feature
 - features/segmented_indexing.feature
@@ -252,3 +296,15 @@ test_files:
 - features/steps/test_helper.rb
 - features/support/mocha.rb
 - features/update.feature
+- spec/berkeley/database.rb
+- spec/berkeley/environment.rb
+- spec/berkeley/sequence.rb
+- spec/berkeley/transaction.rb
+- spec/collection_proxy.rb
+- spec/database.rb
+- spec/model.rb
+- spec/property/base.rb
+- spec/property/field.rb
+- spec/property/plural_association.rb
+- spec/property/singular_association.rb
+has_rdoc: 

data/tests/unit/model.rb

@@ -1,36 +0,0 @@
-$:.unshift("tests")
-require 'test/unit'
-require 'structures'
-
-class ModelTest < Test::Unit::TestCase
-  def setup
-    RodTest::Database.instance.open_database("tmp/abc")
-  end
-
-  def teardown
-    RodTest::Database.instance.close_database()
-  end
-
-  def test_referential_integrity
-    struct1 = RodTest::MyStruct.find_by_title("title_0")
-    assert(not(struct1.nil?))
-    struct2 = RodTest::MyStruct.find_by_title("title_0")
-    assert(not(struct2.nil?))
-    assert(struct1.object_id == struct2.object_id,
-      "Referential integrity not working for find_by " +
-      "#{struct1.object_id}:#{struct2.object_id}")
-
-    struct3 = RodTest::YourStruct[0]
-    assert(not(struct3.nil?))
-    struct4 = RodTest::HisStruct[0]
-    assert(not(struct4.nil?))
-    assert(struct3.his_structs[0].object_id == struct4.object_id,
-      "Referential integrity not working for has_many " +
-      "#{struct3.his_structs[0].object_id}:#{struct4.object_id}")
-  end
-
-  def test_print_system_error
-    puts "Test system error:"
-    RodTest::Database.instance.print_system_error
-  end
-end