rod 0.7.2 → 0.7.2.5

data/.travis.yml

@@ -1,3 +1,3 @@
-rvm: 1.9.2
+rvm: 2.1.0
 before_script:
   - "sudo apt-get install libdb4.8-dev"

data/Rakefile

@@ -1,5 +1,6 @@
 $:.unshift "lib"
 require 'rod/constants'
+require 'fileutils'
 
 task :default => [:all_tests]
 
@@ -27,8 +28,7 @@ task :uninstall do
   sh "sudo gem uninstall #$gem_name"
 end
 
-task :all_tests => [:test,:unit_test,:regression_test,:features] do
-end
+task :all_tests => [:clean,:test,:unit_test,:regression_test,:features]
 
 desc "Run performence tests"
 task :perf do
@@ -87,9 +87,13 @@ task :wip do
   sh "bundle exec cucumber --tags @wip features/*"
 end
 
-desc "Clean all gems"
+desc "Clean tmp directory"
 task :clean do
-  sh "rm #$gem_name*.gem" 
+  if File.exist?("tmp")
+    sh "rm -rf tmp/*" 
+  else
+    FileUtils.mkdir("tmp")
+  end
 end
 
 desc "Show changelog from the last release"

data/lib/rod/constants.rb

@@ -1,5 +1,5 @@
 module Rod
-  VERSION = "0.7.2"
+  VERSION = "0.7.2.5"
 
   # The name of file containing the data base.
   DATABASE_FILE = "database.yml"

data/lib/rod/database.rb

@@ -93,7 +93,7 @@ module Rod
       |  // exted the file
       |
       |  // increase the pages count by numer of pages allocated at-once
-      |  model_p->#{klass.struct_name}_page_count += ALLOCATED_PAGES;
+      |  model_p->#{klass.struct_name}_page_count += 1;
       |  {
       |    // open the file for writing
       |    FILE * #{klass.struct_name}_file =
@@ -106,8 +106,7 @@ module Rod
       |      rb_raise(rodException(),"Could not seek to end file for #{klass.struct_name}.");
       |    }
       |    // write empty data at the end
