sequel_model 0.5.0.1 → 0.5.0.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.5.0.2 (2008-03-12)
+
+* More fixes for Model.associate to accept strings and symbols as class references.
+
 === 0.5.0.1 (2008-03-09)
 
 * Fixed Model.associate to accept class and class name in :class option.

data/Rakefile

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

data/lib/sequel_model/associations.rb

@@ -107,17 +107,28 @@ module Sequel::Model::Associations
     # check arguments
     raise ArgumentError unless [:many_to_one, :one_to_many, :many_to_many].include?(type) && Symbol === name
 
+    # merge early so we don't modify opts
+    opts = opts.merge(:type => type, :name => name, :block => block)
+
     # deprecation
     if opts[:from]
       STDERR << "The :from option is deprecated, please use the :class option instead.\r\n"
       opts[:class] = opts[:from]
     end
 
-    # prepare options
-    opts[:class_name] ||= opts[:class].to_s if opts[:class]
-    opts = association_reflections[name] = opts.merge(:type => type, :name => name, :block => block)
+    # find class
+    case opts[:class]
+      when String, Symbol
+        # Delete :class to allow late binding
+        opts[:class_name] ||= opts.delete(:class).to_s
+      when Class
+        opts[:class_name] ||= opts[:class].name
+    end
 
     send(:"def_#{type}", name, opts)
+
+    # don't add to association_reflections until we are sure there are no errors
+    association_reflections[name] = opts
   end
   
   # The association reflection hash for the association of the given name.

data/spec/associations_spec.rb

@@ -1,5 +1,22 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 
+describe Sequel::Model, "associate" do
+  it "should use explicit class if given a class, symbol, or string" do
+    MODEL_DB.reset
+    klass = Class.new(Sequel::Model(:nodes))
+    class ParParent < Sequel::Model
+    end
+    
+    klass.associate :many_to_one, :par_parent0, :class=>ParParent
+    klass.associate :one_to_many, :par_parent1s, :class=>'ParParent'
+    klass.associate :many_to_many, :par_parent2s, :class=>:ParParent
+    
+    klass.send(:associated_class, klass.association_reflection(:"par_parent0")).should == ParParent
+    klass.send(:associated_class, klass.association_reflection(:"par_parent1s")).should == ParParent
+    klass.send(:associated_class, klass.association_reflection(:"par_parent2s")).should == ParParent
+  end
+end
+
 describe Sequel::Model, "many_to_one" do
 
   before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_model
 version: !ruby/object:Gem::Version 
-  version: 0.5.0.1
+  version: 0.5.0.2
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-09 00:00:00 +02:00
+date: 2008-03-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency