sequel 3.12.1 → 3.13.0

data/spec/extensions/sql_expr_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "Sequel sql_expr extension" do
   specify "Object#sql_expr should wrap the object in a GenericComplexExpression" do

data/spec/extensions/string_date_time_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "String#to_time" do
   specify "should convert the string into a Time object" do

data/spec/extensions/string_stripper_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::StringStripper" do
   before do

data/spec/extensions/subclasses_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "Subclasses plugin" do
   before do

data/spec/extensions/tactical_eager_loading_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::TacticalEagerLoading" do
   before do

data/spec/extensions/thread_local_timezones_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel thread_local_timezones extension" do
   after do

data/spec/extensions/timestamps_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::Timestamps" do
   before do

data/spec/extensions/touch_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Touch plugin" do
   before do

data/spec/extensions/tree_spec.rb

@@ -0,0 +1,119 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe Sequel::Model, "tree plugin" do
+  def klass(opts={})
+    @db = MODEL_DB
+    c = Class.new(Sequel::Model(@db[:nodes]))
+    c.class_eval do
+      def self.name; 'Node'; end
+      columns :id, :name, :parent_id, :i, :pi
+    end
+    ds = c.dataset
+    class << ds
+      attr_accessor :row_sets
+      def fetch_rows(sql)
+        @db << sql
+        if rs = row_sets.shift
+          rs.each{|row| yield row}
+        end
+      end
+    end
+    c.plugin :tree, opts
+    c
+  end
+
+  def y(c, *hs)
+    ds = c.dataset
+    ds.row_sets = hs
+  end
+
+  before do
+    @c = klass
+    @ds = @c.dataset
+    @o = @c.load(:id=>2, :parent_id=>1, :name=>'AA', :i=>3, :pi=>4)
+    @db.reset
+  end
+
+  it "should define the correct associations" do
+    @c.associations.sort_by{|x| x.to_s}.should == [:children, :parent]
+  end
+  
+  it "should define the correct associations when giving options" do
+    klass(:children=>{:name=>:cs}, :parent=>{:name=>:p}).associations.sort_by{|x| x.to_s}.should == [:cs, :p]
+  end
+
+  it "should use the correct SQL for lazy associations" do
+    @o.parent_dataset.sql.should == 'SELECT * FROM nodes WHERE (nodes.id = 1) LIMIT 1'
+    @o.children_dataset.sql.should == 'SELECT * FROM nodes WHERE (nodes.parent_id = 2)'
+  end
+  
+  it "should use the correct SQL for lazy associations when giving options" do
+    o = klass(:primary_key=>:i, :key=>:pi, :order=>:name, :children=>{:name=>:cs}, :parent=>{:name=>:p}).load(:id=>2, :parent_id=>1, :name=>'AA', :i=>3, :pi=>4)
+    o.p_dataset.sql.should == 'SELECT * FROM nodes WHERE (nodes.i = 4) ORDER BY name LIMIT 1'
+    o.cs_dataset.sql.should == 'SELECT * FROM nodes WHERE (nodes.pi = 3) ORDER BY name'
+  end
+
+  it "should have parent_column give the symbol of the parent column" do
+    @c.parent_column.should == :parent_id
+    klass(:key=>:p_id).parent_column.should == :p_id
+  end
+
+  it "should have tree_order give the order of the association" do
+    @c.tree_order.should == nil
+    klass(:order=>:name).tree_order.should == :name
+    klass(:order=>[:parent_id, :name]).tree_order.should == [:parent_id, :name]
+  end
+
+  it "should work correctly in subclasses" do
+    o = Class.new(klass(:primary_key=>:i, :key=>:pi, :order=>:name, :children=>{:name=>:cs}, :parent=>{:name=>:p})).load(:id=>2, :parent_id=>1, :name=>'AA', :i=>3, :pi=>4)
+    o.p_dataset.sql.should == 'SELECT * FROM nodes WHERE (nodes.i = 4) ORDER BY name LIMIT 1'
+    o.cs_dataset.sql.should == 'SELECT * FROM nodes WHERE (nodes.pi = 3) ORDER BY name'
+  end
+
+  it "should have roots return an array of the tree's roots" do
+    y(@c, [{:id=>1, :parent_id=>nil, :name=>'r'}])
+    @c.roots.should == [@c.load(:id=>1, :parent_id=>nil, :name=>'r')]
+    @db.sqls.should == ["SELECT * FROM nodes WHERE (parent_id IS NULL)"]
+  end
+
+  it "should have roots_dataset be a dataset representing the tree's roots" do
+    @c.roots_dataset.sql.should == "SELECT * FROM nodes WHERE (parent_id IS NULL)"
+  end
+
+  it "should have ancestors return the ancestors of the current node" do
+    y(@c, [{:id=>1, :parent_id=>5, :name=>'r'}], [{:id=>5, :parent_id=>nil, :name=>'r2'}])
+    @o.ancestors.should == [@c.load(:id=>1, :parent_id=>5, :name=>'r'), @c.load(:id=>5, :parent_id=>nil, :name=>'r2')]
+    @db.sqls.should == ["SELECT * FROM nodes WHERE (nodes.id = 1) LIMIT 1",
+      "SELECT * FROM nodes WHERE (nodes.id = 5) LIMIT 1"]
+  end
+
+  it "should have descendants return the descendants of the current node" do
+    y(@c, [{:id=>3, :parent_id=>2, :name=>'r'}, {:id=>4, :parent_id=>2, :name=>'r2'}], [{:id=>5, :parent_id=>4, :name=>'r3'}], [])
+    @o.descendants.should == [@c.load(:id=>3, :parent_id=>2, :name=>'r'), @c.load(:id=>4, :parent_id=>2, :name=>'r2'), @c.load(:id=>5, :parent_id=>4, :name=>'r3')] 
+    @db.sqls.should == ["SELECT * FROM nodes WHERE (nodes.parent_id = 2)",
+      "SELECT * FROM nodes WHERE (nodes.parent_id = 3)",
+      "SELECT * FROM nodes WHERE (nodes.parent_id = 5)",
+      "SELECT * FROM nodes WHERE (nodes.parent_id = 4)"]
+  end
+
+  it "should have root return the root of the current node" do
+    y(@c, [{:id=>1, :parent_id=>5, :name=>'r'}], [{:id=>5, :parent_id=>nil, :name=>'r2'}])
+    @o.root.should == @c.load(:id=>5, :parent_id=>nil, :name=>'r2')
+    @db.sqls.should == ["SELECT * FROM nodes WHERE (nodes.id = 1) LIMIT 1",
+      "SELECT * FROM nodes WHERE (nodes.id = 5) LIMIT 1"]
+  end
+
+  it "should have self_and_siblings return the children of the current node's parent" do
+    y(@c, [{:id=>1, :parent_id=>3, :name=>'r'}], [{:id=>7, :parent_id=>1, :name=>'r2'}, @o.values.dup])
+    @o.self_and_siblings.should == [@c.load(:id=>7, :parent_id=>1, :name=>'r2'), @o] 
+    @db.sqls.should == ["SELECT * FROM nodes WHERE (nodes.id = 1) LIMIT 1",
+      "SELECT * FROM nodes WHERE (nodes.parent_id = 1)"]
+  end
+
+  it "should have siblings return the children of the current node's parent, except for the current node" do
+    y(@c, [{:id=>1, :parent_id=>3, :name=>'r'}], [{:id=>7, :parent_id=>1, :name=>'r2'}, @o.values.dup])
+    @o.siblings.should == [@c.load(:id=>7, :parent_id=>1, :name=>'r2')] 
+    @db.sqls.should == ["SELECT * FROM nodes WHERE (nodes.id = 1) LIMIT 1",
+      "SELECT * FROM nodes WHERE (nodes.parent_id = 1)"]
+  end
+end

