sequel 2.2.0 → 2.3.0

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

@@ -349,24 +349,24 @@ describe "Model#before_validation && Model#after_validation" do
   
   specify "should be called around validation" do
     @c.before_validation{MODEL_DB << "BLAH before"}
-    m = @c.new(:id => 2233)
+    m = @c.load(:id => 2233)
     m.should be_valid
     MODEL_DB.sqls.should == ['BLAH before', 'BLAH after']
 
     MODEL_DB.sqls.clear
-    m = @c.new(:id => 22)
+    m = @c.load(:id => 22)
     m.should_not be_valid
     MODEL_DB.sqls.should == ['BLAH before', 'BLAH after']
   end
 
   specify "should be called when calling save" do
     @c.before_validation{MODEL_DB << "BLAH before"}
-    m = @c.new(:id => 2233)
+    m = @c.load(:id => 2233)
     m.save.should == m
     MODEL_DB.sqls.should == ['BLAH before', 'BLAH after', 'CREATE BLAH']
 
     MODEL_DB.sqls.clear
-    m = @c.new(:id => 22)
+    m = @c.load(:id => 22)
     m.raise_on_save_failure = false
     m.save.should == nil
     MODEL_DB.sqls.should == ['BLAH before', 'BLAH after']

data/spec/sequel_model/inflector_spec.rb

@@ -0,0 +1,119 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe String do
+  it "#camelize and #camelcase should transform the word to CamelCase" do
+    "egg_and_hams".camelize.should == "EggAndHams"
+    "egg_and_hams".camelize(false).should == "eggAndHams"
+    "post".camelize.should == "Post"
+    "post".camelcase.should == "Post"
+  end
+
+  it "#constantize should eval the string to get a constant" do
+    "String".constantize.should == String
+    "String::Inflections".constantize.should == String::Inflections
+    proc{"BKSDDF".constantize}.should raise_error
+    proc{"++A++".constantize}.should raise_error
+  end
+  
+  it "#dasherize should transform underscores to dashes" do
+    "egg_and_hams".dasherize.should == "egg-and-hams"
+    "post".dasherize.should == "post"
+  end
+  
+  it "#demodulize should remove any preceding modules" do
+    "String::Inflections::Blah".demodulize.should == "Blah"
+    "String::Inflections".demodulize.should == "Inflections"
+    "String".demodulize.should == "String"
+  end
+  
+  it "#humanize should remove _i, transform underscore to spaces, and capitalize" do
+    "egg_and_hams".humanize.should == "Egg and hams"
+    "post".humanize.should == "Post"
+    "post_id".humanize.should == "Post"
+  end
+  
+  it "#titleize and #titlecase should underscore, humanize, and capitalize all words" do
+    "egg-and: hams".titleize.should == "Egg And: Hams"
+    "post".titleize.should == "Post"
+    "post".titlecase.should == "Post"
+  end
+  
+  it "#underscore should add underscores between CamelCased words, change :: to / and - to _, and downcase" do
+    "EggAndHams".underscore.should == "egg_and_hams"
+    "EGGAndHams".underscore.should == "egg_and_hams"
+    "Egg::And::Hams".underscore.should == "egg/and/hams"
+    "post".underscore.should == "post"
+    "post-id".underscore.should == "post_id"
+  end
+
+  it "#pluralize 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 "#singularize 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 "#tableize 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 "#classify should tranform table names to class names" do
+    "egg_and_hams".classify.should == "EggAndHam"
+    "post".classify.should == "Post"
+  end
+  
+  it "#foreign_key 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
+
+describe String::Inflections do
+  before do
+    @plurals, @singulars, @uncountables = String.inflections.plurals.dup, String.inflections.singulars.dup, String.inflections.uncountables.dup
+  end
+  after do
+    String.inflections.plurals.replace(@plurals)
+    String.inflections.singulars.replace(@singulars)
+    String.inflections.uncountables.replace(@uncountables)
+  end
+
+  it "should be possible to clear the list of singulars, plurals, and uncountables" do
+    String.inflections.clear(:plurals)
+    String.inflections.plurals.should == []
+    String.inflections.plural('blah', 'blahs')
+    String.inflections.clear
+    String.inflections.plurals.should == []
+    String.inflections.singulars.should == []
+    String.inflections.uncountables.should == []
+  end
+
+  it "should be able to specify new inflection rules" do
+    String.inflections do |i|
+      i.plural(/xx$/i, 'xxx')
+      i.singular(/ttt$/i, 'tt')
+      i.irregular('yy', 'yyy')
+      i.uncountable(%w'zz')
+    end
+    'roxx'.pluralize.should == 'roxxx'
+    'rottt'.singularize.should == 'rott'
+    'yy'.pluralize.should == 'yyy'
+    'yyy'.singularize.should == 'yy'
+    'zz'.pluralize.should == 'zz'
+    'zz'.singularize.should == 'zz'
+  end
+
+  it "should be yielded and returned by String.inflections" do
+    String.inflections{|i| i.should == String::Inflections}.should == String::Inflections
+  end
+end

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

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "spec_helper")
 
 describe Sequel::Model do
   it "should have class method aliased as model" do
