sequel 2.6.0 → 2.7.0

data/spec/sequel_model/hooks_spec.rb

@@ -17,7 +17,8 @@ describe "Model hooks" do
   
   specify "should be definable using a block" do
     $adds = []
-    c = Class.new(Sequel::Model) do
+    c = Class.new(Sequel::Model)
+    c.class_eval do
       before_save {$adds << 'hi'}
     end
     
@@ -27,7 +28,8 @@ describe "Model hooks" do
   
   specify "should be definable using a method name" do
     $adds = []
-    c = Class.new(Sequel::Model) do
+    c = Class.new(Sequel::Model)
+    c.class_eval do
       def bye; $adds << 'bye'; end
       before_save :bye
     end
@@ -38,7 +40,8 @@ describe "Model hooks" do
   
   specify "should be additive" do
     $adds = []
-    c = Class.new(Sequel::Model) do
+    c = Class.new(Sequel::Model)
+    c.class_eval do
       before_save {$adds << 'hyiyie'}
       before_save {$adds << 'byiyie'}
     end
@@ -49,7 +52,8 @@ describe "Model hooks" do
 
   specify "should not be additive if the method or tag already exists" do
     $adds = []
-    c = Class.new(Sequel::Model) do
+    c = Class.new(Sequel::Model)
+    c.class_eval do
       def bye; $adds << 'bye'; end
       before_save :bye
       before_save :bye
@@ -59,7 +63,8 @@ describe "Model hooks" do
     $adds.should == ['bye']
 
     $adds = []
-    d = Class.new(Sequel::Model) do
+    d = Class.new(Sequel::Model)
+    d.class_eval do
       before_save(:bye){$adds << 'hyiyie'}
       before_save(:bye){$adds << 'byiyie'}
     end
@@ -68,7 +73,8 @@ describe "Model hooks" do
     $adds.should == ['byiyie']
 
     $adds = []
-    e = Class.new(Sequel::Model) do
+    e = Class.new(Sequel::Model)
+    e.class_eval do
       def bye; $adds << 'bye'; end
       before_save :bye
       before_save(:bye){$adds << 'byiyie'}
@@ -78,7 +84,8 @@ describe "Model hooks" do
     $adds.should == ['byiyie']
 
     $adds = []
-    e = Class.new(Sequel::Model) do
+    e = Class.new(Sequel::Model)
+    e.class_eval do
       def bye; $adds << 'bye'; end
       before_save(:bye){$adds << 'byiyie'}
       before_save :bye
@@ -92,11 +99,13 @@ describe "Model hooks" do
     # pending
     
     $adds = []
-    a = Class.new(Sequel::Model) do
+    a = Class.new(Sequel::Model)
+    a.class_eval do
       before_save {$adds << '123'}
     end
     
-    b = Class.new(a) do
+    b = Class.new(a)
+    b.class_eval do
       before_save {$adds << '456'}
       before_save {$adds << '789'}
     end
@@ -107,11 +116,13 @@ describe "Model hooks" do
   
   specify "should be overridable in descendant classes" do
     $adds = []
-    a = Class.new(Sequel::Model) do
+    a = Class.new(Sequel::Model)
+    a.class_eval do
       before_save {$adds << '123'}
     end
     
-    b = Class.new(a) do
+    b = Class.new(a)
+    b.class_eval do
       def before_save; $adds << '456'; end
     end
     
@@ -126,7 +137,8 @@ describe "Model hooks" do
     $flag = true
     $adds = []
     
-    a = Class.new(Sequel::Model) do
+    a = Class.new(Sequel::Model)
+    a.class_eval do
       before_save {$adds << 'blah'; $flag}
       before_save {$adds << 'cruel'}
     end
@@ -145,7 +157,8 @@ describe "Model hooks" do
     a.new.before_save
     $adds.should == ['blah']
     
-    b = Class.new(a) do
+    b = Class.new(a)
+    b.class_eval do
       before_save {$adds << 'mau'}
     end
     
@@ -160,7 +173,8 @@ describe "Model#after_initialize" do
     $values1 = nil
     $reached_after_initialized = false
     
-    a = Class.new(Sequel::Model) do
+    a = Class.new(Sequel::Model)
+    a.class_eval do
       columns :x, :y
       after_initialize do
         $values1 = @values.clone
@@ -178,7 +192,8 @@ describe "Model#before_create && Model#after_create" do
   setup do
     MODEL_DB.reset
 
-    @c = Class.new(Sequel::Model(:items)) do
+    @c = Class.new(Sequel::Model(:items))
+    @c.class_eval do
       columns :x
       no_primary_key
       
@@ -214,7 +229,8 @@ describe "Model#before_update && Model#after_update" do
   setup do
     MODEL_DB.reset
 
-    @c = Class.new(Sequel::Model(:items)) do
+    @c = Class.new(Sequel::Model(:items))
+    @c.class_eval do
       after_update {MODEL_DB << "BLAH after"}
     end
   end
@@ -248,7 +264,8 @@ describe "Model#before_save && Model#after_save" do
   setup do
     MODEL_DB.reset
 
-    @c = Class.new(Sequel::Model(:items)) do
+    @c = Class.new(Sequel::Model(:items))
+    @c.class_eval do
       columns :x
       after_save {MODEL_DB << "BLAH after"}
     end
@@ -294,7 +311,8 @@ describe "Model#before_destroy && Model#after_destroy" do
   setup do
     MODEL_DB.reset
 
-    @c = Class.new(Sequel::Model(:items)) do
+    @c = Class.new(Sequel::Model(:items))
+    @c.class_eval do
       after_destroy {MODEL_DB << "BLAH after"}
       
       def delete
@@ -332,7 +350,8 @@ describe "Model#before_validation && Model#after_validation" do
   setup do
     MODEL_DB.reset
 
-    @c = Class.new(Sequel::Model(:items)) do
+    @c = Class.new(Sequel::Model(:items))
+    @c.class_eval do
       after_validation{MODEL_DB << "BLAH after"}
 
       def self.validate(o)
@@ -403,8 +422,5 @@ describe "Model.has_hooks?" do
   specify "should return true if hooks are inherited" do
     @d = Class.new(@c)
     @d.has_hooks?(:before_save).should be_false
-    
-    @c.before_save :blah
-    @d.has_hooks?(:before_save).should be_true
   end
 end

data/spec/sequel_model/model_spec.rb

@@ -426,55 +426,31 @@ describe Sequel::Model, "A model class without a primary key" do
 end
 
 describe Sequel::Model, "attribute accessors" do
-  after do
-    Sequel::Model.lazy_load_schema = false
-  end
-
   before do
     MODEL_DB.reset
-
-    @c = Class.new(Sequel::Model) do
-      def self.columns; orig_columns; end
-    end
     @dataset = Sequel::Dataset.new(MODEL_DB)
-    def @dataset.db; end
-    def @dataset.set_model(blah); end
-    def @dataset.naked; self; end
     def @dataset.columns; [:x, :y]; end
-    def @dataset.def_mutation_method(*names);  end
-  end
-
-  it "should be created on set_dataset unless lazy loading schema" do
-    %w'x y x= y='.each do |x|
-      @c.instance_methods.collect{|y| y.to_s}.should_not include(x)
-    end
-    @c.set_dataset(@dataset)
-    %w'x y x= y='.each do |x|
-      @c.instance_methods.collect{|y| y.to_s}.should include(x)
-    end
-    o = @c.new
-    %w'x y x= y='.each do |x|
-      o.methods.collect{|y| y.to_s}.should include(x)
+    @c = Class.new(Sequel::Model) do
+      def self.db_schema
+         set_columns(Array(@columns))
+        @db_schema = {:x=>{}, :y=>{}}
+      end
+      def self.set_dataset(ds, opts={}) 
+        @columns = ds.columns
+        db_schema
+      end
     end
-
-    o.x.should be_nil
-    o.x = 34
-    o.x.should == 34
   end
 
-  it "should be created on first initialization if lazy loading schema" do
-    Sequel::Model.lazy_load_schema = true
+  it "should be created on set_dataset" do
     %w'x y x= y='.each do |x|
       @c.instance_methods.collect{|y| y.to_s}.should_not include(x)
     end
     @c.set_dataset(@dataset)
