sequel-rails 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e86a6f0412e0e4ba310a49df1c54a707f7a95ded
-  data.tar.gz: bd6ed554e0ccbff298b4c5cbf6fe813149e39039
+  metadata.gz: 246de7c0ab5e5b678e5cc36cbd9e4b8244e1e508
+  data.tar.gz: 2a1e078efd0934a6c93ac02772c0fcef672fbf78
 SHA512:
-  metadata.gz: 3ab0f6cda2bc41a90f5e806063c4990c1c49c2de012b7342dda416a00f6287ecb8a77ad3a7d341e21770144145ce08a61984fb7ddc8984c3abd387f19808ad6d
-  data.tar.gz: 1ce064ffe25f21bfc0aabc66101ff3707a82c6cc8e03e595bad652622a0d632708894011b10d3a955b48bc42ee1b5224c2c3d597357aa1e51c28b3e97b80e71a
+  metadata.gz: 8507eb62d41126c59d9cf089476d87cc3a6da8cb25c2794a47665a157274604f203b9c59542a8612cd5907fa77387c7555cd766bb38e7e0c2ea3d21b8b54bc6d
+  data.tar.gz: 59e78d025928669a0d92b5b4fa5bbd4f017e5ca5a1805a6459ebf7d3db30be31c0a459c0c23313c5e04325f660a8efd7efa536eb5d6fb000dc46f7d18a86bfcd

data/.travis.yml

@@ -2,11 +2,11 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.2
-  - jruby-9.0.5.0
-  - jruby-9.1.13.0
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
+  - jruby-9.1.16.0
 before_script:
   - mysql -e 'create database sequel_rails_test;'
   - mysql -e 'create database sequel_rails_test_mysql2;'
@@ -14,7 +14,6 @@ before_script:
   - psql  -c 'create database sequel_rails_test_storage_dev;' -U postgres
   - psql  -c 'create database sequel_rails_test;' -U postgres
 env:
-  - SEQUEL='~> 3.0'
   - SEQUEL='~> 4.0'
   - SEQUEL='~> 5.0'
 gemfile:
@@ -24,16 +23,14 @@ gemfile:
   - ci/rails-5.0.gemfile
   - ci/rails-5.1.gemfile
 matrix:
-  allow_failures:
-    - rvm: jruby-9.0.5.0
-      gemfile: ci/rails-4.2.gemfile
-    - rvm: jruby-9.0.5.0
-      gemfile: ci/rails-5.0.gemfile
-    - gemfile: ci/rails-5.1.gemfile
   exclude:
-    - rvm: 2.4.2
+    - rvm: 2.4.3
       gemfile: ci/rails-4.0.gemfile
-    - rvm: 2.4.2
+    - rvm: 2.4.3
+      gemfile: ci/rails-4.1.gemfile
+    - rvm: 2.5.0
+      gemfile: ci/rails-4.0.gemfile
+    - rvm: 2.5.0
       gemfile: ci/rails-4.1.gemfile
 notifications:
   email:

data/History.md

@@ -1,3 +1,21 @@
+1.0.1 (2018-02-27)
+==================
+
+* Check that db/ exists before running db:schema:load (Olivier Lacan)
+  [#157](https://github.com/TalentBox/sequel-rails/pull/157)
+* Raise useful exception when db/migrate directory is absent (Olivier Lacan)
+  [#156](https://github.com/TalentBox/sequel-rails/pull/156)
+* Test Ruby 2.5.0 on Travis CI (Olivier Lacan)
+  [#155](https://github.com/TalentBox/sequel-rails/pull/155)
+* Fix Sequel::DatabaseConnectionError on db:create:all task (Olivier Lacan)
+  [#154](https://github.com/TalentBox/sequel-rails/pull/154)
+* Enable skip_connect in db:create rake task (Olivier Lacan)
+  [#148](https://github.com/TalentBox/sequel-rails/pull/148)
+* Update controller tests to cope with `ActionDispatch::IntegrationTest`
+  params handling change.
+* Fix db:create rake tasks (Rolf Timmermans)
+  [#145](https://github.com/TalentBox/sequel-rails/pull/145)
+
 1.0.0 (2017-11-20)
 ==================
 

data/README.md

@@ -1,8 +1,8 @@
 # sequel-rails
 
-[![Gem Version](https://badge.fury.io/rb/sequel-rails.png)][gem]
-[![Build Status](https://secure.travis-ci.org/TalentBox/sequel-rails.png?branch=master)][travis]
-[![Code Climate](https://codeclimate.com/github/TalentBox/sequel-rails.png)][codeclimate]
+[![Gem Version](https://badge.fury.io/rb/sequel-rails.svg)][gem]
+[![Build Status](https://secure.travis-ci.org/TalentBox/sequel-rails.svg?branch=master)][travis]
+[![Code Climate](https://codeclimate.com/github/TalentBox/sequel-rails.svg)][codeclimate]
 
 [gem]: https://rubygems.org/gems/sequel-rails
 [travis]: http://travis-ci.org/TalentBox/sequel-rails
@@ -401,6 +401,8 @@ Improvements have been made by those awesome contributors:
 * Steve Hoeksema (@steveh)
 * Jester (@Jesterovskiy)
 * ckoenig (@ckoenig)
+* Rolf Timmermans (@rolftimmermans)
+* Olivier Lacan (@olivierlacan)
 
 Credits
 =======

data/lib/sequel_rails/migrations.rb

@@ -6,7 +6,13 @@ module SequelRails
       def migrate(version = nil)
         opts = {}
         opts[:target] = version.to_i if version
-        ::Sequel::Migrator.run(::Sequel::Model.db, migrations_dir, opts)
+
+        if migrations_dir.directory?
+          ::Sequel::Migrator.run(::Sequel::Model.db, migrations_dir, opts)
+        else
+          relative_path_name = migrations_dir.relative_path_from(Rails.root).to_s
+          raise "The #{relative_path_name} directory doesn't exist, you need to create it."
+        end
       end
       alias_method :migrate_up!, :migrate
       alias_method :migrate_down!, :migrate

data/lib/sequel_rails/railtie.rb

@@ -38,12 +38,16 @@ module SequelRails
 
     rake_tasks do |app|
       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
+
+      check_skip_connect_conditions(app)
     end
 
     initializer 'sequel.load_hooks' do
@@ -68,7 +72,7 @@ module SequelRails
     end
 
     initializer 'sequel.connect' do |app|
-      ::SequelRails.setup ::Rails.env unless app.config.sequel[:skip_connect]
+      ::SequelRails.setup(::Rails.env) if database_connection_required?(app)
     end
 
     initializer 'sequel.spring' do |_app|
@@ -105,5 +109,17 @@ module SequelRails
       require 'sequel_rails/railties/controller_runtime'
       ActionController::Base.send :include, SequelRails::Railties::ControllerRuntime
     end
+
+    def check_skip_connect_conditions(app)
+      app.config.sequel[:skip_connect] ||= database_create_command?
+    end
+
+    def database_connection_required?(app)
+      !app.config.sequel[:skip_connect]
+    end
+
+    def database_create_command?
+      ["db:create", "db:create:all"].any? { |c| ARGV.include?(c) }
+    end
   end
 end

data/lib/sequel_rails/railties/database.rake

@@ -22,11 +22,17 @@ namespace sequel_rails_namespace do
     task :dump => :environment do
       db_for_current_env.extension :schema_dumper
       filename = ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb"
-      File.open filename, 'w' do |file|
-        file << db_for_current_env.dump_schema_migration(:same_db => true)
-        file << SequelRails::Migrations.dump_schema_information(:sql => false)
+
+      if Rails.root.join("db").exist?
+        File.open filename, 'w' do |file|
+          file << db_for_current_env.dump_schema_migration(:same_db => true)
+          file << SequelRails::Migrations.dump_schema_information(:sql => false)
+        end
+
+        Rake::Task["#{sequel_rails_namespace}:schema:dump"].reenable
+      else
+        abort "The db/ directory doesn't exist, please create it."
       end
-      Rake::Task["#{sequel_rails_namespace}:schema:dump"].reenable
     end
 
     desc 'Load a schema.rb file into the database'
@@ -45,6 +51,7 @@ namespace sequel_rails_namespace do
   namespace :structure do
     desc 'Dump the database structure to db/structure.sql'
     task :dump, [:env] => :environment do |_t, args|
+      db_for_current_env
       args.with_defaults(:env => Rails.env)
 
       filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, 'db', 'structure.sql')
@@ -126,6 +133,7 @@ namespace sequel_rails_namespace do
   namespace :migrate do
     task :load => :environment do
       require 'sequel_rails/migrations'
+      db_for_current_env
     end
 
     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.'

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/sequel-rails.gemspec

@@ -32,9 +32,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'combustion'
   s.add_development_dependency 'generator_spec'
   s.add_development_dependency 'rake', '>= 0.8.7', '< 12.1'
-  s.add_development_dependency 'rspec', '~> 3.1'
-  s.add_development_dependency 'rspec-rails', '~> 3.1', '< 3.6'
-  s.add_development_dependency 'rubocop', '~> 0.50.0'
+  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/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/spec_helper.rb

@@ -53,6 +53,7 @@ end
 begin
   require 'sequel_rails/storage'
   require 'sequel/extensions/migration'
+  ::SequelRails.setup(Rails.env)
   load "#{Rails.root}/db/schema.rb.init"
   Sequel::Migration.descendants.first.apply Sequel::Model.db, :up
 rescue Sequel::DatabaseConnectionError => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -127,48 +127,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.52.0
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -305,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)