sequel 3.3.0 → 3.4.0

data/spec/model/associations_spec.rb

@@ -1207,7 +1207,7 @@ end
 
 describe Sequel::Model, "many_to_many" do
 
-  before(:each) do
+  before do
     MODEL_DB.reset
 
     @c1 = Class.new(Sequel::Model(:attributes)) do
@@ -1216,6 +1216,10 @@ describe Sequel::Model, "many_to_many" do
       def self.name; 'Attribute'; end
       def self.to_s; 'Attribute'; end
       columns :id
+      def _refresh(ds)
+        self.id = 1
+        self
+      end
     end
 
     @c2 = Class.new(Sequel::Model(:nodes)) do
@@ -1403,8 +1407,8 @@ describe Sequel::Model, "many_to_many" do
   it "should define an add_ method" do
     @c2.many_to_many :attributes, :class => @c1
     
-    n = @c2.new(:id => 1234)
-    a = @c1.new(:id => 2345)
+    n = @c2.load(:id => 1234)
+    a = @c1.load(:id => 2345)
     a.should == n.add_attribute(a)
     ['INSERT INTO attributes_nodes (node_id, attribute_id) VALUES (1234, 2345)',
      'INSERT INTO attributes_nodes (attribute_id, node_id) VALUES (2345, 1234)'
@@ -1423,8 +1427,8 @@ describe Sequel::Model, "many_to_many" do
   it "should have the add_ method respect the :left_primary_key and :right_primary_key options" do
     @c2.many_to_many :attributes, :class => @c1, :left_primary_key=>:xxx, :right_primary_key=>:yyy
     
-    n = @c2.new(:id => 1234, :xxx=>5)
-    a = @c1.new(:id => 2345, :yyy=>8)
+    n = @c2.load(:id => 1234).set(:xxx=>5)
+    a = @c1.load(:id => 2345).set(:yyy=>8)
     a.should == n.add_attribute(a)
     ['INSERT INTO attributes_nodes (node_id, attribute_id) VALUES (5, 8)',
      'INSERT INTO attributes_nodes (attribute_id, node_id) VALUES (8, 5)'
@@ -1450,12 +1454,20 @@ describe Sequel::Model, "many_to_many" do
     proc{a.remove_attribute(n)}.should raise_error(Sequel::Error)
     proc{a.remove_all_attributes}.should raise_error(Sequel::Error)
   end
+  
+  it "should save the associated object first if passed a new model object" do
+    @c2.many_to_many :attributes, :class => @c1 
+    n = @c1.new
+    a = @c2.load(:id=>123)
+    n.new?.should == true
+    a.add_attribute(n)
+    n.new?.should == false
+  end
 
-  it "should raise an error if trying to add/remove a model object that doesn't have a valid primary key" do
+  it "should raise an error if trying to remove a model object that doesn't have a valid primary key" do
     @c2.many_to_many :attributes, :class => @c1 
     n = @c1.new
     a = @c2.load(:id=>123)
-    proc{a.add_attribute(n)}.should raise_error(Sequel::Error)
     proc{a.remove_attribute(n)}.should raise_error(Sequel::Error)
   end
 

data/spec/model/model_spec.rb

@@ -1,5 +1,34 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 
+describe "Sequel::Model()" do
+  before do
+    @db = Sequel::Model.db
+  end
+  it "should return a model subclass with the given dataset if given a dataset" do
+    ds = @db[:blah]
+    c = Sequel::Model(ds)
+    c.superclass.should == Sequel::Model
+    c.dataset.should == ds
+  end
+  it "should return a model subclass with a dataset with the default database and given table name if given a symbol" do
+    c = Sequel::Model(:blah)
+    c.superclass.should == Sequel::Model
+    c.db.should == @db
+    c.table_name.should == :blah
+  end
+  it "should return a model subclass associated to the given database if given a database" do
+    db = Sequel::Database.new
+    c = Sequel::Model(db)
+    c.superclass.should == Sequel::Model
+    c.db.should == db
+    proc{c.dataset}.should raise_error(Sequel::Error)
+    class SmBlahTest < c
+    end
+    SmBlahTest.db.should == db
+    SmBlahTest.table_name.should == :sm_blah_tests
+  end
+end
+
 describe Sequel::Model do
   it "should have class method aliased as model" do
     Sequel::Model.instance_methods.collect{|x| x.to_s}.should include("model")

data/spec/model/record_spec.rb

@@ -1120,6 +1120,16 @@ describe Sequel::Model, "typecasting" do
     m.x.should == y
   end
 
+  specify "should accept a hash with symbol or string keys for a date field" do
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:date}})
+    m = @c.new
+    y = Date.new(2007,10,21)
+    m.x = {:year=>2007, :month=>10, :day=>21}
+    m.x.should == y
+    m.x = {'year'=>'2007', 'month'=>'10', 'day'=>'21'}
+    m.x.should == y
+  end
+
   specify "should raise an error if invalid data is used in a date field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:date}})
     proc{@c.new.x = 'a'}.should raise_error(Sequel::InvalidValue)
