sequel 0.0.11 → 0.0.12

data/CHANGELOG

@@ -1,5 +1,19 @@
+*0.0.12*
+
+* Model#save now correctly performs an INSERT for new objects.
+
+* Added Model#reload for reloading an object from the database.
+
+* Added Dataset#naked method for getting a version of a dataset that fetches records as hashes.
+
+* Implemented attribute accessors for column values ala ActiveRecord models.
+
+* Fixed filtering using nil values (e.g. dataset.filter(:parent_id => nil)).
+
 *0.0.11*
 
+* Renamed Model.schema to Model.set_schema and Model.get_schema to Model.schema.
+
 * Improved Model class to allow descendants of model clases (thanks Pedro Gutierrez.)
 
 * Removed require 'postgres' in schema.rb (thanks Douglas Koszerek.)

data/Rakefile

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

data/lib/sequel/dataset.rb

@@ -47,6 +47,13 @@ module Sequel
       self.class.new(@db, @opts.merge(opts), @record_class)
     end
     
+    # Returns a dataset that fetches records as hashes (instead of model 
+    # objects). If no record class is defined for the dataset, self is
+    # returned.
+    def naked
+      @record_class ? self.class.new(@db, @opts) : self
+    end
+    
     AS_REGEXP = /(.*)___(.*)/.freeze
     AS_FORMAT = "%s AS %s".freeze
     DOUBLE_UNDERSCORE = '__'.freeze
@@ -118,6 +125,7 @@ module Sequel
 #    BETWEEN_EXPR = "(%s BETWEEN %s AND %s)".freeze
     INCLUSIVE_RANGE_EXPR = "(%s >= %s AND %s <= %s)".freeze
     EXCLUSIVE_RANGE_EXPR = "(%s >= %s AND %s < %s)".freeze
+    NULL_EXPR = "(%s IS NULL)".freeze
     
     # Formats an equality condition SQL expression.
     def where_condition(left, right)
@@ -129,6 +137,8 @@ module Sequel
 #        BETWEEN_EXPR % [field_name(left), literal(right.begin), literal(right.end)]
       when Array:
         IN_EXPR % [left, literal(right)]
+      when NilClass:
+        NULL_EXPR % left
       when self.class:
         IN_EXPR % [left, right.sql]
       else
@@ -415,7 +425,7 @@ module Sequel
     end
     
     def print(*columns)
-      Sequel::PrettyTable.print(all, columns.empty? ? nil : columns)
+      Sequel::PrettyTable.print(naked.all, columns.empty? ? nil : columns)
     end
   end
 end

data/lib/sequel/model.rb

@@ -215,8 +215,34 @@ module Sequel
     
     def db; @@db; end
     
+    ASSIGN_METHOD_REGEXP = /(.*)=$/.freeze
+    
+    def method_missing(sym, value = nil)
+      if sym.to_s =~ ASSIGN_METHOD_REGEXP
+        @values[$1.to_sym] = value
+      else
+        @values[sym]
+      end
+    end
+    
+    def reload
+      temp = self.class[@pkey]
+      @values = self.class.dataset.naked[primary_key => @pkey]
+    end
+    
     def [](field); @values[field]; end
     
+    def []=(field, value); @values[field] = value; end
+    
+    def save
+      if @pkey
+        model.dataset.filter(primary_key => @pkey).update(@values)
+      else
+        @pkey = model.dataset.insert(@values)
+        reload
+      end
+    end
+    
     def ==(obj)
       (obj.class == model) && (obj.pkey == @pkey)
     end
@@ -225,12 +251,6 @@ module Sequel
       model.dataset.filter(primary_key => @pkey).update(values)
       @values.merge!(values)
     end
-
-    def []=(field, value); @values[field] = value; end
-    
-    def save
-      model.dataset.filter(primary_key => @pkey).update(@values)
-    end
   end
   
   def self.Model(table_name)

metadata

@@ -1,9 +1,9 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.0
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 date: 2007-03-27 00:00:00 +02:00
 summary: Concise ORM for Ruby.
 require_paths: 
@@ -33,18 +33,19 @@ files:
 - README
 - Rakefile
 - bin/sequel
+- doc/rdoc
 - lib/sequel
 - lib/sequel.rb
+- lib/sequel/connection_pool.rb
+- lib/sequel/core_ext.rb
+- lib/sequel/database.rb
 - lib/sequel/dataset.rb
 - lib/sequel/model.rb
+- lib/sequel/mysql.rb
 - lib/sequel/postgres.rb
+- lib/sequel/pretty_table.rb
 - lib/sequel/schema.rb
 - lib/sequel/sqlite.rb
-- lib/sequel/connection_pool.rb
-- lib/sequel/database.rb
-- lib/sequel/core_ext.rb
-- lib/sequel/mysql.rb
-- lib/sequel/pretty_table.rb
 - CHANGELOG
 test_files: []