sequel_rails3 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/sequel_rails3/configuration.rb

@@ -12,14 +12,14 @@ module SequelRails3
     end
 
     def normalize!
+      symbolize_keys!
+
       each_pair do |k, v|
-        k = k.to_sym
         case k
           when :uri
             self[:url] = delete(:uri)
           when :adapter
-            v = v.to_sym
-            case v
+            case v.to_sym
               when :sqlite3
                 self[k] = :sqlite
               when :postgresql
@@ -30,18 +30,25 @@ module SequelRails3
 
       # always use jdbc when running jruby
       if defined?(JRUBY_VERSION)
-        self[:adapter] = "jdbc:#{self[:adapter]}"
+        if self[:adapter]
+          case self[:adapter].to_sym
+            when :postgres
+              self[:adapter] = :postgresql
+          end
+          self[:adapter] = "jdbc:#{self[:adapter]}"
+        end
       end
-      
+
       # some adapters only support an url
-      if self[:adapter] =~ "^(jdbc|do):"
-        port = self[:port] ? ":#{self[:port]}" : ""
+      if self[:adapter] && self[:adapter] =~ /^(jdbc|do):/
         params = {}
         each_pair do |k, v|
-          next if [].include?(:adapter, :host, :port, :database)
+          next if [:adapter, :host, :port, :database].include?(k)
           params[k] = v
         end
-        self[:url] = "%s://%s%s/%s?%s" % [self[:adapter], self[:host], port, self[:database], params]
+        params_str = params.each_pair{ |k, v| "#{k}=#{v}" }
+        port = self[:port] ? ":#{self[:port]}" : ""
+        self[:url] = "%s://%s%s/%s?%s" % [self[:adapter], self[:host], port, self[:database], params_str]
       end
     end
   end

data/lib/sequel_rails3/railtie.rb

@@ -17,7 +17,7 @@ module SequelRails3
 
       Sequel::Model.plugin :active_model
 
-      self.db = Sequel.connect(config)
+      self.db = config[:url] ? Sequel.connect(config[:url], config) : Sequel.connect(config)
     end
 
     initializer 'sequel_rails3.logging', :after => :initialize_logger do |app|

data/sequel_rails3.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_rails3}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corin Langosch"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Corin Langosch