-    Sequel::Model.instance_methods.should include("model")
+    Sequel::Model.instance_methods.collect{|x| x.to_s}.should include("model")
 
     model_a = Class.new(Sequel::Model(:items))
     model_a.new.model.should be(model_a)
@@ -79,18 +79,28 @@ describe Sequel::Model, "dataset & schema" do
     @model.primary_key.should == :id
     @model.table_name.should == :foo
   end
+
+  it "doesn't raise an error on set_dataset if there is an error raised getting the schema" do
+    @model.meta_def(:get_db_schema){raise Sequel::Error}
+    proc{@model.set_dataset(MODEL_DB[:foo])}.should_not raise_error
+  end
+
+  it "doesn't raise an error on inherited if there is an error setting the dataset" do
+    @model.meta_def(:set_dataset){raise Sequel::Error}
+    proc{Class.new(@model)}.should_not raise_error
+  end
 end
 
 describe Sequel::Model, "#sti_key" do
   before do
-    class StiTest < Sequel::Model
+    class ::StiTest < Sequel::Model
       def kind=(x); self[:kind] = x; end
       def refresh; end
       set_sti_key :kind
     end
-    class StiTestSub1 < StiTest
+    class ::StiTestSub1 < StiTest
     end
-    class StiTestSub2 < StiTest
+    class ::StiTestSub2 < StiTest
     end
     @ds = StiTest.dataset
     MODEL_DB.reset
@@ -435,15 +445,15 @@ describe Sequel::Model, "attribute accessors" do
 
   it "should be created on set_dataset unless lazy loading schema" do
     %w'x y x= y='.each do |x|
-      @c.instance_methods.include?(x).should == false
+      @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.include?(x).should == true
+      @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.include?(x).should == true
+      o.methods.collect{|y| y.to_s}.should include(x)
     end
 
     o.x.should be_nil
@@ -454,18 +464,18 @@ describe Sequel::Model, "attribute accessors" do
   it "should be created on first initialization if lazy loading schema" do
     Sequel::Model.lazy_load_schema = true
     %w'x y x= y='.each do |x|
-      @c.instance_methods.include?(x).should == false
+      @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.include?(x).should == false 
+      @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.include?(x).should == true
+      @c.instance_methods.collect{|y| y.to_s}.should include(x)
     end
     %w'x y x= y='.each do |x|
-      o.methods.include?(x).should == true
+      o.methods.collect{|y| y.to_s}.should include(x)
     end
 
     o.x.should be_nil
@@ -596,3 +606,12 @@ context "Model.db_schema" do
     @c.db_schema.should == {:x=>{}}
   end
 end
+
+context "Model.str_columns" do
+  specify "should return the columns as frozen strings" do
+    c = Class.new(Sequel::Model)
+    c.meta_def(:columns){[:a, :b]}
+    c.orig_str_columns.should == %w'a b'
+    proc{c.orig_str_columns.first << 'a'}.should raise_error
+  end
+end

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

@@ -33,7 +33,7 @@ describe "Model#save" do
   end
   
   it "should mark saved columns as not changed" do
-    o = @c.new(:id => 3, :x => 1, :y => nil)
+    o = @c.load(:id => 3, :x => 1, :y => nil)
     o[:y] = 4
     o.changed_columns.should == [:y]
     o.save(:x)
@@ -50,6 +50,7 @@ describe "Model#save_changes" do
     MODEL_DB.reset
 
     @c = Class.new(Sequel::Model(:items)) do
+      unrestrict_primary_key
       columns :id, :x, :y
     end
   end
@@ -110,6 +111,7 @@ describe "Model#update_values" do
     MODEL_DB.reset
 
     @c = Class.new(Sequel::Model(:items)) do
+      unrestrict_primary_key
       columns :id, :x, :y
     end
   end
@@ -141,6 +143,7 @@ describe "Model#set_values" do
     MODEL_DB.reset
 
     @c = Class.new(Sequel::Model(:items)) do
+      unrestrict_primary_key
       columns :id, :x, :y
     end
   end
@@ -164,6 +167,10 @@ describe "Model#set_values" do
     o.set_values('x' => 1)
     o.x.should == 1
   end
+
+  it "should raise an error if used with a non-String, non-Symbol key" do
+    proc{@c.new.set_values(1=>2)}.should raise_error(Sequel::Error)
+  end
 end
 
 describe "Model#new?" do
@@ -172,6 +179,7 @@ describe "Model#new?" do
     MODEL_DB.reset
 
     @c = Class.new(Sequel::Model(:items)) do
+      unrestrict_primary_key
     end
   end
   
@@ -380,6 +388,12 @@ describe Sequel::Model, "#set" do
     @o1.values.should == {:x => 1}
     MODEL_DB.sqls.should == []
   end
+  
+  it "should return self" do
+    returned_value = @o1.set_with_params(:x => 1, :z => 2)
+    returned_value.should == @o1
+    MODEL_DB.sqls.should == []
+  end
 end
 
 describe Sequel::Model, "#update" do
@@ -712,6 +726,7 @@ describe Sequel::Model, ".create" do
   before(:each) do
     MODEL_DB.reset
     @c = Class.new(Sequel::Model(:items)) do
+      unrestrict_primary_key
       columns :x
     end
   end
@@ -730,7 +745,7 @@ describe Sequel::Model, ".create" do
 
   it "should accept a block and run it" do
     o1, o2, o3 =  nil, nil, nil
-    o = @c.create {|o3| o1 = o3; o2 = :blah; o3.x = 333}
+    o = @c.create {|o4| o1 = o4; o3 = o4; o2 = :blah; o3.x = 333}
     o.class.should == @c
     o1.should === o
     o3.should === o
@@ -750,7 +765,8 @@ describe Sequel::Model, "#refresh" do
   setup do
     MODEL_DB.reset
     @c = Class.new(Sequel::Model(:items)) do
-      columns :x
+      unrestrict_primary_key
+      columns :id, :x
     end
   end
 
@@ -815,6 +831,30 @@ describe Sequel::Model, "typecasting" do
     m.x.should == 1
   end
 
