talentbox-sequel-rails 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    talentbox-sequel-rails (0.3.1)
+    talentbox-sequel-rails (0.3.2)
       rails (~> 3.2.0)
       sequel (~> 3.28)
 
@@ -9,34 +9,34 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.6.2)
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
+    arel (3.0.2)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     builder (3.0.0)
@@ -44,33 +44,33 @@ GEM
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.1)
-    json (1.6.5)
-    mail (2.4.1)
+    journey (1.0.3)
+    json (1.6.6)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
+    mime-types (1.18)
+    multi_json (1.3.2)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -87,7 +87,7 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    sequel (3.32.0)
+    sequel (3.34.1)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -97,7 +97,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.33)
     yard (0.7.3)
 
 PLATFORMS

data/{CHANGELOG → History.md}

@@ -1,5 +1,11 @@
+== 0.3.2
+* Ignore environments without `database` key (like ActiveRecord do it), to allow
+  shared configurations in `database.yml`.
+* Fix db creation commands to let the `system` method escape the arguments
+* Fix error when using `mysql2` gem
+
 == 0.3.1
-* Make `db:dump` Rake task depends on Rails `environment` task (Gabor Ratky)
+* Make `db:schema:dump` Rake task depends on Rails `environment` task (Gabor Ratky)
 
 == 0.3.0
 * Update dependency to Rails (~> 3.2.0)

data/README.rdoc

@@ -1,16 +1,18 @@
 = sequel-rails
 
-This gem provides the railtie that allows {sequel}[http://github.com/jeremyevans/sequel] to hook into {rails3}[http://github.com/rails/rails] and thus behave like a rails framework component. Just like activerecord does in rails, {sequel-rails}[http://github.com/brasten/sequel-rails] uses the railtie API to hook into rails. The two are actually hooked into rails almost identically.
+This gem provides the railtie that allows {sequel}[http://github.com/jeremyevans/sequel] to hook into {rails3}[http://github.com/rails/rails] and thus behave like a rails framework component. Just like activerecord does in rails, {sequel-rails}[http://github.com/talentbox/sequel-rails] uses the railtie API to hook into rails. The two are actually hooked into rails almost identically.
 
 The code for this gem was initially taken from the excellent {dm-rails}[http://github.com/datamapper/dm-rails] project.
 
+This is a fork of {brasten}[https://github.com/brasten]'s {sequel-rails}[https://github.com/brasten/sequel-rails] that has been updated to support newer versions of rails.
+
 == Using sequel-rails
 
 Using sequel with rails3 requires a couple minor changes.
 
 First, add the following to your Gemfile:
 
-  gem 'sequel-rails'
+  gem 'talentbox-sequel-rails'
   
 ... be sure to run "bundle install" if needed!
 
@@ -79,8 +81,14 @@ The {dm-rails}[http://github.com/datamapper/dm-rails] team wrote most of this co
 
 == The sequel-rails team
 
+{Original project}[https://github.com/brasten/sequel-rails]:
+
 * Brasten Sager (brasten)
 
+This fork:
+
+* Jonathan Tron (JonathanTron)
+
 == Copyright
 
 Copyright (c) 2010 The sequel-rails team. See {LICENSE}[http://github.com/brasten/sequel-rails/blob/master/LICENSE] for details.

data/lib/sequel-rails/storage.rb

@@ -26,7 +26,7 @@ module Rails
 
       def self.new(config)
         config = Rails::Sequel.configuration.environments[config.to_s] unless config.kind_of?(Hash)
-        
+
         klass = lookup_class(config['adapter'])
         if klass.equal?(self)
           super(config)
@@ -40,6 +40,7 @@ module Rails
 
         def with_local_repositories
           Rails::Sequel.configuration.environments.each_value do |config|
+            next if config['database'].blank?
             if config['host'].blank? || %w[ 127.0.0.1 localhost ].include?(config['host'])
               yield(config)
             else
@@ -98,7 +99,7 @@ module Rails
       def owner
         @owner ||= config['owner'] || ''
       end
-        
+
       def charset
         @charset ||= config['charset'] || ENV['CHARSET'] || 'utf8'
       end
@@ -138,13 +139,12 @@ module Rails
       private
 
         def execute(statement)
-          commands = 'mysql '
-          commands << "--user=#{username} "     unless username.blank?
-          commands << "--password=#{password} " unless password.blank?
-          commands << "--host=#{host} "         unless host.blank?
-          commands << '-e '
-          commands << statement
-          system(commands)
+          commands = ["mysql"]
+          commands << "--user" << username unless username.blank?
+          commands << "--password" << password unless password.blank?
+          commands << "--host" << host unless host.blank?
+          commands << "-e" << statement
+          system(*commands)
         end
 
         def collation
@@ -152,49 +152,46 @@ module Rails
         end
 
       end
+      class Mysql2 < Mysql
+      end
 
       class Postgres < Storage
         def _create
           ENV["PGPASSWORD"] = password unless password.blank?
-          commands = "createdb --encoding=#{charset} "
-          commands << "--username=#{username} " unless username.blank?
-          commands << "--owner=#{owner} "       unless owner.blank?
-          commands << "--port=#{port} "         unless port.blank?
-          commands << "--host=#{host} "         unless host.blank?
+          commands = ["createdb", "--encoding", charset]
+          commands << "--username" << username unless username.blank?
+          commands << "--owner" << owner unless owner.blank?
+          commands << "--port" << port unless port.blank?
+          commands << "--host" << host unless host.blank?
           commands << database
-          res = system(commands)
+          res = system(*commands)
           ENV["PGPASSWORD"] = nil
           res
         end
 
         def _drop
-          system(
-            'dropdb',
-            '-U',
-            username,
-            database
-          )
+          system("dropdb", "-U", username, database)
         end
       end
-      
+
       class Jdbc < Storage
-        
+
         def _is_mysql?
           database.match(/^jdbc:mysql/)
         end
-        
+
         def _root_url
           database.scan /^jdbc:mysql:\/\/\w*:?\d*/
         end
-        
+
         def db_name
           database.scan(/^jdbc:mysql:\/\/\w+:?\d*\/(\w+)/).flatten.first
         end
-        
+
         def _params
           database.scan /\?.*$/
         end
-        
+
         def _create
           if _is_mysql?
             ::Sequel.connect("#{_root_url}#{_params}") do |db|
@@ -210,16 +207,16 @@ module Rails
             end
           end
         end
-        
+
         private
-        
+
         def collation
           @collation ||= config['collation'] || ENV['COLLATION'] || 'utf8_unicode_ci'
         end
-        
-        
+
+
       end
-      
+
     end
   end
 end

data/lib/sequel-rails/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Sequel
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: talentbox-sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2153959840 !ruby/object:Gem::Requirement
+  requirement: &2166376760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.28'
   type: :runtime
   prerelease: false
-  version_requirements: *2153959840
+  version_requirements: *2166376760
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153959320 !ruby/object:Gem::Requirement
+  requirement: &2166392200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153959320
+  version_requirements: *2166392200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153958840 !ruby/object:Gem::Requirement
+  requirement: &2166391160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2153958840
+  version_requirements: *2166391160
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153958360 !ruby/object:Gem::Requirement
+  requirement: &2166390060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *2153958360
+  version_requirements: *2166390060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153957880 !ruby/object:Gem::Requirement
+  requirement: &2166389020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2153957880
+  version_requirements: *2166389020
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2153957400 !ruby/object:Gem::Requirement
+  requirement: &2166388360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 4.4.6
   type: :development
   prerelease: false
-  version_requirements: *2153957400
+  version_requirements: *2166388360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153956740 !ruby/object:Gem::Requirement
+  requirement: &2166387540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: 0.9.11
   type: :development
   prerelease: false
-  version_requirements: *2153956740
+  version_requirements: *2166387540
 description: Integrate Sequel with Rails 3
 email:
 - brasten@gmail.com
@@ -101,9 +101,9 @@ extra_rdoc_files:
 files:
 - .document
 - .gitignore
-- CHANGELOG
 - Gemfile
 - Gemfile.lock
+- History.md
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -129,10 +129,10 @@ files:
 - lib/sequel-rails/setup.rb
 - lib/sequel-rails/storage.rb
 - lib/sequel-rails/version.rb
-- sequel-rails.gemspec
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
+- talentbox-sequel-rails.gemspec
 - tasks/ci.rake
 - tasks/clean.rake
 - tasks/metrics.rake
@@ -154,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -458416955551314614
+      hash: -3768588127880768772
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,10 +163,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -458416955551314614
+      hash: -3768588127880768772
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Use Sequel with Rails 3