sequel-rails 0.9.11 → 0.9.12

data/lib/sequel_rails/railtie.rb

@@ -15,6 +15,7 @@ require 'sequel_rails/configuration'
 require 'sequel_rails/migrations'
 require 'sequel_rails/railties/log_subscriber'
 require 'sequel_rails/railties/i18n_support'
+require 'sequel_rails/railties/spring_support'
 require 'sequel_rails/railties/controller_runtime'
 require 'sequel_rails/sequel/database/active_support_notification'
 require 'action_dispatch/middleware/session/sequel_store'
@@ -36,10 +37,16 @@ module SequelRails
     config.sequel = ::SequelRails::Configuration.new
 
     rake_tasks do |app|
-      load 'sequel_rails/railties/database.rake' if app.config.sequel.load_database_tasks
+      load_tasks_config = app.config.sequel.load_database_tasks
+      SequelRails::TASK_NAMESPACE =
+      case load_tasks_config
+      when Symbol, String then load_tasks_config.to_sym
+      else :db
+      end
+      load 'sequel_rails/railties/database.rake' if load_tasks_config
     end
 
-    initializer 'sequel.load_hooks' do |app|
+    initializer 'sequel.load_hooks' do
       ::ActiveSupport.run_load_hooks(:sequel, ::Sequel::Model)
     end
 
@@ -48,7 +55,7 @@ module SequelRails
     end
 
     initializer 'sequel.logger' do |app|
-      setup_logger app, ::Rails.logger
+      app.config.sequel.logger ||= ::Rails.logger
     end
 
     initializer 'sequel.i18n_support' do |_app|
@@ -61,8 +68,15 @@ module SequelRails
     end
 
     initializer 'sequel.connect' do |app|
-      unless app.config.sequel[:skip_connect]
-        ::SequelRails.setup ::Rails.env
+      ::SequelRails.setup ::Rails.env unless app.config.sequel[:skip_connect]
+    end
+
+    initializer 'sequel.spring' do |app|
+      if defined?(::Spring::Application)
+        class ::Spring::Application
+          include ::SequelRails::SpringSupport
+          alias_method_chain :disconnect_database, :sequel
+        end
       end
     end
 
@@ -90,9 +104,5 @@ module SequelRails
       require 'sequel_rails/railties/controller_runtime'
       ActionController::Base.send :include, SequelRails::Railties::ControllerRuntime
     end
-
-    def setup_logger(app, logger)
-      app.config.sequel.logger = logger
-    end
   end
 end

data/lib/sequel_rails/railties/controller_runtime.rb

@@ -35,7 +35,8 @@ module SequelRails
 
       module ClassMethods
         def log_process_action(payload)
-          messages, db_runtime = super, payload[:db_runtime]
+          messages = super
+          db_runtime = payload[:db_runtime]
           messages << format('Models: %.1fms', db_runtime.to_f) if db_runtime
           messages
         end

data/lib/sequel_rails/railties/database.rake

@@ -1,17 +1,19 @@
 require 'sequel_rails/storage'
 
+sequel_rails_namespace = SequelRails::TASK_NAMESPACE
+
 # TODO: DRY these up
-namespace :db do
+namespace sequel_rails_namespace do
   def db_for_current_env
     @db_for_current_env ||= {}
     @db_for_current_env[Rails.env] ||= ::SequelRails.setup(Rails.env)
   end
 
   # desc "Raises an error if there are pending migrations"
-  task :abort_if_pending_migrations => [:environment, 'db:migrate:load'] do
+  task :abort_if_pending_migrations => [:environment, "#{sequel_rails_namespace}:migrate:load"] do
     if SequelRails::Migrations.pending_migrations?
       warn 'You have pending migrations:'
-      abort 'Run `rake db:migrate` to update your database then try again.'
+      abort "Run `rake #{sequel_rails_namespace}:migrate` to update your database then try again."
     end
   end
 