data/spec/extensions/typecast_on_load_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "TypecastOnLoad plugin" do
   before do

data/spec/extensions/update_primary_key_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::UpdatePrimaryKey" do
   before do

data/spec/extensions/validation_class_methods_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model do
   before do

data/spec/extensions/validation_helpers_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::ValidationHelpers" do
   before do

data/spec/extensions/xml_serializer_spec.rb

@@ -0,0 +1,142 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+begin
+  require 'nokogiri'
+rescue LoadError => e
+  skip_warn "xml_serializer plugin: can't load nokogiri (#{e.class}: #{e})"
+else
+describe "Sequel::Plugins::XmlSerializer" do
+  before do
+    class ::Artist < Sequel::Model
+      plugin :xml_serializer
+      columns :id, :name
+      @db_schema = {:id=>{:type=>:integer}, :name=>{:type=>:string}}
+      one_to_many :albums
+    end
+    class ::Album < Sequel::Model
+      attr_accessor :blah
+      plugin :xml_serializer
+      columns :id, :name, :artist_id
+      @db_schema = {:id=>{:type=>:integer}, :name=>{:type=>:string}, :artist_id=>{:type=>:integer}}
+      many_to_one :artist
+    end
+    @artist = Artist.load(:id=>2, :name=>'YJM')
+    @artist.associations[:albums] = []
+    @album = Album.load(:id=>1, :name=>'RF')
+    @album.artist = @artist
+    @album.blah = 'Blah'
+  end
+  after do
+    Object.send(:remove_const, :Artist)
+    Object.send(:remove_const, :Album)
+  end
+
+  it "should round trip successfully" do
+    Artist.from_xml(@artist.to_xml).should == @artist
+    Album.from_xml(@album.to_xml).should == @album
+  end
+
+  it "should handle the :only option" do
+    Artist.from_xml(@artist.to_xml(:only=>:name)).should == Artist.load(:name=>@artist.name)
+    Album.from_xml(@album.to_xml(:only=>[:id, :name])).should == Album.load(:id=>@album.id, :name=>@album.name)
+  end
+
+  it "should handle the :except option" do
+    Artist.from_xml(@artist.to_xml(:except=>:id)).should == Artist.load(:name=>@artist.name)
+    Album.from_xml(@album.to_xml(:except=>[:id, :artist_id])).should == Album.load(:name=>@album.name)
+  end
+
+  it "should handle the :include option for associations" do
+    Artist.from_xml(@artist.to_xml(:include=>:albums)).albums.should == [@album]
+    Album.from_xml(@album.to_xml(:include=>:artist)).artist.should == @artist
+  end
+
+  it "should handle the :include option for arbitrary attributes" do
+    Album.from_xml(@album.to_xml(:include=>:blah)).blah.should == @album.blah
+  end
+
+  it "should handle multiple inclusions using an array for the :include option" do
+    a = Album.from_xml(@album.to_xml(:include=>[:blah, :artist]))
+    a.blah.should == @album.blah
+    a.artist.should == @artist
+  end
+
+  it "should handle cascading using a hash for the :include option" do
+    Artist.from_xml(@artist.to_xml(:include=>{:albums=>{:include=>:artist}})).albums.map{|a| a.artist}.should == [@artist]
+    Album.from_xml(@album.to_xml(:include=>{:artist=>{:include=>:albums}})).artist.albums.should == [@album]
+
+    Artist.from_xml(@artist.to_xml(:include=>{:albums=>{:only=>:name}})).albums.should == [Album.load(:name=>@album.name)]
+    Album.from_xml(@album.to_xml(:include=>{:artist=>{:except=>:name}})).artist.should == Artist.load(:id=>@artist.id)
+
+    Artist.from_xml(@artist.to_xml(:include=>{:albums=>{:include=>{:artist=>{:include=>:albums}}}})).albums.map{|a| a.artist.albums}.should == [[@album]]
+    Album.from_xml(@album.to_xml(:include=>{:artist=>{:include=>{:albums=>{:only=>:name}}}})).artist.albums.should == [Album.load(:name=>@album.name)]
+  end
+
+  it "should handle the :include option cascading with an empty hash" do
+    Album.from_xml(@album.to_xml(:include=>{:artist=>{}})).artist.should == @artist
+    Album.from_xml(@album.to_xml(:include=>{:blah=>{}})).blah.should == @album.blah
+  end
+
+  it "should support #from_xml to set column values" do
+    @artist.from_xml('<album><name>AS</name></album>')
+    @artist.name.should == 'AS'
+    @artist.id.should == 2
+  end
+
+  it "should support a :name_proc option when serializing and deserializing" do
+    Album.from_xml(@album.to_xml(:name_proc=>proc{|s| s.reverse}), :name_proc=>proc{|s| s.reverse}).should == @album
+  end
+
+  it "should support a :camelize option when serializing and :underscore option when deserializing" do
+    Album.from_xml(@album.to_xml(:camelize=>true), :underscore=>true).should == @album
+  end
+
+  it "should support a :camelize option when serializing and :underscore option when deserializing" do
+    Album.from_xml(@album.to_xml(:dasherize=>true), :underscore=>true).should == @album
+  end
+
+  it "should support an :encoding option when serializing" do
+    ["<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><id>2</id><name>YJM</name></artist>",
+     "<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><name>YJM</name><id>2</id></artist>"].should include(@artist.to_xml(:encoding=>'utf-8').gsub(/\n */m, ''))
+  end
+
+  it "should support a :builder_opts option when serializing" do
+    ["<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><id>2</id><name>YJM</name></artist>",
+     "<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><name>YJM</name><id>2</id></artist>"].should include(@artist.to_xml(:builder_opts=>{:encoding=>'utf-8'}).gsub(/\n */m, ''))
+  end
+
+  it "should support an :types option when serializing" do
+    ["<?xml version=\"1.0\"?><artist><id type=\"integer\">2</id><name type=\"string\">YJM</name></artist>",
+     "<?xml version=\"1.0\"?><artist><name type=\"string\">YJM</name><id type=\"integer\">2</id></artist>"].should include(@artist.to_xml(:types=>true).gsub(/\n */m, ''))
+  end
+
+  it "should support an :root_name option when serializing" do
+    ["<?xml version=\"1.0\"?><ar><id>2</id><name>YJM</name></ar>",
+     "<?xml version=\"1.0\"?><ar><name>YJM</name><id>2</id></ar>"].should include(@artist.to_xml(:root_name=>'ar').gsub(/\n */m, ''))
+  end
+
+  it "should support an :array_root_name option when serializing arrays" do
+    artist = @artist
+    Artist.dataset.meta_def(:all){[artist]}
+    ["<?xml version=\"1.0\"?><ars><ar><id>2</id><name>YJM</name></ar></ars>",
+     "<?xml version=\"1.0\"?><ars><ar><name>YJM</name><id>2</id></ar></ars>"].should include(Artist.to_xml(:array_root_name=>'ars', :root_name=>'ar').gsub(/\n */m, ''))
+  end
+
+  it "should raise an exception for xml tags that aren't associations, columns, or setter methods" do
+    Album.send(:undef_method, :blah=)
+    proc{Album.from_xml(@album.to_xml(:include=>:blah))}.should raise_error(Sequel::Error)
+  end
+
+  it "should support a to_xml class and dataset method" do
+    album = @album
+    Album.dataset.meta_def(:all){[album]}
+    Album.array_from_xml(Album.to_xml).should == [@album]
+    Album.array_from_xml(Album.to_xml(:include=>:artist)).map{|x| x.artist}.should == [@artist]
+    Album.array_from_xml(Album.dataset.to_xml(:only=>:name)).should == [Album.load(:name=>@album.name)]
+  end
+
+  it "should raise an error if the dataset does not have a row_proc" do
+    proc{Album.dataset.naked.to_xml}.should raise_error(Sequel::Error)
+  end
+end
+end