-    %w'x y x= y='.each do |x|
-      @c.instance_methods.collect{|y| y.to_s}.should_not include(x)
-    end
-    o = @c.new
     %w'x y x= y='.each do |x|
       @c.instance_methods.collect{|y| y.to_s}.should include(x)
     end
+    o = @c.new
     %w'x y x= y='.each do |x|
       o.methods.collect{|y| y.to_s}.should include(x)
     end

data/spec/sequel_model/plugins_spec.rb

@@ -28,7 +28,8 @@ describe Sequel::Model, "using a plugin" do
 
   it "should fail if the plugin is not found" do
     proc do
-      c = Class.new(Sequel::Model) do
+      c = Class.new(Sequel::Model)
+      c.class_eval do
         is :something_or_other
       end
     end.should raise_error(LoadError)
@@ -37,7 +38,8 @@ describe Sequel::Model, "using a plugin" do
   it "should apply the plugin to the class" do
     c = nil
     proc do
-      c = Class.new(Sequel::Model) do
+      c = Class.new(Sequel::Model)
+      c.class_eval do
         set_dataset MODEL_DB[:items]
         is :timestamped, :a => 1, :b => 2
       end

data/spec/sequel_model/record_spec.rb

@@ -750,11 +750,6 @@ describe Sequel::Model, "#initialize" do
     m.values.should == {}
   end
   
-  specify "should accept nil values" do
-    m = @c.new(nil)
-    m.values.should == {}
-  end
-  
   specify "should accept a block to execute" do
     m = @c.new {|o| o[:id] = 1234}
     m.id.should == 1234
@@ -874,6 +869,14 @@ describe Sequel::Model, "typecasting" do
     m.x.should == '1'
   end
 
+  specify "should not convert if serializing the field" do
+    @c.serialize :x
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:string}})
+    m = @c.new
+    m.x =[1, 2]
+    m.x.should == [1, 2]
+  end
+
   specify "should convert to integer for an integer field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:integer}})
     m = @c.new

data/spec/sequel_model/validations_spec.rb

@@ -48,6 +48,31 @@ describe Sequel::Model::Validation::Errors do
     msgs.size.should == 3
     msgs.should include('blow blieuh', 'blow blich', 'blay bliu')
   end
+
+  specify "should return the number of error messages using #count" do
+    @errors.count.should == 0
+    @errors.add(:a, 'b')
+    @errors.count.should == 1
+    @errors.add(:a, 'c')
+    @errors.count.should == 2
+    @errors.add(:b, 'c')
+    @errors.count.should == 3
+  end
+
+  specify "should return the array of error messages for a given attribute using #on" do
+    @errors.add(:a, 'b')
+    @errors.on(:a).should == ['b']
+    @errors.add(:a, 'c')
+    @errors.on(:a).should == ['b', 'c']
+    @errors.add(:b, 'c')
+    @errors.on(:a).should == ['b', 'c']
+  end
+
+  specify "should return nil if there are no error messages for a given attribute using #on" do
+    @errors.on(:a).should == nil
+    @errors.add(:b, 'b')
+    @errors.on(:a).should == nil
+  end
 end
 
 describe Sequel::Model do

data/spec/spec_config.rb

@@ -1,9 +1,10 @@
 # database objects for running adapter specs
+# ADO_DB = Sequel.connect(:adapter => 'ado', :driver => "{Microsoft Access Driver (*.mdb)}; DBQ=c:\\Nwind.mdb")
 # INFORMIX_DB = Sequel.connect('informix://localhost/mydb')
 # INTEGRATION_URL = 'sqlite:/'
 # MYSQL_USER = 'root'
-MYSQL_URL = "mysql://agp:sequel++@sql.mit.edu/agp+sequel"
+# 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://_postgresql@postgresql/sequel_test"
-# SQLITE_DB = Sequel.connect('sqlite:/')
+POSTGRES_URL = 'postgres:///sequel_test?user=_postgresql'
+# SQLITE_URL = 'sqlite:/'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-11 00:00:00 -07:00
+date: 2008-11-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -27,8 +27,8 @@ extra_rdoc_files:
 - doc/cheat_sheet.rdoc
 - doc/dataset_filtering.rdoc
 - doc/prepared_statements.rdoc
