sequel-rails 0.9.14 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90ed9796d87fe7d62c60fc3752d706f0c4c19de7
-  data.tar.gz: 2323353fac7da84745b44b320a58357a63f795ea
+  metadata.gz: ed14c702e7214388cd2e710194e042af79c94500
+  data.tar.gz: 5d24c306c8b3bf9a04fecfb3a5b90b6c6d748e12
 SHA512:
-  metadata.gz: 405740fcebcda2f7bd07f5757df869c047f4ce32cd73bff464dfceaff0b7194f3c0fa5c1946d61ca209102220dd555f797086d384ee9ac051814779c7941f9ce
-  data.tar.gz: b933f042a3d849e399ab0c0a9f489bb6aac3bae31ab5b5f428697d75367cbedccbda6670cbb1b6722a6ba3870fa12c6e55ee819b2aa43ce247169bc9c2983818
+  metadata.gz: 6e75087a06063ced626b4175bd01d34de92cc1554f07988885a42e66e1b1345a4dc1660dfa94498637cfff1ff4bd8dcbf9062d5a525ea8898548215028eb4650
+  data.tar.gz: ffc42b072985b7aede6d41754a7c6f3f21855e57edba66ba82b34db70714d04472e20ce3e8f85a3cc5273ee1b6020e241fe0359f6e5f84f0a6988903170dec68

data/.travis.yml

@@ -7,12 +7,13 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
   - jruby-18mode
   - jruby-19mode
   - jruby-9.0.5.0
-  - jruby-9.1.2.0
+  - jruby-9.1.8.0
 before_script:
   - mysql -e 'create database sequel_rails_test;'
   - mysql -e 'create database sequel_rails_test_mysql2;'
@@ -27,14 +28,22 @@ gemfile:
   - ci/rails-4.2.gemfile
   - ci/rails-5.0.gemfile
 matrix:
+  allow_failures:
+    - rvm: 2.4.0
+    - rvm: jruby-9.0.5.0
+      gemfile: ci/rails-5.0.gemfile
+    - rvm: jruby-9.1.8.0
+      gemfile: ci/rails-5.0.gemfile
   exclude:
-    - rvm: 2.2.4
+    - rvm: 2.2.6
+      gemfile: ci/rails-3.2.gemfile
+    - rvm: 2.3.3
       gemfile: ci/rails-3.2.gemfile
-    - rvm: 2.3.0
+    - rvm: 2.4.0
       gemfile: ci/rails-3.2.gemfile
     - rvm: jruby-9.0.5.0
       gemfile: ci/rails-3.2.gemfile
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.8.0
       gemfile: ci/rails-3.2.gemfile
     - rvm: ree
       gemfile: ci/rails-4.0.gemfile

data/Gemfile

@@ -17,7 +17,9 @@ end
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
   gem 'pg'
-  gem 'mysql'
+  if RUBY_VERSION < '2.4'
+    gem 'mysql'
+  end
   gem 'mysql2'
   gem 'sqlite3'
 end

data/History.md

@@ -1,3 +1,13 @@
+0.9.15 (2017-04-11)
+===================
+
+** This will be the last version to support Ruby < 2.2 **
+
+* Remove `alias_method_chain` usage for Rails 5.1 compatibility (Mohammad Satrio)
+  [#132](https://github.com/TalentBox/sequel-rails/issues/132)
+* Fix string interpolation syntax in error message for db:migrate task (Henre Botha)
+  [#133](https://github.com/TalentBox/sequel-rails/issues/133)
+
 0.9.14 (2016-08-15)
 ===================
 

data/README.md

@@ -10,7 +10,7 @@
 
 This gem provides the railtie that allows
 [sequel](http://github.com/jeremyevans/sequel) to hook into
-[Rails (3.x and 4.x)](http://github.com/rails/rails) and thus behave like a
+[Rails (3.x, 4.x and 5.x)](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.
@@ -28,7 +28,8 @@ Since January 2013, we've become the official maintainers of the gem after
 Using sequel-rails
 ==================
 
-Using sequel with Rails (3.x or 4.x) requires a couple minor changes.
+Using sequel with Rails (3.x, 4.x or 5.x) requires a couple minor
+changes.
 
 First, add the following to your Gemfile (after the `Rails` lines):
 
@@ -51,32 +52,35 @@ The top of your `config/application.rb` will probably look something like:
 # require 'rails/all'
 
 # Instead of 'rails/all', require these:
-require "action_controller/railtie"
+require "active_model/railtie"
+require "active_job/railtie"
 # require "active_record/railtie"
+require "action_controller/railtie"
 require "action_mailer/railtie"
+require "action_view/railtie"
+require "action_cable/engine"
 require "sprockets/railtie"
+require "rails/test_unit/railtie
 ```
 
 Then you need to get rid of `ActiveRecord` configurations, that is if you
 didn't generate the new app with `-O` (or the long form `--skip-active-record`):
 
-`config/application.rb` and `config/environments/*.rb`
-
-For example in a fresh `Rails 4.2.4`, you would need to remove those lines:
+For example in a fresh `Rails 5.0.0.1`, you would need to remove those lines:
 
 ```
-config/application.rb
-line 27:    config.active_record.raise_in_transactional_callbacks = true
+config/initializers/new_framework_defaults.rb
+line 18:  Rails.application.config.active_record.belongs_to_required_by_default = true
 ```
 
 ```
 config/environments/development.rb
-line 23:  config.active_record.migration_error = :page_load
+line 38:  config.active_record.migration_error = :page_load
 ```
 
 ```
 config/environments/production.rb
-line 78:  config.active_record.dump_schema_after_migration = false
+line 85:  config.active_record.dump_schema_after_migration = false
 ```
 
 Starting with sequel-rails 0.4.0.pre3 we don't change default Sequel behaviour
@@ -392,6 +396,8 @@ Improvements have been made by those awesome contributors:
 * Lukas Fittl (@lfittl)
 * Jordan Owens (@jkowens)
 * Pablo Herrero (@pabloh)
+* Henre Botha (@henrebotha)
+* Mohammad Satrio (@tyok)
 
 Credits
 =======

data/Rakefile

@@ -30,14 +30,15 @@ begin
 
     configs = {
       'postgresql' => { 'TEST_ENCODING' => 'unicode' },
-      'mysql'      => { 'TEST_ENCODING' => 'utf8', 'TEST_USERNAME' => 'root' },
       'sqlite3'    => { 'TEST_DATABASE' => 'db/database.sqlite3' },
     }
 
     configs.merge!(
-      'mysql2' => configs.fetch('mysql').merge(
-        'TEST_DATABASE' => 'sequel_rails_test_mysql2'
-      )
+      'mysql' => { 'TEST_ENCODING' => 'utf8', 'TEST_USERNAME' => 'root' }
+    ) if RUBY_VERSION < '2.4'
+
+    configs.merge!(
+      'mysql2' => { 'TEST_ENCODING' => 'utf8', 'TEST_USERNAME' => 'root', 'TEST_DATABASE' => 'sequel_rails_test_mysql2' }
     ) unless SequelRails.jruby?
 
     configs.each do |adapter, config|

data/ci/rails-3.2.gemfile

@@ -16,13 +16,16 @@ if RUBY_VERSION < '1.9'
   gem 'rake', '< 11.0.0'
 end
 if RUBY_VERSION < '2.0'
-  gem "rack-cache", "< 1.3.0"
+  gem 'rack-cache', "< 1.3.0"
 end
 
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
-  if RUBY_VERSION < '1.9'
+  case
+  when RUBY_VERSION < '1.9'
     gem 'pg', '~> 0.17.1'
+  when RUBY_VERSION < '2.0'
+    gem 'pg', '~> 0.18.4'
   else
     gem 'pg'
   end

data/ci/rails-4.0.gemfile

@@ -8,10 +8,20 @@ gem 'sequel', "#{ENV['SEQUEL']}"
 
 gem 'fakefs', '0.5.3', :require => 'fakefs/safe'
 
+if RUBY_VERSION < '2.1'
+  gem 'nokogiri', '< 1.7.0'
+end
+
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
-  gem 'pg'
-  gem 'mysql'
+  if RUBY_VERSION < '2.0'
+    gem 'pg', '~> 0.18.4'
+  else
+    gem 'pg'
+  end
+  if RUBY_VERSION < '2.4'
+    gem 'mysql'
+  end
   gem 'mysql2'
   gem 'sqlite3'
 end

data/ci/rails-4.1.gemfile

@@ -8,10 +8,20 @@ gem 'sequel', "#{ENV['SEQUEL']}"
 
 gem 'fakefs', '0.5.3', :require => 'fakefs/safe'
 
+if RUBY_VERSION < '2.1'
+  gem 'nokogiri', '< 1.7.0'
+end
+
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
-  gem 'pg'
-  gem 'mysql'
+  if RUBY_VERSION < '2.0'
+    gem 'pg', '~> 0.18.4'
+  else
+    gem 'pg'
+  end
+  if RUBY_VERSION < '2.4'
+    gem 'mysql'
+  end
   gem 'mysql2'
   gem 'sqlite3'
 end

data/ci/rails-4.2.gemfile

@@ -8,10 +8,20 @@ gem 'sequel', "#{ENV['SEQUEL']}"
 
 gem 'fakefs', '0.5.3', :require => 'fakefs/safe'
 
+if RUBY_VERSION < '2.1'
+  gem 'nokogiri', '< 1.7.0'
+end
+
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
-  gem 'pg'
-  gem 'mysql'
+  if RUBY_VERSION < '2.0'
+    gem 'pg', '~> 0.18.4'
+  else
+    gem 'pg'
+  end
+  if RUBY_VERSION < '2.4'
+    gem 'mysql'
+  end
   gem 'mysql2'
   gem 'sqlite3'
 end

data/ci/rails-5.0.gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~> 5.0.0.beta1'
-gem 'activemodel', '~> 5.0.0.beta1'
+gem 'railties', '~> 5.0.0'
+gem 'activemodel', '~> 5.0.0'
 
 gemspec :path => '../'
 
@@ -12,7 +12,9 @@ gem 'fakefs', '0.5.3', :require => 'fakefs/safe'
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
   gem 'pg'
-  gem 'mysql'
+  if RUBY_VERSION < '2.4'
+    gem 'mysql'
+  end
   gem 'mysql2'
   gem 'sqlite3'
 end

data/lib/sequel_rails/railtie.rb

@@ -75,7 +75,8 @@ module SequelRails
       if defined?(::Spring::Application)
         class ::Spring::Application # rubocop:disable Style/ClassAndModuleChildren
           include ::SequelRails::SpringSupport
-          alias_method_chain :disconnect_database, :sequel
+          alias_method :disconnect_database_without_sequel, :disconnect_database
+          alias_method :disconnect_database, :disconnect_database_with_sequel
         end
       end
     end

data/lib/sequel_rails/railties/database.rake

@@ -37,7 +37,7 @@ namespace sequel_rails_namespace do
         load(file)
         ::Sequel::Migration.descendants.each { |m| m.apply(db_for_current_env, :up) }
       else
-        abort '#{file} doesn\'t exist yet. Run \'rake #{sequel_rails_namespace}: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

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '0.9.14'
+  VERSION = '0.9.15'
 end

data/sequel-rails.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'combustion'
   s.add_development_dependency 'generator_spec'
-  s.add_development_dependency 'rake', '>= 0.8.7'
+  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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -108,6 +108,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -115,6 +118,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)