-      |    if(write(model_p->#{klass.struct_name}_lib_file,model_p->empty_data,
-      |      page_size() * ALLOCATED_PAGES) == -1){
+      |    if(write(model_p->#{klass.struct_name}_lib_file,model_p->empty_data, page_size()) == -1){
       |      rb_raise(rodException(),"Could not write to file for #{klass.struct_name}.");
       |    }
       |
@@ -174,11 +173,11 @@ module Rod
             builder.prefix(klass.typedef_struct)
           end
 
-          builder.prefix("const ALLOCATED_PAGES = 25;")
+          builder.prefix("const int ALLOCATED_PAGES = 25;")
 
           str =<<-END
           |unsigned int page_size(){
-          |  return sysconf(_SC_PAGE_SIZE);
+          |  return sysconf(_SC_PAGE_SIZE) * ALLOCATED_PAGES;
           |}
           END
           builder.prefix(str.margin)
@@ -547,7 +546,7 @@ module Rod
           |  strcpy(model_p->path,dir_path);
           |
           |  // initialize empty data written when extending file
-          |  model_p->empty_data = calloc(page_size() * ALLOCATED_PAGES,1);
+          |  model_p->empty_data = calloc(page_size(),1);
           |
           |  //create the wrapping object
           |  cClass = rb_define_class("#{model_struct_name(path).camelcase(true)}",
@@ -620,6 +619,8 @@ module Rod
             |      page_size() * model_p->#{klass.struct_name}_page_count) == -1){
             |      rb_raise(rodException(),"Could not unmap #{klass.struct_name}.");
             |    }
+            |    model_p->#{klass.struct_name}_table = NULL;
+            |    #{update_pointer(klass) unless special_class?(klass)}
             |  }
             |  if(close(model_p->#{klass.struct_name}_lib_file) == -1){
             |    rb_raise(rodException(),"Could not close model file for #{klass}.");

data/lib/rod/index/hash_index.rb

@@ -18,6 +18,7 @@ module Rod
       def initialize(path,klass,options={})
         @path = path + ".db"
         @klass = klass
+        @options = options
       end
 
       # Stores the index on disk.
@@ -79,7 +80,6 @@ module Rod
         _get_first(key)
       end
 
-
       protected
       # Returns an empty BDB based collection proxy.
       def empty_collection_proxy(key)
@@ -93,9 +93,10 @@ module Rod
       # Options:
       # * +:truncate+ - clears the contents of the index
       # * +:create+ - creates the index if it doesn't exist
+      # * +:cache_size+ - set the cache size of the index
       def open(path,options={})
         raise RodException.new("The index #{@path} is already opened!") if opened?
-        _open(path,options)
+        _open(path,{:cache_size => @options[:cache_size]}.merge(options))
         @opened = true
       end
 
@@ -318,6 +319,7 @@ module Rod
         |  VALUE handleClass;
         |  VALUE handle;
         |  VALUE mod;
+        |  unsigned long cache_size = 8 * 1024 * 1024;
         |
         |  db_pointer = ALLOC(DB);
         |  return_value = db_create(&db_pointer,NULL,0);
@@ -337,8 +339,12 @@ module Rod
         |  if(rb_hash_aref(options,ID2SYM(rb_intern("truncate"))) == Qtrue){
         |    flags |= DB_TRUNCATE;
         |  }
+        |  if(rb_hash_aref(options,ID2SYM(rb_intern("cache_size"))) != Qnil){
+        |    cache_size = NUM2ULONG(rb_hash_aref(options,ID2SYM(rb_intern("cache_size"))));
+        |  }
+        |
+        |  db_pointer->set_cachesize(db_pointer,0,cache_size,0);
         |
-        |  db_pointer->set_cachesize(db_pointer,0,5 * 1024 * 1024,0);
         |  return_value = db_pointer->open(db_pointer,NULL,path,
         |    NULL,DB_HASH,flags,0);
         |  if(return_value != 0){

data/lib/rod/model.rb

@@ -447,7 +447,7 @@ module Rod
           backup_path = self.property(property.name).index.path
           new_path = property.index.path
           puts "Copying #{backup_path} to #{new_path}" if $ROD_DEBUG
-          FileUtils.cp(backup_path,new_path)
+          FileUtils.cp(backup_path,new_path) if File.exist?(backup_path)
         end
         return
       end
@@ -530,7 +530,7 @@ module Rod
           backup_path = self.property(property.name).index.path
           new_path = property.index.path
           puts "Copying #{backup_path} to #{new_path}" if $ROD_DEBUG
-          FileUtils.cp(backup_path,new_path)
+          FileUtils.cp(backup_path,new_path) if File.exist?(backup_path)
         else
           print "-  copying #{property.options[:index]} index for '#{property.name}'... " if $ROD_DEBUG
           new_index = property.index

data/lib/rod/property/base.rb

@@ -116,8 +116,12 @@ module Rod
         |#{result_type} _#{name}(unsigned long object_rod_id){
 	|  VALUE klass;
 	|  #{struct_name} * pointer;
+        |#ifdef __BYTE_ORDER
+        |#  if __BYTE_ORDER == __BIG_ENDIAN
         |  uint64_t as_uint;
         |  uint64_t result_swapped;
+        |#  endif
+        |#endif
         |
         |  if(object_rod_id == 0){
         |    rb_raise(rodException(), "Invalid object rod_id (0)");
@@ -125,6 +129,9 @@ module Rod
         |  klass = rb_funcall(self,rb_intern("class"),0);
         |  pointer = (#{struct_name} *)
         |    NUM2ULONG(rb_funcall(klass,rb_intern("rod_pointer"),0));
+        |  if(pointer == 0){
+        |    rb_raise(rodException(), "Invalid model pointer (0). DB is closed.");
+        |  }
         |#ifdef __BYTE_ORDER
         |#  if __BYTE_ORDER == __BIG_ENDIAN
         |  // This code assumes that all values are 64 bit wide. This is not true
@@ -151,7 +158,11 @@ module Rod
         |void _#{name}_equals(unsigned long object_rod_id,#{arg_type} value){
         |  VALUE klass;
         |  #{struct_name} * pointer;
+        |#ifdef __BYTE_ORDER
+        |#  if __BYTE_ORDER == __BIG_ENDIAN
         |  uint64_t value_swapped;
+        |#  endif
+        |#endif
         |
         |  if(object_rod_id == 0){
         |    rb_raise(rodException(), "Invalid object rod_id (0)");
@@ -159,6 +170,9 @@ module Rod
         |  klass = rb_funcall(self,rb_intern("class"),0);
         |  pointer = (#{struct_name} *)
         |    NUM2ULONG(rb_funcall(klass,rb_intern("rod_pointer"),0));
+        |  if(pointer == 0){
+        |    rb_raise(rodException(), "Invalid model pointer (0). DB is closed.");
+        |  }
         |#ifdef __BYTE_ORDER
         |#  if __BYTE_ORDER == __BIG_ENDIAN
         |  // TODO #220 #221

data/rod.gemspec

@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
   s.add_dependency("activemodel", ["~> 3.2.2"])
   s.add_dependency("bsearch", [">= 1.5.0","< 1.6.0"])
 
-  s.add_development_dependency("mocha", "~> 0.9.8")
   s.add_development_dependency("cucumber", "~> 1.0.0")
   s.add_development_dependency("rspec", [">= 2.2.0","< 2.3.0"])
   s.add_development_dependency("rake", [">= 0.9.0","< 1.0.0"])
-  s.add_development_dependency("minitest", "~> 2.7.0")
+  s.add_development_dependency("minitest", "~> 4.0.0")
+  s.add_development_dependency("mocha", "~> 0.9.12")
 end

data/spec/property/base.rb

@@ -64,6 +64,7 @@ describe Rod::Property::Base do
       database.expect :nil?,false
       database.expect :path,"path"
       @klass.expect :database,database
+      @klass.expect :database,database
       @klass.expect :model_path,"model_path"
       @field.define_finders
       proc {@klass.find_by_user_name("Name")}.must_be_silent

data/spec/property/field.rb

@@ -32,11 +32,20 @@ describe Rod::Property::Field do
 
     it "must define C accessors" do
       @klass.expect :struct_name, "struct_name"
+      @klass.expect :struct_name, "struct_name"
+      @klass.expect :struct_name, "struct_name"
+      @klass.expect :struct_name, "struct_name"
+      @builder.expect :c,nil,[String]
+      @builder.expect :c,nil,[String]
+      @builder.expect :c,nil,[String]
       @builder.expect :c,nil,[String]
       @field.define_c_accessors(@builder)
     end
 
     it "must seal C accessors" do
+      @klass.expect :send,nil,[:private,String]
+      @klass.expect :send,nil,[:private,String]
+      @klass.expect :send,nil,[:private,String]
       @klass.expect :send,nil,[:private,String]
       @field.seal_c_accessors
     end

data/spec/property/plural_association.rb

@@ -42,17 +42,27 @@ describe Rod::Property::PluralAssociation do
 
     it "must define C accessors" do
       @klass.expect :struct_name, "struct_name"
+      @klass.expect :struct_name, "struct_name"
+      @klass.expect :struct_name, "struct_name"
+      @klass.expect :struct_name, "struct_name"
+      @builder.expect :c,nil,[String]
+      @builder.expect :c,nil,[String]
+      @builder.expect :c,nil,[String]
       @builder.expect :c,nil,[String]
       @association.define_c_accessors(@builder)
     end
 
     it "must seal C accessors" do
+      @klass.expect :send,nil,[:private,String]
+      @klass.expect :send,nil,[:private,String]
+      @klass.expect :send,nil,[:private,String]
       @klass.expect :send,nil,[:private,String]
       @association.seal_c_accessors
     end
 
     it "must define getter" do
       @klass.expect :send,nil,[:define_method,"users"]
+      @klass.expect :send,nil,[:define_method,"users_count"]
       @klass.expect :scope_name,"Rod"
       @klass.expect :database, nil
       @association.define_getter

data/spec/property/singular_association.rb

@@ -42,11 +42,20 @@ describe Rod::Property::SingularAssociation do
 
     it "must define C accessors" do
       @klass.expect :struct_name, "struct_name"
+      @klass.expect :struct_name, "struct_name"
+      @klass.expect :struct_name, "struct_name"
+      @klass.expect :struct_name, "struct_name"
+      @builder.expect :c,nil,[String]
+      @builder.expect :c,nil,[String]
+      @builder.expect :c,nil,[String]
       @builder.expect :c,nil,[String]
       @association.define_c_accessors(@builder)
     end
 
     it "must seal C accessors" do
+      @klass.expect :send,nil,[:private,String]
+      @klass.expect :send,nil,[:private,String]
+      @klass.expect :send,nil,[:private,String]
       @klass.expect :send,nil,[:private,String]
       @association.seal_c_accessors
     end

data/tests/migration_model2.rb

@@ -18,7 +18,7 @@ class User < Model
   field :city, :string, :index => :segmented
 
   # changed: index flat -> hash
-  field :street, :string, :index => :hash
+  field :street, :string, :index => :hash, :cache_size => 10 * 1024 * 1024
 
   # changed: index flat -> nil
   field :number, :integer

metadata

@@ -1,141 +1,198 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rod
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.7.2.5
   prerelease: 
-  version: 0.7.2
 platform: ruby
-authors: 
+authors:
 - Aleksander Pohl
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-07-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: RubyInline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.10.0
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: english
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.10.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: english
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.2.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bsearch
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+- !ruby/object:Gem::Dependency
+  name: bsearch
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.0
     - - <
-      - !ruby/object:Gem::Version 
+      - !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 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !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 
-  name: cucumber
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.0
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.7.0
+      - !ruby/object:Gem::Version
+        version: 0.9.12
   type: :development
-  version_requirements: *id009
-description: Ruby Object Database is designed for large amounts of data, whose structure rarely changes.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12
+description: Ruby Object Database is designed for large amounts of data, whose structure
+  rarely changes.
+email:
 - apohllo@o2.pl
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -249,62 +306,29 @@ files:
 - utils/convert_index.rb
 homepage: http://github.com/apohllo/rod
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rod
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby Object Database
-test_files: 
-- features/append.feature
-- features/backward.feature
-- features/basic.feature
-- features/collection.feature
-- features/collection_proxy.feature
-- features/flat_indexing.feature
-- features/hash_indexing.feature
-- features/inheritence.feature
-- features/muliple_db.feature
-- features/persistence.feature
-- features/portability.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
-- 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
+test_files: []
 has_rdoc: