rod 0.7.3.0 → 0.7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 5696079b9fc14e12da61535396f3a74d84cce085
-  data.tar.gz: 2702498d0fbd8c92471244edd7a1afb64423ca72
+SHA1:
+  metadata.gz: 1768fb8fe46b1bddd6b539d98768f745b26bb7af
+  data.tar.gz: a4e2f7407df7b62bd52a34da8b817b921994de40
 SHA512:
-  metadata.gz: 7a5c84069b27b1eb23292eb51037d924e67460dc0b039e20b3fa913d70c51c08f4b87fe5111b4a96e537855b6f6c990bb25b2612cd65913b703373b0f7864a82
-  data.tar.gz: 99bd274f39274c8b8bb09695d26071da27734bc69b64932b54014501cda0c7e87f5e412f2367461afc41f78b2fa632a050215f7a1a3db1f8ccd0ef91edeff168
+  metadata.gz: 2c36c36db2e218615096b9c23ef7662163e1e8ea2af2e70686655d3e5a89c49b85389915a9fa7442145b3f1a2207b7013fa38c94e4627599c8fdfd9299f0384c
+  data.tar.gz: c1ddc8783edf657c278c4131578ef6a5cf10710043c50c1284edad1410fcdc9f2ad1a746ab203c6e56fa7203a1965f560437dce33e9d91432958001c9f3cf4b8

data/lib/rod/constants.rb

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

data/lib/rod/database.rb

@@ -249,7 +249,7 @@ module Rod
           END
           builder.c(str.margin)
 
-          str =<<-END
+          builder.c(<<-END.margin)
           |VALUE _polymorphic_join_element_index(unsigned long element_offset,
           |  unsigned long element_index, VALUE handler){
           |  #{model_struct} * model_p;
@@ -266,9 +266,8 @@ module Rod
           |  return ULONG2NUM(result);
           |}
           END
-          builder.c(str.margin)
 
-          str =<<-END
+          builder.c(<<-END.margin)
           |VALUE _polymorphic_join_element_class(unsigned long element_offset,
           |  unsigned long element_index, VALUE handler){
           |  #{model_struct} * model_p;
@@ -285,9 +284,8 @@ module Rod
           |  return ULONG2NUM(result);
           |}
           END
-          builder.c(str.margin)
 
-          str =<<-END
+          builder.c(<<-END.margin)
           |void _set_join_element_offset(unsigned long element_offset,
           |  unsigned long element_index, unsigned long offset,
           |  VALUE handler){
@@ -296,10 +294,6 @@ module Rod
           |
           |  Data_Get_Struct(handler,#{model_struct},model_p);
           |  element_p = model_p->_join_element_table + element_offset + element_index;
-          |  if(element_p->index != element_index){
-          |      rb_raise(rodException(), "Join element indices are inconsistent: %lu %lu!",
-          |        element_index, element_p->index);
-          |  }
           |#ifdef __BYTE_ORDER
           |#  if __BYTE_ORDER == __BIG_ENDIAN
           |  offset = bswap_64(offset);
@@ -308,9 +302,8 @@ module Rod
           |  element_p->offset = offset;
           |}
           END
-          builder.c(str.margin)
 
-          str =<<-END
+          builder.c(<<-END.margin)
           |void _set_polymorphic_join_element_offset(unsigned long element_offset,
           |  unsigned long element_index, unsigned long offset, unsigned long class_id,
           |  VALUE handler){
@@ -319,10 +312,6 @@ module Rod
           |
           |  Data_Get_Struct(handler,#{model_struct},model_p);
           |  element_p = model_p->_polymorphic_join_element_table + element_offset + element_index;
-          |  if(element_p->index != element_index){
-          |      rb_raise(rodException(), "Polymorphic join element indices are inconsistent: %lu %lu!",
-          |        element_index, element_p->index);
-          |  }
           |#ifdef __BYTE_ORDER
           |#  if __BYTE_ORDER == __BIG_ENDIAN
           |  offset = bswap_64(offset);
@@ -333,9 +322,8 @@ module Rod
           |  element_p->class = class_id;
           |}
           END
-          builder.c(str.margin)
 
-          str =<<-END
+          builder.c(<<-END.margin)
           |unsigned long _allocate_join_elements(unsigned long size, VALUE handler){
           |  _join_element * element;
           |  unsigned long index;
@@ -351,15 +339,13 @@ module Rod
           |    }
           |    element = model_p->_join_element_table + model_p->_join_element_count;
           |    model_p->_join_element_count++;
-          |    element->index = index;
           |    element->offset = 0;
           |  }
           |  return result;
           |}
           END
-          builder.c(str.margin)
 