+  specify "should typecast '' to nil unless type is string or blob" do
+    [:integer, :float, :decimal, :boolean, :date, :time, :datetime].each do |x|
+      @c.instance_variable_set(:@db_schema, {:x=>{:type=>x}})
+      m = @c.new
+      m.x = ''
+      m.x.should == nil
+    end
+   [:string, :blob].each do |x|
+      @c.instance_variable_set(:@db_schema, {:x=>{:type=>x}})
+      m = @c.new
+      m.x = ''
+      m.x.should == ''
+    end
+  end
+
+  specify "should not typecast '' to nil if typecast_empty_string_to_nil is false" do
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:integer}})
+    m = @c.new
+    m.typecast_empty_string_to_nil = false
+    proc{m.x = ''}.should raise_error
+    @c.typecast_empty_string_to_nil = false
+    proc{@c.new.x = ''}.should raise_error
+  end
+
   specify "should not typecast nil if NULLs are allowed" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:integer,:allow_null=>true}})
     m = @c.new
@@ -825,6 +865,7 @@ describe Sequel::Model, "typecasting" do
   specify "should raise an error if attempting to typecast nil and NULLs are not allowed" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:integer,:allow_null=>false}})
     proc{@c.new.x = nil}.should raise_error(Sequel::Error)
+    proc{@c.new.x = ''}.should raise_error(Sequel::Error)
   end
 
   specify "should not raise an error if NULLs are not allowed and typecasting is turned off" do
@@ -940,6 +981,7 @@ describe Sequel::Model, "typecasting" do
   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
+    proc{@c.new.x = 100}.should raise_error
   end
 
   specify "should convert to time for a time field" do
@@ -989,10 +1031,9 @@ describe Sequel::Model, "typecasting" do
   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
-    proc{@c.new.x = ''}.should_not raise_error # Valid Time
+    proc{@c.new.x = 'a'}.should_not raise_error # Valid Time
     Sequel.datetime_class = DateTime
     proc{@c.new.x = '0000'}.should raise_error
-    proc{@c.new.x = ''}.should raise_error
+    proc{@c.new.x = 'a'}.should raise_error
   end
-
 end

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

@@ -15,13 +15,12 @@ describe Sequel::Model, "table_exists?" do
 
 end
 
-describe Sequel::Model, "create_table" do
+describe Sequel::Model, "create_table and schema" do
 
   before(:each) do
     MODEL_DB.reset
     @model = Class.new(Sequel::Model) do
-      set_dataset MODEL_DB[:items]
-      set_schema do
+      set_schema(:items) do
         text :name
         float :price, :null => false
       end
@@ -40,6 +39,22 @@ describe Sequel::Model, "create_table" do
     @model.db_schema.should == schem
     @model.instance_variable_get(:@columns).should == [:name, :price]
   end
+
+  it "should return the schema generator via schema" do
+    @model.schema.should be_a_kind_of(Sequel::Schema::Generator)
+  end
+
+  it "should use the superclasses schema if it exists" do
+    @submodel = Class.new(@model)
+    @submodel.schema.should be_a_kind_of(Sequel::Schema::Generator)
+  end
+
+  it "should return nil if no schema is present" do
+    @model = Class.new(Sequel::Model)
+    @model.schema.should == nil
+    @submodel = Class.new(@model)
+    @submodel.schema.should == nil
+  end
 end
 
 describe Sequel::Model, "drop_table" do
@@ -66,7 +81,6 @@ describe Sequel::Model, "create_table!" do
   end
   
   it "should drop table if it exists and then create the table" do
-    @model.should_receive(:table_exists?).and_return(true)
     @model.should_receive(:drop_table).and_return(true)
     @model.should_receive(:create_table).and_return(true)
 

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

@@ -1,10 +1,10 @@
 require 'rubygems'
 unless Object.const_defined?('Sequel')
-  $:.unshift(File.join(File.dirname(__FILE__), "../../sequel_core/lib/"))
+  $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
   require 'sequel_core'
 end
 unless Sequel.const_defined?('Model')
-  $:.unshift(File.join(File.dirname(__FILE__), "../lib/"))
+  $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
   require 'sequel_model'
 end
 
@@ -52,6 +52,7 @@ end
 
 class << Sequel::Model
   alias orig_columns columns
+  alias orig_str_columns str_columns
   def columns(*cols)
     return if cols.empty?
     define_method(:columns){cols}