sequel-rails 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f373b19d13b5acc804458b3a6402e1ad71a5480b
-  data.tar.gz: d204a4d3aa6756161d9cc94b8dcf8733b65722da
+  metadata.gz: 1baea5434b859f792b982cb26885b30629e8a443
+  data.tar.gz: f1176da5f83ed06c55aa675a2de1a5631845de55
 SHA512:
-  metadata.gz: 06590d5d6130a9ef1a8c81928b6e3cea9fd7aedd85115e133bf2d81a27ef21446e15b9040611a6cedf2a44edee1a555c3e639ed168a8aacaa6821c64cdca40a7
-  data.tar.gz: c244b95d90081edf5fe865ceedaf7b712b3445177a088d0eba8430c0726331945fa52d0550204aa9741973ffa7159d354e0261bf7a02b96bf18159f486be0caf
+  metadata.gz: 8be6f01d2e34e7062c6a854ad18e0a60af75a4448470d18ce70e8206ab5843bdabf0b300c706624988050ffa8ff10674f29c5abb2c479bda75f8d80d41f87194
+  data.tar.gz: aa6ea0faee39b20dc3bc01f40bc472e95a933c1e528c204e83fd0e53d33576e13b63924756d2de882bc05e13c7652f4d0ef5e71205eac18187cbff6f9d90752a

data/.travis.yml

@@ -6,12 +6,17 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - jruby-18mode
   - jruby-19mode
-  - jruby-9.0.1.0
+  - jruby-9.0.5.0
+  - jruby-9.1.2.0
+before_script:
+  - mysql -e 'create database sequel_rails_test;'
+  - mysql -e 'create database sequel_rails_test_mysql2;'
+  - psql -c 'create database sequel_rails_test;' -U postgres
 env:
   - SEQUEL='~> 3.0'
   - SEQUEL='~> 4.0'
@@ -22,14 +27,14 @@ gemfile:
   - ci/rails-4.2.gemfile
   - ci/rails-5.0.gemfile
 matrix:
-  allow_failures:
-    - gemfile: ci/rails-5.0.gemfile
   exclude:
     - rvm: 2.2.4
       gemfile: ci/rails-3.2.gemfile
     - rvm: 2.3.0
       gemfile: ci/rails-3.2.gemfile
-    - rvm: jruby-9.0.1.0
+    - rvm: jruby-9.0.5.0
+      gemfile: ci/rails-3.2.gemfile
+    - rvm: jruby-9.1.2.0
       gemfile: ci/rails-3.2.gemfile
     - rvm: ree
       gemfile: ci/rails-4.0.gemfile
@@ -61,8 +66,10 @@ matrix:
       gemfile: ci/rails-5.0.gemfile
     - rvm: 2.0.0
       gemfile: ci/rails-5.0.gemfile
-    - rvm: 2.1.8
+    - rvm: 2.1.10
       gemfile: ci/rails-5.0.gemfile
+    - gemfile: ci/rails-3.2.gemfile
+      env: SEQUEL='~> 4.0'
 notifications:
   email:
     - jonathan.tron@metrilio.com

data/History.md

@@ -1,3 +1,15 @@
+0.9.13 (2016-08-11)
+===================
+
+* Remove some trailing spaces (Pablo Herrero)
+  [#119](https://github.com/TalentBox/sequel-rails/pull/119)
+* Update session store for Rails 5/Rack 2.0 compatibility (Jordan Owens)
+  [#110](https://github.com/TalentBox/sequel-rails/pull/110)
+* Make logging compatible with the Sequel master
+  [#109](https://github.com/TalentBox/sequel-rails/issues/109)
+* Ensure `url` database config is used in Rake task as well (Lukas Fittl)
+  [#106](https://github.com/TalentBox/sequel-rails/pull/106)
+
 0.9.12 (2016-01-18)
 ===================
 

data/README.md

@@ -361,34 +361,37 @@ Contributors
 
 Improvements have been made by those awesome contributors:
 
-* Benjamin Atkin (benatkin)
-* Gabor Ratky (rgabo)
-* Joshua Hansen (binarypaladin)
-* Arron Washington (radicaled)
-* Thiago Pradi (tchandy)
-* Sascha Cunz (scunz)
-* Brian Donovan (eventualbuddha)
-* Jack Danger Canty (JackDanger)
-* Ed Ruder (edruder)
-* Rafał Rzepecki (dividedmind)
-* Sean Sorrell (rudle)
-* Saulius Grigaliunas (sauliusg)
-* Jacques Crocker (railsjedi)
-* Eric Strathmeyer (strathmeyer)
-* Jan Berdajs (mrbrdo)
-* Robert Payne (robertjpayne)
-* Kevin Menard (nirvdrum)
-* Chris Heisterkamp (cheister)
-* Tamir Duberstein (tamird)
-* shelling (shelling)
-* a3gis (a3gis)
-* Andrey Chernih (andreychernih)
-* Nico Rieck (gix)
-* Alexander Birkner (BirknerAlex)
-* kr3ssh (kressh)
-* John Anderson (djellemah)
-* Larivact (Larivact)
-* Jan Berdajs (mrbrdo)
+* Benjamin Atkin (@benatkin)
+* Gabor Ratky (@rgabo)
+* Joshua Hansen (@binarypaladin)
+* Arron Washington (@radicaled)
+* Thiago Pradi (@tchandy)
+* Sascha Cunz (@scunz)
+* Brian Donovan (@eventualbuddha)
+* Jack Danger Canty (@JackDanger)
+* Ed Ruder (@edruder)
+* Rafał Rzepecki (@dividedmind)
+* Sean Sorrell (@rudle)
+* Saulius Grigaliunas (@sauliusg)
+* Jacques Crocker (@railsjedi)
+* Eric Strathmeyer (@strathmeyer)
+* Jan Berdajs (@mrbrdo)
+* Robert Payne (@robertjpayne)
+* Kevin Menard (@nirvdrum)
+* Chris Heisterkamp (@cheister)
+* Tamir Duberstein (@tamird)
+* shelling (@shelling)
+* a3gis (@a3gis)
+* Andrey Chernih (@andreychernih)
+* Nico Rieck (@gix)
+* Alexander Birkner (@BirknerAlex)
+* kr3ssh (@kressh)
+* John Anderson (@djellemah)
+* Larivact (@Larivact)
+* Jan Berdajs (@mrbrdo)
+* Lukas Fittl (@lfittl)
+* Jordan Owens (@jkowens)
+* Pablo Herrero (@pabloh)
 
 Credits
 =======

data/Rakefile

@@ -34,19 +34,23 @@ begin
       'sqlite3'    => { 'TEST_DATABASE' => 'db/database.sqlite3' },
     }
 
-    configs.merge!('mysql2' => configs.fetch('mysql')) unless SequelRails.jruby?
+    configs.merge!(
+      'mysql2' => configs.fetch('mysql').merge(
+        'TEST_DATABASE' => 'sequel_rails_test_mysql2'
+      )
+    ) unless SequelRails.jruby?
 
     configs.each do |adapter, config|
       desc "Run specs for #{adapter} adapter"
       task adapter do
         puts "running spec:#{adapter}"
         clean_env
-        Rake::Task['spec'].reenable
         ENV['TEST_ADAPTER'] = adapter
         config.each do |key, value|
           ENV[key] = value
         end
-        Rake::Task['spec'].invoke
+        rake = ENV['RAKE'] || "#{FileUtils::RUBY} -S rake"
+        sh "#{rake} spec 2>&1"
       end
     end
 

data/ci/rails-3.2.gemfile

@@ -13,6 +13,7 @@ gem 'tzinfo'
 
 if RUBY_VERSION < '1.9'
   gem 'i18n', '< 0.7.0'
+  gem 'rake', '< 11.0.0'
 end
 if RUBY_VERSION < '2.0'
   gem "rack-cache", "< 1.3.0"

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

@@ -21,42 +21,49 @@ module ActionDispatch
 
       private
 
+      def find_session(req, sid)
+        get_session(req.env, sid)
+      end
+
       def get_session(env, sid)
-        sid ||= generate_sid
-        session = find_session(sid)
+        session = load_from_store(sid)
         env[SESSION_RECORD_KEY] = session
-        [sid, session.data]
+        [session.session_id, session.data]
+      end
+
+      def write_session(req, sid, session_data, options)
+        set_session(req.env, sid, session_data, options)
       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
+        session.save(:raise_on_failure => false) && session.session_id
       end
 
-      def destroy_session(env, sid, options)
-        sid = current_session_id(env)
-        if sid
-          session = get_session_model(env, sid)
-          session.destroy unless session.new?
-          env[SESSION_RECORD_KEY] = nil
-        end
+      def delete_session(req, sid, options)
+        destroy_session(req.env, sid, options)
+      end
 
+      def destroy_session(env, sid, options)
+        session = get_session_model(env, sid)
+        session.destroy unless session.new?
+        env[SESSION_RECORD_KEY] = nil
         generate_sid unless options[:drop]
       end
 
       def get_session_model(env, sid)
         if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
-          env[SESSION_RECORD_KEY] = find_session(sid)
+          env[SESSION_RECORD_KEY] = load_from_store(sid)
         else
-          env[SESSION_RECORD_KEY] ||= find_session(sid)
+          env[SESSION_RECORD_KEY] ||= load_from_store(sid)
         end
       end
 
-      def find_session(sid)
+      def load_from_store(sid)
         klass = self.class.session_class
         klass.where(:session_id => sid).first ||
-          klass.new(:session_id => sid, :data => {})
+          klass.new(:session_id => generate_sid, :data => {})
       end
     end
   end

data/lib/generators/sequel/model/templates/migration.rb.erb

@@ -1,4 +1,4 @@
-Sequel.migration do 
+Sequel.migration do
   change do
 
     create_table :<%= table_name %> do
@@ -13,4 +13,4 @@ Sequel.migration do
     end
 
   end
-end
+end

data/lib/generators/sequel/model/templates/model.rb.erb

@@ -2,5 +2,5 @@ class <%= class_name %><%= options[:parent] ? " < #{options[:parent].classify}"
   <%- if options[:timestamps] -%>
   plugin :timestamps
   <%- end -%>
-  
+
 end

data/lib/sequel_rails/railtie.rb

@@ -71,9 +71,9 @@ module SequelRails
       ::SequelRails.setup ::Rails.env unless app.config.sequel[:skip_connect]
     end
 
-    initializer 'sequel.spring' do |app|
+    initializer 'sequel.spring' do |_app|
       if defined?(::Spring::Application)
-        class ::Spring::Application
+        class ::Spring::Application # rubocop:disable Style/ClassAndModuleChildren
           include ::SequelRails::SpringSupport
           alias_method_chain :disconnect_database, :sequel
         end

data/lib/sequel_rails/railties/spring_support.rb

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

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

@@ -3,9 +3,10 @@ require 'active_support/notifications'
 
 module Sequel
   class Database
-    def log_yield(sql, args = nil)
-      sql_for_log = args ? "#{sql}; #{args.inspect}" : sql
-      start = Time.now.to_f
+
+    def log_connection_yield(sql, conn, args=nil)
+      sql_for_log = "#{connection_info(conn) if conn && log_connection_info}#{sql}#{"; #{args.inspect}" if args}"
+      start = Time.now
       begin
         ::ActiveSupport::Notifications.instrument(
           'sql.sequel',
@@ -19,8 +20,12 @@ module Sequel
         log_exception(e, sql_for_log) unless @loggers.empty?
         raise
       ensure
-        log_duration(Time.now.to_f - start, sql_for_log) unless e || @loggers.empty?
+        log_duration(Time.now - start, sql_for_log) unless e || @loggers.empty?
       end
     end
+
+    def log_yield(sql, args = nil, &block)
+      log_connection_yield(sql, nil, args, &block)
+    end
   end
 end

data/lib/sequel_rails/storage.rb

@@ -53,20 +53,54 @@ module SequelRails
 
     private
 
+    def self.parse_url(value)
+      URI(value) if value.present?
+    rescue ArgumentError
+      warn "config url could not be parsed, value was: #{value.inspect}"
+    end
+
+    def self.extract_database(config, uri)
+      database = config['database']
+      database ||= uri.path[1..-1] if uri
+      database
+    end
+
+    def self.extract_adapter(config, uri)
+      adapter = config['adapter']
+      adapter ||= uri.scheme if uri
+      adapter
+    end
+
+    def self.extract_host(config, uri)
+      host = config['host']
+      host ||= uri.host if uri
+      host
+    end
+
     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'])
+        uri = parse_url(config['url'])
+
+        database = extract_database(config, uri)
+        adapter = extract_adapter(config, uri)
+        host = extract_host(config, uri)
+
+        next if database.blank? || adapter.blank?
+        if host.blank? || %w( 127.0.0.1 localhost ).include?(host)
           yield config
         else
-          warn "This task only modifies local databases. #{config['database']} is on a remote host."
+          warn "This task only modifies local databases. #{database} is on a remote host."
         end
       end
     end
 
     def self.with_all_repositories
       ::SequelRails.configuration.environments.each_value do |config|
-        next if config['database'].blank? || config['adapter'].blank?
+        uri = parse_url(config['url'])
+        database = extract_database(config, uri)
+        adapter = extract_adapter(config, uri)
+
+        next if database.blank? || adapter.blank?
         yield config
       end
     end

data/lib/sequel_rails/storage/abstract.rb

@@ -5,6 +5,7 @@ module SequelRails
 
       def initialize(config)
         @config = config
+        parse_url
       end
 
       def create
@@ -93,6 +94,21 @@ module SequelRails
 
       private
 
+      def parse_url
+        return unless @config['url'].present?
+
+        url = URI(@config['url'])
+
+        username, password = url.userinfo.to_s.split(':')
+        @config.reverse_merge!(
+          'database' => url.path.to_s[1..-1],
+          'username' => username,
+          'password' => password,
+          'host' => url.host,
+          'port' => url.port
+        )
+      end
+
       def add_option(commands, name, value)
         return unless value.present?
         separator = name[0, 2] == '--' ? '=' : ' '

data/lib/sequel_rails/version.rb

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

data/spec/internal/app/controllers/sessions_controller.rb

@@ -1,11 +1,11 @@
 class SessionsController < ApplicationController
   def create
     session[:status] = params[:status]
-    head :status => 200
+    head :ok
   end
 
   def destroy
     reset_session
-    head :status => 200
+    head :ok
   end
 end

data/spec/lib/sequel_rails/storage_spec.rb

@@ -12,10 +12,9 @@ describe SequelRails::Storage do
       },
       'test' => {
         'adapter' => 'postgres',
+        'url' => 'postgres://127.0.0.1/sequel_rails_test_storage_test',
         'owner' => (ENV['TEST_OWNER'] || ENV['USER']),
         'username' => (ENV['TEST_OWNER'] || ENV['USER']),
-        'database' => 'sequel_rails_test_storage_test',
-        'host' => '127.0.0.1',
       },
       'remote' => {
         'adapter' => 'postgres',

data/spec/spec_helper.rb

@@ -47,14 +47,9 @@ RSpec.configure do |config|
   end
 end
 
-# Ensure db exists and clean state
+# Ensure db migrated
 begin
   require 'sequel_rails/storage'
-  Ammeter::OutputCapturer.capture_stdout do
-    SequelRails::Storage.adapter_for(:test).drop
-    SequelRails::Storage.adapter_for(:test).create
-  end
-
   require 'sequel/extensions/migration'
   load "#{Rails.root}/db/schema.rb.init"
   Sequel::Migration.descendants.first.apply Sequel::Model.db, :up

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -299,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)