sequel_core 1.0.4.1 → 1.0.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.0.5 (2008-01-25)
+
+* Added support for instantiating models by using the load constructor method.
+
 === 1.0.4.1 (2008-01-24)
 
 * Fixed bin/sequel to require sequel_model if available.

data/Rakefile

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

data/lib/sequel_core/dataset.rb

@@ -235,16 +235,32 @@ module Sequel
       when Class
         # isomorphic model
         @opts.merge!(:naked => nil, :models => {nil => key}, :polymorphic_key => nil)
-        set_row_proc {|h| key.new(h, *args)}
+        if key.respond_to?(:load)
+          # the class has a values setter method, so we use it
+          set_row_proc {|h| key.load(h, *args)}
+        else
+          # otherwise we just pass the hash to the constructor
+          set_row_proc {|h| key.new(h, *args)}
+        end
         extend_with_destroy
       when Symbol
         # polymorphic model
         hash = args.shift || raise(ArgumentError, "No class hash supplied for polymorphic model")
         @opts.merge!(:naked => true, :models => hash, :polymorphic_key => key)
-        set_row_proc do |h|
-          c = hash[h[key]] || hash[nil] || \
-            raise(Error, "No matching model class for record (#{polymorphic_key} => #{h[polymorphic_key].inspect})")
-          c.new(h, *args)
+        if hash.values.first.respond_to?(:load)
+          # the class has a values setter method, so we use it
+          set_row_proc do |h|
+            c = hash[h[key]] || hash[nil] || \
+              raise(Error, "No matching model class for record (#{polymorphic_key} => #{h[polymorphic_key].inspect})")
+            c.load(h, *args)
+          end
+        else
+          # otherwise we just pass the hash to the constructor
+          set_row_proc do |h|
+            c = hash[h[key]] || hash[nil] || \
+              raise(Error, "No matching model class for record (#{polymorphic_key} => #{h[polymorphic_key].inspect})")
+            c.new(h, *args)
+          end
         end
         extend_with_destroy
       else

data/spec/core_sql_spec.rb

@@ -305,7 +305,7 @@ context "String#to_date" do
   end
   
   specify "should raise Error::InvalidValue for an invalid date" do
-    proc {'0000-00-00'.to_time}.should raise_error(Sequel::Error::InvalidValue)
+    proc {'0000-00-00'.to_date}.should raise_error(Sequel::Error::InvalidValue)
   end
 end
 

data/spec/dataset_spec.rb

@@ -1736,6 +1736,50 @@ context "A polymorphic model dataset" do
   end
 end
 
+context "A dataset with associated model class(es)" do
+  setup do
+    @c = Class.new(Sequel::Dataset) do
+      def fetch_rows(sql, &block)
+        block.call({:x => 1, :y => 2})
+      end
+    end
+    @dataset = @c.new(nil).from(:items)
+    @m1 = Class.new do
+      attr_accessor :v
+      def initialize(v); @v = v; end
+    end
+    @m2 = Class.new do
+      attr_accessor :v, :vv
+      def initialize(v = nil); @v = v; end
+      def self.load(v); o = new(nil); o.vv = v; o; end
+    end
+    @m3 = Class.new(@m2)
+  end
+
+  specify "should instantiate an instance by passing the record hash as argument" do
+    @dataset.set_model(@m1)
+    o = @dataset.first
+    o.class.should == @m1
+    o.v.should == {:x => 1, :y => 2}
+  end
+  
+  specify "should use the .load constructor if available" do
+    @dataset.set_model(@m2)
+    o = @dataset.first
+    o.class.should == @m2
+    o.v.should == nil
+    o.vv.should == {:x => 1, :y => 2}
+  end
+  
+  specify "should use the .load constructor also for polymorphic datasets" do
+    @dataset.set_model(:y, 1 => @m2, 2 => @m3)
+    o = @dataset.first
+    o.class.should == @m3
+    o.v.should == nil
+    o.vv.should == {:x => 1, :y => 2}
+  end
+end
+
 context "Dataset#destroy" do
   setup do
     db = Object.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_core
 version: !ruby/object:Gem::Version 
-  version: 1.0.4.1
+  version: 1.0.5
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-24 00:00:00 +02:00
+date: 2008-01-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency