sequel 2.11.0 → 2.12.0

data/spec/{sequel_core → core}/spec_helper.rb

@@ -1,7 +1,34 @@
 require 'rubygems'
 unless Object.const_defined?('Sequel')
   $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
-  require 'sequel_core'
+  require 'sequel/core'
+end
+
+Sequel.virtual_row_instance_eval = true
+
+module Spec::Example::ExampleMethods
+  def deprec
+    output = Sequel::Deprecation.output = nil 
+    begin
+      yield
+    ensure
+      Sequel::Deprecation.output = output
+    end 
+  end 
+end
+
+module Spec::Example::ExampleGroupMethods
+  def deprec_specify(*args, &block)
+    specify(*args) do
+      output = Sequel::Deprecation.output
+      Sequel::Deprecation.output = nil
+      begin
+        instance_eval(&block)
+      ensure
+        Sequel::Deprecation.output = output
+      end
+    end
+  end
 end
 
 class MockDataset < Sequel::Dataset
@@ -38,7 +65,7 @@ class MockDatabase < Sequel::Database
     @sqls = []
   end
 
-  def transaction; yield; end
+  def transaction(opts={}); yield; end
   
   def dataset; MockDataset.new(self); end
 end

data/spec/extensions/blank_spec.rb

@@ -0,0 +1,67 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+context "Object#blank?" do
+  specify "it should be true if the object responds true to empty?" do
+    [].blank?.should == true
+    {}.blank?.should == true
+    o = Object.new
+    def o.empty?; true; end
+    o.blank?.should == true
+  end
+
+  specify "it should be false if the object doesn't respond true to empty?" do
+    [2].blank?.should == false
+    {1=>2}.blank?.should == false
+    Object.new.blank?.should == false
+  end
+end
+
+context "Numeric#blank?" do
+  specify "it should always be false" do
+    1.blank?.should == false
+    0.blank?.should == false
+    -1.blank?.should == false
+    1.0.blank?.should == false
+    0.0.blank?.should == false
+    -1.0.blank?.should == false
+    10000000000000000.blank?.should == false
+    -10000000000000000.blank?.should == false
+    10000000000000000.0.blank?.should == false
+    -10000000000000000.0.blank?.should == false
+  end
+end
+
+context "NilClass#blank?" do
+  specify "it should always be true" do
+    nil.blank?.should == true
+  end
+end
+
+context "TrueClass#blank?" do
+  specify "it should always be false" do
+    true.blank?.should == false
+  end
+end
+
+context "FalseClass#blank?" do
+  specify "it should always be true" do
+    false.blank?.should == true
+  end
+end
+
+context "String#blank?" do
+  specify "it should be true if the string is empty" do
+    ''.blank?.should == true
+  end
+  specify "it should be true if the string is composed of just whitespace" do
+    ' '.blank?.should == true
+    "\r\n\t".blank?.should == true
+    (' '*4000).blank?.should == true
+    ("\r\n\t"*4000).blank?.should == true
+  end
+  specify "it should be false if the string has any non whitespace characters" do
+    '1'.blank?.should == false
+    ("\r\n\t"*4000 + 'a').blank?.should == false
+    ("\r\na\t"*4000).blank?.should == false
+  end
+end

data/spec/extensions/caching_spec.rb

@@ -0,0 +1,201 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+describe Sequel::Model, "caching" do
+  before do
+    MODEL_DB.reset
+    
+    @cache_class = Class.new(Hash) do
+      attr_accessor :ttl
+      def set(k, v, ttl); self[k] = v; @ttl = ttl; end
+      def get(k); self[k]; end
+    end
+    cache = @cache_class.new
+    @cache = cache
+    
+    @c = Class.new(Sequel::Model(:items))
+    @c.class_eval do
+      plugin :caching, cache
+      def self.name; 'Item' end
+      
+      columns :name, :id
+    end
+    
+    $cache_dataset_row = {:name => 'sharon', :id => 1}
+    @dataset = @c.dataset
+    $sqls = []
+    @dataset.extend(Module.new {
+      def fetch_rows(sql)
+        $sqls << sql
+        yield $cache_dataset_row
+      end
+      
+      def update(values)
+        $sqls << update_sql(values)
+        $cache_dataset_row.merge!(values)
+      end
+      
+      def delete
+        $sqls << delete_sql
+      end
+    })
+    @c2 = Class.new(@c) do
+      def self.name; 'SubItem' end
+    end
+  end
+  
+  it "should set the model's cache store" do
+    @c.cache_store.should be(@cache)
+    @c2.cache_store.should be(@cache)
+  end
+  
+  it "should have a default ttl of 3600" do
+    @c.cache_ttl.should == 3600
+    @c2.cache_ttl.should == 3600
+  end
+  
+  it "should take a ttl option" do
+    @c.plugin :caching, @cache, :ttl => 1234
+    @c.cache_ttl.should == 1234
+    Class.new(@c).cache_ttl.should == 1234
+  end
+  
+  it "should offer a set_cache_ttl method for setting the ttl" do
+    @c.cache_ttl.should == 3600
+    @c.set_cache_ttl 1234
+    @c.cache_ttl.should == 1234
+    Class.new(@c).cache_ttl.should == 1234
+  end
+  
+  it "should generate a cache key appropriate to the class" do
+    m = @c.new
+    m.values[:id] = 1
+    m.cache_key.should == "#{m.class}:1"
+    m = @c2.new
+    m.values[:id] = 1
+    m.cache_key.should == "#{m.class}:1"
+    
+    # custom primary key
+    @c.set_primary_key :ttt
+    m = @c.new
+    m.values[:ttt] = 333
+    m.cache_key.should == "#{m.class}:333"
+    c = Class.new(@c)
+    m = c.new
+    m.values[:ttt] = 333
+    m.cache_key.should == "#{m.class}:333"
+    
+    # composite primary key
+    @c.set_primary_key [:a, :b, :c]
+    m = @c.new
+    m.values[:a] = 123
+    m.values[:c] = 456
+    m.values[:b] = 789
+    m.cache_key.should == "#{m.class}:123,789,456"
+    c = Class.new(@c)
+    m = c.new
+    m.values[:a] = 123
+    m.values[:c] = 456
+    m.values[:b] = 789
+    m.cache_key.should == "#{m.class}:123,789,456"
+  end
+  
+  it "should raise error if attempting to generate cache_key and primary key value is null" do
+    m = @c.new
+    proc {m.cache_key}.should raise_error(Sequel::Error)
+    m.values[:id] = 1
+    proc {m.cache_key}.should_not raise_error(Sequel::Error)
+
+    m = @c2.new
+    proc {m.cache_key}.should raise_error(Sequel::Error)
+    m.values[:id] = 1
+    proc {m.cache_key}.should_not raise_error(Sequel::Error)
+  end
+  
+  it "should not raise error if trying to save a new record" do
+    proc {@c.new(:name=>'blah').save}.should_not raise_error
+    proc {@c.create(:name=>'blah')}.should_not raise_error
+    proc {@c2.new(:name=>'blah').save}.should_not raise_error
+    proc {@c2.create(:name=>'blah')}.should_not raise_error
+  end
+  
+  it "should set the cache when reading from the database" do
+    $sqls.should == []
+    @cache.should be_empty
+    
+    m = @c[1]
+    $sqls.should == ['SELECT * FROM items WHERE (id = 1) LIMIT 1']
+    m.values.should == $cache_dataset_row
+    @cache[m.cache_key].should == m
+    m2 = @c[1]
+    $sqls.should == ['SELECT * FROM items WHERE (id = 1) LIMIT 1']
+    m2.should == m
+    m2.values.should == $cache_dataset_row
+
+    $sqls.clear
+    m = @c2[1]
+    $sqls.should == ['SELECT * FROM items WHERE (id = 1) LIMIT 1']
+    m.values.should == $cache_dataset_row
+    @cache[m.cache_key].should == m
+    m2 = @c2[1]
+    $sqls.should == ['SELECT * FROM items WHERE (id = 1) LIMIT 1']
+    m2.should == m
+    m2.values.should == $cache_dataset_row
+  end
+  
+  it "should delete the cache when writing to the database" do
+    m = @c[1]
+    @cache[m.cache_key].should == m
+    m.name = 'hey'
+    m.save
+    @cache.has_key?(m.cache_key).should be_false
+    $sqls.last.should == "UPDATE items SET name = 'hey', id = 1 WHERE (id = 1)"
+
+    m = @c2[1]
+    @cache[m.cache_key].should == m
+    m.name = 'hey'
+    m.save
+    @cache.has_key?(m.cache_key).should be_false
+    $sqls.last.should == "UPDATE items SET name = 'hey', id = 1 WHERE (id = 1)"
+  end
+
+  it "should delete the cache when deleting the record" do
+    m = @c[1]
+    @cache[m.cache_key].should == m
+    m.delete
+    @cache.has_key?(m.cache_key).should be_false
+    $sqls.last.should == "DELETE FROM items WHERE (id = 1)"
+
+    m = @c2[1]
+    @cache[m.cache_key].should == m
+    m.delete
+    @cache.has_key?(m.cache_key).should be_false
+    $sqls.last.should == "DELETE FROM items WHERE (id = 1)"
+  end
+  
+  it "should support #[] as a shortcut to #find with hash" do
+    m = @c[:id => 3]
+    @cache[m.cache_key].should be_nil
+    $sqls.last.should == "SELECT * FROM items WHERE (id = 3) LIMIT 1"
+    m = @c[1]
+    @cache[m.cache_key].should == m
+    $sqls.should == ["SELECT * FROM items WHERE (id = 3) LIMIT 1", \
+      "SELECT * FROM items WHERE (id = 1) LIMIT 1"]
+    @c[:id => 4]
+    $sqls.should == ["SELECT * FROM items WHERE (id = 3) LIMIT 1", \
+      "SELECT * FROM items WHERE (id = 1) LIMIT 1", \
+      "SELECT * FROM items WHERE (id = 4) LIMIT 1"]
+
+    $sqls.clear
+    m = @c2[:id => 3]
+    @cache[m.cache_key].should be_nil
+    $sqls.last.should == "SELECT * FROM items WHERE (id = 3) LIMIT 1"
+    m = @c2[1]
+    @cache[m.cache_key].should == m
+    $sqls.should == ["SELECT * FROM items WHERE (id = 3) LIMIT 1", \
+      "SELECT * FROM items WHERE (id = 1) LIMIT 1"]
+    @c2[:id => 4]
+    $sqls.should == ["SELECT * FROM items WHERE (id = 3) LIMIT 1", \
+      "SELECT * FROM items WHERE (id = 1) LIMIT 1", \
+      "SELECT * FROM items WHERE (id = 4) LIMIT 1"]
+  end
+end

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

@@ -5,16 +5,6 @@ describe "Model hooks" do
     MODEL_DB.reset
   end
   
-  specify "should be definable using def <hook name>" do
-    c = Class.new(Sequel::Model) do
-      def before_save
-        "hi there"
-      end
-    end
-    
-    c.new.before_save.should == 'hi there'
-  end
-  
   specify "should be definable using a block" do
     $adds = []
     c = Class.new(Sequel::Model)
@@ -201,7 +191,7 @@ describe "Model#after_initialize" do
 end
 
 describe "Model#before_create && Model#after_create" do
-  setup do
+  before do
     MODEL_DB.reset
 
     @c = Class.new(Sequel::Model(:items))
@@ -239,7 +229,7 @@ describe "Model#before_create && Model#after_create" do
 end
 
 describe "Model#before_update && Model#after_update" do
-  setup do
+  before do
     MODEL_DB.reset
 
     @c = Class.new(Sequel::Model(:items))
@@ -275,7 +265,7 @@ describe "Model#before_update && Model#after_update" do
 end
 
 describe "Model#before_save && Model#after_save" do
-  setup do
+  before do
     MODEL_DB.reset
 
     @c = Class.new(Sequel::Model(:items))
@@ -323,7 +313,7 @@ describe "Model#before_save && Model#after_save" do
 end
 
 describe "Model#before_destroy && Model#after_destroy" do
