sequel_model 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 0.4.2 (2008-02-29)
+
+* Fixed one_to_many implicit key to work correctly for namespaced classes (#167).
+
+* Fixed Model.db= to affect the underlying dataset (#183).
+
+* Fixed Model.implicit_table_name to disregard namespaces.
+
 === 0.4.1 (2008-02-10)
 
 * Implemented Model#inspect (#151).

data/Rakefile

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

data/lib/sequel_model/base.rb

@@ -9,6 +9,9 @@ module Sequel
     # Sets the database associated with the Model class.
     def self.db=(db)
       @db = db
+      if @dataset
+        set_dataset(db[table_name])
+      end
     end
     
     # Called when a database is opened in order to automatically associate the
@@ -16,14 +19,19 @@ module Sequel
     def self.database_opened(db)
       @db = db if (self == Model) && !@db
     end
+    
+    # Returns the implicit table name for the model class.
+    def self.implicit_table_name
+      name.demodulize.underscore.pluralize.to_sym
+    end
 
     # Returns the dataset associated with the Model class.
     def self.dataset
       unless @dataset
         if ds = super_dataset
           set_dataset(ds.clone)
-        elsif !(n = name).empty?
-          set_dataset(db[n.underscore.pluralize.to_sym])
+        elsif !name.empty?
+          set_dataset(db[implicit_table_name])
         else
           raise Error, "No dataset associated with #{self}"
         end

data/lib/sequel_model/relations.rb

@@ -76,7 +76,7 @@ module Sequel
     def self.one_to_many(name, opts)
       from = opts[:from]
       from || (raise Error, "No association source defined (use :from option)")
-      key = opts[:key] || (self.to_s + ID_POSTFIX).to_sym
+      key = opts[:key] || (self.name.demodulize.underscore.to_s + ID_POSTFIX).to_sym
       
       case from
       when Symbol

data/spec/base_spec.rb

@@ -80,8 +80,8 @@ describe "Model#serialize" do
     @c.create(:abc => "hello")
 
     MODEL_DB.sqls.should == [ \
-      "INSERT INTO items (abc) VALUES ('\004\bi\006')", \
-      "INSERT INTO items (abc) VALUES ('\004\b\"\nhello')", \
+      "INSERT INTO items (abc) VALUES ('BAhpBg==\n')", \
+      "INSERT INTO items (abc) VALUES ('BAgiCmhlbGxv\n')", \
     ]
   end
 
@@ -182,6 +182,15 @@ describe Sequel::Model, "dataset" do
   specify "should raise if no dataset is explicitly set and the class is anonymous" do
     proc {@b.dataset}.should raise_error(Sequel::Error)
   end
+  
+  specify "should disregard namespaces for the table name" do
+    module BlahBlah
+      class MwaHaHa < Sequel::Model
+      end
+    end
+    
+    BlahBlah::MwaHaHa.dataset.sql.should == 'SELECT * FROM mwa_ha_has'
+  end
 end
 
 describe "A model class with implicit table name" do
@@ -208,4 +217,23 @@ describe "A model inheriting from a model" do
     Feline.dataset.model_classes.should == {nil => Feline}
     Leopard.dataset.model_classes.should == {nil => Leopard}
   end
-end
+end
+
+describe "Model.db=" do
+  setup do
+    $db1 = Sequel::Database.new
+    $db2 = Sequel::Database.new
+    
+    class BlueBlue < Sequel::Model
+      set_dataset $db1[:blue]
+    end
+  end
+  
+  specify "should affect the underlying dataset" do
+    BlueBlue.db = $db2
+    
+    BlueBlue.dataset.db.should === $db2
+    BlueBlue.dataset.db.should_not === $db1
+  end
+end
+

data/spec/relations_spec.rb

@@ -133,4 +133,17 @@ describe Sequel::Model, "one_to_many" do
     a.should be_a_kind_of(Sequel::Dataset)
     a.sql.should == 'SELECT * FROM abc WHERE (node_id = 1234)'
   end
+  
+  it "should support implicit key names" do
+    module Music
+      class BlueNote < Sequel::Model
+        one_to_many :attributes, :from => :abc
+      end
+    end
+    
+    n = Music::BlueNote.new(:id => 1234)
+    a = n.attributes
+    a.should be_a_kind_of(Sequel::Dataset)
+    a.sql.should == 'SELECT * FROM abc WHERE (blue_note_id = 1234)'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_model
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-10 00:00:00 +02:00
+date: 2008-02-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency