sequel-rails 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc0e3d05487281cba1193b28d1319abdaf4a1f7a
-  data.tar.gz: 7b159c411db6beeb9c1ff09bb2a39c2814d639fa
+  metadata.gz: e7e8c4d115890eb4b68cf24fa551a13a0d9dc1f0
+  data.tar.gz: eebe30d28b9279cdab91af9718dbc7a655b3d3de
 SHA512:
-  metadata.gz: c8227bf0453d4b356035de10d00be3db7df7feaac230801a6a9d513cce4bf0b420f61aceeaf17efbde804dfa68dcda6c2c10693b0b87a4762dc458065e38aaff
-  data.tar.gz: 60bf62c8284abcdcf623dbcc392332db99b106ffdc7a21c981f547d344d3d9337b1feb35e99ac8efca483146247e89f3115cd66540c95a15cf656d2359da2719
+  metadata.gz: cc726e214a6c3c511ca9475a87125650c755f436053ee9b4496ddc4b13d145c2f44f23184faf2963bb7abe3363596e93a62c26bf2bc679e95d148ff2c2c1fd0c
+  data.tar.gz: 809c17b658f92fab40398b87d079b109dbd51ab0b499f279876b59740c03d3baa9cd7970716f25946e18e586b65d0d18e89b15cbc8f941aa665cd729c0656f2e

data/.travis.yml

@@ -14,6 +14,7 @@ gemfile:
   - ci/rails-3.2.gemfile
   - ci/rails-4.0.gemfile
   - ci/rails-4.1.gemfile
+  - ci/rails-4.2.gemfile
 matrix:
   exclude:
     - rvm: ree
@@ -52,6 +53,24 @@ matrix:
     - rvm: jruby-18mode
       gemfile: ci/rails-4.1.gemfile
       env: SEQUEL='~> 4.0'
+    - rvm: ree
+      gemfile: ci/rails-4.2.gemfile
+      env: SEQUEL='~> 3.0'
+    - rvm: ree
+      gemfile: ci/rails-4.2.gemfile
+      env: SEQUEL='~> 4.0'
+    - rvm: 1.8.7
+      gemfile: ci/rails-4.2.gemfile
+      env: SEQUEL='~> 3.0'
+    - rvm: 1.8.7
+      gemfile: ci/rails-4.2.gemfile
+      env: SEQUEL='~> 4.0'
+    - rvm: jruby-18mode
+      gemfile: ci/rails-4.2.gemfile
+      env: SEQUEL='~> 3.0'
+    - rvm: jruby-18mode
+      gemfile: ci/rails-4.2.gemfile
+      env: SEQUEL='~> 4.0'
 notifications:
   email:
     - jonathan.tron@metrilio.com

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'actionpack'
-gem 'fakefs', :require => 'fakefs/safe'
+gem 'fakefs', '0.5.3', :require => 'fakefs/safe'
 gem 'pry'
 
 # MRI/Rubinius Adapter Dependencies

data/History.md

@@ -1,7 +1,14 @@
+0.9.6 (2014-11-30)
+==================
+
+* Run CI with Rails 4.2.0.rc1
+* Update RSpec to 3.1
+* Do not attempt to destroy session record if it's not persisted (Andrey Chernih) [#72](https://github.com/TalentBox/sequel-rails/pull/72)
+
 0.9.5 (2014-08-14)
 ==================
 