@@ -1145,6 +1155,16 @@ describe Sequel::Model, "typecasting" do
     m.x.should == y
   end
 
+  specify "should accept a hash with symbol or string keys for a time field" do
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:time}})
+    m = @c.new
+    y = Time.parse('10:20:30')
+    m.x = {:hour=>10, :minute=>20, :second=>30}
+    m.x.should == y
+    m.x = {'hour'=>'10', 'minute'=>'20', 'second'=>'30'}
+    m.x.should == y
+  end
+
   specify "should raise an error if invalid data is used in a time field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:time}})
     proc{@c.new.x = '0000'}.should raise_error
@@ -1186,6 +1206,22 @@ describe Sequel::Model, "typecasting" do
     m.x.should == DateTime.parse('2007-10-21')
   end
 
+  specify "should accept a hash with symbol or string keys for a datetime field" do
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:datetime}})
+    m = @c.new
+    y = Time.parse('2007-10-21 10:20:30')
+    m.x = {:year=>2007, :month=>10, :day=>21, :hour=>10, :minute=>20, :second=>30}
+    m.x.should == y
+    m.x = {'year'=>'2007', 'month'=>'10', 'day'=>'21', 'hour'=>'10', 'minute'=>'20', 'second'=>'30'}
+    m.x.should == y
+    Sequel.datetime_class = DateTime
+    y = DateTime.parse('2007-10-21 10:20:30')
+    m.x = {:year=>2007, :month=>10, :day=>21, :hour=>10, :minute=>20, :second=>30}
+    m.x.should == y
+    m.x = {'year'=>'2007', 'month'=>'10', 'day'=>'21', 'hour'=>'10', 'minute'=>'20', 'second'=>'30'}
+    m.x.should == y
+  end
+
   specify "should raise an error if invalid data is used in a datetime field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:datetime}})
     proc{@c.new.x = '0000'}.should raise_error(Sequel::InvalidValue)

data/spec/spec_config.rb

@@ -6,5 +6,5 @@
 # MYSQL_URL = "mysql://#{MYSQL_USER}@localhost/sandbox"
 # MYSQL_SOCKET_FILE = '/tmp/mysql.sock'
 # ORACLE_DB = Sequel.connect('oracle://hr:hr@localhost/XE')
-POSTGRES_URL = 'postgres:///sequel_test?user=_postgresql'
+POSTGRES_URL = 'postgres:///sequel_test?user=postgres'
 # SQLITE_URL = 'sqlite:/'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-03 00:00:00 -07:00
+date: 2009-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -54,6 +54,7 @@ extra_rdoc_files:
 - doc/release_notes/3.1.0.txt
 - doc/release_notes/3.2.0.txt
 - doc/release_notes/3.3.0.txt
+- doc/release_notes/3.4.0.txt
 files: 
 - COPYING
 - CHANGELOG
@@ -89,6 +90,7 @@ files:
 - doc/release_notes/3.1.0.txt
 - doc/release_notes/3.2.0.txt
 - doc/release_notes/3.3.0.txt
+- doc/release_notes/3.4.0.txt
 - doc/schema.rdoc
 - doc/sharding.rdoc
 - doc/virtual_rows.rdoc
@@ -133,6 +135,10 @@ files:
 - spec/extensions/validation_class_methods_spec.rb
 - spec/extensions/validation_helpers_spec.rb
 - spec/extensions/association_proxies_spec.rb
+- spec/extensions/timestamps_spec.rb
+- spec/extensions/instance_hooks_spec.rb
+- spec/extensions/boolean_readers_spec.rb
+- spec/extensions/nested_attributes_spec.rb
 - spec/integration
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
@@ -142,6 +148,7 @@ files:
 - spec/integration/spec_helper.rb
 - spec/integration/transaction_test.rb
 - spec/integration/type_test.rb
+- spec/integration/timezone_test.rb
 - spec/model
 - spec/model/association_reflection_spec.rb
 - spec/model/associations_spec.rb
@@ -233,6 +240,7 @@ files:
 - lib/sequel/model/exceptions.rb
 - lib/sequel/model/inflections.rb
 - lib/sequel/model/plugins.rb
+- lib/sequel/model/default_inflections.rb
 - lib/sequel/plugins
 - lib/sequel/plugins/caching.rb
 - lib/sequel/plugins/hook_class_methods.rb
@@ -246,6 +254,10 @@ files:
 - lib/sequel/plugins/validation_class_methods.rb
 - lib/sequel/plugins/validation_helpers.rb
 - lib/sequel/plugins/association_proxies.rb
+- lib/sequel/plugins/timestamps.rb
+- lib/sequel/plugins/boolean_readers.rb
+- lib/sequel/plugins/instance_hooks.rb
+- lib/sequel/plugins/nested_attributes.rb
 - lib/sequel/sql.rb
 - lib/sequel/version.rb
 - lib/sequel_core.rb