sequel 0.0.13 → 0.0.14

data/CHANGELOG

@@ -1,3 +1,13 @@
+*0.0.14*
+
+* Added Model#id to to return the id column.
+
+* Fixed Model's attribute accessors (hopefully for the last time).
+
+* Changed Model.db and Model.db= to allow different databases for different model classes.
+
+* Fixed bug in aggregate methods (max, min, etc) for datasets using record classes.
+
 *0.0.13*
 
 * Fixed Model#method_missing to do both find, filter and attribute accessors. duh.

data/Rakefile

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

data/lib/sequel/dataset.rb

@@ -365,19 +365,19 @@ module Sequel
     
     # aggregates
     def min(field)
-      select(field.MIN).first.values.first
+      select(field.MIN).naked.first.values.first
     end
     
     def max(field)
-      select(field.MAX).first.values.first
+      select(field.MAX).naked.first.values.first
     end
 
     def sum(field)
-      select(field.SUM).first.values.first
+      select(field.SUM).naked.first.values.first
     end
     
     def avg(field)
-      select(field.AVG).first.values.first
+      select(field.AVG).naked.first.values.first
     end
     
     EXISTS_EXPR = "EXISTS (%s)".freeze

data/lib/sequel/model.rb

@@ -4,11 +4,13 @@ module Sequel
   class Model
     @@db = nil
     
-    def self.db; @@db; end
-    def self.db=(db); @@db = db; end
+    def self.db
+      @db ||= ((superclass != Object) && (superclass.db)) || nil
+    end
+    def self.db=(db); @db = db; end
     
     def self.table_name
-      @table_name || ((superclass != Model) && (superclass.table_name))
+      @table_name ||= ((superclass != Model) && (superclass.table_name)) || nil
     end
     def self.set_table_name(t); @table_name = t; end
 
@@ -23,7 +25,12 @@ module Sequel
       @dataset.record_class = self
       @dataset
     end
-    def self.set_dataset(ds); @dataset = ds; @dataset.record_class = self; end
+
+    def self.set_dataset(ds)
+      @db = ds.db
+      @dataset = ds
+      @dataset.record_class = self
+    end
     
     def self.cache_by(column, expiration)
       @cache_column = column
@@ -195,7 +202,6 @@ module Sequel
     
     FIND_BY_REGEXP = /^find_by_(.*)/.freeze
     FILTER_BY_REGEXP = /^filter_by_(.*)/.freeze
-    WRITE_ATTR_REGEXP = /(.*)=$/.freeze
     
     def self.method_missing(m, *args)
       Thread.exclusive do
@@ -208,15 +214,11 @@ module Sequel
           c = $1
           meta_def(method_name) {|arg| filter(c => arg)}
           send(m, *args) if respond_to?(m)
-        elsif method_name =~ WRITE_ATTR_REGEXP
-          self[$1.to_sym] = value
-        else
-          self[m]
         end
       end
     end
     
-    def db; @@db; end
+    def db; self.class.db; end
     
     def reload
       temp = self.class[@pkey]
@@ -227,6 +229,16 @@ module Sequel
     
     def []=(field, value); @values[field] = value; end
     
+    WRITE_ATTR_REGEXP = /(.*)=$/.freeze
+
+    def method_missing(m, value = nil)
+      if m.to_s =~ WRITE_ATTR_REGEXP
+        self[$1.to_sym] = value
+      else
+        self[m]
+      end
+    end
+    
     def save
       if @pkey
         model.dataset.filter(primary_key => @pkey).update(@values)
@@ -246,9 +258,15 @@ module Sequel
     end
   end
   
-  def self.Model(table_name)
+  def self.Model(table)
     Class.new(Sequel::Model) do
-      meta_def(:inherited) {|c| c.set_table_name(table_name)}
+      meta_def(:inherited) do |c|
+        if table.is_a?(Dataset)
+          c.set_dataset(table)
+        else
+          c.set_table_name(table)
+        end
+      end
     end
   end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.0.14
 date: 2007-03-28 00:00:00 +02:00
 summary: Concise ORM for Ruby.
 require_paths: 
@@ -33,7 +33,6 @@ files:
 - README
 - Rakefile
 - bin/sequel
-- doc/rdoc
 - lib/sequel
 - lib/sequel.rb
 - lib/sequel/dataset.rb