sequel 3.12.1 → 3.13.0

data/spec/integration/type_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 "Supported types" do
   def create_items_table_with_column(name, type, opts={})

data/spec/model/association_reflection_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::Associations::AssociationReflection, "#associated_class" do
   before do

data/spec/model/associations_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, "associate" do
   it "should use explicit class if given a class, symbol, or string" do
@@ -461,6 +461,21 @@ describe Sequel::Model, "many_to_one" do
     @c2.instance_methods(false).collect{|x| x.to_s}.should_not(include('parent='))
   end
 
+  it "should add associations methods to the :methods_module option" do
+    m = Module.new
+    @c2.many_to_one :parent, :class => @c2, :methods_module=>m
+    m.instance_methods.collect{|x| x.to_s}.should(include('parent'))
+    m.instance_methods.collect{|x| x.to_s}.should(include('parent='))
+    @c2.instance_methods.collect{|x| x.to_s}.should_not(include('parent'))
+    @c2.instance_methods.collect{|x| x.to_s}.should_not(include('parent='))
+  end
+
+  it "should add associations methods directly to class if :methods_module is the class itself" do
+    @c2.many_to_one :parent, :class => @c2, :methods_module=>@c2
+    @c2.instance_methods(false).collect{|x| x.to_s}.should(include('parent'))
+    @c2.instance_methods(false).collect{|x| x.to_s}.should(include('parent='))
+  end
+
   it "should raise an error if trying to set a model object that doesn't have a valid primary key" do
     @c2.many_to_one :parent, :class => @c2
     p = @c2.new
@@ -485,15 +500,15 @@ describe Sequel::Model, "many_to_one" do
     h = []
     @c2.many_to_one :parent, :class => @c2, :before_set=>[proc{|x,y| h << x.pk; h << (y ? -y.pk : :y)}, :blah], :after_set=>proc{h << 3}
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def []=(a, v)
-        a == :parent_id ? (@@blah << (v ? 4 : 5)) : super
+        a == :parent_id ? (self.class.send(:class_variable_get, :@@blah) << (v ? 4 : 5)) : super
       end
       def blah(x)
-        @@blah << (x ? x.pk : :x)
+        self.class.send(:class_variable_get, :@@blah) << (x ? x.pk : :x)
       end
       def blahr(x)
-        @@blah << 6
+        self.class.send(:class_variable_get, :@@blah) << 6
       end
     end
     p = @c2.load(:id=>10)
@@ -509,9 +524,9 @@ describe Sequel::Model, "many_to_one" do
     h = []
     @c2.many_to_one :parent, :class => @c2, :after_load=>[proc{|x,y| h << [x.pk, y.pk]}, :al]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def al(v)
-        @@blah << v.pk
+        self.class.send(:class_variable_get, :@@blah) << v.pk
       end
       def @dataset.fetch_rows(sql)
         yield({:id=>20})
@@ -553,15 +568,15 @@ describe Sequel::Model, "many_to_one" do
     h = []
     @c2.many_to_one :parent, :class => @c2, :before_set=>:bs, :after_set=>:as
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def []=(a, v)
-        a == :parent_id ? (@@blah << 5) : super
+        a == :parent_id ? (self.class.send(:class_variable_get, :@@blah) << 5) : super
       end
       def bs(x)
-        @@blah << x.pk
+        self.class.send(:class_variable_get, :@@blah) << x.pk
       end
       def as(x)
-        @@blah << x.pk * 2
+        self.class.send(:class_variable_get, :@@blah) << x.pk * 2
       end
     end
     p.parent = c
@@ -968,12 +983,12 @@ describe Sequel::Model, "one_to_one" do
     h = []
     @c2.one_to_one :parent, :class => @c2, :before_set=>[proc{|x,y| h << x.pk; h << (y ? -y.pk : :y)}, :blah], :after_set=>proc{h << 3}
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def blah(x)
-        @@blah << (x ? x.pk : :x)
+        self.class.send(:class_variable_get, :@@blah) << (x ? x.pk : :x)
       end
       def blahr(x)
-        @@blah << 6
+        self.class.send(:class_variable_get, :@@blah) << 6
       end
     end
     p = @c2.load(:id=>10)
