rod 0.6.2 → 0.6.3

data/tests/properties_order_create.rb

@@ -0,0 +1,16 @@
+$:.unshift("lib")
+require 'rod'
+
+class User < Rod::Model
+  database_class Rod::Database
+  field :name, :string
+  field :surname, :string
+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
+

data/tests/properties_order_verify.rb

@@ -0,0 +1,17 @@
+$:.unshift("lib")
+require 'rod'
+require 'rspec/expectations'
+include RSpec::Matchers
+
+# This class have properties in oposite order as the class in the
+# properties_order_create file.
+class User < Rod::Model
+  database_class Rod::Database
+  field :surname, :string
+  field :name, :string
+end
+
+Rod::Database.development_mode = true
+
+(lambda {Rod::Database.instance.open_database("tmp/properties_order")}).
+  should raise_error(Rod::IncompatibleVersion)

data/tests/unit/abstract_database.rb

@@ -0,0 +1,13 @@
+$:.unshift("lib")
+require 'test/unit'
+require 'rod'
+
+class AbstractDatabaseTest < Test::Unit::TestCase
+  def test_canonicalize_path
+    db = Rod::AbstractDatabase.instance
+    path = "/abc"
+    assert_equal(db.send(:canonicalize_path,path),path + "/")
+    path = "/abc/"
+    assert_equal(db.send(:canonicalize_path,path),path)
+  end
+end

data/tests/unit/model_tests.rb

@@ -13,7 +13,7 @@ module RodTest
 
   class AStruct < Model
     field :a1, :integer
-    field :a2, :ulong, :index => true
+    field :a2, :ulong, :index => :flat
     has_many :b_structs, :class_name => "RodTest::BStruct"
 
     def to_s
@@ -51,7 +51,7 @@ module RodTest
       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] == true
+      assert AStruct.fields[:a2][:index] == :flat
 
       assert AStruct.fields.has_key?("rod_id")
 
@@ -81,7 +81,7 @@ module RodTest
 
       assert a1.b_structs_count == a1.b_structs.count
       a1.b_structs = [b1, b2]
-      assert 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"

data/utils/convert_index.rb

@@ -25,7 +25,7 @@ klass = class_name.split("::").inject(Object) do |mod,name|
     klass
   end
 end
-index = db.read_index(class_name.constantize,property,{:index => :flat})
+index = class_name.constantize.index_for(property,{:index => :flat})
 klass.instance_variable_set("@#{property}_index",index)
 db.write_index(klass,property,{:index => :segmented, :convert => true})
 #Rod::Database.instance.close_database

metadata

@@ -2,7 +2,7 @@
 name: rod
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Aleksander Pohl
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 +02:00
-default_executable: 
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RubyInline
@@ -21,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.8.3
+        version: 3.10.0
     - - <
       - !ruby/object:Gem::Version 
         version: 4.0.0
@@ -56,9 +55,23 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: bsearch
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.0
+    - - <
+      - !ruby/object:Gem::Version 
+        version: 1.6.0
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -68,22 +81,22 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,7 +106,21 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.3.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.0
+    - - <
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  version_requirements: *id008
 description: Ruby object database is designed for large amount of data, whose structure rarely changes.
 email: 
 - apohllo@o2.pl
@@ -105,24 +132,29 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.rdoc
 - Rakefile
 - changelog.txt
 - contributors.txt
 - features/append.feature
-- features/assoc_indexing.feature
 - features/basic.feature
 - features/collection.feature
+- features/collection_proxy.feature
 - features/flat_indexing.feature
-- features/fred.feature
 - features/inheritence.feature
 - features/muliple_db.feature
+- features/persistence.feature
+- features/relationship_indexing.feature
 - features/relationships.feature
 - features/segmented_indexing.feature
+- features/steps/collection_proxy.rb
 - features/steps/model.rb
 - features/steps/rod.rb
 - features/steps/test_helper.rb
+- features/support/mocha.rb
+- features/update.feature
 - lib/rod.rb
 - lib/rod/abstract_database.rb
 - lib/rod/abstract_model.rb
@@ -131,11 +163,15 @@ files:
 - lib/rod/constants.rb
 - lib/rod/database.rb
 - lib/rod/exception.rb
+- lib/rod/index/base.rb
+- lib/rod/index/flat_index.rb
+- lib/rod/index/segmented_index.rb
 - lib/rod/join_element.rb
 - lib/rod/model.rb
-- lib/rod/segmented_index.rb
+- lib/rod/reference_updater.rb
 - lib/rod/string_element.rb
 - lib/rod/string_ex.rb
+- lib/rod/utils.rb
 - rod.gemspec
 - tests/check_strings.rb
 - tests/class_compatibility_create.rb
@@ -153,16 +189,20 @@ files:
 - tests/migration_model1.rb
 - tests/migration_model2.rb
 - tests/migration_verify.rb
+- tests/missing_class_create.rb
+- tests/missing_class_verify.rb
 - tests/mock_tests.rb
+- tests/properties_order_create.rb
+- tests/properties_order_verify.rb
 - tests/read_on_create.rb
 - tests/save_struct.rb
 - 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
-has_rdoc: true
 homepage: http://github.com/apohllo/rod
 licenses: []
 
@@ -177,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -187,21 +227,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rod
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Ruby object database
 test_files: 
 - features/append.feature
-- features/assoc_indexing.feature
 - features/basic.feature
 - features/collection.feature
+- features/collection_proxy.feature
 - features/flat_indexing.feature
-- features/fred.feature
 - features/inheritence.feature
 - features/muliple_db.feature
+- features/persistence.feature
+- features/relationship_indexing.feature
 - features/relationships.feature
 - features/segmented_indexing.feature
+- features/steps/collection_proxy.rb
 - features/steps/model.rb
 - features/steps/rod.rb
 - features/steps/test_helper.rb
+- features/support/mocha.rb
+- features/update.feature

data/lib/rod/segmented_index.rb

@@ -1,85 +0,0 @@
-module Rod
-  # Class implementing segmented index, i.e. an index which allows for
-  # lazy loading of its pieces.
-  class SegmentedIndex
-    # Creats the index with given +path+ and number of buckets (+buckets_count+).
-    def initialize(path,buckets_count=1001)
-      @path = path
-      @buckets_count = buckets_count
-      @buckets_ceil = Math::log2(buckets_count).ceil
-      @buckets = {}
-    end
-
-    # Stores the index at @path. Assumes the path exists.
-    def save
-      unless File.exist?(@path)
-        Dir.mkdir(@path)
-      end
-      @buckets.each do |bucket_number,hash|
-        File.open(path_for(bucket_number),"w") do |out|
-          out.puts(Marshal.dump(hash))
-        end
-      end
-    end
-
-    # Return value for the key.
-    def [](key)
-      bucket_number = bucket_for(key)
-      load_bucket(bucket_number) unless @buckets[bucket_number]
-      @buckets[bucket_number][key]
-    end
-
-    # Set the value for the key.
-    def []=(key,value)
-      bucket_number = bucket_for(key)
-      load_bucket(bucket_number) unless @buckets[bucket_number]
-      @buckets[bucket_number][key] = value
-    end
-
-    def each
-      if block_given?
-        @buckets.each do |bucket_number,hash|
-          hash.each do |key,value|
-            yield key, value
-          end
-        end
-      else
-        enum_for(:each)
-      end
-    end
-
-    protected
-    def bucket_for(key)
-      case key
-      when NilClass
-        1 % @buckets_count
-      when TrueClass
-        2 % @buckets_count
-      when FalseClass
-        3 % @buckets_count
-      when String
-        key.sum(@buckets_ceil) % @buckets_count
-      when Integer
-        key % @buckets_count
-      when Float
-        (key.numerator - key.denominator) % @buckets_count
-      else
-        raise RodException.new("Object of type '#{key.class}' not supported as a key of segmented index!")
-      end
-    end
-
-    def path_for(bucket_number)
-      "#{@path}#{bucket_number}.idx"
-    end
-
-    def load_bucket(bucket_number)
-      if File.exist?(path_for(bucket_number))
-        File.open(path_for(bucket_number)) do |input|
-          @buckets[bucket_number] = Marshal.load(input)
-        end
-      else
-        @buckets[bucket_number] = {}
-      end
-    end
-  end
-end