-* Use `DATABASE_URL` environment variable even if there's no config (Rafał Rzepecki) [71](https://github.com/TalentBox/sequel-rails/pull/71)
+* Use `DATABASE_URL` environment variable even if there's no config (Rafał Rzepecki) [#71](https://github.com/TalentBox/sequel-rails/pull/71)
 * Fix spelling error in README (a3gis) [#70](https://github.com/TalentBox/sequel-rails/pull/70)
 
 0.9.4 (2014-07-24)

data/README.md

@@ -347,6 +347,7 @@ Improvements has been made by those awesome contributors:
 * Tamir Duberstein (tamird)
 * shelling (shelling)
 * a3gis (a3gis)
+* Andrey Chernih (andreychernih)
 
 Credits
 =======

data/ci/rails-3.2.gemfile

@@ -6,7 +6,7 @@ gemspec :path => '../'
 
 gem 'sequel', "#{ENV['SEQUEL']}"
 
-gem 'fakefs', :require => 'fakefs/safe'
+gem 'fakefs', '0.5.3', :require => 'fakefs/safe'
 
 # activesupport has an undeclared dependency on tzinfo prior to 4.0.0
 gem 'tzinfo'

data/ci/rails-4.0.gemfile

@@ -6,7 +6,7 @@ gemspec :path => '../'
 
 gem 'sequel', "#{ENV['SEQUEL']}"
 
-gem 'fakefs', :require => 'fakefs/safe'
+gem 'fakefs', '0.5.3', :require => 'fakefs/safe'
 
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do

data/ci/rails-4.1.gemfile

@@ -6,7 +6,7 @@ gemspec :path => '../'
 
 gem 'sequel', "#{ENV['SEQUEL']}"
 
-gem 'fakefs', :require => 'fakefs/safe'
+gem 'fakefs', '0.5.3', :require => 'fakefs/safe'
 
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do

data/ci/rails-4.2.gemfile

@@ -0,0 +1,25 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.2.0.rc1'
+gem 'activemodel', '~> 4.2.0.rc1' # Remove once 4.2.0 final is release
+
+gemspec :path => '../'
+
+gem 'sequel', "#{ENV['SEQUEL']}"
+
+gem 'fakefs', '0.5.3', :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

@@ -37,7 +37,8 @@ module ActionDispatch
       def destroy_session(env, sid, options)
         sid = current_session_id(env)
         if sid
-          get_session_model(env, sid).destroy
+          session = get_session_model(env, sid)
+          session.destroy unless session.new?
           env[SESSION_RECORD_KEY] = nil
         end
 

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

data/sequel-rails.gemspec

@@ -28,7 +28,8 @@ 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 'rspec', '~> 2.14'
-  s.add_development_dependency 'rspec-rails', '~> 2.14'
+  s.add_development_dependency 'rspec', '~> 3.1'
+  s.add_development_dependency 'rspec-rails', '~> 3.1'
   s.add_development_dependency 'rubocop', '~> 0.20.1' unless RUBY_VERSION < '1.9.2'
+  s.add_development_dependency 'ammeter', '1.1.2'
 end

data/spec/integration/sessions_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SessionsController do
+describe SessionsController, :type => :request do
   let(:session_class) { ::ActionDispatch::Session::SequelStore.session_class }
 
   def login

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -24,45 +24,45 @@ describe SequelRails::Configuration do
     context 'in test environment' do
       let(:environment) { 'test' }
       it 'defaults to false' do
-        expect(subject.schema_dump).to be_false
+        expect(subject.schema_dump).to be false
       end
       it 'can be assigned' do
         subject.schema_dump = true
-        expect(subject.schema_dump).to be_true
+        expect(subject.schema_dump).to be true
       end
       it 'can be set from merging another hash' do
         subject.merge!(:schema_dump => true)
-        expect(subject.schema_dump).to be_true
+        expect(subject.schema_dump).to be true
       end
     end
 
     context 'in production environment' do
       let(:environment) { 'production' }
       it 'defaults to false' do
-        expect(subject.schema_dump).to be_false
+        expect(subject.schema_dump).to be false
       end
       it 'can be assigned' do
         subject.schema_dump = true
-        expect(subject.schema_dump).to be_true
+        expect(subject.schema_dump).to be true
       end
       it 'can be set from merging another hash' do
         subject.merge!(:schema_dump => true)
-        expect(subject.schema_dump).to be_true
+        expect(subject.schema_dump).to be true
       end
     end
 
     context 'in other environments' do
       let(:environment) { 'development' }
       it 'defaults to true' do
-        expect(subject.schema_dump).to be_true
+        expect(subject.schema_dump).to be true
       end
       it 'can be assigned' do
         subject.schema_dump = false
-        expect(subject.schema_dump).to be_false
+        expect(subject.schema_dump).to be false
       end
       it 'can be set from merging another hash' do
         subject.merge!(:schema_dump => false)
-        expect(subject.schema_dump).to be_false
+        expect(subject.schema_dump).to be false
       end
     end
   end
@@ -71,15 +71,15 @@ describe SequelRails::Configuration do
     subject { described_class.new }
 
     it 'defaults to true' do
-      expect(subject.load_database_tasks).to be_true
+      expect(subject.load_database_tasks).to be true
     end
     it 'can be assigned' do
       subject.load_database_tasks = false
-      expect(subject.load_database_tasks).to be_false
+      expect(subject.load_database_tasks).to be false
     end
     it 'can be set from merging another hash' do
       subject.merge!(:load_database_tasks => false)
-      expect(subject.load_database_tasks).to be_false
+      expect(subject.load_database_tasks).to be false
     end
   end
 

data/spec/lib/sequel_rails/migrations_spec.rb

@@ -38,7 +38,7 @@ describe SequelRails::Migrations do
 
     it 'returns false if db/migrate directory exists, but is empty' do
       FileUtils.mkdir_p path
-      expect(described_class.pending_migrations?).to be_false
+      expect(described_class.pending_migrations?).to be false
     end
 
     context 'when db/migrate directory exists and contains migrations' do

data/spec/lib/sequel_rails/railtie_spec.rb

@@ -7,8 +7,8 @@ describe SequelRails::Railtie do
     expect(
       ActiveSupport::LogSubscriber.log_subscribers.select do |subscriber|
         subscriber.is_a?(SequelRails::Railties::LogSubscriber)
-      end
-    ).to have(1).item
+      end.size
+    ).to eq 1
   end
 
   context 'configures generator to use Sequel' do
