sequel-rails 0.9.16 → 1.1.1

data/lib/sequel_rails/sequel/plugins/rails_extensions.rb

@@ -25,7 +25,7 @@ module Sequel
       module ClassMethods
         def find!(args)
           m = self[args]
-          fail ModelNotFound, "Couldn't find #{self} matching #{args}." unless m
+          raise ModelNotFound, "Couldn't find #{self} matching #{args}." unless m
           m
         end
       end

data/lib/sequel_rails/storage.rb

@@ -51,8 +51,6 @@ module SequelRails
       lookup_class(config['adapter']).new config
     end
 
-    private
-
     def self.parse_url(value)
       URI(value) if value.present?
     rescue ArgumentError
@@ -106,12 +104,12 @@ module SequelRails
     end
 
     def self.lookup_class(adapter)
-      fail 'Adapter not specified in config, please set the :adapter key.' unless adapter
+      raise 'Adapter not specified in config, please set the :adapter key.' unless adapter
       return Jdbc if adapter =~ /jdbc/
 
       klass_name = adapter.camelize.to_sym
       unless self.const_defined?(klass_name)
-        fail "Adapter #{adapter} not supported (#{klass_name.inspect})"
+        raise "Adapter #{adapter} not supported (#{klass_name.inspect})"
       end
 
       const_get klass_name

data/lib/sequel_rails/storage/abstract.rb

@@ -80,13 +80,13 @@ module SequelRails
         if inserts.any?
           res = inserts.join("\n")
           unless sql_dump
-            res = <<-EOS.strip_heredoc
+            res = <<-RUBY.strip_heredoc
               Sequel.migration do
                 change do
                   #{res}
                 end
               end
-            EOS
+            RUBY
           end
         end
         res
@@ -127,7 +127,19 @@ module SequelRails
       end
 
       def safe_exec(args)
-        exec SequelRails::Shellwords.join(Array(args))
+        if !Gem.win_platform?
+          exec SequelRails::Shellwords.join(Array(args))
+        else
+          jarg = args.map do |arg|
+            str = arg.to_s
+            return "''" if str.empty?
+            str = str.dup
+            str.gsub!(%r{([^A-Za-z0-9_\-.,:/@\n])}, '\\1')
+            str.gsub!(/\n/, "'\n'")
+            str
+          end
+          exec jarg.join(' ')
+        end
       end
 
       def schema_information_inserts(migrator, sql_dump)
@@ -146,14 +158,14 @@ module SequelRails
           if sql_dump
             res = "#{set_search_path_sql};\n#{res}"
           else
-            res = <<-EOS.strip_heredoc
+            res = <<-RUBY.strip_heredoc
               Sequel.migration do
                 change do
                   self << #{set_search_path_sql.inspect}
                   #{res}
                 end
               end
-            EOS
+            RUBY
           end
         end
         res

data/lib/sequel_rails/storage/jdbc.rb

@@ -58,7 +58,7 @@ module SequelRails
           adapter = ::SequelRails::Storage::Postgres.new(config)
           adapter._dump(filename)
         else
-          fail NotImplementedError
+          raise NotImplementedError
         end
       end
 
@@ -67,7 +67,7 @@ module SequelRails
           adapter = ::SequelRails::Storage::Postgres.new(config)
           adapter._load(filename)
         else
-          fail NotImplementedError
+          raise NotImplementedError
         end
       end
 

data/lib/sequel_rails/storage/mysql.rb

@@ -13,6 +13,7 @@ module SequelRails
         commands = ['mysqldump']
         add_connection_settings commands
         add_flag commands, '--no-data'
+        add_flag commands, '--skip-dump-date'
         add_option commands, '--result-file', filename
         commands << database
         safe_exec commands

data/lib/sequel_rails/storage/postgres.rb

@@ -22,6 +22,7 @@ module SequelRails
         with_pgpassword do
           commands = ['dropdb']
           add_connection_settings commands
+          add_flag commands, '--if-exists'
           commands << database
           safe_exec commands
         end
@@ -64,6 +65,9 @@ module SequelRails
         # command. Seems to be only way to ensure *all* test connections
         # are closed
         nil
+      rescue Sequel::DatabaseConnectionError
+        # Will raise an error if the database doesn't exist.
+        nil
       end
 
       def encoding
@@ -104,9 +108,9 @@ module SequelRails
       end
 
       def add_connection_settings(commands)
-        add_option commands, '--username', username
-        add_option commands, '--host', host
-        add_option commands, '--port', port.to_s
+        add_option commands, '--username', username unless username.blank?
+        add_option commands, '--host', host unless host.blank?
+        add_option commands, '--port', port.to_s unless port.to_s.blank? || port.to_s == '0'
       end
     end
   end

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '0.9.16'
+  VERSION = '1.1.1'.freeze
 end

data/rubocop-todo.yml