data/spec/integration/associations_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 shared_examples_for "regular and composite key associations" do  
   specify "should return no objects if none are associated" do

data/spec/integration/database_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 describe Sequel::Database do
   specify "should provide disconnect functionality" do

data/spec/integration/dataset_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 describe "Simple Dataset operations" do
   before do
@@ -656,32 +656,47 @@ describe "Sequel::Dataset DSL support" do
     @ds.get{a / b}.to_i.should == 2
   end
   
-  cspecify "should work with standard bitwise mathematical operators", :mssql, :h2 do
-    @ds.insert(24, 2)
-    @ds.get{a.sql_number << b}.to_i.should == 96
-    @ds.get{a.sql_number >> b}.to_i.should == 6
+  specify "should work with bitwise shift operators" do
+    @ds.insert(3, 2)
+    @ds.get{a.sql_number << b}.to_i.should == 12
+    @ds.get{a.sql_number >> b}.to_i.should == 0
     @ds.delete
+    @ds.insert(3, 1)
+    @ds.get{a.sql_number << b}.to_i.should == 6
+    @ds.get{a.sql_number >> b}.to_i.should == 1
+  end
+
+  specify "should work with bitwise AND and OR operators" do
     @ds.insert(3, 5)
     @ds.get{a.sql_number | b}.to_i.should == 7
     @ds.get{a.sql_number & b}.to_i.should == 1
   end
   