-- doc/sharding.rdoc
 - doc/schema.rdoc
+- doc/sharding.rdoc
 files: 
 - COPYING
 - CHANGELOG
@@ -39,16 +39,23 @@ files:
 - doc/cheat_sheet.rdoc
 - doc/dataset_filtering.rdoc
 - doc/prepared_statements.rdoc
-- doc/sharding.rdoc
 - doc/schema.rdoc
+- doc/sharding.rdoc
 - spec/adapters
+- spec/adapters/ado_spec.rb
 - spec/adapters/informix_spec.rb
 - spec/adapters/mysql_spec.rb
 - spec/adapters/oracle_spec.rb
 - spec/adapters/postgres_spec.rb
 - spec/adapters/spec_helper.rb
 - spec/adapters/sqlite_spec.rb
-- spec/adapters/ado_spec.rb
+- spec/integration
+- spec/integration/dataset_test.rb
+- spec/integration/eager_loader_test.rb
+- spec/integration/prepared_statement_test.rb
+- spec/integration/schema_test.rb
+- spec/integration/spec_helper.rb
+- spec/integration/type_test.rb
 - spec/rcov.opts
 - spec/sequel_core
 - spec/sequel_core/connection_pool_spec.rb
@@ -81,13 +88,6 @@ files:
 - spec/spec.opts
 - spec/spec_config.rb.example
 - spec/spec_config.rb
-- spec/integration
-- spec/integration/eager_loader_test.rb
-- spec/integration/spec_helper.rb
-- spec/integration/dataset_test.rb
-- spec/integration/schema_test.rb
-- spec/integration/type_test.rb
-- spec/integration/prepared_statement_test.rb
 - lib/sequel.rb
 - lib/sequel_core.rb
 - lib/sequel_core
@@ -97,21 +97,23 @@ files:
 - lib/sequel_core/adapters/dbi.rb
 - lib/sequel_core/adapters/informix.rb
 - lib/sequel_core/adapters/jdbc.rb
+- lib/sequel_core/adapters/jdbc
+- lib/sequel_core/adapters/jdbc/mysql.rb
+- lib/sequel_core/adapters/jdbc/oracle.rb
+- lib/sequel_core/adapters/jdbc/postgresql.rb
+- lib/sequel_core/adapters/jdbc/sqlite.rb
 - lib/sequel_core/adapters/mysql.rb
 - lib/sequel_core/adapters/odbc.rb
 - lib/sequel_core/adapters/openbase.rb
 - lib/sequel_core/adapters/oracle.rb
 - lib/sequel_core/adapters/postgres.rb
-- lib/sequel_core/adapters/sqlite.rb
 - lib/sequel_core/adapters/shared
-- lib/sequel_core/adapters/shared/mysql.rb
 - lib/sequel_core/adapters/shared/mssql.rb
+- lib/sequel_core/adapters/shared/mysql.rb
+- lib/sequel_core/adapters/shared/oracle.rb
 - lib/sequel_core/adapters/shared/postgres.rb
 - lib/sequel_core/adapters/shared/sqlite.rb
-- lib/sequel_core/adapters/jdbc
-- lib/sequel_core/adapters/jdbc/mysql.rb
-- lib/sequel_core/adapters/jdbc/postgresql.rb
-- lib/sequel_core/adapters/jdbc/sqlite.rb
+- lib/sequel_core/adapters/sqlite.rb
 - lib/sequel_core/connection_pool.rb
 - lib/sequel_core/core_ext.rb
 - lib/sequel_core/core_sql.rb
@@ -123,10 +125,10 @@ files:
 - lib/sequel_core/dataset/callback.rb
 - lib/sequel_core/dataset/convenience.rb
 - lib/sequel_core/dataset/pagination.rb
+- lib/sequel_core/dataset/prepared_statements.rb
 - lib/sequel_core/dataset/query.rb
 - lib/sequel_core/dataset/schema.rb
 - lib/sequel_core/dataset/sql.rb
-- lib/sequel_core/dataset/prepared_statements.rb
 - lib/sequel_core/deprecated.rb
 - lib/sequel_core/exceptions.rb
 - lib/sequel_core/migration.rb