sequel_model 0.5 → 0.5.0.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.5.0.1 (2008-03-09)
+
+* Fixed Model.associate to accept class and class name in :class option.
+
 === 0.5 (2008-03-08)
 
 * Merged new associations branch into trunk.

data/Rakefile

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

data/lib/sequel_model/associations.rb

@@ -80,12 +80,9 @@ module Sequel::Model::Associations
   #
   # The following options can be supplied:
   # * *ALL types*:
-  #   - :class_name - The name of the associated class as a string.  If not
+  #   - :class - The associated class or its name. If not
   #     given, uses the association's name, which is camelized (and
   #     singularized if type is :{one,many}_to_many)
-  #   - :class - The associated class itself.  Simpler than using
-  #     :class_name, but can't be used always due to dependencies not being
-  #     loaded.
   # * :many_to_one:
   #   - :key - foreign_key in current model's table that references
   #     associated model's primary key, as a symbol.  Defaults to :"#{name}_id".
@@ -117,7 +114,7 @@ module Sequel::Model::Associations
     end
 
     # prepare options
-    opts[:class_name] ||= opts[:class].name if opts[:class]
+    opts[:class_name] ||= opts[:class].to_s if opts[:class]
     opts = association_reflections[name] = opts.merge(:type => type, :name => name, :block => block)
 
     send(:"def_#{type}", name, opts)

data/spec/associations_spec.rb

@@ -150,9 +150,8 @@ describe Sequel::Model, "one_to_many" do
     @c2 = Class.new(Sequel::Model(:nodes)) do
       attr_accessor :xxx
       
-      def self.name
-        'Node'
-      end
+      def self.name; 'Node'; end
+      def self.to_s; 'Node'; end
     end
     @dataset = @c2.dataset
     
@@ -353,17 +352,15 @@ describe Sequel::Model, "many_to_many" do
     MODEL_DB.reset
 
     @c1 = Class.new(Sequel::Model(:attributes)) do
-      def self.name
-        'Attribute'
-      end
+      def self.name; 'Attribute'; end
+      def self.to_s; 'Attribute'; end
     end
 
     @c2 = Class.new(Sequel::Model(:nodes)) do
       attr_accessor :xxx
       
-      def self.name
-        'Node'
-      end
+      def self.name; 'Node'; end
+      def self.to_s; 'Node'; end
     end
     @dataset = @c2.dataset
 
@@ -546,9 +543,8 @@ describe Sequel::Model, "all_association_reflections" do
   before(:each) do
     MODEL_DB.reset
     @c1 = Class.new(Sequel::Model(:nodes)) do
-      def self.name
-        'Node'
-      end
+      def self.name; 'Node'; end
+      def self.to_s; 'Node'; end
     end
   end
   
@@ -572,9 +568,8 @@ describe Sequel::Model, "association_reflection" do
   before(:each) do
     MODEL_DB.reset
     @c1 = Class.new(Sequel::Model(:nodes)) do
-      def self.name
-        'Node'
-      end
+      def self.name; 'Node'; end
+      def self.to_s; 'Node'; end
     end
   end
 
@@ -600,9 +595,8 @@ describe Sequel::Model, "associations" do
   before(:each) do
     MODEL_DB.reset
     @c1 = Class.new(Sequel::Model(:nodes)) do
-      def self.name
-        'Node'
-      end
+      def self.name; 'Node'; end
+      def self.to_s; 'Node'; end
     end
   end
 

metadata

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