merb_sequel 0.4.2 → 0.4.3

data/README

@@ -5,7 +5,6 @@ A plugin for the Merb framework that provides Sequel access
 After you install the plugin, you have access to the sequel_migration generator in your merb projects
 example: /merb/root/script/generate sequel_migration new_migration
 
-
 = Contributors
 
 originally written by Duane Johnson (canadaduane@gmail.com).

data/Rakefile

@@ -3,7 +3,7 @@ require "rake/gempackagetask"
 
 PLUGIN   = "merb_sequel"
 NAME     = "merb_sequel"
-VERSION  = "0.4.2"
+VERSION  = "0.4.3"
 AUTHOR   = "Wayne E. Seguin"
 EMAIL    = "wayneeseguin@gmail.com"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb_sequel/"
@@ -23,7 +23,7 @@ specification = Gem::Specification.new do |spec|
   spec.require_path = "lib"
   spec.extra_rdoc_files = ["README", "LICENSE", 'TODO']
   # Dependencies
-  spec.add_dependency("merb",         ">= 0.4.0")
+  spec.add_dependency("merb",         ">= 0.4.2")
   spec.add_dependency("sequel",       ">= 1.0.0")
   spec.add_dependency("sequel_model", ">= 0.2")
   spec.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*")

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

@@ -18,7 +18,9 @@ module Merb
               # Convert string keys to symbols
               full_config = Erubis.load_yaml_file(config_file)
               config = (Merb::Plugins.config[:merb_sequel] = {})
-              (full_config[MERB_ENV.to_sym] || full_config[MERB_ENV]).each { |k, v| config[k.to_sym] = v }
+              (full_config[MERB_ENV.to_sym] || full_config[MERB_ENV]).each do |key, value|
+                config[key.to_sym] = value
+              end
               config
             end
         end
@@ -29,9 +31,10 @@ module Merb
           require "sequel_model"
 
           if File.exists?(config_file)
-            puts "#{Time.now.httpdate}: Connecting to the '#{config[:adapter]}' database '#{config[:hosts]}' ..."
+            puts "#{Time.now.httpdate}: Connecting to the '#{config[:database]}' database on '#{config[:host]}' using '#{config[:adapter]}' ..."
             connection = ::Sequel.connect(config_options(config))
             MERB_LOGGER.error("Connection Error: #{e}") unless connection
+            connection
           else
             copy_sample_config
             puts "#{Time.now.httpdate}: No database.yml file found in #{MERB_ROOT}/config."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_sequel
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire: merb_sequel
 bindir: bin
 cert_chain: []
 
-date: 2008-01-03 00:00:00 -05:00
+date: 2008-01-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.4.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: sequel