sequel 2.2.0 → 2.3.0

data/spec/{validations_spec.rb → sequel_model/validations_spec.rb}

@@ -83,17 +83,23 @@ describe Sequel::Model do
     @c.validates_each(:xx, :xx, :tag=>:low) {|o, a, v| o.xxx; o.errors[a] << 'too low' if v < 50}
     @c.validates_each(:yy, :yy) {|o, a, v| o.yyy; o.errors[a] << 'too low' if v < 50}
     @c.validates_presence_of(:zz, :zz)
+    @c.validates_length_of(:aa, :aa, :tag=>:blah)
     o = @c.new
     def o.zz
       @a ||= 0
       @a += 1
     end
+    def o.aa
+      @b ||= 0
+      @b += 1
+    end
     o.should_receive(:xx).once.and_return(40)
     o.should_receive(:yy).once.and_return(60)
     o.should_receive(:xxx).once
     o.should_receive(:yyy).twice
     o.valid?.should == false
     o.zz.should == 2
+    o.aa.should == 2
     o.errors.full_messages.should == ['xx too low']
   end
 
@@ -339,6 +345,20 @@ describe Sequel::Model do
     @m.should be_valid
   end
 
+  specify "should allow multiple calls to validates_length_of with different options without overwriting" do
+    @c.validates_length_of :value, :maximum => 5
+    @c.validates_length_of :value, :minimum => 5
+    @m.should_not be_valid
+    @m.value = '12345'
+    @m.should be_valid
+    @m.value = '123456'
+    @m.should_not be_valid
+    @m.value = '12345'
+    @m.should be_valid
+    @m.value = '1234'
+    @m.should_not be_valid
+  end
+
   specify "should validate numericality_of" do
     @c.validates_numericality_of :value
     @m.value = 'blah'
@@ -507,28 +527,28 @@ end
 describe Sequel::Model, "Validations" do
 
   before(:all) do
-    class Person < Sequel::Model
+    class ::Person < Sequel::Model
       columns :id,:name,:first_name,:last_name,:middle_name,:initials,:age, :terms
     end
 
-    class Smurf < Person
+    class ::Smurf < Person
     end
     
-    class Cow < Sequel::Model
+    class ::Cow < Sequel::Model
       columns :id, :name, :got_milk
     end
 
-    class User < Sequel::Model
+    class ::User < Sequel::Model
       columns :id, :username, :password
     end
     
-    class Address < Sequel::Model
+    class ::Address < Sequel::Model
       columns :id, :zip_code
     end
   end
   
   it "should validate the acceptance of a column" do
-    class Cow < Sequel::Model
+    class ::Cow < Sequel::Model
       validations.clear
       validates_acceptance_of :got_milk, :accept => 'blah', :allow_nil => false
     end
@@ -542,7 +562,7 @@ describe Sequel::Model, "Validations" do
   end
   
   it "should validate the confirmation of a column" do
-    class User < Sequel::Model
+    class ::User < Sequel::Model
       def password_confirmation
         "test"
       end
@@ -560,7 +580,7 @@ describe Sequel::Model, "Validations" do
   end
   
   it "should validate format of column" do
-    class Person < Sequel::Model
+    class ::Person < Sequel::Model
       validates_format_of :first_name, :with => /^[a-zA-Z]+$/
     end
 
@@ -575,7 +595,7 @@ describe Sequel::Model, "Validations" do
   # end
 
   it "should validate length of column" do
-    class Person < Sequel::Model
+    class ::Person < Sequel::Model
       validations.clear
       validates_length_of :first_name, :maximum => 30
       validates_length_of :last_name, :minimum => 30
@@ -607,7 +627,7 @@ describe Sequel::Model, "Validations" do
   end
   
   it "should validate numericality of column" do
-    class Person < Sequel::Model
+    class ::Person < Sequel::Model
       validations.clear
       validates_numericality_of :age
     end
@@ -621,7 +641,7 @@ describe Sequel::Model, "Validations" do
   end
   
   it "should validate the presence of a column" do
-    class Cow < Sequel::Model
+    class ::Cow < Sequel::Model
       validations.clear
       validates_presence_of :name
     end
@@ -635,7 +655,7 @@ describe Sequel::Model, "Validations" do
   end
  
   it "should validate the uniqueness of a column" do
-    class User < Sequel::Model
+    class ::User < Sequel::Model
       validations.clear
       validates do
         uniqueness_of :username
@@ -679,7 +699,7 @@ describe Sequel::Model, "Validations" do
   end
   
   it "should have a validates block that contains multiple validations" do
-    class Person < Sequel::Model
+    class ::Person < Sequel::Model
       validations.clear
       validates do
         format_of :first_name, :with => /^[a-zA-Z]+$/
@@ -698,7 +718,7 @@ describe Sequel::Model, "Validations" do
 
   it "should allow 'longhand' validations direcly within the model." do
     lambda {
-      class Person < Sequel::Model
+      class ::Person < Sequel::Model
         validations.clear
         validates_length_of :first_name, :maximum => 30
       end
@@ -707,7 +727,7 @@ describe Sequel::Model, "Validations" do
   end
 
   it "should define a has_validations? method which returns true if the model has validations, false otherwise" do
-    class Person < Sequel::Model
+    class ::Person < Sequel::Model
       validations.clear
       validates do
         format_of :first_name, :with => /\w+/
@@ -715,7 +735,7 @@ describe Sequel::Model, "Validations" do
       end
     end
 
-    class Smurf < Person
+    class ::Smurf < Person
       validations.clear
     end
 
@@ -724,7 +744,7 @@ describe Sequel::Model, "Validations" do
   end
 
   it "should validate correctly instances initialized with string keys" do
-    class Can < Sequel::Model
+    class ::Can < Sequel::Model
       columns :id, :name
       
       validates_length_of :name, :minimum => 4

data/spec/spec_config.rb

@@ -0,0 +1,9 @@
+# database objects for running adapter specs
+# INFORMIX_DB = Sequel.connect('informix://localhost/mydb')
+# INTEGRATION_URL = 'sqlite:/'
+# MYSQL_USER = 'root'
+MYSQL_URL = "mysql://agp:sequel++@sql.mit.edu/agp+sequel"
+# 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:/')

data/spec/spec_config.rb.example

@@ -0,0 +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://#{MYSQL_USER}@localhost/sandbox"
+# MYSQL_SOCKET_FILE = '/tmp/mysql.sock'
+# ORACLE_DB = Sequel.connect('oracle://hr:hr@localhost/XE')
+# POSTGRES_URL = 'postgres://postgres:postgres@localhost:5432/reality_spec'
+# SQLITE_URL = 'sqlite:/'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,22 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-05 00:00:00 -07:00
+date: 2008-07-25 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: sequel_core
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.2.0
-    version: 
-description: "The Database Toolkit for Ruby: Model Classes"
-email: code@jeremyevans.net
-executables: []
+dependencies: []
 
+description: The Database Toolkit for Ruby
+email: code@jeremyevans.net
+executables: 
+- sequel
 extensions: []
 
 extra_rdoc_files: 
@@ -32,43 +24,126 @@ extra_rdoc_files:
 - CHANGELOG
 - COPYING
 - doc/advanced_associations.rdoc
+- doc/cheat_sheet.rdoc
+- doc/dataset_filtering.rdoc
 files: 
 - COPYING
+- CHANGELOG
 - README
 - Rakefile
+- bin/sequel
 - doc/advanced_associations.rdoc
-- spec/associations_spec.rb
-- spec/base_spec.rb
-- spec/caching_spec.rb
-- spec/model_spec.rb
-- spec/eager_loading_spec.rb
-- spec/hooks_spec.rb
-- spec/record_spec.rb
-- spec/plugins_spec.rb
+- doc/cheat_sheet.rdoc
+- doc/dataset_filtering.rdoc
+- spec/adapters
+- 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/rcov.opts
+- spec/sequel_core
+- spec/sequel_core/connection_pool_spec.rb
+- spec/sequel_core/core_ext_spec.rb
+- spec/sequel_core/core_sql_spec.rb
+- spec/sequel_core/database_spec.rb
+- spec/sequel_core/dataset_spec.rb
+- spec/sequel_core/expression_filters_spec.rb
+- spec/sequel_core/migration_spec.rb
+- spec/sequel_core/object_graph_spec.rb
+- spec/sequel_core/pretty_table_spec.rb
+- spec/sequel_core/schema_generator_spec.rb
+- spec/sequel_core/schema_spec.rb
+- spec/sequel_core/spec_helper.rb
+- spec/sequel_model
+- spec/sequel_model/association_reflection_spec.rb
+- spec/sequel_model/associations_spec.rb
+- spec/sequel_model/base_spec.rb
+- spec/sequel_model/caching_spec.rb
+- spec/sequel_model/dataset_methods_spec.rb
+- spec/sequel_model/eager_loading_spec.rb
+- spec/sequel_model/hooks_spec.rb
+- spec/sequel_model/inflector_spec.rb
+- spec/sequel_model/model_spec.rb
+- spec/sequel_model/plugins_spec.rb
+- spec/sequel_model/record_spec.rb
+- spec/sequel_model/schema_spec.rb
+- spec/sequel_model/spec_helper.rb
+- spec/sequel_model/validations_spec.rb
 - spec/spec.opts
-- spec/schema_spec.rb
-- spec/spec_helper.rb
-- spec/validations_spec.rb
-- spec/inflector_spec.rb
-- spec/association_reflection_spec.rb
-- spec/dataset_methods_spec.rb
+- 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
 - lib/sequel.rb
+- lib/sequel_core.rb
+- lib/sequel_core
+- lib/sequel_core/adapters
+- lib/sequel_core/adapters/adapter_skeleton.rb
+- lib/sequel_core/adapters/ado.rb
+- lib/sequel_core/adapters/db2.rb
+- lib/sequel_core/adapters/dbi.rb
+- lib/sequel_core/adapters/informix.rb
+- lib/sequel_core/adapters/jdbc.rb
+- lib/sequel_core/adapters/mysql.rb
+- lib/sequel_core/adapters/odbc.rb
+- lib/sequel_core/adapters/odbc_mssql.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/postgres.rb
+- lib/sequel_core/adapters/shared/sqlite.rb
+- lib/sequel_core/adapters/shared/mysql.rb
+- lib/sequel_core/adapters/jdbc
+- lib/sequel_core/adapters/jdbc/postgresql.rb
+- lib/sequel_core/adapters/jdbc/mysql.rb
+- lib/sequel_core/adapters/jdbc/sqlite.rb
+- lib/sequel_core/connection_pool.rb
+- lib/sequel_core/core_ext.rb
+- lib/sequel_core/core_sql.rb
+- lib/sequel_core/database.rb
+- lib/sequel_core/database
+- lib/sequel_core/database/schema.rb
+- lib/sequel_core/dataset.rb
+- lib/sequel_core/dataset
+- lib/sequel_core/dataset/callback.rb
+- lib/sequel_core/dataset/convenience.rb
+- lib/sequel_core/dataset/pagination.rb
+- lib/sequel_core/dataset/query.rb
+- lib/sequel_core/dataset/schema.rb
+- lib/sequel_core/dataset/sql.rb
+- lib/sequel_core/deprecated.rb
+- lib/sequel_core/exceptions.rb
+- lib/sequel_core/migration.rb
+- lib/sequel_core/object_graph.rb
+- lib/sequel_core/pretty_table.rb
+- lib/sequel_core/schema.rb
+- lib/sequel_core/schema
+- lib/sequel_core/schema/generator.rb
+- lib/sequel_core/schema/sql.rb
+- lib/sequel_core/sql.rb
 - lib/sequel_model.rb
 - lib/sequel_model
+- lib/sequel_model/association_reflection.rb
 - lib/sequel_model/associations.rb
 - lib/sequel_model/base.rb
 - lib/sequel_model/caching.rb
+- lib/sequel_model/dataset_methods.rb
 - lib/sequel_model/eager_loading.rb
 - lib/sequel_model/hooks.rb
+- lib/sequel_model/inflector.rb
 - lib/sequel_model/plugins.rb
 - lib/sequel_model/record.rb
 - lib/sequel_model/schema.rb
 - lib/sequel_model/validations.rb
-- lib/sequel_model/inflector.rb
-- lib/sequel_model/association_reflection.rb
-- lib/sequel_model/dataset_methods.rb
-- CHANGELOG
 has_rdoc: true
 homepage: http://sequel.rubyforge.org
 post_install_message: 
@@ -77,11 +152,9 @@ rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
-- "Sequel: The Database Toolkit for Ruby: Model Classes"
+- "Sequel: The Database Toolkit for Ruby"
 - --main
 - README
-- --exclude
-- ^(examples|extras)/
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -102,6 +175,6 @@ rubyforge_project: sequel
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: "The Database Toolkit for Ruby: Model Classes"
+summary: The Database Toolkit for Ruby
 test_files: []
 

data/spec/inflector_spec.rb

@@ -1,34 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe String do
-  it "should transform words from singular to plural" do
-    "post".pluralize.should == "posts"
-    "octopus".pluralize.should =="octopi"
-    "the blue mailman".pluralize.should == "the blue mailmen"
-    "CamelOctopus".pluralize.should == "CamelOctopi"
-  end
-  
-  it "should transform words from plural to singular" do
-    "posts".singularize.should == "post"
-    "octopi".singularize.should == "octopus"
-    "the blue mailmen".singularize.should == "the blue mailman"
-    "CamelOctopi".singularize.should == "CamelOctopus"
-  end
-  
-  it "should transform class names to table names" do
-    "RawScaledScorer".tableize.should == "raw_scaled_scorers"
-    "egg_and_ham".tableize.should == "egg_and_hams"
-    "fancyCategory".tableize.should == "fancy_categories"
-  end
-  
-  it "should tranform table names to class names" do
-    "egg_and_hams".classify.should == "EggAndHam"
-    "post".classify.should == "Post"
-  end
-  
-  it "should create a foreign key name from a class name" do
-    "Message".foreign_key.should == "message_id"
-    "Message".foreign_key(false).should == "messageid"
-    "Admin::Post".foreign_key.should == "post_id"
-  end
-end