@@ -23,7 +23,10 @@ LineLength:
 MethodLength:
   Enabled: false
 
-TrailingComma:
+TrailingCommaInLiteral:
+  Enabled: false
+
+TrailingCommaInArguments:
   Enabled: false
 
 Metrics/AbcSize:

data/sequel-rails.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 require 'sequel_rails/version'
@@ -20,29 +21,20 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.license = 'MIT'
 
-  if RUBY_VERSION < '1.9.3'
-    s.post_install_message = <<-NOTE
-
-      !!! sequel-rails
-      NOTE: Support for Ruby < 1.9.3 (this is 1.8.x, 1.9.0, 1.9.2) in sequel-rails
-      is deprecated and will be dropped in the next major release. If you really
-      rely on it please complain at http://git.io/WgfgZQ to delay the inevitable.
-      !!!
-
-    NOTE
-  end
+  s.required_ruby_version = '>= 2.2.2'
+  s.required_rubygems_version = '>= 1.8.11'
 
-  s.add_dependency 'activemodel'
-  s.add_dependency 'railties', '>= 3.2.0'
-  s.add_dependency 'actionpack', '>= 3.2.0'
-  s.add_dependency 'sequel', ['>= 3.28', '< 5.0']
+  s.add_dependency 'activemodel', '>= 4.0.0'
+  s.add_dependency 'railties', '>= 4.0.0'
+  s.add_dependency 'actionpack', '>= 4.0.0'
+  s.add_dependency 'sequel', ['>= 3.28', '< 6.0']
 
   s.add_development_dependency 'combustion'
   s.add_development_dependency 'generator_spec'
-  s.add_development_dependency 'rake', '>= 0.8.7', '< 11.0'
-  s.add_development_dependency 'rspec', '~> 3.1'
-  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'
+  s.add_development_dependency 'rake', '>= 0.8.7', '< 12.1'
+  s.add_development_dependency 'rspec', '~> 3.7'
+  s.add_development_dependency 'rspec-rails', '~> 3.7'
+  s.add_development_dependency 'rubocop', '~> 0.52.0'
+  s.add_development_dependency 'ammeter', '1.1.4'
+  s.add_development_dependency 'test-unit'
 end

data/spec/helpers/io.rb

@@ -2,11 +2,7 @@ module IOSpecHelper
   def pretend_file_not_exists(pattern)
     allow(IO).to receive(:read).and_wrap_original do |m, *a|
       # if this isn't a good use for case equality I don't know what is
-      if pattern === a.first # rubocop:disable CaseEquality
-        fail Errno::ENOENT
-      else
-        m.call(*a)
-      end
+      pattern === a.first ? raise(Errno::ENOENT) : m.call(*a) # rubocop:disable CaseEquality
     end
   end
 end

data/spec/integration/sessions_controller_spec.rb

@@ -4,7 +4,12 @@ describe SessionsController, :type => :request do
   let(:session_class) { ::ActionDispatch::Session::SequelStore.session_class }
 
   def login
-    post '/session', :status => 'logged_in'
+    opts = if ActionPack::VERSION::MAJOR >= 5
+      {params: {:status => 'logged_in'}}
+    else
+      {:status => 'logged_in'}
+    end
+    post '/session', opts
   end
 
   describe '#create' do

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

@@ -21,7 +21,7 @@ describe Sequel::Generators::MigrationGenerator do
   it 'refuses to generate migration with invalid filename' do
     expect do
       run_generator ['add_something:datetime']
-    end.to raise_error
+    end.to raise_error(Sequel::IllegalMigrationNameError)
   end
 
   context 'when name starts with create' do
@@ -251,5 +251,13 @@ describe Sequel::Generators::MigrationGenerator do
         }
       end
     end
+
+    context 'when invalid migration name' do
+      it 'raises error' do
+        expect { run_generator ['invalid:file:name'] }
+          .to raise_error(Sequel::IllegalMigrationNameError)
+          .with_message("Illegal name for migration file: invalid:file:name (only lower case letters, numbers, and '_' allowed)")
+      end
+    end
   end
 end

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

@@ -11,7 +11,7 @@ describe Sequel::Generators::SessionMigrationGenerator do
   it 'refuses to generate migration with invalid filename' do
     expect do
       run_generator ['add:sessions']
-    end.to raise_error
+    end.to raise_error(Sequel::IllegalMigrationNameError)
   end
 
   it 'creates a new migration for sessions table' do

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -96,6 +96,22 @@ describe SequelRails::Configuration do
     end
   end
 