-          str =<<-END
+          builder.c(<<-END.margin)
           |unsigned long _allocate_polymorphic_join_elements(unsigned long size, VALUE handler){
           |  _polymorphic_join_element * element;
           |  unsigned long index;
@@ -377,16 +363,14 @@ module Rod
           |    element = model_p->_polymorphic_join_element_table +
           |      model_p->_polymorphic_join_element_count;
           |    model_p->_polymorphic_join_element_count++;
-          |    element->index = index;
           |    element->offset = 0;
           |    element->class = 0;
           |  }
           |  return result;
           |}
           END
-          builder.c(str.margin)
 
-          str =<<-END
+          builder.c(<<-END.margin)
           |VALUE _fast_intersection_size(unsigned long first_offset,
           |  unsigned long first_length, unsigned long second_offset,
           |  unsigned long second_length, VALUE handler){
@@ -418,12 +402,11 @@ module Rod
           |  return ULONG2NUM(count);
           |}
           END
-          builder.c(str.margin)
 
           #########################################
           # Strings
           #########################################
-          str =<<-END
+          builder.c(<<-END.margin)
           |VALUE _read_string(unsigned long length, unsigned long offset, VALUE handler){
           |  #{model_struct} * model_p;
           |  char * str;
@@ -433,9 +416,8 @@ module Rod
           |  return rb_str_new(str, length);
           |}
           END
-          builder.c(str.margin)
 
-          str =<<-END
+          builder.c(<<-END.margin)
           |// The first argument is the string to be stored.
           |// The return value is a pair: length and offset.
           |VALUE _set_string(VALUE ruby_value, VALUE handler){
@@ -484,7 +466,6 @@ module Rod
           |  return result;
           |}
           END
-          builder.c(str.margin)
 
           #########################################
           # Object accessors
@@ -505,29 +486,24 @@ module Rod
           #########################################
           classes.each do |klass|
             next if special_class?(klass)
-            str =<<-END
+            builder.c(<<-END.margin)
             |// Store the object in the database.
             |void _store_#{klass.struct_name}(VALUE object, VALUE handler){
             |  #{model_struct} * model_p;
-            |  #{klass.struct_name} * struct_p;
             |
             |  Data_Get_Struct(handler,#{model_struct},model_p);
             |  if((model_p->#{klass.struct_name}_count+1) * sizeof(#{klass.struct_name}) >=
             |    model_p->#{klass.struct_name}_page_count * page_size()){
             |     \n#{mmap_class(klass)}
             |  }
-            |  struct_p = model_p->#{klass.struct_name}_table +
-            |    model_p->#{klass.struct_name}_count;
             |  //printf("struct assigned\\n");
             |  model_p->#{klass.struct_name}_count++;
             |
             |  //the number is incresed by 1, because 0 indicates that the
             |  //(referenced) object is nil
-            |  struct_p->rod_id = model_p->#{klass.struct_name}_count;
-            |  rb_iv_set(object, \"@rod_id\",ULONG2NUM(struct_p->rod_id));
+            |  rb_iv_set(object, \"@rod_id\",ULONG2NUM(model_p->#{klass.struct_name}_count));
             |}
             END
-            builder.c(str.margin)
           end
 
           #########################################
@@ -575,7 +551,7 @@ module Rod
           #########################################
           # open
           #########################################
-          str =<<-END
+          builder.c(<<-END.margin)
           |void _open(VALUE handler){
           |  #{model_struct} * model_p;
           |
@@ -600,12 +576,11 @@ module Rod
           end.join("\n")}
           |}
           END
-          builder.c(str.margin)
 
           #########################################
           # close
           #########################################
-          str =<<-END
+          builder.c(<<-END.margin)
           |// if +classes+ are Qnil, the DB was open in readonly mode.
           |void _close(VALUE handler){
           |  #{model_struct} * model_p;
@@ -629,7 +604,6 @@ module Rod
           end.join("\n")}
           |}
           END
-          builder.c(str.margin)
 
 
           #########################################
@@ -657,19 +631,17 @@ module Rod
           END
           builder.c(str.margin)
 
-          str =<<-END
+          builder.c(<<-END.margin)
           |void _print_system_error(){
           |  perror(NULL);
           |}
           END
-          builder.c(str.margin)
 
-          str =<<-END
+          builder.c(<<-END.margin)
           |unsigned int _page_size(){
           |  return page_size();
           |}
           END
-          builder.c(str.margin)
 
           if @@rod_development_mode
             # This method is created to force rebuild of the C code, since
@@ -687,7 +659,7 @@ module Rod
 
     # Reads the value of a specified field of the C-structure.
     def self.field_reader(name,result_type,builder,model_struct)
-      str =<<-END
+      builder.c(<<-END.margin)
       |#{result_type} _#{name}(VALUE handler){
       |  #{model_struct} * model_p;
       |
@@ -695,12 +667,11 @@ module Rod
       |  return model_p->#{name};
       |}
       END
