merb_sequel 0.9.2 → 0.9.3

data/Rakefile

@@ -3,7 +3,7 @@ require "rake/gempackagetask"
 
 PLUGIN   = "merb_sequel"
 NAME     = "merb_sequel"
-VERSION  = "0.9.2"
+VERSION  = "0.9.3"
 AUTHOR   = "Wayne E. Seguin, Lance Carlson"
 EMAIL    = "wayneeseguin@gmail.com, lancecarlson@gmail.com"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb_sequel/"
@@ -24,9 +24,8 @@ specification = Gem::Specification.new do |spec|
   spec.extra_rdoc_files = ["README", "LICENSE", 'TODO']
   # Dependencies
   #spec.add_dependency("merb",         ">= 0.9")
-  spec.add_dependency("merb-core", ">= 0.9.2")    # This will probably only be temporary until there is an official merb gem greater than 0.9
-  spec.add_dependency("sequel",       ">= 1.0.0")
-  spec.add_dependency("sequel_model", ">= 0.3.3")
+  spec.add_dependency("merb-core", ">= 0.9.3")    # This will probably only be temporary until there is an official merb gem greater than 0.9
+  spec.add_dependency("sequel",       ">= 1.4.0")
   spec.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*")
 end
 

data/lib/merb/orms/sequel/connection.rb

@@ -33,7 +33,6 @@ module Merb
         def connect
           
           require "sequel"
-          require "sequel_model"
 
           if File.exists?(config_file)
             Merb.logger.info!("Connecting to the '#{config[:database]}' database on '#{config[:host]}' using '#{config[:adapter]}' ...")

data/lib/merb_sequel/merbtasks.rb

@@ -11,7 +11,7 @@ namespace :sequel do
 
     desc "Perform migration using migrations in schema/migrations"
     task :migrate => :merb_start do
-      Sequel::Migrator.apply(Merb::Orms::Sequel.connect, "schema/migrations", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+      Sequel::Migrator.apply(Sequel::Model.db, "schema/migrations", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
     end
 
   end

data/sequel_generators/database_sessions_migration/templates/sessions_migration.erb

@@ -10,7 +10,7 @@ class AddSessionsTable < Sequel::Migration
   end
   
   def down
-    execute "DROP TABLE sessions"
+    drop_table :sessions
   end
 
 end

data/sequel_generators/migration/templates/schema/migrations/%migration_file_name%.rb

@@ -17,9 +17,7 @@ class <%= model_class_name %>Migration < Sequel::Migration
   end
 
   def down
-<% if table_name -%>
-    execute "DROP TABLE <%= table_name %>"
-<% end -%>
+    <% "drop_table :#{table_name}" if table_name -%>
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_sequel
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Wayne E. Seguin, Lance Carlson
@@ -9,7 +9,7 @@ autorequire: merb_sequel
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -05:00
+date: 2008-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: sequel
@@ -28,16 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sequel_model
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.3
+        version: 1.4.0
     version: 
 description: Merb plugin that provides support for Sequel and Sequel::Model
 email: wayneeseguin@gmail.com, lancecarlson@gmail.com