@@ -24,7 +26,7 @@ namespace :db do
         file << db_for_current_env.dump_schema_migration(:same_db => true)
         file << SequelRails::Migrations.dump_schema_information(:sql => false)
       end
-      Rake::Task['db:schema:dump'].reenable
+      Rake::Task["#{sequel_rails_namespace}:schema:dump"].reenable
     end
 
     desc 'Load a schema.rb file into the database'
@@ -35,7 +37,7 @@ namespace :db do
         load(file)
         ::Sequel::Migration.descendants.each { |m| m.apply(db_for_current_env, :up) }
       else
-        abort "#{file} doesn't exist yet. Run 'rake db:migrate' to create it, then try again."
+        abort '#{file} doesn\'t exist yet. Run \'rake #{sequel_rails_namespace}:migrate\' to create it, then try again.'
       end
     end
   end
@@ -54,7 +56,7 @@ namespace :db do
         abort "Could not dump structure for #{args.env}."
       end
 
-      Rake::Task['db:structure:dump'].reenable
+      Rake::Task["#{sequel_rails_namespace}:structure:dump"].reenable
     end
 
     task :load, [:env] => :environment do |_t, args|
@@ -70,9 +72,9 @@ namespace :db do
   task :dump => :environment do
     case (SequelRails.configuration.schema_format ||= :ruby)
     when :ruby
-      Rake::Task['db:schema:dump'].invoke
+      Rake::Task["#{sequel_rails_namespace}:schema:dump"].invoke
     when :sql
-      Rake::Task['db:structure:dump'].invoke
+      Rake::Task["#{sequel_rails_namespace}:structure:dump"].invoke
     else
       abort "unknown schema format #{SequelRails.configuration.schema_format}"
     end
@@ -81,9 +83,9 @@ namespace :db do
   task :load => :environment do
     case (SequelRails.configuration.schema_format ||= :ruby)
     when :ruby
-      Rake::Task['db:schema:load'].invoke
+      Rake::Task["#{sequel_rails_namespace}:schema:load"].invoke
     when :sql
-      Rake::Task['db:structure:load'].invoke
+      Rake::Task["#{sequel_rails_namespace}:structure:load"].invoke
     else
       abort "unknown schema format #{SequelRails.configuration.schema_format}"
     end
@@ -129,23 +131,23 @@ namespace :db do
     desc 'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with VERSION=x.'
     task :redo => :load do
       if ENV['VERSION']
-        Rake::Task['db:migrate:down'].invoke
-        Rake::Task['db:migrate:up'].invoke
+        Rake::Task["#{sequel_rails_namespace}:migrate:down"].invoke
+        Rake::Task["#{sequel_rails_namespace}:migrate:up"].invoke
       else
-        Rake::Task['db:rollback'].invoke
-        Rake::Task['db:migrate'].invoke
+        Rake::Task["#{sequel_rails_namespace}:rollback"].invoke
+        Rake::Task["#{sequel_rails_namespace}:migrate"].invoke
       end
     end
 
     desc 'Resets your database using your migrations for the current environment'
-    task :reset => %w(db:drop db:create db:migrate)
+    task :reset => %W(#{sequel_rails_namespace}:drop #{sequel_rails_namespace}:create #{sequel_rails_namespace}:migrate)
 
     desc 'Runs the "up" for a given migration VERSION.'
     task :up => :load do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       fail 'VERSION is required' unless version
       SequelRails::Migrations.migrate_up!(version)
-      Rake::Task['db:dump'].invoke if SequelRails.configuration.schema_dump
+      Rake::Task["#{sequel_rails_namespace}:dump"].invoke if SequelRails.configuration.schema_dump
     end
 
     desc 'Runs the "down" for a given migration VERSION.'
@@ -153,14 +155,14 @@ namespace :db do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       fail 'VERSION is required' unless version
       SequelRails::Migrations.migrate_down!(version)
-      Rake::Task['db:dump'].invoke if SequelRails.configuration.schema_dump
+      Rake::Task["#{sequel_rails_namespace}:dump"].invoke if SequelRails.configuration.schema_dump
     end
   end
 
   desc 'Migrate the database to the latest version'
   task :migrate => 'migrate:load' do
     SequelRails::Migrations.migrate_up!(ENV['VERSION'] ? ENV['VERSION'].to_i : nil)
-    Rake::Task['db:dump'].invoke if SequelRails.configuration.schema_dump
+    Rake::Task["#{sequel_rails_namespace}:dump"].invoke if SequelRails.configuration.schema_dump
   end
 
   desc 'Rollback the latest migration file or down to specified VERSION=x'
@@ -171,7 +173,7 @@ namespace :db do
                 SequelRails::Migrations.previous_migration
               end
     SequelRails::Migrations.migrate_down! version
-    Rake::Task['db:dump'].invoke if SequelRails.configuration.schema_dump
+    Rake::Task["#{sequel_rails_namespace}:dump"].invoke if SequelRails.configuration.schema_dump
   end
 
   desc 'Load the seed data from db/seeds.rb'
@@ -181,10 +183,10 @@ namespace :db do
   end
 
   desc 'Create the database, load the schema, and initialize with the seed data'
-  task :setup => %w(db:create db:load db:seed)
+  task :setup => %W(#{sequel_rails_namespace}:create #{sequel_rails_namespace}:load #{sequel_rails_namespace}:seed)
 
   desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
-  task :reset => %w(db:drop db:setup)
+  task :reset => %W(#{sequel_rails_namespace}:drop #{sequel_rails_namespace}:setup)
 
   desc 'Forcibly close any open connections to the current env database (PostgreSQL specific)'
   task :force_close_open_connections, [:env] => :environment do |_t, args|
@@ -193,18 +195,16 @@ namespace :db do
   end
 
   namespace :test do
-    desc 'Prepare test database (ensure all migrations ran, drop and re-create database then load schema). This task can be run in the same invocation as other task (eg: rake db:migrate db:test:prepare).'
-    task :prepare => 'db:abort_if_pending_migrations' do
+    desc "Prepare test database (ensure all migrations ran, drop and re-create database then load schema). This task can be run in the same invocation as other task (eg: rake #{sequel_rails_namespace}:migrate #{sequel_rails_namespace}:test:prepare)."
+    task :prepare => "#{sequel_rails_namespace}:abort_if_pending_migrations" do
       previous_env, Rails.env = Rails.env, 'test'
-      Rake::Task['db:drop'].execute
-      Rake::Task['db:create'].execute
-      Rake::Task['db:load'].execute
-      Sequel::DATABASES.each do |db|
-        db.disconnect
-      end
+      Rake::Task["#{sequel_rails_namespace}:drop"].execute
+      Rake::Task["#{sequel_rails_namespace}:create"].execute
+      Rake::Task["#{sequel_rails_namespace}:load"].execute
+      Sequel::DATABASES.each(&:disconnect)
       Rails.env = previous_env
     end
   end
 end
 
-task 'test:prepare' => 'db:test:prepare'
+task 'test:prepare' => "#{sequel_rails_namespace}:test:prepare"

data/lib/sequel_rails/railties/log_subscriber.rb

@@ -18,12 +18,14 @@ module SequelRails
       end
 
       def self.reset_runtime
-        previous, self.runtime = runtime, 0
+        previous = runtime
+        self.runtime = 0
         previous
       end
 
       def self.reset_count
-        previous, self.count = count, 0
+        previous = count
+        self.count = 0
         previous
       end
 

data/lib/sequel_rails/railties/spring_support.rb

@@ -0,0 +1,13 @@
+module SequelRails
+  module SpringSupport
+    def disconnect_database_with_sequel
+      Sequel::DATABASES.each { |db| db.disconnect } if sequel_configured?
+      disconnect_database_without_sequel
+    end
+
+  private
+    def sequel_configured?
+      defined?(Sequel::DATABASES)
+    end
+  end
+end

data/lib/sequel_rails/sequel/database/active_support_notification.rb

@@ -5,7 +5,7 @@ module Sequel
   class Database
     def log_yield(sql, args = nil)
       sql_for_log = args ? "#{sql}; #{args.inspect}" : sql
-      start = Time.now
+      start = Time.now.to_f
       begin
         ::ActiveSupport::Notifications.instrument(
           'sql.sequel',
@@ -19,7 +19,7 @@ module Sequel
         log_exception(e, sql_for_log) unless @loggers.empty?
         raise
       ensure
-        log_duration(Time.now - start, sql_for_log) unless e || @loggers.empty?
+        log_duration(Time.now.to_f - start, sql_for_log) unless e || @loggers.empty?
       end
     end
   end

data/lib/sequel_rails/shellwords.rb

@@ -16,7 +16,7 @@ module SequelRails
         # Treat multibyte characters as is.  It is caller's responsibility
         # to encode the string in the right encoding for the shell
         # environment.
-        str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/, '\\\\\\1')
+        str.gsub!(%r{([^A-Za-z0-9_\-.,:/@\n])}, '\\\\\\1')
 
         # A LF cannot be escaped with a backslash because a backslash + LF
         # combo is regarded as line continuation and simply ignored.

data/lib/sequel_rails/storage.rb

@@ -43,7 +43,7 @@ module SequelRails
     end
 
     def self.adapter_for(config_or_env)
-      config = if config_or_env.kind_of? Hash
+      config = if config_or_env.is_a? Hash
                  config_or_env
                else
                  ::SequelRails.configuration.environments[config_or_env.to_s]

data/lib/sequel_rails/storage/abstract.rb

@@ -94,10 +94,9 @@ module SequelRails
       private
 
       def add_option(commands, name, value)
-        if value.present?
-          separator = name[0, 2] == '--' ? '=' : ' '
-          commands << "#{name}#{separator}#{value}"
-        end
+        return unless value.present?
+        separator = name[0, 2] == '--' ? '=' : ' '
+        commands << "#{name}#{separator}#{value}"
       end
 
       def add_flag(commands, flag)

data/lib/sequel_rails/storage/postgres.rb

@@ -31,7 +31,6 @@ module SequelRails
         with_pgpassword do
           commands = ['pg_dump']
           add_connection_settings commands
-          add_flag commands, '-i'
           add_flag commands, '-s'
           add_flag commands, '-x'
           add_flag commands, '-O'

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '0.9.11'
+  VERSION = '0.9.12'
 end

data/rubocop-todo.yml

@@ -25,3 +25,12 @@ MethodLength:
 
 TrailingComma:
   Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Style/EachWithObject:
+  Enabled: false

data/sequel-rails.gemspec

@@ -41,8 +41,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'generator_spec'
   s.add_development_dependency 'rake', '>= 0.8.7'
   s.add_development_dependency 'rspec', '~> 3.1'
-  s.add_development_dependency 'rspec-rails', '~> 3.1'
-  s.add_development_dependency 'rubocop', '~> 0.28.0' unless RUBY_VERSION < '1.9.2'
-  s.add_development_dependency 'ammeter', '1.1.2'
+  s.add_development_dependency 'rspec-rails', '~> 3.1', '< 3.3'
+  s.add_development_dependency 'rubocop', '~> 0.33.0' unless RUBY_VERSION < '1.9.2'
+  s.add_development_dependency 'ammeter', '1.1.3'
   s.add_development_dependency 'test-unit' if RUBY_VERSION >= '2.2.0'
 end

data/spec/internal/config/database.yml

@@ -1,7 +1,13 @@
 test:
   adapter: "<%= ENV["TEST_ADAPTER"] || "postgresql" %>"
   database: "<%= ENV["TEST_DATABASE"] || "sequel_rails_test" %>"
+  <% if ENV['TEST_ADAPTER'] != 'sqlite3' %>
   owner: "<%= ENV["TEST_OWNER"] || ENV["USER"] %>"
   user: "<%= ENV["TEST_USERNAME"] || ENV["USER"] %>"
   password: "<%= ENV["TEST_PASSWORD"] %>"
+  <% end %>
+  <% if ENV['TEST_ADAPTER'] =~ /mysql/ %>
+  encoding: "<%= ENV["TEST_ENCODING"] || "utf8" %>"
+  <% elsif ENV['TEST_ADAPTER'] =~ /postgres/ %>
   encoding: "<%= ENV["TEST_ENCODING"] || "unicode" %>"
+  <% end %>

data/spec/internal/db/migrate/1273253849_add_twitter_handle_to_users.rb

@@ -1,9 +1,7 @@
 Sequel.migration do
-
   change do
     alter_table :users do
       add_column :twitter_handle, String, :text => true
     end
   end
-
 end

data/spec/lib/generators/sequel/migration_spec.rb

@@ -252,5 +252,4 @@ describe Sequel::Generators::MigrationGenerator do
       end
     end
   end
-
 end

data/spec/lib/generators/sequel/session_migration_spec.rb

@@ -37,5 +37,4 @@ describe Sequel::Generators::SessionMigrationGenerator do
       end
     }
   end
-
 end

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe SequelRails do
-
   describe '.setup' do
     let(:environment) { 'development' }
     let(:configuration) { SequelRails::Configuration.new }
@@ -12,11 +11,9 @@ describe SequelRails do
       SequelRails.setup environment
     end
   end
-
 end
 
 describe SequelRails::Configuration do
-
   describe '#schema_dump' do
     before { allow(Rails).to receive(:env).and_return(environment) }
     subject { described_class.new }
@@ -136,11 +133,10 @@ describe SequelRails::Configuration do
     subject { described_class.new.tap { |config| config.raw = environments } }
 
     context 'when stubbing SequelRails.jruby?' do
-
       before { allow(SequelRails).to receive(:jruby?).and_return(is_jruby) }
 
       shared_examples 'max_connections' do
-        context 'with max_connections config option' do
+        context 'with max_connections=7 config option' do
           let(:max_connections) { 31_337 }
           before do
             environments[environment]['max_connections'] = 7
@@ -150,7 +146,7 @@ describe SequelRails::Configuration do
           it 'overrides the option from the configuration' do
             expect(::Sequel).to receive(:connect) do |hash_or_url, *_|
               if hash_or_url.is_a? Hash
-                expect(hash_or_url['max_connections']).to eq(max_connections)
+                expect(hash_or_url[:max_connections]).to eq(max_connections)
               else
                 expect(hash_or_url).to include("max_connections=#{max_connections}")
               end
@@ -166,7 +162,7 @@ describe SequelRails::Configuration do
           it 'uses the value' do
             expect(::Sequel).to receive(:connect) do |hash_or_url, *_|
               if hash_or_url.is_a? Hash
-                expect(hash_or_url['max_connections']).to eq(7)
+                expect(hash_or_url[:max_connections]).to eq(7)
               else
                 expect(hash_or_url).to include('max_connections=7')
               end
@@ -228,7 +224,6 @@ describe SequelRails::Configuration do
       end
 
       context 'for a postgres connection' do
-
         shared_examples 'search_path' do
           context 'with search_path config option' do
             let(:search_path) { %w(secret private public) }
@@ -240,7 +235,7 @@ describe SequelRails::Configuration do
             it 'overrides the option from the configuration' do
               expect(::Sequel).to receive(:connect) do |hash_or_url, *_|
                 if hash_or_url.is_a? Hash
-                  expect(hash_or_url['search_path']).to eq(search_path)
+                  expect(hash_or_url[:search_path]).to eq(search_path)
                 else
                   expect(hash_or_url).to include('search_path=secret%2Cprivate%2Cpublic')
                 end
@@ -253,7 +248,6 @@ describe SequelRails::Configuration do
         let(:environment) { 'development' }
 
         context 'in C-Ruby' do
-
           include_examples 'max_connections'
           include_examples 'search_path'
           include_examples 'with DATABASE_URL in ENV'
@@ -262,15 +256,13 @@ describe SequelRails::Configuration do
 
           it 'produces a sane config without url' do
             expect(::Sequel).to receive(:connect) do |hash|
-              expect(hash['adapter']).to eq('postgres')
+              expect(hash[:adapter]).to eq('postgres')
             end
             subject.connect environment
           end
-
         end
 
         context 'in JRuby' do
-
           include_examples 'max_connections'
           include_examples 'search_path'
           include_examples 'with DATABASE_URL in ENV'
@@ -280,34 +272,30 @@ describe SequelRails::Configuration do
           it 'produces an adapter config with a url' do
             expect(::Sequel).to receive(:connect) do |url, hash|
               expect(url).to start_with('jdbc:postgresql://')
-              expect(hash['adapter']).to eq('jdbc:postgresql')
-              expect(hash['host']).to eq('127.0.0.1')
+              expect(hash[:adapter]).to eq('jdbc:postgresql')
+              expect(hash[:host]).to eq('127.0.0.1')
             end
             subject.connect environment
           end
 
           context 'when url is already given' do
-
             let(:environment) { 'url_already_constructed' }
 
             it 'does not change the url' do
               expect(::Sequel).to receive(:connect) do |url, hash|
                 expect(url).to eq('jdbc:adaptername://HOST/DB?user=U&password=P&ssl=true&sslfactory=sslFactoryOption')
-                expect(hash['adapter']).to eq('jdbc:adaptername')
+                expect(hash[:adapter]).to eq('jdbc:adaptername')
               end
               subject.connect environment
             end
-
           end
         end
       end
 
       context 'for a mysql connection' do
-
         let(:environment) { 'remote' }
 
         context 'in C-Ruby' do
-
           include_examples 'max_connections'
           include_examples 'with DATABASE_URL in ENV'
 
@@ -315,14 +303,13 @@ describe SequelRails::Configuration do
 
           it 'produces a config without url' do
             expect(::Sequel).to receive(:connect) do |hash|
-              expect(hash['adapter']).to eq('mysql')
+              expect(hash[:adapter]).to eq('mysql')
             end
             subject.connect environment
           end
         end
 
         context 'in JRuby' do
-
           include_examples 'max_connections'
           include_examples 'with DATABASE_URL in ENV'
 
@@ -331,20 +318,19 @@ describe SequelRails::Configuration do
           it 'produces a jdbc mysql config' do
             expect(::Sequel).to receive(:connect) do |url, hash|
               expect(url).to start_with('jdbc:mysql://')
-              expect(hash['adapter']).to eq('jdbc:mysql')
-              expect(hash['database']).to eq('sequel_rails_test_storage_remote')
+              expect(hash[:adapter]).to eq('jdbc:mysql')
+              expect(hash[:database]).to eq('sequel_rails_test_storage_remote')
             end
             subject.connect environment
           end
 
           context 'when url is already given' do
-
             let(:environment) { 'url_already_constructed' }
 
             it 'does not change the url' do
               expect(::Sequel).to receive(:connect) do |url, hash|
                 expect(url).to eq('jdbc:adaptername://HOST/DB?user=U&password=P&ssl=true&sslfactory=sslFactoryOption')
-                expect(hash['adapter']).to eq('jdbc:adaptername')
+                expect(hash[:adapter]).to eq('jdbc:adaptername')
               end
               subject.connect environment
             end
@@ -363,6 +349,5 @@ describe SequelRails::Configuration do
         subject.connect environment
       end
     end
-
   end
 end