-  setup do
+  before do
     MODEL_DB.reset
 
     @c = Class.new(Sequel::Model(:items))
@@ -362,7 +352,7 @@ describe "Model#before_destroy && Model#after_destroy" do
 end
 
 describe "Model#before_validation && Model#after_validation" do
-  setup do
+  before do
     MODEL_DB.reset
 
     @c = Class.new(Sequel::Model(:items))
@@ -372,11 +362,6 @@ describe "Model#before_validation && Model#after_validation" do
       def self.validate(o)
         o.errors[:id] << 'not valid' unless o[:id] == 2233
       end
-      
-      def save!(*columns)
-        MODEL_DB << "CREATE BLAH"
-        self
-      end
       columns :id
     end
   end
@@ -397,7 +382,7 @@ describe "Model#before_validation && Model#after_validation" do
     @c.before_validation{MODEL_DB << "BLAH before"}
     m = @c.load(:id => 2233)
     m.save.should == m
-    MODEL_DB.sqls.should == ['BLAH before', 'BLAH after', 'CREATE BLAH']
+    MODEL_DB.sqls.should == ['BLAH before', 'BLAH after', 'UPDATE items SET id = 2233 WHERE (id = 2233)']
 
     MODEL_DB.sqls.clear
     m = @c.load(:id => 22)
@@ -422,7 +407,7 @@ describe "Model#before_validation && Model#after_validation" do
 end
 
 describe "Model.has_hooks?" do
-  setup do
+  before do
     @c = Class.new(Sequel::Model(:items))
   end
   
@@ -442,7 +427,7 @@ describe "Model.has_hooks?" do
 end
 
 describe "Model#add_hook_type" do
-  setup do
+  before do
     class Foo < Sequel::Model(:items)
       add_hook_type :before_bar, :after_bar
 

data/spec/{sequel_model → extensions}/inflector_spec.rb

@@ -86,6 +86,9 @@ describe String::Inflections do
     String.inflections.plurals.replace(@plurals)
     String.inflections.singulars.replace(@singulars)
     String.inflections.uncountables.replace(@uncountables)
+    Sequel.inflections.plurals.replace(@plurals)
+    Sequel.inflections.singulars.replace(@singulars)
+    Sequel.inflections.uncountables.replace(@uncountables)
   end
 
   it "should be possible to clear the list of singulars, plurals, and uncountables" do

data/spec/{sequel_core → extensions}/migration_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 context "Migration classes" do
-  setup do
+  before do
     Sequel::Migration.descendants.clear
   end
 
@@ -21,7 +21,7 @@ context "Migration classes" do
 end
 
 context "Migration#apply" do
-  setup do
+  before do
     @c = Class.new do
       define_method(:one) {|x| [1111, x]}
       define_method(:two) {|x| [2222, x]}
@@ -129,7 +129,7 @@ MIGRATION_005 = %[
 ]
 
 context "Sequel::Migrator" do
-  setup do
+  before do
     @db = DummyMigrationDB.new
     
     File.open('001_create_sessions.rb', 'w') {|f| f << MIGRATION_001}
@@ -140,7 +140,7 @@ context "Sequel::Migrator" do
     @db[:schema_info].version = nil
   end
   
-  teardown do
+  after do
     Object.send(:remove_const, "CreateSessions") if Object.const_defined?("CreateSessions")
     Object.send(:remove_const, "CreateNodes") if Object.const_defined?("CreateNodes")
     Object.send(:remove_const, "CreateUsers") if Object.const_defined?("CreateUsers")