@@ -17,12 +17,12 @@ describe SequelRails::Railtie do
     end
 
     it 'for migrations' do
-      expect(app.config.generators.options[:sequel][:migration]).to be_true
+      expect(app.config.generators.options[:sequel][:migration]).to be true
     end
   end
 
   it 'configures rails to use fancy pants logging' do
-    expect(app.config.rails_fancy_pants_logging).to be_true
+    expect(app.config.rails_fancy_pants_logging).to be true
   end
 
   context "configures action dispatch's rescue responses" do

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

@@ -19,7 +19,7 @@ describe 'Database rake tasks', :no_transaction => true do
     it "dumps the schema in 'db/schema.rb'" do
       Dir.chdir app_root do
         `rake db:schema:dump`
-        expect(File.exist?(schema)).to be_true
+        expect(File.exist?(schema)).to be true
       end
     end
 
@@ -46,7 +46,7 @@ EOS
     it "dumps the schema in 'db/structure.sql'" do
       Dir.chdir app_root do
         `rake db:structure:dump`
-        expect(File.exist?(schema)).to be_true
+        expect(File.exist?(schema)).to be true
       end
     end
 

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

@@ -23,6 +23,6 @@ describe SequelRails::Railties::LogSubscriber do
     @logger.level = :info
     User.all
     wait
-    expect(@logger.logged(:debug)).to have(:no).line
+    expect(@logger.logged(:debug).size).to eq 0
   end
 end

data/spec/lib/sequel_rails/storage_spec.rb

@@ -39,7 +39,7 @@ describe SequelRails::Storage do
         expect(SequelRails::Storage::Postgres).to receive(:new).with(env).and_return(adapter)
       end
       expect(adapter).to receive(:create).twice
-      capture(:stdout) do
+      Ammeter::OutputCapturer.capture_stdout do
         described_class.create_all
       end
     end
@@ -52,7 +52,7 @@ describe SequelRails::Storage do
       end
       expect(adapter).to receive(:close_connections).twice
       expect(adapter).to receive(:drop).twice
-      capture(:stdout) do
+      Ammeter::OutputCapturer.capture_stdout do
         described_class.drop_all
       end
     end
@@ -81,7 +81,7 @@ describe SequelRails::Storage do
         expect(SequelRails::Storage::Postgres).to receive(:new).with(env).and_return(adapter)
       end
       expect(adapter).to receive(:close_connections).exactly(3).times
-      capture(:stdout) do
+      Ammeter::OutputCapturer.capture_stdout do
         described_class.close_all_connections
       end
     end

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ Bundler.require :default, :development, :test
 Combustion.initialize! :sequel_rails
 
 require 'rspec/rails'
-require 'rspec/autorun'
+require 'ammeter/init'
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
@@ -19,7 +19,6 @@ rspec_exclusions[:mysql] = !%w(mysql mysql2).include?(ENV['TEST_ADAPTER'])
 rspec_exclusions[:sqlite] = ENV['TEST_ADAPTER'] != 'sqlite3'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run_excluding rspec_exclusions
   config.around :each do |example|
     if example.metadata[:no_transaction]
@@ -41,7 +40,7 @@ end
 # Ensure db exists and clean state
 begin
   require 'sequel_rails/storage'
-  silence(:stdout) do
+  Ammeter::OutputCapturer.capture_stdout do
     SequelRails::Storage.adapter_for(:test).drop
     SequelRails::Storage.adapter_for(:test).create
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -121,28 +121,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.20.1
+- !ruby/object:Gem::Dependency
+  name: ammeter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 description: Integrate Sequel with Rails (3.x and 4.x)
 email:
 - brasten@gmail.com
@@ -179,6 +193,7 @@ files:
 - ci/rails-3.2.gemfile
 - ci/rails-4.0.gemfile
 - ci/rails-4.1.gemfile
+- ci/rails-4.2.gemfile
 - config.ru
 - lib/action_dispatch/middleware/session/sequel_store.rb
 - lib/generators/sequel.rb