baza 0.0.8 → 0.0.9

data/Gemfile

@@ -7,6 +7,7 @@ gem "datet"
 gem "wref"
 gem "knjrbfw"
 gem "array_enumerator"
+gem "string-cases"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -39,6 +39,7 @@ GEM
       tsafe
       wref
     sqlite3 (1.3.7)
+    string-cases (0.0.0)
     string-strtr (0.0.3)
     tsafe (0.0.11)
     wref (0.0.6)
@@ -56,4 +57,5 @@ DEPENDENCIES
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
   sqlite3
+  string-cases
   wref

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/baza.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "baza"
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-04-18"
+  s.date = "2013-05-16"
   s.description = "A database abstraction layer, model framework and database framework."
   s.email = "kj@gfish.com"
   s.extra_rdoc_files = [
@@ -62,7 +62,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/kaspernj/baza"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.23"
   s.summary = "A database abstraction layer, model framework and database framework."
 
   if s.respond_to? :specification_version then
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<wref>, [">= 0"])
       s.add_runtime_dependency(%q<knjrbfw>, [">= 0"])
       s.add_runtime_dependency(%q<array_enumerator>, [">= 0"])
+      s.add_runtime_dependency(%q<string-cases>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
@@ -84,6 +85,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<wref>, [">= 0"])
       s.add_dependency(%q<knjrbfw>, [">= 0"])
       s.add_dependency(%q<array_enumerator>, [">= 0"])
+      s.add_dependency(%q<string-cases>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -96,6 +98,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<wref>, [">= 0"])
     s.add_dependency(%q<knjrbfw>, [">= 0"])
     s.add_dependency(%q<array_enumerator>, [">= 0"])