+  describe '#test_connect' do
+    it 'defaults to true' do
+      expect(subject.test_connect).to be true
+    end
+
+    it 'can be assigned' do
+      subject.test_connect = true
+      expect(subject.test_connect).to be true
+    end
+
+    it 'can be set from merging another hash' do
+      subject.merge!(:test_connect => true)
+      expect(subject.test_connect).to be true
+    end
+  end
+
   describe '#connect' do
     let(:environments) do
       {
@@ -135,6 +151,22 @@ describe SequelRails::Configuration do
     context 'when stubbing SequelRails.jruby?' do
       before { allow(SequelRails).to receive(:jruby?).and_return(is_jruby) }
 
+      shared_examples 'test_connect' do
+        context 'test_connect' do
+          it 'passes the value' do
+            expect(::Sequel).to receive(:connect) do |hash_or_url, *_|
+              if hash_or_url.is_a? Hash
+                expect(hash_or_url[:test]).to eq true
+              else
+                expect(hash_or_url).to include('test=true')
+              end
+            end
+
+            subject.connect environment
+          end
+        end
+      end
+
       shared_examples 'max_connections' do
         context 'with max_connections=7 config option' do
           let(:max_connections) { 31_337 }
@@ -172,6 +204,44 @@ describe SequelRails::Configuration do
         end
       end
 
+      shared_examples 'servers' do
+        context 'servers' do
+          let(:servers) { { read_only: { host: 'replica' } } }
+
+          shared_examples 'passes the value only through options hash' do
+            it 'passes the value only through options hash' do
+              expect(::Sequel).to receive(:connect) do |hash_or_url, *_|
+                if hash_or_url.is_a? Hash
+                  servers.keys.each do |k|
+                    expect(hash_or_url[:servers][k]).to eq servers[k]
+                  end
+                else
+                  puts hash_or_url
+                  expect(hash_or_url).not_to include('servers=')
+                end
+              end
+              subject.connect environment
+            end
+          end
+
+          context 'with servers set in config' do
+            before do
+              subject.servers = servers
+            end
+
+            include_examples 'passes the value only through options hash'
+          end
+
+          context 'with servers set in environment' do
+            before do
+              environments[environment]['servers'] = servers
+            end
+
+            include_examples 'passes the value only through options hash'
+          end
+        end
+      end
+
       shared_examples 'with DATABASE_URL in ENV' do
         let(:database_url) { 'adapter://user:pass@host/db' }
         def with_database_url_env
@@ -248,8 +318,10 @@ describe SequelRails::Configuration do
         let(:environment) { 'development' }
 
         context 'in C-Ruby' do
+          include_examples 'test_connect'
           include_examples 'max_connections'
           include_examples 'search_path'
+          include_examples 'servers'
           include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { false }
@@ -263,8 +335,10 @@ describe SequelRails::Configuration do
         end
 
         context 'in JRuby' do
+          include_examples 'test_connect'
           include_examples 'max_connections'
           include_examples 'search_path'
+          include_examples 'servers'
           include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { true }
@@ -296,7 +370,9 @@ describe SequelRails::Configuration do
         let(:environment) { 'remote' }
 
         context 'in C-Ruby' do
+          include_examples 'test_connect'
           include_examples 'max_connections'
+          include_examples 'servers'
           include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { false }
@@ -310,7 +386,9 @@ describe SequelRails::Configuration do
         end
 
         context 'in JRuby' do
+          include_examples 'test_connect'
           include_examples 'max_connections'
+          include_examples 'servers'
           include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { true }

data/spec/lib/sequel_rails/migrations_spec.rb

@@ -8,23 +8,40 @@ describe SequelRails::Migrations do
     describe ".#{migration_method}" do
       let(:result) { double(:result) }
       context 'with no version specified' do
-        let(:opts) { {} }
         it 'runs migrations using Sequel::Migrator' do
           expect(::Sequel::Migrator).to receive(:run).with(
-            db, Rails.root.join('db/migrate'), opts
+            db, Rails.root.join('db/migrate'), allow_missing_migration_files: false
           ).and_return result
           expect(described_class.send(migration_method)).to be(result)
         end
       end
       context 'with version specified' do
-        let(:opts) { { :target => 1 } }
         it 'runs migrations using Sequel::Migrator' do
           expect(::Sequel::Migrator).to receive(:run).with(
-            db, Rails.root.join('db/migrate'), opts
+            db, Rails.root.join('db/migrate'), allow_missing_migration_files: false, target: 1
           ).and_return result
           expect(described_class.send(migration_method, 1)).to be(result)
         end
       end
+
+      context 'with allow_missing_migration_files' do
+        around do |ex|
+          option = SequelRails.configuration.allow_missing_migration_files
+          SequelRails.configuration.allow_missing_migration_files = true
+
+          ex.run
+
+          SequelRails.configuration.allow_missing_migration_files = option
+        end
+
+        it 'runs migrations using Sequel::Migrator' do
+          expect(::Sequel::Migrator).to receive(:run).with(
+            db, Rails.root.join('db/migrate'), allow_missing_migration_files: true
+          ).and_return result
+
+          described_class.send(migration_method)
+        end
+      end
     end
   end