@@ -989,9 +1004,9 @@ describe Sequel::Model, "one_to_one" do
     h = []
     @c2.one_to_one :parent, :class => @c2, :after_load=>[proc{|x,y| h << [x.pk, y.pk]}, :al]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def al(v)
-        @@blah << v.pk
+        self.class.send(:class_variable_get, :@@blah) << v.pk
       end
       def @dataset.fetch_rows(sql)
         yield({:id=>20})
@@ -1033,15 +1048,15 @@ describe Sequel::Model, "one_to_one" do
     h = []
     @c2.one_to_one :parent, :class => @c2, :before_set=>:bs, :after_set=>:as
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def []=(a, v)
-        a == :node_id ? (@@blah << 5) : super
+        a == :node_id ? (self.class.send(:class_variable_get, :@@blah) << 5) : super
       end
       def bs(x)
-        @@blah << x.pk
+        self.class.send(:class_variable_get, :@@blah) << x.pk
       end
       def as(x)
-        @@blah << x.pk * 2
+        self.class.send(:class_variable_get, :@@blah) << x.pk * 2
       end
     end
     p.parent = c
@@ -1724,18 +1739,18 @@ describe Sequel::Model, "one_to_many" do
     h = []
     @c2.one_to_many :attributes, :class => @c1, :before_add=>[proc{|x,y| h << x.pk; h << -y.pk}, :blah], :after_add=>proc{h << 3}, :before_remove=>:blah, :after_remove=>[:blahr]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def _add_attribute(v)
-        @@blah << 4
+        self.class.send(:class_variable_get, :@@blah) << 4
       end
       def _remove_attribute(v)
-        @@blah << 5
+        self.class.send(:class_variable_get, :@@blah) << 5
       end
       def blah(x)
-        @@blah << x.pk
+        self.class.send(:class_variable_get, :@@blah) << x.pk
       end
       def blahr(x)
-        @@blah << 6
+        self.class.send(:class_variable_get, :@@blah) << 6
       end
     end
     p = @c2.load(:id=>10)
@@ -1751,9 +1766,9 @@ describe Sequel::Model, "one_to_many" do
     h = []
     @c2.one_to_many :attributes, :class => @c1, :after_load=>[proc{|x,y| h << [x.pk, y.collect{|z|z.pk}]}, :al]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def al(v)
-        v.each{|x| @@blah << x.pk}
+        v.each{|x| self.class.send(:class_variable_get, :@@blah) << x.pk}
       end
     end
     @c1.class_eval do
@@ -2477,18 +2492,18 @@ describe Sequel::Model, "many_to_many" do
     h = []
     @c2.many_to_many :attributes, :class => @c1, :before_add=>[proc{|x,y| h << x.pk; h << -y.pk}, :blah], :after_add=>proc{h << 3}, :before_remove=>:blah, :after_remove=>[:blahr]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def _add_attribute(v)
-        @@blah << 4
+        self.class.send(:class_variable_get, :@@blah) << 4
       end
       def _remove_attribute(v)
-        @@blah << 5
+        self.class.send(:class_variable_get, :@@blah) << 5
       end
       def blah(x)
-        @@blah << x.pk
+        self.class.send(:class_variable_get, :@@blah) << x.pk
       end
       def blahr(x)
-        @@blah << 6
+        self.class.send(:class_variable_get, :@@blah) << 6
       end
     end
     p = @c2.load(:id=>10)
@@ -2504,9 +2519,9 @@ describe Sequel::Model, "many_to_many" do
     h = []
     @c2.many_to_many :attributes, :class => @c1, :after_load=>[proc{|x,y| h << [x.pk, y.collect{|z|z.pk}]}, :al]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def al(v)
-        v.each{|x| @@blah << x.pk}
+        v.each{|x| self.class.send(:class_variable_get, :@@blah) << x.pk}
       end
     end
     @c1.class_eval do

data/spec/model/base_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 "Model attribute setters" do
 

data/spec/model/dataset_methods_spec.rb

@@ -1,14 +1,14 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model::DatasetMethods, "#destroy"  do
   before do
     @c = Class.new(Sequel::Model(:items)) do
-      @@destroyed = []
+      class_variable_set(:@@destroyed, [])
       def destroy
-        @@destroyed << self
+        self.class.send(:class_variable_get, :@@destroyed) << self
       end
       def self.destroyed
-        @@destroyed
+        class_variable_get(:@@destroyed)
       end
     end
     @d = @c.dataset

data/spec/model/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::Model, "#eager" do
   before(:each) do

data/spec/model/hooks_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 "Model#after_initialize" do
   specify "should be called after initialization" do

data/spec/model/inflector_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::Inflections do
   before do

data/spec/model/model_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
@@ -302,6 +302,12 @@ describe Sequel::Model, ".find_or_create" do
       "INSERT INTO items (x) VALUES (1)"
     ]
   end
+
+  it "should pass the new record to be created to the block if no record is found" do
+    @c.meta_def(:find){|*|} 
+    @c.find_or_create(:x => 1){|x| x[:y] = 2}
+    ["INSERT INTO items (x, y) VALUES (1, 2)", "INSERT INTO items (y, x) VALUES (2, 1)"].should include(MODEL_DB.sqls.first)
+  end
 end
 
 describe Sequel::Model, ".all" do

data/spec/model/plugins_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, ".plugin" do
   before do

data/spec/model/record_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 "Model#save server use" do
   
@@ -1462,7 +1462,6 @@ describe Sequel::Model, "typecasting" do
   specify "should raise an error if invalid data is used in a time field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:time}})
     proc{@c.new.x = '0000'}.should raise_error
-    proc{@c.new.x = 'a'}.should_not raise_error # Valid Time
     proc{@c.new.x = Date.parse('2008-10-21')}.should raise_error(Sequel::InvalidValue)
     proc{@c.new.x = DateTime.parse('2008-10-21')}.should raise_error(Sequel::InvalidValue)
   end
@@ -1519,7 +1518,6 @@ 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(Sequel::InvalidValue)
-    proc{@c.new.x = 'a'}.should_not raise_error # Valid Time
     Sequel.datetime_class = DateTime
     proc{@c.new.x = '0000'}.should raise_error(Sequel::InvalidValue)
     proc{@c.new.x = 'a'}.should raise_error(Sequel::InvalidValue)

data/spec/model/spec_helper.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
 unless Object.const_defined?('Sequel')
-  $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
+  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/core'
 end
 unless Sequel.const_defined?('Model')
-  $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
+  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/model'
 end
 

data/spec/model/validations_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::Errors do
   before do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 3.12.1
+  hash: 51
+  prerelease: false
+  segments: 
+  - 3
+  - 13
+  - 0
+  version: 3.13.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 -07:00
+date: 2010-07-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -70,6 +76,7 @@ extra_rdoc_files:
 - doc/release_notes/3.10.0.txt
 - doc/release_notes/3.11.0.txt
 - doc/release_notes/3.12.0.txt
+- doc/release_notes/3.13.0.txt
 files: 
 - COPYING
 - CHANGELOG
@@ -113,6 +120,7 @@ files:
 - doc/release_notes/3.10.0.txt
 - doc/release_notes/3.11.0.txt
 - doc/release_notes/3.12.0.txt
+- doc/release_notes/3.13.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/virtual_rows.rdoc
@@ -186,6 +194,10 @@ files:
 - spec/extensions/string_stripper_spec.rb
 - spec/extensions/update_primary_key_spec.rb
 - spec/extensions/association_pks_spec.rb
+- spec/extensions/json_serializer_spec.rb
+- spec/extensions/list_spec.rb
+- spec/extensions/tree_spec.rb
+- spec/extensions/xml_serializer_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
@@ -362,6 +374,10 @@ files:
 - lib/sequel/plugins/string_stripper.rb
 - lib/sequel/plugins/update_primary_key.rb
 - lib/sequel/plugins/association_pks.rb
+- lib/sequel/plugins/json_serializer.rb
+- lib/sequel/plugins/list.rb
+- lib/sequel/plugins/tree.rb
+- lib/sequel/plugins/xml_serializer.rb
 - lib/sequel/sql.rb
 - lib/sequel/timezones.rb
 - lib/sequel/version.rb
@@ -383,21 +399,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 63
+      segments: 
+      - 1
+      - 8
+      - 4
       version: 1.8.4
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: sequel
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The Database Toolkit for Ruby