-  cspecify "should work with the bitwise compliment operator", :mysql, :h2 do
+  cspecify "should work with the bitwise compliment operator", :h2 do
+    @ds.insert(-3, 3)
+    @ds.get{~a.sql_number}.to_i.should == 2
+    @ds.get{~b.sql_number}.to_i.should == -4
+  end
+  
+  cspecify "should work with the bitwise xor operator", :sqlite do
     @ds.insert(3, 5)
-    @ds.get{~a.sql_number}.to_i.should == -4
+    @ds.get{a.sql_number ^ b}.to_i.should == 6
   end
   
-  cspecify "should work with inequality operators", :mssql do
+  specify "should work with inequality operators" do
+    @ds.insert(10, 11)
+    @ds.insert(11, 11)
+    @ds.insert(20, 19)
     @ds.insert(20, 20)
-    ['0', 0, false].should include(@ds.get{a > b})
-    ['0', 0, false].should include(@ds.get{a < b})
-    ['1', 1, true].should include(@ds.get{a <= b})
-    ['1', 1, true].should include(@ds.get{a >= b})
+    @ds.filter{a > b}.select_order_map(:a).should == [20]
+    @ds.filter{a >= b}.select_order_map(:a).should == [11, 20, 20]
+    @ds.filter{a < b}.select_order_map(:a).should == [10]
+    @ds.filter{a <= b}.select_order_map(:a).should == [10, 11, 20]
   end
   
-  cspecify "should work with casting and string concatentation", :mssql do
+  specify "should work with casting and string concatentation" do
     @ds.insert(20, 20)
-    @ds.get{a.cast_string + b}.should == '2020'
+    @ds.get{a.cast_string + b.cast_string}.should == '2020'
   end
   
   it "should work with ordering" do

data/spec/integration/eager_loader_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 describe "Eagerly loading a tree structure" do
   before do

data/spec/integration/migrator_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 Sequel.extension :migration
 describe Sequel::Migrator do

data/spec/integration/model_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 describe "Sequel::Model basic support" do 
   before do