Update databases/ruby-sequel to 1.5.0. Changes from version 1.4.0 include:

* No longer depend on the assistance gem, merge the Inflector and
  Validations code

* Make the validation errors API compatible with Merb
* Add validates_uniqueness_of, for protecting against duplicate entries
  in the database

* Use reciprocal associations for all types of associations in the
  getter/setter/add_/remove_ methods
* Fix many_to_one associations to cache negative lookups
* Add eager loading of associations via new sequel_core object graphing
* Fix many_to_many associations with classes inside modules without an
  explicit join table

* Add the eager! and eager_graph! mutation methods to model datasets
* Add Model.def_dataset_method, for defining methods on the model that
  reference methods on the dataset
* Change Model#=== to always be false if the primary key is nil
* Add Model#hash, which should be unique for a given class and primary
  key (or values if primary key is nil)
* Make Model#reload clear any cached associations
* Fix Model#destroy so that it returns self, not the result of after_destroy
* Make Model#initialize, Model#set, and Model#update_with_params
  invulnerable to memory exhaustion
* Add Model.str_columns, which gives a list of columns as frozen strings

5 files changed, 12 insertions, 53 deletions

diff --git a/databases/ruby-sequel/Makefile b/databases/ruby-sequel/Makefile
index dda823ab473..d1bb97ccaee 100644
--- a/databases/ruby-sequel/Makefile
+++ b/databases/ruby-sequel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2008/04/13 06:56:30 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/29 18:39:02 jlam Exp $
 
-DISTNAME=	sequel-1.4.0
+DISTNAME=	sequel-1.5.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases
 
@@ -8,13 +8,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sequel.rubyforge.org/
 COMMENT=	Model classes for the Sequel Database Toolkit
 
-BUILD_DEPENDS+=	${RUBY_PKGPREFIX}-rspec>=1.1.3:../../devel/ruby-rspec
-DEPENDS+=	${RUBY_PKGPREFIX}-assistance>=0.1.2:../../devel/ruby-assistance
-DEPENDS+=	${RUBY_PKGPREFIX}-sequel-core>=1.4.0:../../databases/ruby-sequel-core
-
-# Remove originals of patched files so they aren't included in the gem.
-pre-build:
-	find ${WRKSRC} -name "*.orig" | xargs rm -f
+DEPENDS+=	${RUBY_PKGPREFIX}-sequel-core>=1.5.0:../../databases/ruby-sequel-core
 
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-sequel/PLIST b/databases/ruby-sequel/PLIST
index 00b5ee3fdc5..8c37de1751d 100644
--- a/databases/ruby-sequel/PLIST
+++ b/databases/ruby-sequel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/04/13 06:56:30 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/04/29 18:39:02 jlam Exp $
 ${GEM_HOME}/cache/sequel-${PKGVERSION}.gem
 ${GEM_LIBDIR}/CHANGELOG
 ${GEM_LIBDIR}/COPYING
@@ -9,10 +9,12 @@ ${GEM_LIBDIR}/lib/sequel_model.rb
 ${GEM_LIBDIR}/lib/sequel_model/associations.rb
 ${GEM_LIBDIR}/lib/sequel_model/base.rb
 ${GEM_LIBDIR}/lib/sequel_model/caching.rb
+${GEM_LIBDIR}/lib/sequel_model/deprecated.rb
 ${GEM_LIBDIR}/lib/sequel_model/eager_loading.rb
 ${GEM_LIBDIR}/lib/sequel_model/hooks.rb
+${GEM_LIBDIR}/lib/sequel_model/inflections.rb
+${GEM_LIBDIR}/lib/sequel_model/inflector.rb
 ${GEM_LIBDIR}/lib/sequel_model/plugins.rb
-${GEM_LIBDIR}/lib/sequel_model/pretty_table.rb
 ${GEM_LIBDIR}/lib/sequel_model/record.rb
 ${GEM_LIBDIR}/lib/sequel_model/schema.rb
 ${GEM_LIBDIR}/lib/sequel_model/validations.rb
@@ -22,6 +24,7 @@ ${GEM_LIBDIR}/spec/caching_spec.rb
 ${GEM_LIBDIR}/spec/deprecated_relations_spec.rb
 ${GEM_LIBDIR}/spec/eager_loading_spec.rb
 ${GEM_LIBDIR}/spec/hooks_spec.rb
+${GEM_LIBDIR}/spec/inflector_spec.rb
 ${GEM_LIBDIR}/spec/model_spec.rb
 ${GEM_LIBDIR}/spec/plugins_spec.rb
 ${GEM_LIBDIR}/spec/rcov.opts
diff --git a/databases/ruby-sequel/distinfo b/databases/ruby-sequel/distinfo
index 9dae7b7b09a..717b4b384ee 100644
--- a/databases/ruby-sequel/distinfo
+++ b/databases/ruby-sequel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/04/13 06:56:30 jlam Exp $
+$NetBSD: distinfo,v 1.3 2008/04/29 18:39:02 jlam Exp $
 
-SHA1 (sequel-1.4.0.gem) = d217f621460ae290399f196fe27403bc2154e07c
-RMD160 (sequel-1.4.0.gem) = 774fd51b86c5a92615ee315ee8cff9dfa69b23d8
-Size (sequel-1.4.0.gem) = 38912 bytes
+SHA1 (sequel-1.5.0.gem) = 2b4e7594ef3f3e01c34e10a9446d9302cd5ec02c
+RMD160 (sequel-1.5.0.gem) = 817751f46b2b5bee88cb3fdad160a4ae551a6b3c
+Size (sequel-1.5.0.gem) = 53248 bytes
 SHA1 (patch-aa) = d7c6dabee5fdb77570dac24499867293111bc646
 SHA1 (patch-ab) = b49325eb73bfe37af49010b0650a78f5bfe1b9d0
diff --git a/databases/ruby-sequel/patches/patch-aa b/databases/ruby-sequel/patches/patch-aa
deleted file mode 100644
index b40bc8c1b71..00000000000
--- a/databases/ruby-sequel/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/04/14 21:46:11 jlam Exp $
-
---- lib/sequel_model/caching.rb.orig	2008-04-13 02:33:44.000000000 -0400
-+++ lib/sequel_model/caching.rb
-@@ -19,7 +19,7 @@ module Sequel
-       end
-       
-       class_def(:set) {|v| store.delete(cache_key); super}
--      class_def(:save) {store.delete(cache_key); super}
-+      class_def(:save) {store.delete(cache_key) unless new?; super}
-       class_def(:delete) {store.delete(cache_key); super}
-     end
-     
-@@ -39,4 +39,4 @@ module Sequel
-       "#{self}:#{values.join(',')}"
-     end
-   end
--end
-\ No newline at end of file
-+end
diff --git a/databases/ruby-sequel/patches/patch-ab b/databases/ruby-sequel/patches/patch-ab
deleted file mode 100644
index fabf1df66ef..00000000000
--- a/databases/ruby-sequel/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/04/14 21:46:11 jlam Exp $
-
---- spec/caching_spec.rb.orig	2008-04-13 02:33:44.000000000 -0400
-+++ spec/caching_spec.rb
-@@ -87,7 +87,12 @@ describe Sequel::Model, "caching" do
-     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
-+  end
-+
-   it "should set the cache when reading from the database" do
-     $sqls.should == []
-     @cache.should be_empty