sequel 0.0.10 → 0.0.11

data/CHANGELOG

@@ -1,3 +1,9 @@
+*0.0.11*
+
+* Improved Model class to allow descendants of model clases (thanks Pedro Gutierrez.)
+
+* Removed require 'postgres' in schema.rb (thanks Douglas Koszerek.)
+
 *0.0.10*
 
 * Added some examples.

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.0.10"
+VERS = "0.0.11"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",

data/lib/sequel/model.rb

@@ -1,4 +1,3 @@
-#require 'rubygems'
 require 'metaid'
 
 module Sequel
@@ -8,7 +7,9 @@ module Sequel
     def self.db; @@db; end
     def self.db=(db); @@db = db; end
     
-    def self.table_name; @table_name; end
+    def self.table_name
+      @table_name || ((superclass != Model) && (superclass.table_name))
+    end
     def self.set_table_name(t); @table_name = t; end
 
     def self.dataset
@@ -53,24 +54,27 @@ module Sequel
     def self.primary_key; @primary_key ||= :id; end
     def self.set_primary_key(k); @primary_key = k; end
     
-    def self.schema(name = nil, &block)
+    def self.set_schema(name = nil, &block)
       name ? set_table_name(name) : name = table_name
       @schema = Schema::Generator.new(name, &block)
       if @schema.primary_key_name
         set_primary_key @schema.primary_key_name
       end
     end
+    def self.schema
+      @schema || ((superclass != Model) && (superclass.schema))
+    end
     
     def self.table_exists?
       db.table_exists?(table_name)
     end
     
     def self.create_table
-      db.execute get_schema.create_sql
+      db.execute schema.create_sql
     end
     
     def self.drop_table
-      db.execute get_schema.drop_sql
+      db.execute schema.drop_sql
     end
     
     def self.recreate_table
@@ -78,10 +82,6 @@ module Sequel
       create_table
     end
     
-    def self.get_schema
-      @schema
-    end
-    
     ONE_TO_ONE_PROC = "proc {i = @values[:%s]; %s[i] if i}".freeze
     ID_POSTFIX = "_id".freeze
     FROM_DATASET = "db[%s]".freeze

data/lib/sequel/schema.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'postgres'
-
 module Sequel
   class Schema
     COMMA_SEPARATOR = ', '.freeze

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
-date: 2007-03-26 00:00:00 +02:00
+  version: 0.0.11
+date: 2007-03-27 00:00:00 +02:00
 summary: Concise ORM for Ruby.
 require_paths: 
 - lib