+    s.add_dependency(%q<string-cases>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/include/drivers/sqlite3/sqlite3_columns.rb

@@ -7,7 +7,7 @@ class Baza::Driver::Sqlite3::Columns
     @args = args
   end
   
-  DATA_SQL_ALLOWED_KEYS = [:name, :type, :maxlength, :autoincr, :primarykey, :null, :default, :default_func, :renames]
+  DATA_SQL_ALLOWED_KEYS = [:name, :type, :maxlength, :autoincr, :primarykey, :null, :default, :default_func, :renames, :after]
   #Returns SQL for a knjdb-compatible hash.
   def data_sql(data)
     data.each do |key, val|

data/include/model.rb

@@ -184,6 +184,8 @@ class Baza::Model
   #    ]
   #  end
   def self.has_one(arr)
+    arr = [arr] if arr.is_a?(Symbol)
+    
     arr.each do |val|
       methodname = nil
       colname = nil
@@ -880,4 +882,14 @@ class Baza::Model
     
     return attrs
   end
+  
+  private
+  
+  def str_snake_to_camel(str)
+    
+  end
+  
+  def str_camel_to_snake(str)
+    
+  end
 end

data/include/model_handler.rb

@@ -1,4 +1,5 @@
 require "#{File.dirname(__FILE__)}/model_handler_sqlhelper.rb"
+require "string-cases"
 
 class Baza::ModelHandler
   attr_reader :args, :events, :data, :ids_cache, :ids_cache_should
@@ -32,7 +33,6 @@ class Baza::ModelHandler
     raise "No class path given." if !@args[:class_path] and (@args[:require] or !@args.key?(:require))
     
     if args[:require_all]
-      Knj.gem_require(:Php4r, "php4r")
       loads = []
       
       Dir.foreach(@args[:class_path]) do |file|
@@ -40,7 +40,7 @@ class Baza::ModelHandler
         file_parsed = file
         file_parsed.gsub!(@args[:class_pre], "") if @args.key?(:class_pre)
         file_parsed.gsub!(/\.rb$/, "")
-        file_parsed = Php4r.ucwords(file_parsed)
+        file_parsed = StringCases.snake_to_camel(file_parsed)
         
         loads << file_parsed
         self.requireclass(file_parsed, {:load => false})
@@ -198,9 +198,6 @@ class Baza::ModelHandler
           end
           
           callback["block"].call(*callargs)
-        elsif callback["callback"]
-          require "php4r" if !Kernel.const_defined?(:Php4r)
-          Php4r.call_user_func(callback["callback"], args)
         else
           raise "No valid callback given."
         end
@@ -211,6 +208,7 @@ class Baza::ModelHandler
   def requireclass(classname, args = {})
     classname = classname.to_sym
     return false if @objects.key?(classname)
+    classname_snake = StringCases.camel_to_snake(classname)
     
     @lock_require.synchronize do
       #Maybe the classname got required meanwhile the synchronized wait - check again.
@@ -232,8 +230,8 @@ class Baza::ModelHandler
         end
         
         if doreq
-          filename = "#{@args[:class_path]}/#{@args[:class_pre]}#{classname.to_s.downcase}.rb"
-          filename_req = "#{@args[:class_path]}/#{@args[:class_pre]}#{classname.to_s.downcase}"
+          filename = "#{@args[:class_path]}/#{@args[:class_pre]}#{classname_snake}.rb"
+          filename_req = "#{@args[:class_path]}/#{@args[:class_pre]}#{classname_snake}"
           raise "Class file could not be found: #{filename}." if !File.exists?(filename)
           require filename_req
         end
@@ -360,13 +358,7 @@ class Baza::ModelHandler
       end
       
       #Spawn object.
-      if @args[:datarow] or @args[:custom]
-        obj = @args[:module].const_get(classname).new(data, args)
-      else
-        pass_args = [data]
-        pass_args = pass_args | @args[:extra_args] if @args[:extra_args]
-        obj = @args[:module].const_get(classname).new(*pass_args)
-      end
+      obj = @args[:module].const_get(classname).new(data, args)
       
       #Save object in cache.
       case @args[:cache]
@@ -414,6 +406,13 @@ class Baza::ModelHandler
     return false
   end
   
+  #Searches for an object with the given data. If not found it creates it. Returns the found or created object in the end.
+  def get_or_add(classname, data, args = nil)
+    obj = self.get_by(classname, data)
+    obj = self.add(classname, data) if !obj
+    return obj
+  end
+  
   def get_try(obj, col_name, obj_name = nil)
     if !obj_name
       if match = col_name.to_s.match(/^(.+)_id$/)
@@ -445,14 +444,7 @@ class Baza::ModelHandler
     classob = @args[:module].const_get(classname)
     
     raise "list-function has not been implemented for '#{classname}'." if !classob.respond_to?("list")
-    
-    if @args[:datarow] or @args[:custom]
-      ret = classob.list(Knj::Hash_methods.new(:args => args, :ob => self, :db => @args[:db]), &block)
-    else
-      realargs = [args]
-      realargs = realargs | @args[:extra_args] if @args[:extra_args]
-      ret = classob.list(*realargs, &block)
-    end
+    ret = classob.list(Knj::Hash_methods.new(:args => args, :ob => self, :db => @args[:db]), &block)
     
     #If 'ret' is an array and a block is given then the list-method didnt return blocks. We emulate it instead with the following code.
     if block and ret.is_a?(Array)
@@ -655,7 +647,13 @@ class Baza::ModelHandler
     classname = classname.to_sym
     self.requireclass(classname)
     
-    if @args[:datarow]
+    if @args[:custom]
+      classobj = @args[:module].const_get(classname)
+      retob = classobj.add(Knj::Hash_methods.new(
+        :ob => self,
+        :data => data
+      ))
+    else
       classobj = @args[:module].const_get(classname)
       
       #Run the class 'add'-method to check various data.
@@ -686,16 +684,6 @@ class Baza::ModelHandler
       
       #Spawn the object.
       retob = self.get(classname, ins_id, {:skip_reload => true})
-    elsif @args[:custom]
-      classobj = @args[:module].const_get(classname)
-      retob = classobj.add(Knj::Hash_methods.new(
-        :ob => self,
-        :data => data
-      ))
-    else
-      args = [data]
-      args = args | @args[:extra_args] if @args[:extra_args]
-      retob = @args[:module].const_get(classname).add(*args)
     end
     
     self.call("object" => retob, "signal" => "add")
@@ -708,31 +696,22 @@ class Baza::ModelHandler
   #===Examples
   # ob.adds(:User, [{:username => "User 1"}, {:username => "User 2"})
   def adds(classname, datas)
-    if !@args[:datarow]
+    if @args[:module].const_get(classname).respond_to?(:add)
       datas.each do |data|
-        @args[:module].const_get(classname).add(*args)
-        self.call("object" => retob, "signal" => "add")
-      end
-    else
-      if @args[:module].const_get(classname).respond_to?(:add)
-        datas.each do |data|
-          @args[:module].const_get(classname).add(Knj::Hash_methods.new(
-            :ob => self,
-            :db => self.db,
-            :data => data
-          ))
-        end
+        @args[:module].const_get(classname).add(Knj::Hash_methods.new(
+          :ob => self,
+          :db => self.db,
+          :data => data
+        ))
       end
-      
-      db.insert_multi(classname, datas)
     end
     
+    db.insert_multi(classname, datas)
     self.cache_ids(classname)
   end
   
   #Calls a static method on a class. Passes the d-variable which contains the Objects-object, database-reference and more...
   def static(class_name, method_name, *args, &block)
-    raise "Only available with datarow enabled." if !@args[:datarow] and !@args[:custom]
     class_name = class_name
     method_name = method_name
     
@@ -742,13 +721,7 @@ class Baza::ModelHandler
     #Sometimes this raises the exception but actually responds to the class? Therefore commented out. - knj
     #raise "The class '#{class_obj.name}' has no such method: '#{method_name}' (#{class_obj.methods.sort.join(", ")})." if !class_obj.respond_to?(method_name)
     
-    pass_args = []
-    
-    if @args[:datarow]
-      pass_args << Knj::Hash_methods.new(:ob => self, :db => self.db)
-    else
-      pass_args << Knj::Hash_methods.new(:ob => self)
-    end
+    pass_args = [Knj::Hash_methods.new(:ob => self, :db => self.db)]
     
     args.each do |arg|
       pass_args << arg
@@ -805,52 +778,50 @@ class Baza::ModelHandler
     obj_id = object.id
     object.delete if object.respond_to?(:delete)
     
-    if @args[:datarow]
-      #If autodelete is set by 'has_many'-method, go through it and delete the various objects first.
-      if autodelete_data = object.class.autodelete_data
-        autodelete_data.each do |adel_data|
-          self.list(adel_data[:classname], {adel_data[:colname].to_s => object.id}) do |obj_del|
-            self.delete(obj_del, args)
-          end
-        end
-      end
-      
-      #If depend is set by 'has_many'-method, check if any objects exists and raise error if so.
-      if dep_datas = object.class.depending_data
-        dep_datas.each do |dep_data|
-          if obj = self.get_by(dep_data[:classname], {dep_data[:colname].to_s => object.id})
-            raise "Cannot delete <#{object.class.name}:#{object.id}> because <#{obj.class.name}:#{obj.id}> depends on it."
-          end
+    #If autodelete is set by 'has_many'-method, go through it and delete the various objects first.
+    if autodelete_data = object.class.autodelete_data
+      autodelete_data.each do |adel_data|
+        self.list(adel_data[:classname], {adel_data[:colname].to_s => object.id}) do |obj_del|
+          self.delete(obj_del, args)
         end
       end
-      
-      #If autozero is set by 'has_many'-method, check if any objects exists and set the ID to zero.
-      if autozero_datas = object.class.autozero_data
-        autozero_datas.each do |zero_data|
-          self.list(zero_data[:classname], {zero_data[:colname].to_s => object.id}) do |obj_zero|
-            obj_zero[zero_data[:colname].to_sym] = 0
-          end
+    end
+    
+    #If depend is set by 'has_many'-method, check if any objects exists and raise error if so.
+    if dep_datas = object.class.depending_data
+      dep_datas.each do |dep_data|
+        if obj = self.get_by(dep_data[:classname], {dep_data[:colname].to_s => object.id})
+          raise "Cannot delete <#{object.class.name}:#{object.id}> because <#{obj.class.name}:#{obj.id}> depends on it."
         end
       end
-      
-      #Delete any translations that has been set on the object by 'has_translation'-method.
-      if object.class.translations
-        begin
-          _hb.trans_del(object)
-        rescue NameError
-          _kas.trans_del(object)
+    end
+    
+    #If autozero is set by 'has_many'-method, check if any objects exists and set the ID to zero.
+    if autozero_datas = object.class.autozero_data
+      autozero_datas.each do |zero_data|
+        self.list(zero_data[:classname], {zero_data[:colname].to_s => object.id}) do |obj_zero|
+          obj_zero[zero_data[:colname].to_sym] = 0
         end
       end
-      
-      
-      #If a buffer is given in arguments, then use that to delete the object.
-      if args and buffer = args[:db_buffer]
-        buffer.delete(object.table, {:id => obj_id})
-      else
-        @args[:db].delete(object.table, {:id => obj_id})
+    end
+    
+    #Delete any translations that has been set on the object by 'has_translation'-method.
+    if object.class.translations
+      begin
+        _hb.trans_del(object)
+      rescue NameError
+        _kas.trans_del(object)
       end
     end
     
+    
+    #If a buffer is given in arguments, then use that to delete the object.
+    if args and buffer = args[:db_buffer]
+      buffer.delete(object.table, {:id => obj_id})
+    else
+      @args[:db].delete(object.table, {:id => obj_id})
+    end
+    
     @ids_cache[classname].delete(obj_id.to_i) if @ids_cache_should.key?(classname)
     self.call("object" => object, "signal" => "delete")
     object.destroy
@@ -859,38 +830,32 @@ class Baza::ModelHandler
   
   #Deletes several objects as one. If running datarow-mode it checks all objects before it starts to actually delete them. Its faster than deleting every single object by itself...
   def deletes(objs)
-    if !@args[:datarow]
+    tables = {}
+    
+    begin
       objs.each do |obj|
-        self.delete(obj)
-      end
-    else
-      tables = {}
-      
-      begin
-        objs.each do |obj|
-          next if obj.deleted?
-          tablen = obj.table
-          
-          if !tables.key?(tablen)
-            tables[tablen] = []
-          end
-          
-          tables[tablen] << obj.id
-          obj.delete if obj.respond_to?(:delete)
-          
-          #Remove from ID-cache.
-          classname = obj.class.classname.to_sym
-          @ids_cache[classname].delete(obj.id.to_i) if @ids_cache_should.key?(classname)
-          
-          #Unset any data on the object, so it seems deleted.
-          obj.destroy
+        next if obj.deleted?
+        tablen = obj.table
+        
+        if !tables.key?(tablen)
+          tables[tablen] = []
         end
-      ensure
-        #An exception may occur, and we should make sure, that objects that has gotten 'delete' called also are deleted from their tables.
-        tables.each do |table, ids|
-          ids.each_slice(1000) do |ids_slice|
-            @args[:db].delete(table, {:id => ids_slice})
-          end
+        
+        tables[tablen] << obj.id
+        obj.delete if obj.respond_to?(:delete)
+        
+        #Remove from ID-cache.
+        classname = obj.class.classname.to_sym
+        @ids_cache[classname].delete(obj.id.to_i) if @ids_cache_should.key?(classname)
+        
+        #Unset any data on the object, so it seems deleted.
+        obj.destroy
+      end
+    ensure
+      #An exception may occur, and we should make sure, that objects that has gotten 'delete' called also are deleted from their tables.
+      tables.each do |table, ids|
+        ids.each_slice(1000) do |ids_slice|
+          @args[:db].delete(table, {:id => ids_slice})
         end
       end
     end

data/include/model_handler_sqlhelper.rb

@@ -219,7 +219,7 @@ class Baza::ModelHandler
         
         sql_where << " AND #{table}`#{db.esc_col(key)}` = '#{db.esc(realval)}'"
         found = true
-      elsif args[:cols].key?(key)
+      elsif args[:cols].key?(key.to_s)
         if val.is_a?(Array)
           if val.empty? and db.opts[:type].to_s == "mysql"
             sql_where << " AND false"

data/include/revision.rb

@@ -42,6 +42,7 @@ class Baza::Revision
     
     schema = args[:schema]
     db = args[:db]
+    raise "No 'db' was given." if !db
     
     schema.each do |key, val|
       raise "Invalid key for schema: '#{key}' (#{key.class.name})." unless INIT_DB_SCHEMA_ALLOWED_ARGS.include?(key)
@@ -241,7 +242,7 @@ class Baza::Revision
           
           if table_data[:indexes]
             table_data[:indexes].each do |index_data|
-              if index_data.is_a?(String)
+              if index_data.is_a?(String) or index_data.is_a?(Symbol)
                 index_data = {:name => index_data, :columns => [index_data]}
               end
               

metadata

@@ -1,171 +1,187 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.8
   prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: datet
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: datet
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wref
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: wref
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: knjrbfw
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: knjrbfw
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   name: array_enumerator
+  type: :runtime
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: string-cases
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.0
+  name: rspec
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
+  name: rdoc
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+  name: bundler
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
+  name: jeweler
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: sqlite3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: mysql2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -232,10 +248,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 3231877095185720850
+      hash: -33240531491757229
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -244,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A database abstraction layer, model framework and database framework.