sequel-rails 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5f5a7169279f155b93bff5ba8e8810476d90e2
-  data.tar.gz: efbdcdb7bcec836942e4c9d128f8ecce42c02f78
+  metadata.gz: 3a1cd2895c74ba9e4a8a5ef09818780374a39a5a
+  data.tar.gz: d7411b415c0f316fba662ed2ef5480d100e3965d
 SHA512:
-  metadata.gz: 3fb9ddba737bd25fb13ec5626cab4ef932e8109adfc4ad87af995b583bc546da6c1a05e6d863133b8331854b7f1c74347d613f9aafc6e11adc3c7b6f4e9eea28
-  data.tar.gz: 6ad79e4f6b46c8ef912777f4a4ab8bdfbd1f9059a01146c565eb1f1e01ed953e00135377be748f7719639bc67cbd4547080c404aad6565035529419492f5e9e6
+  metadata.gz: 56005f7d3bd105d08938c3f7f14a8b256a9015deac144b7c685481e4b2af7b90ad1d6b027eacedb5794c10745ea5778361e7b2fdbcbb05cac02b6c5dea2dbb9e
+  data.tar.gz: ad9e912ed38c60d59c73649d5b08ef1ad615ebe72e31cc31c8d176588b320db1c79bfacde4d232daa9b6ef426596e57c9016818b86cc8629c433fe6cdc7632a8

data/.rubocop.yml

@@ -1,11 +1,13 @@
 AllCops:
-  Includes:
-    - Gemfile
-    - config.ru
-    - Rakefile
-    - '*.rake'
-    - '*.gemfile'
-    - '*.gemspec'
+  Include:
+    - '**/Gemfile'
+    - '**/config.ru'
+    - '**/Rakefile'
+    - '**/*.rake'
+    - '**/*.gemfile'
+    - '**/*.gemspec'
+  Exclude:
+    - 'lib/sequel-rails.rb'
 
 HashSyntax:
   EnforcedStyle: hash_rockets

data/.travis.yml

@@ -1,23 +1,19 @@
 language: ruby
-before_install:
-  - gem update --system 2.1.11
-  - gem --version
-  - gem install bundler -v 1.5.1
 rvm:
   - ree
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
   - jruby-18mode
   - jruby-19mode
-  - jruby-20mode
 env:
   - SEQUEL='~> 3.0'
   - SEQUEL='~> 4.0'
 gemfile:
   - ci/rails-3.2.gemfile
   - ci/rails-4.0.gemfile
+  - ci/rails-4.1.gemfile
 matrix:
   exclude:
     - rvm: ree
@@ -38,6 +34,24 @@ matrix:
     - rvm: jruby-18mode
       gemfile: ci/rails-4.0.gemfile
       env: SEQUEL='~> 4.0'
+    - rvm: ree
+      gemfile: ci/rails-4.1.gemfile
+      env: SEQUEL='~> 3.0'
+    - rvm: ree
+      gemfile: ci/rails-4.1.gemfile
+      env: SEQUEL='~> 4.0'
+    - rvm: 1.8.7
+      gemfile: ci/rails-4.1.gemfile
+      env: SEQUEL='~> 3.0'
+    - rvm: 1.8.7
+      gemfile: ci/rails-4.1.gemfile
+      env: SEQUEL='~> 4.0'
+    - rvm: jruby-18mode
+      gemfile: ci/rails-4.1.gemfile
+      env: SEQUEL='~> 3.0'
+    - rvm: jruby-18mode
+      gemfile: ci/rails-4.1.gemfile
+      env: SEQUEL='~> 4.0'
 notifications:
   email:
     - jonathan.tron@metrilio.com

data/History.md

@@ -1,3 +1,8 @@
+0.9.3 (2014-05-18)
+==================
+
+* Use `ENV['DATABASE_URL']` for connection if set [#66](https://github.com/TalentBox/sequel-rails/issues/66)
+
 0.9.2 (2014-02-11)
 ==================
 

data/README.md

@@ -103,7 +103,7 @@ Features provided by `sequel-rails`
    Session:
 
    ```ruby
-   rails generate session_migration
+   rails generate sequel:session_migration
    ```
 
 3. Rake tasks similar to `ActiveRecord`, see
@@ -178,6 +178,8 @@ Here's some examples:
       template: template1 # Optional
       tablespace: non_default_tablespace_name # Optional
       max_connections: 20 # Optional, also accept 'pool' as key, if both are present 'max_connections' is used (default to nil, Sequel default is 4)
+      url: "postgres://myuser:mypass@host/somedatabase" # Optional, if present it's passed to `Sequel.connect` with other config as options
+                                                        # If url is not set in config file, environment variable `DATABASE_URL` is used
     ```
 
 2. For MySQL:
@@ -192,6 +194,8 @@ Here's some examples:
       port: 5432 # Optional
       charset: latin1 # Optional (defaults to 'utf8')
       collation: latin1_general_ci # Optional (defaults to 'utf8_unicode_ci')
+      url: "mysql://myuser:mypass@host/somedatabase" # Optional, if present it's passed to `Sequel.connect` with other config as options
+                                                     # If url is not set in config file, environment variable `DATABASE_URL` is used
     ```
 
 2. For SQLite:
@@ -242,7 +246,7 @@ You can then generate a migration for the session table using the provided
 generator:
 
 ```bash
-rails generate session_migration
+rails generate sequel:session_migration
 rake db:migrate
 ```
 
@@ -337,6 +341,7 @@ Improvements has been made by those awesome contributors:
 * Kevin Menard (nirvdrum)
 * Chris Heisterkamp (cheister)
 * Tamir Duberstein (tamird)
+* shelling (shelling)
 
 Credits
 =======

data/Rakefile

@@ -1,7 +1,7 @@
 begin
   require 'bundler/setup'
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  warn 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
 Bundler::GemHelper.install_tasks

data/ci/rails-3.2.gemfile

@@ -4,7 +4,7 @@ gem 'railties', '~> 3.2.13'
 
 gemspec :path => '../'
 
-gem 'sequel', "#{ENV["SEQUEL"]}"
+gem 'sequel', "#{ENV['SEQUEL']}"
 
 gem 'fakefs', :require => 'fakefs/safe'
 

data/ci/rails-4.0.gemfile

@@ -4,7 +4,7 @@ gem 'railties', '~> 4.0.0'
 
 gemspec :path => '../'
 
-gem 'sequel', "#{ENV["SEQUEL"]}"
+gem 'sequel', "#{ENV['SEQUEL']}"
 
 gem 'fakefs', :require => 'fakefs/safe'
 

data/ci/rails-4.1.gemfile

@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.1.0'
+
+gemspec :path => '../'
+
+gem 'sequel', "#{ENV['SEQUEL']}"
+
+gem 'fakefs', :require => 'fakefs/safe'
+
+# MRI/Rubinius Adapter Dependencies
+platform :ruby do
+  gem 'pg'
+  gem 'mysql'
+  gem 'mysql2'
+  gem 'sqlite3'
+end
+
+# JRuby Adapter Dependencies
+platform :jruby do
+  gem 'jdbc-sqlite3'
+  gem 'jdbc-mysql'
+  gem 'jdbc-postgres'
+end

data/lib/action_dispatch/middleware/session/sequel_store.rb

@@ -28,7 +28,7 @@ module ActionDispatch
         [sid, session.data]
       end
 
-      def set_session(env, sid, session_data, options)
+      def set_session(env, sid, session_data, _options)
         session      = get_session_model(env, sid)
         session.data = session_data
         session.save(:raise_on_failure => false) && sid

data/lib/generators/sequel.rb

@@ -22,7 +22,7 @@ module Sequel
       # Sequel does not care if migrations have the same name as long as
       # they have different ids.
       #
-      def migration_exists?(dirname, file_name) #:nodoc:
+      def migration_exists?(_dirname, _file_name) #:nodoc:
         false
       end
 
@@ -30,7 +30,7 @@ module Sequel
       #
       def self.next_migration_number(dirname) #:nodoc:
         next_migration_number = current_migration_number(dirname) + 1
-        [Time.now.utc.strftime('%Y%m%d%H%M%S'), sprintf('%.14d', next_migration_number)].max
+        [Time.now.utc.strftime('%Y%m%d%H%M%S'), format('%.14d', next_migration_number)].max
       end
     end
 

data/lib/sequel_rails/configuration.rb

@@ -91,6 +91,10 @@ module SequelRails
       config['max_connections'] = max_connections if max_connections
       config['search_path'] = search_path if search_path
 
+      # Allow to set the URL from environment directly
+      url = ENV['DATABASE_URL']
+      config['url'] ||= url if url
+
       # some adapters only support an url
       if config['adapter'] && config['adapter'] =~ /^(jdbc|do):/ && !config.key?('url')
         params = {}
@@ -106,9 +110,9 @@ module SequelRails
         port = config['port'] ? ":#{config['port']}" : ''
         config['url'] ||=
         if config['adapter'].include?('sqlite')
-          sprintf('%s:%s', config['adapter'], config['database'])
+          format('%s:%s', config['adapter'], config['database'])
         else
-          sprintf('%s://%s%s/%s?%s', config['adapter'], config['host'], port, config['database'], params_str)
+          format('%s://%s%s/%s?%s', config['adapter'], config['host'], port, config['database'], params_str)
         end
       end
 

data/lib/sequel_rails/migrations.rb

@@ -44,7 +44,7 @@ module SequelRails
       end
 
       def available_migrations?
-        File.exists?(migrations_dir) && Dir[File.join(migrations_dir, '*')].any?
+        File.exist?(migrations_dir) && Dir[File.join(migrations_dir, '*')].any?
       end
     end
   end

data/lib/sequel_rails/railtie.rb

@@ -47,16 +47,16 @@ module SequelRails
       setup_logger app, ::Rails.logger
     end
 
-    initializer 'sequel.i18n_support' do |app|
-      setup_i18n_support app
+    initializer 'sequel.i18n_support' do |_app|
+      setup_i18n_support
     end
 
     # Expose database runtime to controller for logging.
-    initializer 'sequel.log_runtime' do |app|
-      setup_controller_runtime app
+    initializer 'sequel.log_runtime' do |_app|
+      setup_controller_runtime
     end
 
-    initializer 'sequel.connect' do |app|
+    initializer 'sequel.connect' do |_app|
       ::SequelRails.setup ::Rails.env
     end
 
@@ -69,11 +69,11 @@ module SequelRails
       ::SequelRails.configuration = app.config.sequel
     end
 
-    def setup_i18n_support(app)
+    def setup_i18n_support
       ::Sequel::Model.send :include, ::SequelRails::I18nSupport
     end
 
-    def setup_controller_runtime(app)
+    def setup_controller_runtime
       require 'sequel_rails/railties/controller_runtime'
       ActionController::Base.send :include, SequelRails::Railties::ControllerRuntime
     end

data/lib/sequel_rails/railties/controller_runtime.rb

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

data/lib/sequel_rails/railties/database.rake

@@ -10,7 +10,7 @@ namespace :db do
   # desc "Raises an error if there are pending migrations"
   task :abort_if_pending_migrations => [:environment, 'db:migrate:load'] do
     if SequelRails::Migrations.pending_migrations?
-      puts 'You have pending migrations:'
+      warn 'You have pending migrations:'
       abort 'Run `rake db:migrate` to update your database then try again.'
     end
   end
@@ -30,7 +30,7 @@ namespace :db do
     desc 'Load a schema.rb file into the database'
     task :load => :environment do
       file = ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb"
-      if File.exists?(file)
+      if File.exist?(file)
         require 'sequel/extensions/migration'
         load(file)
         ::Sequel::Migration.descendants.each { |m| m.apply(db_for_current_env, :up) }
@@ -42,7 +42,7 @@ namespace :db do
 
   namespace :structure do
     desc 'Dump the database structure to db/structure.sql'
-    task :dump, [:env] => :environment do |t, args|
+    task :dump, [:env] => :environment do |_t, args|
       args.with_defaults(:env => Rails.env)
 
       filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, 'db', 'structure.sql')
@@ -57,7 +57,7 @@ namespace :db do
       Rake::Task['db:structure:dump'].reenable
     end
 
-    task :load, [:env] => :environment do |t, args|
+    task :load, [:env] => :environment do |_t, args|
       args.with_defaults(:env => Rails.env)
 
       filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, 'db', 'structure.sql')
@@ -97,7 +97,7 @@ namespace :db do
   end
 
   desc 'Create the database defined in config/database.yml for the current Rails.env'
-  task :create, [:env] => :environment do |t, args|
+  task :create, [:env] => :environment do |_t, args|
     args.with_defaults(:env => Rails.env)
 
     unless SequelRails::Storage.create_environment(args.env)
@@ -113,7 +113,7 @@ namespace :db do
   end
 
   desc 'Drop the database defined in config/database.yml for the current Rails.env'
-  task :drop, [:env] => :environment do |t, args|
+  task :drop, [:env] => :environment do |_t, args|
     args.with_defaults(:env => Rails.env)
 
     unless SequelRails::Storage.drop_environment(args.env)
@@ -126,7 +126,7 @@ namespace :db do
       require 'sequel_rails/migrations'
     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.'
+    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
@@ -176,7 +176,7 @@ namespace :db do
   task :reset => %w(db:drop db:setup)
 
   desc 'Forcibly close any open connections to the current env database (PostgreSQL specific)'
-  task :force_close_open_connections, [:env] => :environment do |t, args|
+  task :force_close_open_connections, [:env] => :environment do |_t, args|
     args.with_defaults(:env => Rails.env)
     SequelRails::Storage.close_connections_environment(args.env)
   end

data/lib/sequel_rails/railties/log_subscriber.rb

@@ -20,7 +20,7 @@ module SequelRails
 
         payload = event.payload
 
-        name = sprintf('%s (%.1fms)', payload[:name], event.duration)
+        name = format('%s (%.1fms)', payload[:name], event.duration)
         sql  = payload[:sql].squeeze(' ')
         binds = nil
 

data/lib/sequel_rails/storage.rb

@@ -56,7 +56,7 @@ module SequelRails
     def self.with_local_repositories
       ::SequelRails.configuration.environments.each_value do |config|
         next if config['database'].blank? || config['adapter'].blank?
-        if config['host'].blank? || %w[ 127.0.0.1 localhost ].include?(config['host'])
+        if config['host'].blank? || %w( 127.0.0.1 localhost ).include?(config['host'])
           yield config
         else
           warn "This task only modifies local databases. #{config['database']} is on a remote host."

data/lib/sequel_rails/storage/jdbc.rb

@@ -42,7 +42,7 @@ module SequelRails
       def _drop
         if _is_sqlite?
           return if in_memory?
-          FileUtils.rm db_name if File.exists? db_name
+          FileUtils.rm db_name if File.exist? db_name
         elsif _is_mysql?
           ::Sequel.connect("#{_root_url}#{_params}") do |db|
             db.execute("DROP DATABASE IF EXISTS `#{db_name}`")

data/lib/sequel_rails/storage/mysql.rb

@@ -22,7 +22,7 @@ module SequelRails
         commands = ['mysql']
         add_connection_settings commands
         add_option commands, '--database', database
-        add_option commands, '--execute', %{SET FOREIGN_KEY_CHECKS = 0; SOURCE #{filename}; SET FOREIGN_KEY_CHECKS = 1}
+        add_option commands, '--execute', %(SET FOREIGN_KEY_CHECKS = 0; SOURCE #{filename}; SET FOREIGN_KEY_CHECKS = 1)
         safe_exec commands
       end
 

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/sequel-rails.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '>= 0.8.7'
   s.add_development_dependency 'rspec', '~> 2.14'
   s.add_development_dependency 'rspec-rails', '~> 2.14'
-  s.add_development_dependency 'rubocop' unless RUBY_VERSION < '1.9.2'
+  s.add_development_dependency 'rubocop', '~> 0.20.1' unless RUBY_VERSION < '1.9.2'
 end

data/spec/internal/Rakefile

@@ -1,7 +1,7 @@
 begin
   require 'bundler/setup'
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  warn 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 Bundler.require :default, :development, :test
 

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -160,6 +160,42 @@ describe SequelRails::Configuration do
         end
       end
 
+      shared_examples 'with DATABASE_URL in ENV' do
+        let(:database_url) { 'adapter://user:pass@host/db' }
+        def with_database_url_env
+          previous, ENV['DATABASE_URL'] = ENV['DATABASE_URL'], database_url
+          yield
+          ENV['DATABASE_URL'] = previous
+        end
+        context 'without url set in config' do
+          around do |example|
+            with_database_url_env { example.call }
+          end
+          it 'uses DATABASE_URL' do
+            expect(::Sequel).to receive(:connect) do |url, _hash|
+              expect(url).to eq database_url
+            end
+            subject.connect environment
+          end
+        end
+
+        context 'with url set in config' do
+          let(:config_url) { 'another_adapter://user:pass@host/db' }
+          around do |example|
+            with_database_url_env do
+              environments[environment]['url'] = config_url
+              example.call
+            end
+          end
+          it 'uses url from config' do
+            expect(::Sequel).to receive(:connect) do |url, _hash|
+              expect(url).to eq config_url
+            end
+            subject.connect environment
+          end
+        end
+      end
+
       context 'for a postgres connection' do
 
         shared_examples 'search_path' do
@@ -189,6 +225,7 @@ describe SequelRails::Configuration do
 
           include_examples 'max_connections'
           include_examples 'search_path'
+          include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { false }
 
@@ -205,6 +242,7 @@ describe SequelRails::Configuration do
 
           include_examples 'max_connections'
           include_examples 'search_path'
+          include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { true }
 
@@ -240,6 +278,7 @@ describe SequelRails::Configuration do
         context 'in C-Ruby' do
 
           include_examples 'max_connections'
+          include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { false }
 
@@ -254,6 +293,7 @@ describe SequelRails::Configuration do
         context 'in JRuby' do
 
           include_examples 'max_connections'
+          include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { true }
 

data/spec/lib/sequel_rails/railties/database_rake_spec.rb

@@ -7,10 +7,10 @@ describe 'Database rake tasks' do
 
   around do |example|
     begin
-      FileUtils.rm schema if File.exists? schema
+      FileUtils.rm schema if File.exist? schema
       example.run
     ensure
-      FileUtils.rm schema if File.exists? schema
+      FileUtils.rm schema if File.exist? schema
     end
   end
 
@@ -20,7 +20,7 @@ describe 'Database rake tasks' do
     it "dumps the schema in 'db/schema.rb'" do
       Dir.chdir app_root do
         `rake db:schema:dump`
-        expect(File.exists?(schema)).to be_true
+        expect(File.exist?(schema)).to be_true
       end
     end
 
@@ -47,7 +47,7 @@ EOS
     it "dumps the schema in 'db/structure.sql'" do
       Dir.chdir app_root do
         `rake db:structure:dump`
-        expect(File.exists?(schema)).to be_true
+        expect(File.exist?(schema)).to be_true
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -147,16 +147,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.20.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.20.1
 description: Integrate Sequel with Rails (3.x and 4.x)
 email:
 - brasten@gmail.com
@@ -178,6 +178,7 @@ files:
 - Rakefile
 - ci/rails-3.2.gemfile
 - ci/rails-4.0.gemfile
+- ci/rails-4.1.gemfile
 - config.ru
 - lib/action_dispatch/middleware/session/sequel_store.rb
 - lib/generators/sequel.rb
@@ -258,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)