sequel_model 0.4 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 0.4.1 (2008-02-10)
+
+* Implemented Model#inspect (#151).
+
+* Changed Model#method_missing to short-circuit and bypass checking #columns if the values hash already contains the relevant column (#150).
+
+* Updated to reflect changes in sequel_core (Dataset#clone_merge renamed to Dataset#clone).
+
 === 0.4 (2008-02-05)
 
 * Fixed Model#set to work with string keys (#143).

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel_model"
-VERS = "0.4"
+VERS = "0.4.1"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 

data/lib/sequel_model.rb

@@ -1,3 +1,17 @@
+module Sequel
+  class Model
+    alias_method :model, :class
+  end
+end
+
+# TODO: add relationships when complete:
+files = %w[
+  base hooks record schema relations 
+  caching plugins validations
+]
+dir = File.join(File.dirname(__FILE__), "sequel_model")
+files.each {|f| require(File.join(dir, f))}
+
 module Sequel
   # == Sequel Models
   # 
@@ -225,22 +239,11 @@ module Sequel
   #   Post.create_table! # drops the table if it exists and then recreates it
   # 
   class Model
-    alias_method :model, :class
-  end
-
-end
-
-# TODO: add relationships when complete:
-files = %w[
-  base hooks record schema relations 
-  caching plugins validations
-]
-dir = File.join(File.dirname(__FILE__), "sequel_model")
-files.each {|f| require(File.join(dir, f))}
-
-module Sequel
-  
-  class Model
+    # Returns a string representation of the model instance including
+    # the class name and values.
+    def inspect
+      "#<%s @values=%s>" % [self.class.name, @values.inspect]
+    end
     
     # Defines a method that returns a filtered dataset.
     def self.subset(name, *args, &block)
@@ -316,5 +319,4 @@ module Sequel
       dataset.all
     end
   end
-
 end

data/lib/sequel_model/base.rb

@@ -21,7 +21,7 @@ module Sequel
     def self.dataset
       unless @dataset
         if ds = super_dataset
-          set_dataset(ds.clone_merge({}))
+          set_dataset(ds.clone)
         elsif !(n = name).empty?
           set_dataset(db[n.underscore.pluralize.to_sym])
         else

data/lib/sequel_model/record.rb

@@ -299,20 +299,15 @@ module Sequel
     end
     
     ATTR_RE = /^([a-zA-Z_]\w*)(=)?$/.freeze
+    EQUAL_SIGN = '='.freeze
 
     def method_missing(m, *args) #:nodoc:
       if m.to_s =~ ATTR_RE
         att = $1.to_sym
-        write = $2 == '='
+        write = $2 == EQUAL_SIGN
         
         # check whether the column is legal
-        unless columns.include?(att)
-          # if read accessor and a value exists for the column, we return it
-          if !write && @values.has_key?(att)
-            return @values[att]
-          end
-          
-          # otherwise, raise an error
+        unless @values.has_key?(att) || columns.include?(att)
           raise Error, "Invalid column (#{att.inspect}) for #{self}"
         end
 

data/spec/model_spec.rb

@@ -439,10 +439,9 @@ describe Sequel::Model, "attribute accessors" do
     MODEL_DB.reset
 
     @c = Class.new(Sequel::Model(:items)) do
-      def columns
-        [:id, :x, :y]
-      end
     end
+    
+    @c.dataset.meta_def(:columns) {[:id, :x, :y]}
   end
 
   it "should be created dynamically" do
@@ -469,7 +468,7 @@ describe Sequel::Model, "attribute accessors" do
 
     proc {o.yy?}.should raise_error(NoMethodError)
   end
-
+  
   it "should not raise for a column not in the dataset, but for which there's a value" do
     o = @c.new
 
@@ -484,9 +483,8 @@ describe Sequel::Model, "attribute accessors" do
     o.xx.should == 123
     o.yy.should == nil
 
-    proc {o.xx = 3}.should raise_error(Sequel::Error)
+    proc {o.xx = 3}.should_not raise_error(Sequel::Error)
   end
-
 end
 
 describe Sequel::Model, ".[]" do
@@ -533,3 +531,13 @@ describe Sequel::Model, ".[]" do
     /^SELECT \* FROM items WHERE (\(node_id = 3921\) AND \(kind = 201\))|(\(kind = 201\) AND \(node_id = 3921\)) LIMIT 1$/
   end
 end
+
+context "Model#inspect" do
+  setup do
+    @o = Sequel::Model.load(:x => 333)
+  end
+  
+  specify "should include the class name and the values" do
+    @o.inspect.should == '#<Sequel::Model @values={:x=>333}>'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_model
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: 0.4.1
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-05 00:00:00 +02:00
+date: 2008-02-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,28 +44,28 @@ files:
 - COPYING
 - README
 - Rakefile
-- spec/hooks_spec.rb
 - spec/base_spec.rb
 - spec/caching_spec.rb
-- spec/validations_spec.rb
-- spec/record_spec.rb
-- spec/spec_helper.rb
+- spec/hooks_spec.rb
 - spec/model_spec.rb
+- spec/plugins_spec.rb
+- spec/rcov.opts
+- spec/record_spec.rb
 - spec/relations_spec.rb
 - spec/schema_spec.rb
-- spec/rcov.opts
-- spec/plugins_spec.rb
 - spec/spec.opts
+- spec/spec_helper.rb
+- spec/validations_spec.rb
 - lib/sequel_model
-- lib/sequel_model/validations.rb
+- lib/sequel_model/base.rb
+- lib/sequel_model/caching.rb
+- lib/sequel_model/hooks.rb
+- lib/sequel_model/plugins.rb
 - lib/sequel_model/pretty_table.rb
 - lib/sequel_model/record.rb
 - lib/sequel_model/relations.rb
 - lib/sequel_model/schema.rb
-- lib/sequel_model/plugins.rb
-- lib/sequel_model/hooks.rb
-- lib/sequel_model/base.rb
-- lib/sequel_model/caching.rb
+- lib/sequel_model/validations.rb
 - lib/sequel_model.rb
 - CHANGELOG
 has_rdoc: true