sequel 3.42.0 → 3.43.0

data/spec/model/hooks_spec.rb

@@ -385,19 +385,19 @@ describe "Model around filters" do
     @c.raise_on_save_failure = false
 
     o = @c.load(:id => 1)
-    o.meta_def(:around_save){}
+    def o.around_save() end
     o.save.should == nil
 
     o = @c.load(:id => 1)
-    o.meta_def(:around_update){}
+    def o.around_update() end
     o.save.should == nil
 
     o = @c.new
-    o.meta_def(:around_create){}
+    def o.around_create() end
     o.save.should == nil
 
     o = @c.new
-    o.meta_def(:around_validation){}
+    def o.around_validation() end
     o.save.should == nil
   end
 end

data/spec/model/model_spec.rb

@@ -248,22 +248,22 @@ describe Sequel::Model, "dataset & schema" do
   end
 
   it "should raise an error on set_dataset if there is an error connecting to the database" do
-    @model.meta_def(:columns){raise Sequel::DatabaseConnectionError}
+    def @model.columns() raise Sequel::DatabaseConnectionError end
     proc{@model.set_dataset(Sequel::Database.new[:foo].join(:blah))}.should raise_error
   end
 
   it "should not raise an error if there is a problem getting the columns for a dataset" do
-    @model.meta_def(:columns){raise Sequel::Error}
+    def @model.columns() raise Sequel::Error end
     proc{@model.set_dataset(MODEL_DB[:foo].join(:blah))}.should_not raise_error
   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}
+    def @model.get_db_schema(*) raise Sequel::Error end
     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}
+    def @model.set_dataset(*) raise Sequel::Error end
     proc{Class.new(@model)}.should_not raise_error
   end
 end
@@ -376,7 +376,7 @@ describe Sequel::Model, ".subset" do
   end
 
   specify "should not override existing model methods" do
-    @c.meta_def(:active){true}
+    def @c.active() true end
     @c.subset(:active, :active)
     @c.active.should == true
   end
@@ -652,7 +652,7 @@ describe "Model.db_schema" do
   specify "should automatically set a singular primary key based on the schema" do
     ds = @dataset
     d = ds.db
-    d.meta_def(:schema){|table, *opts| [[:x, {:primary_key=>true}]]}
+    def d.schema(table, *opts) [[:x, {:primary_key=>true}]] end
     @c.primary_key.should == :id
     @c.dataset = ds
     @c.db_schema.should == {:x=>{:primary_key=>true}}
@@ -662,7 +662,7 @@ describe "Model.db_schema" do
   specify "should automatically set the composite primary key based on the schema" do
     ds = @dataset
     d = ds.db
-    d.meta_def(:schema){|table, *opts| [[:x, {:primary_key=>true}], [:y, {:primary_key=>true}]]}
+    def d.schema(table, *opts) [[:x, {:primary_key=>true}], [:y, {:primary_key=>true}]] end
     @c.primary_key.should == :id
     @c.dataset = ds
     @c.db_schema.should == {:x=>{:primary_key=>true}, :y=>{:primary_key=>true}}
@@ -672,7 +672,7 @@ describe "Model.db_schema" do
   specify "should automatically set no primary key based on the schema" do
     ds = @dataset
     d = ds.db
-    d.meta_def(:schema){|table, *opts| [[:x, {:primary_key=>false}], [:y, {:primary_key=>false}]]}
+    def d.schema(table, *opts) [[:x, {:primary_key=>false}], [:y, {:primary_key=>false}]] end
     @c.primary_key.should == :id
     @c.dataset = ds
     @c.db_schema.should == {:x=>{:primary_key=>false}, :y=>{:primary_key=>false}}
@@ -682,7 +682,7 @@ describe "Model.db_schema" do
   specify "should not modify the primary key unless all column schema hashes have a :primary_key entry" do
     ds = @dataset
     d = ds.db
-    d.meta_def(:schema){|table, *opts| [[:x, {:primary_key=>false}], [:y, {}]]}
+    def d.schema(table, *opts) [[:x, {:primary_key=>false}], [:y, {}]] end
     @c.primary_key.should == :id
     @c.dataset = ds
     @c.db_schema.should == {:x=>{:primary_key=>false}, :y=>{}}

data/spec/model/record_spec.rb

@@ -96,7 +96,7 @@ describe "Model#save" do
     @c.unrestrict_primary_key
     @c.set_primary_key [:x, :y]
     o = @c.new(:x => 11)
-    o.meta_def(:autoincrementing_primary_key){:y}
+    def o.autoincrementing_primary_key() :y end
     o.save
     sqls = MODEL_DB.sqls
     sqls.length.should == 2
@@ -152,7 +152,7 @@ describe "Model#save" do
   end
   
   it "should mark all columns as not changed if this is a new record and insert_select was used" do
-    @c.dataset.meta_def(:insert_select){|h| h.merge(:id=>1)}
+    def (@c.dataset).insert_select(h) h.merge(:id=>1) end
     o = @c.new(:x => 1, :y => nil)
     o.x = 4
     o.changed_columns.should == [:x]
@@ -1088,17 +1088,17 @@ describe Sequel::Model, "#destroy with filtered dataset" do
   end
 
   it "should raise a NoExistingObject exception if the dataset delete call doesn't return 1" do
-    @instance.this.meta_def(:execute_dui){|*a| 0}
+    def (@instance.this).execute_dui(*a) 0 end
     proc{@instance.delete}.should raise_error(Sequel::NoExistingObject)
-    @instance.this.meta_def(:execute_dui){|*a| 2}
+    def (@instance.this).execute_dui(*a) 2 end
     proc{@instance.delete}.should raise_error(Sequel::NoExistingObject)
-    @instance.this.meta_def(:execute_dui){|*a| 1}
+    def (@instance.this).execute_dui(*a) 1 end
     proc{@instance.delete}.should_not raise_error
     
     @instance.require_modification = false
-    @instance.this.meta_def(:execute_dui){|*a| 0}
+    def (@instance.this).execute_dui(*a) 0 end
     proc{@instance.delete}.should_not raise_error
-    @instance.this.meta_def(:execute_dui){|*a| 2}
+    def (@instance.this).execute_dui(*a) 2 end
     proc{@instance.delete}.should_not raise_error
   end
 
@@ -1122,17 +1122,17 @@ describe Sequel::Model, "#destroy" do
   end
   
   it "should raise a NoExistingObject exception if the dataset delete call doesn't return 1" do
-    @model.dataset.meta_def(:execute_dui){|*a| 0}
+    def (@model.dataset).execute_dui(*a) 0 end
     proc{@instance.delete}.should raise_error(Sequel::NoExistingObject)
-    @model.dataset.meta_def(:execute_dui){|*a| 2}
+    def (@model.dataset).execute_dui(*a) 2 end
     proc{@instance.delete}.should raise_error(Sequel::NoExistingObject)
-    @model.dataset.meta_def(:execute_dui){|*a| 1}
+    def (@model.dataset).execute_dui(*a) 1 end
     proc{@instance.delete}.should_not raise_error
     
     @instance.require_modification = false
-    @model.dataset.meta_def(:execute_dui){|*a| 0}
+    def (@model.dataset).execute_dui(*a) 0 end
     proc{@instance.delete}.should_not raise_error
-    @model.dataset.meta_def(:execute_dui){|*a| 2}
+    def (@model.dataset).execute_dui(*a) 2 end
     proc{@instance.delete}.should_not raise_error
   end
 
@@ -1868,21 +1868,18 @@ describe "Model#lock!" do
   
   it "should do nothing if the record is a new record" do
     o = @c.new
-    called = false
-    o.meta_def(:_refresh){|x| called = true; super(x)}
+    def o._refresh(x) raise Sequel::Error; super(x) end
     x = o.lock!
     x.should == o
-    called.should == false
     MODEL_DB.sqls.should == []
   end
     
   it "should refresh the record using for_update if it is not a new record" do
     o = @c.load(:id => 1)
-    called = false
-    o.meta_def(:_refresh){|x| called = true; super(x)}
+    def o._refresh(x) instance_variable_set(:@a, 1); super(x) end
     x = o.lock!
     x.should == o
-    called.should == true
+    o.instance_variable_get(:@a).should == 1
     MODEL_DB.sqls.should == ["SELECT * FROM items WHERE (id = 1) LIMIT 1 FOR UPDATE"]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 3.42.0
+  version: 3.43.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -105,6 +105,7 @@ extra_rdoc_files:
 - doc/release_notes/3.40.0.txt
 - doc/release_notes/3.41.0.txt
 - doc/release_notes/3.42.0.txt
+- doc/release_notes/3.43.0.txt
 files:
 - MIT-LICENSE
 - CHANGELOG
@@ -184,6 +185,7 @@ files:
 - doc/release_notes/3.40.0.txt
 - doc/release_notes/3.41.0.txt
 - doc/release_notes/3.42.0.txt
+- doc/release_notes/3.43.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc
@@ -250,12 +252,13 @@ files:
 - spec/extensions/timestamps_spec.rb
 - spec/extensions/typecast_on_load_spec.rb
 - spec/extensions/validation_helpers_spec.rb
+- spec/extensions/string_stripper_spec.rb
 - spec/extensions/composition_spec.rb
 - spec/extensions/rcte_tree_spec.rb
 - spec/extensions/instance_filters_spec.rb
 - spec/extensions/sharding_spec.rb
 - spec/extensions/skip_create_refresh_spec.rb
-- spec/extensions/string_stripper_spec.rb
+- spec/extensions/date_arithmetic_spec.rb
 - spec/extensions/update_primary_key_spec.rb
 - spec/extensions/association_pks_spec.rb
 - spec/extensions/json_serializer_spec.rb
@@ -304,6 +307,8 @@ files:
 - spec/extensions/constraint_validations_spec.rb
 - spec/extensions/connection_validator_spec.rb
 - spec/extensions/validation_class_methods_spec.rb
+- spec/extensions/meta_def_spec.rb
+- spec/extensions/core_refinements_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
@@ -505,7 +510,10 @@ files:
 - lib/sequel/extensions/pg_row_ops.rb
 - lib/sequel/extensions/constraint_validations.rb
 - lib/sequel/extensions/connection_validator.rb
-- lib/sequel/metaprogramming.rb
+- lib/sequel/extensions/date_arithmetic.rb
+- lib/sequel/extensions/core_refinements.rb
+- lib/sequel/extensions/meta_def.rb
+- lib/sequel/version.rb
 - lib/sequel/model.rb
 - lib/sequel/model/associations.rb
 - lib/sequel/model/base.rb
@@ -567,7 +575,6 @@ files:
 - lib/sequel/plugins/pg_typecast_on_load.rb
 - lib/sequel/plugins/constraint_validations.rb
 - lib/sequel/timezones.rb
-- lib/sequel/version.rb
 - lib/sequel/ast_transformer.rb
 - lib/sequel/no_core_ext.rb
 - lib/sequel_core.rb

data/lib/sequel/metaprogramming.rb

@@ -1,13 +0,0 @@
-module Sequel
-  # Contains meta_def method for adding methods to objects via blocks, used by some of Sequel's classes and objects.
-  module Metaprogramming
-    # Define a method with the given name and block body on the receiver.
-    #
-    #   ds = DB[:items]
-    #   ds.meta_def(:x){42}
-    #   ds.x # => 42
-    def meta_def(name, &block)
-      (class << self; self end).send(:define_method, name, &block)
-    end
-  end
-end