sequel_model 0.3.2 → 0.3.2.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.3.2.1 (2008-01-24)
+
+* Fixed Model.dataset to correctly set the dataset if using implicit naming or inheriting the superclass dataset (thanks celldee).
+
 === 0.3.2 (2008-01-24)
 
 * Added Model#update_with_params method with support for virtual attributes and auto-filtering of unrelated parameters, and changed Model.create_with_params to support virtual attributes (#128).

data/Rakefile

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

data/lib/sequel_model/base.rb

@@ -19,11 +19,24 @@ module Sequel
 
     # Returns the dataset associated with the Model class.
     def self.dataset
-      @dataset ||= super_dataset ||
-        (!(n = name).empty? && db[n.underscore.pluralize.to_sym]) ||
-        (raise Error, "No dataset associated with #{self}")
+      unless @dataset
+        if ds = super_dataset
+          set_dataset(ds.clone_merge({}))
+        elsif !(n = name).empty?
+          set_dataset(db[n.underscore.pluralize.to_sym])
+        else
+          raise Error, "No dataset associated with #{self}"
+        end
+      end
+      @dataset
     end
     
+    # def self.dataset
+    #   @dataset ||= super_dataset ||
+    #     (!(n = name).empty? && db[n.underscore.pluralize.to_sym]) ||
+    #     (raise Error, "No dataset associated with #{self}")
+    # end
+    
     def self.super_dataset # :nodoc:
       superclass.dataset if (superclass != Sequel::Model) && superclass.respond_to?(:dataset)
     end
@@ -32,7 +45,7 @@ module Sequel
     #
     # See Dataset#columns for more information.
     def self.columns
-      @columns ||= @dataset.columns or
+      @columns ||= dataset.columns or
       raise Error, "Could not fetch columns for #{self}"
     end
 

data/spec/base_spec.rb

@@ -182,4 +182,30 @@ 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
+end
+
+describe "A model class with implicit table name" do
+  setup do
+    class Donkey < Sequel::Model
+    end
+  end
+  
+  specify "should have a dataset associated with the model class" do
+    Donkey.dataset.model_classes.should == {nil => Donkey}
+  end
+end
+
+describe "A model inheriting from a model" do
+  setup do
+    class Feline < Sequel::Model
+    end
+    
+    class Leopard < Feline
+    end
+  end
+  
+  specify "should have a dataset associated with itself" do
+    Feline.dataset.model_classes.should == {nil => Feline}
+    Leopard.dataset.model_classes.should == {nil => Leopard}
+  end
 end

data/spec/model_spec.rb

@@ -247,7 +247,7 @@ describe Sequel::Model, "magic methods" do
 
   it "should support count_by_xxx" do
     @m.count_by_name.should be_a_kind_of(@c)
-    @m.count_by_name.sql.should == "SELECT name, count(name) AS count FROM items GROUP BY name ORDER BY count"
+    @m.count_by_name.sql.should == "SELECT name, count(*) AS count FROM items GROUP BY name ORDER BY count"
   end
 
   it "should support filter_by_xxx" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_model
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.2.1
 platform: ruby
 authors: 
 - Sharon Rosner