-      builder.c(str.margin)
     end
 
     # Writes the value of a specified field of the C-structure.
     def self.field_writer(name,arg_type,builder,model_struct)
-      str =<<-END
+      builder.c(<<-END.margin)
       |void _#{name}_equals(VALUE handler,#{arg_type} value){
       |  #{model_struct} * model_p;
       |
@@ -708,11 +679,10 @@ module Rod
       |  model_p->#{name} = value;
       |}
       END
-      builder.c(str.margin)
     end
 
     def self.rod_exception
-      str =<<-END
+      <<-END.margin
       |VALUE rodException(){
       |  VALUE klass;
       |
@@ -721,7 +691,6 @@ module Rod
       |  return klass;
       |}
       END
-      str.margin
     end
   end
 end

data/lib/rod/join_element.rb

@@ -6,15 +6,13 @@ module Rod
       str = <<-END
       |typedef struct {
       |  unsigned long offset;
-      |  unsigned long index;
       |} _join_element;
       END
       str.margin
     end
 
     def self.layout
-      '  printf("  offset: %lu, index: %lu\n",' +
-        '(unsigned long)sizeof(unsigned long), ' +
+      '  printf("  offset: %lu' +
         '(unsigned long)sizeof(unsigned long));' + "\n"
     end
 
@@ -28,7 +26,6 @@ module Rod
       str = <<-END
       |typedef struct {
       |  unsigned long offset;
-      |  unsigned long index;
       |  unsigned long class;
       |} _polymorphic_join_element;
       END
@@ -40,8 +37,7 @@ module Rod
     end
 
     def self.layout
-      '  printf("  offset: %lu, index: %lu, class: %lu\n",' +
-        '(unsigned long)sizeof(unsigned long), ' +
+      '  printf("  offset: %lu, class: %lu\n",' +
         '(unsigned long)sizeof(unsigned long), ' +
         '(unsigned long)sizeof(unsigned long));' + "\n"
     end

data/lib/rod/model.rb

@@ -52,6 +52,11 @@ module Rod
       object
     end
 
+    # Return the ROD identifier of the object.
+    def rod_id
+      @rod_id
+    end
+
     #########################################################################
     # Public API
     #########################################################################
@@ -171,7 +176,6 @@ module Rod
     # Sets the default values for fields.
     def initialize_fields
       self.class.fields.each do |field|
-        next if field.name == :rod_id
         send("#{field.name}=",field.default_value)
       end
     end
@@ -365,7 +369,7 @@ module Rod
     # Returns the fields of this class.
     def self.fields
       if self == Rod::Model
-        @fields ||= [Property::Field.new(self,:rod_id,:ulong)]
+        @fields ||= []
       else
         @fields ||= superclass.fields.map{|p| p.copy(self)}
       end

data/tests/unit/model_tests.rb

@@ -58,15 +58,12 @@ module RodTest
         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
 

metadata

@@ -1,217 +1,216 @@
 --- !ruby/object:Gem::Specification
 name: rod
 version: !ruby/object:Gem::Version
-  version: 0.7.3.0
+  version: 0.7.4.0
 platform: ruby
 authors:
 - Aleksander Pohl
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RubyInline
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.10.0
     - - <
       - !ruby/object:Gem::Version
         version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.10.0
     - - <
       - !ruby/object:Gem::Version
         version: 4.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: english
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
     - - <
       - !ruby/object:Gem::Version
         version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
     - - <
       - !ruby/object:Gem::Version
         version: 0.6.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.2
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bsearch
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
     - - <
       - !ruby/object:Gem::Version
         version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
     - - <
       - !ruby/object:Gem::Version
         version: 1.6.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: ref
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.5
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.5
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
     - - <
       - !ruby/object:Gem::Version
         version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
     - - <
       - !ruby/object:Gem::Version
         version: 2.3.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
     - - <
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
     - - <
       - !ruby/object:Gem::Version
         version: 1.0.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.12
-description: Ruby Object Database is designed for large amounts of data, whose structure
-  rarely changes.
+  prerelease: false
+  type: :development
+description: Ruby Object Database is designed for large amounts of data, whose structure rarely changes.
 email:
 - apohllo@o2.pl
 executables: []
@@ -333,7 +332,7 @@ homepage: http://github.com/apohllo/rod
 licenses:
 - http://opensource.org/licenses/MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - --main
 - README.rdoc
@@ -341,19 +340,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rod
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Ruby Object Database
 test_files: []
-has_rdoc: