sequel 0.5 → 0.5.0.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 0.5.0.1 (2007-12-31)
+
+* Added a stub for Sequel::Model that auto-loads sequel_model.
+
+* Changed Sequel.method_missing and Database.adapter_class to raise AdapterNotFound if an adapter could not be loaded.
+
+* Fixed behavior of error trap in sequel command line tool.
+
 === 0.5 (2007-12-30)
 
 * Removed model code into separate sub-project. Rearranged trunk into core, model and model_plugins.

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel"
-VERS = "0.5"
+VERS = "0.5.0.1"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 
@@ -57,15 +57,21 @@ spec = Gem::Specification.new do |s|
   s.executables = ["sequel"]
   s.required_ruby_version = ">= 1.8.4"
 
+  s.add_dependency("metaid")
+
   case RUBY_PLATFORM
   when /mswin/
     s.platform = Gem::Platform::CURRENT
+    s.add_dependency("RubyInline", ">= 3.6.6")
+    s.add_dependency("ParseTree", ">= 2.1.1")
+    s.add_dependency("ruby2ruby")
   when /java/
     s.platform = "jruby"
   else
     s.platform = Gem::Platform::RUBY
-    s.add_dependency("metaid")
-    s.add_dependency("ParseTree", ">= 2.0.0")
+    # ParseTree on win32 requires PT2.1.1 and RI3.6.6
+    s.add_dependency("RubyInline", ">= 3.6.6")
+    s.add_dependency("ParseTree", ">= 2.1.1")
     s.add_dependency("ruby2ruby")
   end
   

data/bin/sequel

@@ -23,9 +23,6 @@ end
 
 begin
   DB = Sequel.connect db
-rescue LoadError => e
-  puts "Failed to load #{scheme} adapter: #{e.message}"
-  exit
 rescue => e
   puts e.message
   exit

data/lib/sequel.rb

@@ -45,10 +45,22 @@ module Sequel #:nodoc:
           opts = args[1].merge(:database => args[0])
         end
       rescue
-        raise Error, "Unknown adapter (#{m})"
+        raise Error::AdapterNotFound, "Unknown adapter (#{m})"
       end
       c.new(opts)
     end
+    
+    # stub for Sequel::Model()
+    def Model(*args)
+      require 'sequel_model'
+      if respond_to?(:Model)
+        send(:Model, *args)
+      else
+        raise LoadError
+      end
+    rescue LoadError
+      raise SequelError, "The sequel_model library could not be found. In order to use Sequel models please install sequel_model."
+    end
   end
 end
 

data/lib/sequel/database.rb

@@ -371,13 +371,23 @@ module Sequel
     end
     
     def self.adapter_class(scheme)
-      scheme = scheme.to_s =~ /\-/ ? scheme.to_s.gsub('-', '_').to_sym : scheme.to_sym
-      unless c = @@adapters[scheme.to_sym]
-        require File.join(File.dirname(__FILE__), "adapters/#{scheme}")
-        c = @@adapters[scheme.to_sym]
+      adapter_name = scheme.to_s =~ /\-/ ? scheme.to_s.gsub('-', '_').to_sym : scheme.to_sym
+      scheme = scheme.to_sym
+      
+      if (klass = @@adapters[scheme]).nil?
+        # attempt to load the adapter file
+        begin
+          require File.join(File.dirname(__FILE__), "adapters/#{scheme}")
+        rescue LoadError => e
+          raise Error::AdapterNotFound, "Could not load #{scheme} adapter:\n  #{e.message}"
+        end
+        
+        # make sure we actually loaded the adapter
+        if (klass = @@adapters[scheme]).nil?
+          raise Error::AdapterNotFound, "Could not load #{scheme} adapter"
+        end
       end
-      raise Error::InvalidDatabaseScheme, "Invalid database scheme" unless c
-      c
+      return klass
     end
         
     # call-seq:

data/lib/sequel/exceptions.rb

@@ -5,8 +5,6 @@ module Sequel
     # Rollback is a special error used to rollback a transactions.
     # A transaction block will catch this error and wont pass further up the stack.
     class Rollback < Error ; end
-
-    class InvalidDatabaseScheme < Error; end
     
     # Represents an invalid value stored in the database.
     class InvalidValue < Error ; end
@@ -26,7 +24,9 @@ module Sequel
     class InvalidJoinType < Error ; end
                                        
     class WorkerStop < RuntimeError ; end
-
+    
+    # Raised when Sequel is unable to load a specified adapter.
+    class AdapterNotFound < Error ; end
   end  
 end
 

data/spec/database_spec.rb

@@ -545,15 +545,15 @@ end
 
 context "An unknown database scheme" do
   specify "should raise an error in Sequel::Database.connect" do
-    proc {Sequel::Database.connect('ddd://localhost/db')}.should raise_error(LoadError)
+    proc {Sequel::Database.connect('ddd://localhost/db')}.should raise_error(Sequel::Error::AdapterNotFound)
   end
 
   specify "should raise an error in Sequel.connect" do
-    proc {Sequel.connect('ddd://localhost/db')}.should raise_error(LoadError)
+    proc {Sequel.connect('ddd://localhost/db')}.should raise_error(Sequel::Error::AdapterNotFound)
   end
 
   specify "should raise an error in Sequel.open" do
-    proc {Sequel.open('ddd://localhost/db')}.should raise_error(LoadError)
+    proc {Sequel.open('ddd://localhost/db')}.should raise_error(Sequel::Error::AdapterNotFound)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: 0.5.0.1
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-30 00:00:00 +02:00
+date: 2007-12-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: RubyInline
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.6.6
+    version: 
 - !ruby/object:Gem::Dependency 
   name: ParseTree
   version_requirement: 
@@ -28,7 +37,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby