sequel-rails 0.7.0 → 0.8.0

data/spec/lib/sequel_rails/railtie_spec.rb

@@ -1,26 +1,28 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe SequelRails::Railtie do
   let(:app) { Combustion::Application }
 
-  it "registers ::Sequel::Railtie::LogSubscriber to receive :sequel notification" do
-    ActiveSupport::LogSubscriber.log_subscribers.select do |subscriber|
-      subscriber.is_a?(SequelRails::Railties::LogSubscriber)
-    end.should have(1).item
+  it 'registers ::Sequel::Railtie::LogSubscriber to receive :sequel notification' do
+    expect(
+      ActiveSupport::LogSubscriber.log_subscribers.select do |subscriber|
+        subscriber.is_a?(SequelRails::Railties::LogSubscriber)
+      end
+    ).to have(1).item
   end
 
-  context "configures generator to use Sequel" do
-    it "as orm" do
-      app.config.generators.options[:rails][:orm].should == :sequel
+  context 'configures generator to use Sequel' do
+    it 'as orm' do
+      expect(app.config.generators.options[:rails][:orm]).to be(:sequel)
     end
 
-    it "for migrations" do
-      app.config.generators.options[:sequel][:migration].should be true
+    it 'for migrations' do
+      expect(app.config.generators.options[:sequel][:migration]).to be_true
     end
   end
 
-  it "configures rails to use fancy pants logging" do
-    app.config.rails_fancy_pants_logging.should be true
+  it 'configures rails to use fancy pants logging' do
+    expect(app.config.rails_fancy_pants_logging).to be_true
   end
 
   context "configures action dispatch's rescue responses" do
@@ -28,44 +30,44 @@ describe SequelRails::Railtie do
       app.config.action_dispatch.rescue_responses
     end
 
-    it "to handle Sequel::Plugins::RailsExtensions::ModelNotFound with :not_found" do
-      rescue_responses["Sequel::Plugins::RailsExtensions::ModelNotFound"].should == :not_found
+    it 'to handle Sequel::Plugins::RailsExtensions::ModelNotFound with :not_found' do
+      expect(rescue_responses['Sequel::Plugins::RailsExtensions::ModelNotFound']).to be(:not_found)
     end
 
-    it "to handle Sequel::NoMatchingRow with :not_found" do
-      rescue_responses["Sequel::NoMatchingRow"].should == :not_found
+    it 'to handle Sequel::NoMatchingRow with :not_found' do
+      expect(rescue_responses['Sequel::NoMatchingRow']).to be(:not_found)
     end
 
-    it "to handle Sequel::ValidationFailed with :unprocessable_entity" do
-      rescue_responses["Sequel::ValidationFailed"].should == :unprocessable_entity
+    it 'to handle Sequel::ValidationFailed with :unprocessable_entity' do
+      expect(rescue_responses['Sequel::ValidationFailed']).to be(:unprocessable_entity)
     end
 
-    it "to handle Sequel::NoExistingObject with :unprocessable_entity" do
-      rescue_responses["Sequel::NoExistingObject"].should == :unprocessable_entity
+    it 'to handle Sequel::NoExistingObject with :unprocessable_entity' do
+      expect(rescue_responses['Sequel::NoExistingObject']).to be(:unprocessable_entity)
     end
   end
 
   it "stores it's own config in app.config.sequel" do
-    app.config.sequel.should be_instance_of SequelRails::Configuration
+    expect(app.config.sequel).to be_instance_of SequelRails::Configuration
   end
 
-  it "sets Rails.logger as default logger for its configuration" do
-    app.config.sequel.logger.should be Rails.logger
+  it 'sets Rails.logger as default logger for its configuration' do
+    expect(app.config.sequel.logger).to be Rails.logger
   end
 
-  it "configures Sequel::Model instances for i18n" do
-    User.new.i18n_scope.should == :sequel
+  it 'configures Sequel::Model instances for i18n' do
+    expect(User.new.i18n_scope).to be(:sequel)
   end
 
-  it "adds Sequel runtime to controller for logging" do
-    ActionController::Base.included_modules.should include(
+  it 'adds Sequel runtime to controller for logging' do
+    expect(ActionController::Base.included_modules).to include(
       SequelRails::Railties::ControllerRuntime
     )
   end
 
-  it "configures database in Sequel" do
+  it 'configures database in Sequel' do
     expect do
       Sequel::Model.db.test_connection
-    end.to_not raise_error Sequel::Error
+    end.to_not raise_error
   end
 end

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

@@ -1,6 +1,6 @@
-require "spec_helper"
+require 'spec_helper'
 
-describe "Database rake tasks" do
+describe 'Database rake tasks' do
 
   let(:app) { Combustion::Application }
   let(:app_root) { app.root }
@@ -14,22 +14,23 @@ describe "Database rake tasks" do
     end
   end
 
-  describe "db:schema:dump" do
+  describe 'db:schema:dump' do
     let(:schema) { "#{app_root}/db/schema.rb" }
 
     it "dumps the schema in 'db/schema.rb'" do
       Dir.chdir app_root do
         `rake db:schema:dump`
-        File.exists?(schema).should be_true
+        expect(File.exists?(schema)).to be_true
       end
     end
 
-    it "append the migration schema information if any" do
+    it 'append the migration schema information if any' do
       Dir.chdir app_root do
         `rake db:migrate db:schema:dump`
-        sql = Sequel::Model.db.from(:schema_migrations).
-          insert_sql(:filename => "1273253849_add_twitter_handle_to_users.rb")
-        File.read(schema).should include <<-EOS
+        sql = Sequel::Model.db.from(
+          :schema_migrations
+        ).insert_sql(:filename => '1273253849_add_twitter_handle_to_users.rb')
+        expect(File.read(schema)).to include <<-EOS
 Sequel.migration do
   change do
     self << #{sql.inspect}
@@ -40,25 +41,25 @@ EOS
     end
   end
 
-  describe "db:structure:dump", :skip_jdbc do
+  describe 'db:structure:dump', :skip_jdbc do
     let(:schema) { "#{app_root}/db/structure.sql" }
 
     it "dumps the schema in 'db/structure.sql'" do
       Dir.chdir app_root do
         `rake db:structure:dump`
-        File.exists?(schema).should be_true
+        expect(File.exists?(schema)).to be_true
       end
     end
 
-    it "append the migration schema information if any" do
+    it 'append the migration schema information if any' do
       Dir.chdir app_root do
         `rake db:migrate db:structure:dump`
 
-        sql = Sequel::Model.db.from(:schema_migrations).
-          insert_sql(:filename => "1273253849_add_twitter_handle_to_users.rb")
-        File.read(schema).should include sql
+        sql = Sequel::Model.db.from(
+          :schema_migrations
+        ).insert_sql(:filename => '1273253849_add_twitter_handle_to_users.rb')
+        expect(File.read(schema)).to include sql
       end
     end
   end
-
 end

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

@@ -1,5 +1,5 @@
-require "spec_helper"
-require "active_support/log_subscriber/test_helper"
+require 'spec_helper'
+require 'active_support/log_subscriber/test_helper'
 
 describe SequelRails::Railties::LogSubscriber do
   include ActiveSupport::LogSubscriber::TestHelper
@@ -13,16 +13,16 @@ describe SequelRails::Railties::LogSubscriber do
   end
   after { teardown }
 
-  it "logs queries" do
+  it 'logs queries' do
     User.all
     wait
-    @logger.logged(:debug).last.should =~ /SELECT \* FROM ("|`)users("|`)/
+    expect(@logger.logged(:debug).last).to match(/SELECT \* FROM ("|`)users("|`)/)
   end
 
-  it "does not log query when logger level is not debug" do
+  it 'does not log query when logger level is not debug' do
     @logger.level = :info
     User.all
     wait
-    @logger.logged(:debug).should have(:no).line
+    expect(@logger.logged(:debug)).to have(:no).line
   end
 end

data/spec/lib/sequel_rails/storage/mysql_spec.rb

@@ -1,31 +1,31 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe SequelRails::Storage::Mysql, :mysql do
-  let(:username)      { "username" }
-  let(:host)          { "host" }
+  let(:username)      { 'username' }
+  let(:host)          { 'host' }
   let(:port)          { 1234 }
-  let(:password)      { "password" }
-  let(:charset)       { "charset" }
-  let(:collation)     { "collation" }
-  let(:database)      { "database" }
+  let(:password)      { 'password' }
+  let(:charset)       { 'charset' }
+  let(:collation)     { 'collation' }
+  let(:database)      { 'database' }
   let(:config) do
     {
-      "adapter" => "postgres",
-      "username" => username,
-      "password" => password,
-      "host" => host,
-      "port" => port,
-      "database" => database,
-      "charset" => charset,
-      "collation" => collation,
+      'adapter' => 'postgres',
+      'username' => username,
+      'password' => password,
+      'host' => host,
+      'port' => port,
+      'database' => database,
+      'charset' => charset,
+      'collation' => collation,
     }
   end
   subject { described_class.new config }
 
-  describe "#_create" do
-    context "with all possible options" do
-      it "uses the mysql command" do
-        subject.should_receive(:`).with(
+  describe '#_create' do
+    context 'with all possible options' do
+      it 'uses the mysql command' do
+        expect(subject).to receive(:`).with(
           "mysql --user\\=#{username} --password\\=#{password} --host\\=#{host} --port\\=#{port} --execute\\=CREATE\\ DATABASE\\ IF\\ NOT\\ EXISTS\\ \\`#{database}\\`\\ DEFAULT\\ CHARACTER\\ SET\\ #{charset}\\ DEFAULT\\ COLLATE\\ #{collation}"
         )
         subject._create
@@ -33,30 +33,30 @@ describe SequelRails::Storage::Mysql, :mysql do
     end
   end
 
-  describe "#_drop" do
-    it "uses the mysql command" do
-      subject.should_receive(:`).with(
+  describe '#_drop' do
+    it 'uses the mysql command' do
+      expect(subject).to receive(:`).with(
         "mysql --user\\=#{username} --password\\=#{password} --host\\=#{host} --port\\=#{port} --execute\\=DROP\\ DATABASE\\ IF\\ EXISTS\\ \\`#{database}\\`"
       )
       subject._drop
     end
   end
 
-  describe "#_dump" do
-    let(:dump_file_name) { "dump.sql" }
-    it "uses the mysqldump command" do
-      subject.should_receive(:`).with(
+  describe '#_dump' do
+    let(:dump_file_name) { 'dump.sql' }
+    it 'uses the mysqldump command' do
+      expect(subject).to receive(:`).with(
         "mysqldump --user\\=#{username} --password\\=#{password} --host\\=#{host} --port\\=#{port} --no-data --result-file\\=#{dump_file_name} #{database}"
       )
       subject._dump dump_file_name
     end
   end
 
-  describe "#_load" do
-    let(:dump_file_name) { "dump.sql" }
-    it "uses the mysql command" do
-      subject.should_receive(:`).with(
-        "mysql --user\\=username --password\\=password --host\\=host --port\\=1234 --database\\=database --execute\\=SET\\ FOREIGN_KEY_CHECKS\\ \\=\\ 0\\;\\ SOURCE\\ dump.sql\\;\\ SET\\ FOREIGN_KEY_CHECKS\\ \\=\\ 1"
+  describe '#_load' do
+    let(:dump_file_name) { 'dump.sql' }
+    it 'uses the mysql command' do
+      expect(subject).to receive(:`).with(
+        'mysql --user\\=username --password\\=password --host\\=host --port\\=1234 --database\\=database --execute\\=SET\\ FOREIGN_KEY_CHECKS\\ \\=\\ 0\\;\\ SOURCE\\ dump.sql\\;\\ SET\\ FOREIGN_KEY_CHECKS\\ \\=\\ 1'
       )
       subject._load dump_file_name
     end

data/spec/lib/sequel_rails/storage/postgres_spec.rb

@@ -1,121 +1,121 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe SequelRails::Storage::Postgres, :postgres do
-  let(:username)      { "username" }
-  let(:host)          { "host" }
+  let(:username)      { 'username' }
+  let(:host)          { 'host' }
   let(:port)          { 1234 }
-  let(:password)      { "password" }
-  let(:maintenance_db){ "maintenance_db" }
-  let(:encoding)      { "encoding" }
-  let(:locale)        { "locale" }
-  let(:collation)     { "collation" }
-  let(:ctype)         { "ctype" }
-  let(:template)      { "template" }
-  let(:tablespace)    { "tablespace" }
-  let(:owner)         { "owner" }
-  let(:database)      { "database" }
+  let(:password)      { 'password' }
+  let(:maintenance_db) { 'maintenance_db' }
+  let(:encoding)      { 'encoding' }
+  let(:locale)        { 'locale' }
+  let(:collation)     { 'collation' }
+  let(:ctype)         { 'ctype' }
+  let(:template)      { 'template' }
+  let(:tablespace)    { 'tablespace' }
+  let(:owner)         { 'owner' }
+  let(:database)      { 'database' }
   let(:config) do
     {
-      "adapter" => "postgres",
-      "username" => username,
-      "password" => password,
-      "host" => host,
-      "port" => port,
-      "maintenance_db" => maintenance_db,
-      "encoding" => encoding,
-      "locale" => locale,
-      "collation" => collation,
-      "ctype" => ctype,
-      "template" => template,
-      "tablespace" => tablespace,
-      "owner" => owner,
-      "database" => database,
+      'adapter' => 'postgres',
+      'username' => username,
+      'password' => password,
+      'host' => host,
+      'port' => port,
+      'maintenance_db' => maintenance_db,
+      'encoding' => encoding,
+      'locale' => locale,
+      'collation' => collation,
+      'ctype' => ctype,
+      'template' => template,
+      'tablespace' => tablespace,
+      'owner' => owner,
+      'database' => database,
     }
   end
 
   subject { described_class.new config }
 
-  describe "#_create" do
-    context "with all possible options" do
-      it "uses the createdb command" do
-        subject.should_receive(:`).with(
+  describe '#_create' do
+    context 'with all possible options' do
+      it 'uses the createdb command' do
+        expect(subject).to receive(:`).with(
           "createdb --username\\=#{username} --host\\=#{host} --port\\=#{port} --maintenance-db\\=#{maintenance_db} --encoding\\=#{encoding} --locale\\=#{locale} --lc-collate\\=#{collation} --lc-ctype\\=#{ctype} --template\\=#{template} --tablespace\\=#{tablespace} --owner\\=#{owner} #{database}"
         )
         subject._create
       end
     end
 
-    context "with only a subset of possible options" do
-      let(:maintenance_db) { "" }
-      let(:locale) { "" }
-      it "uses the createdb command" do
-        subject.should_receive(:`).with(
+    context 'with only a subset of possible options' do
+      let(:maintenance_db) { '' }
+      let(:locale) { '' }
+      it 'uses the createdb command' do
+        expect(subject).to receive(:`).with(
           "createdb --username\\=#{username} --host\\=#{host} --port\\=#{port} --encoding\\=#{encoding} --lc-collate\\=#{collation} --lc-ctype\\=#{ctype} --template\\=#{template} --tablespace\\=#{tablespace} --owner\\=#{owner} #{database}"
         )
         subject._create
       end
     end
 
-    it "sets and remove the password in environment variable PGPASSWORD" do
-      ENV["PGPASSWORD"].should be_nil
-      subject.should_receive(:`) do |_|
-        ENV["PGPASSWORD"].should == password
+    it 'sets and remove the password in environment variable PGPASSWORD' do
+      expect(ENV['PGPASSWORD']).to be_nil
+      expect(subject).to receive(:`) do |_|
+        expect(ENV['PGPASSWORD']).to eq(password)
       end
       subject._create
-      ENV["PGPASSWORD"].should be_nil
+      expect(ENV['PGPASSWORD']).to be_nil
     end
   end
 
-  describe "#_drop" do
-    it "uses the dropdb command" do
-      subject.should_receive(:`).with(
+  describe '#_drop' do
+    it 'uses the dropdb command' do
+      expect(subject).to receive(:`).with(
         "dropdb --username\\=#{username} --host\\=#{host} --port\\=#{port} #{database}"
       )
       subject._drop
     end
-    it "sets and remove the password in environment variable PGPASSWORD" do
-      ENV["PGPASSWORD"].should be_nil
-      subject.should_receive(:`) do |_|
-        ENV["PGPASSWORD"].should == password
+    it 'sets and remove the password in environment variable PGPASSWORD' do
+      expect(ENV['PGPASSWORD']).to be_nil
+      expect(subject).to receive(:`) do |_|
+        expect(ENV['PGPASSWORD']).to eq(password)
       end
       subject._drop
-      ENV["PGPASSWORD"].should be_nil
+      expect(ENV['PGPASSWORD']).to be_nil
     end
   end
 
-  describe "#_dump" do
-    let(:dump_file_name) { "dump.sql" }
-    it "uses the pg_dump command" do
-      subject.should_receive(:`).with(
+  describe '#_dump' do
+    let(:dump_file_name) { 'dump.sql' }
+    it 'uses the pg_dump command' do
+      expect(subject).to receive(:`).with(
         "pg_dump --username\\=#{username} --host\\=#{host} --port\\=#{port} -i -s -x -O --file\\=#{dump_file_name} #{database}"
       )
       subject._dump dump_file_name
     end
-    it "sets and remove the password in environment variable PGPASSWORD" do
-      ENV["PGPASSWORD"].should be_nil
-      subject.should_receive(:`) do |_|
-        ENV["PGPASSWORD"].should == password
+    it 'sets and remove the password in environment variable PGPASSWORD' do
+      expect(ENV['PGPASSWORD']).to be_nil
+      expect(subject).to receive(:`) do |_|
+        expect(ENV['PGPASSWORD']).to eq(password)
       end
       subject._dump dump_file_name
-      ENV["PGPASSWORD"].should be_nil
+      expect(ENV['PGPASSWORD']).to be_nil
     end
   end
 
-  describe "#_load" do
-    let(:dump_file_name) { "dump.sql" }
-    it "uses the psql command" do
-      subject.should_receive(:`).with(
+  describe '#_load' do
+    let(:dump_file_name) { 'dump.sql' }
+    it 'uses the psql command' do
+      expect(subject).to receive(:`).with(
         "psql --username\\=#{username} --host\\=#{host} --port\\=#{port} --file\\=#{dump_file_name} #{database}"
       )
       subject._load dump_file_name
     end
-    it "sets and remove the password in environment variable PGPASSWORD" do
-      ENV["PGPASSWORD"].should be_nil
-      subject.should_receive(:`) do |_|
-        ENV["PGPASSWORD"].should == password
+    it 'sets and remove the password in environment variable PGPASSWORD' do
+      expect(ENV['PGPASSWORD']).to be_nil
+      expect(subject).to receive(:`) do |_|
+        expect(ENV['PGPASSWORD']).to eq(password)
       end
       subject._load dump_file_name
-      ENV["PGPASSWORD"].should be_nil
+      expect(ENV['PGPASSWORD']).to be_nil
     end
   end
 end

data/spec/lib/sequel_rails/storage/sqlite_spec.rb

@@ -1,50 +1,50 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe SequelRails::Storage::Sqlite, :sqlite do
   let(:config) do
     {
-      "adapter" => "sqlite3",
-      "database" => database,
+      'adapter' => 'sqlite3',
+      'database' => database,
     }
   end
   subject { described_class.new config }
 
-  context "when database is not in memory" do
-    let(:database) { "test_database.sqlite" }
+  context 'when database is not in memory' do
+    let(:database) { 'test_database.sqlite' }
     let(:database_path) { "#{Combustion::Application.root}/#{database}" }
 
-    describe "#_create" do
-      it "defer to Sequel" do
-        path = mock :path
-        subject.stub(:path).and_return path
-        ::Sequel.should_receive(:connect).with("adapter"=>"sqlite3", "database"=>path)
+    describe '#_create' do
+      it 'defer to Sequel' do
+        path = double(:path)
+        allow(subject).to receive(:path).and_return path
+        expect(::Sequel).to receive(:connect).with('adapter' => 'sqlite3', 'database' => path)
         subject._create
       end
     end
 
-    describe "#_drop" do
-      it "delete the database file" do
-        path = mock :path, :file? => true
-        subject.stub(:path).and_return path
-        path.should_receive :unlink
+    describe '#_drop' do
+      it 'delete the database file' do
+        path = double(:path, :file? => true)
+        allow(subject).to receive(:path).and_return path
+        expect(path).to receive :unlink
         subject._drop
       end
     end
 
-    describe "#_dump" do
-      let(:dump_file_name) { "dump.sql" }
-      it "uses the sqlite3 command" do
-        subject.should_receive(:`).with(
+    describe '#_dump' do
+      let(:dump_file_name) { 'dump.sql' }
+      it 'uses the sqlite3 command' do
+        expect(subject).to receive(:`).with(
           "sqlite3 #{database_path} .schema > #{dump_file_name}"
         )
         subject._dump dump_file_name
       end
     end
 
-    describe "#_load" do
-      let(:dump_file_name) { "dump.sql" }
-      it "uses the sqlite3 command" do
-        subject.should_receive(:`).with(
+    describe '#_load' do
+      let(:dump_file_name) { 'dump.sql' }
+      it 'uses the sqlite3 command' do
+        expect(subject).to receive(:`).with(
           "sqlite3 #{database_path} < #{dump_file_name}"
         )
         subject._load dump_file_name
@@ -52,36 +52,36 @@ describe SequelRails::Storage::Sqlite, :sqlite do
     end
   end
 
-  context "when database is in memory" do
-    let(:database) { ":memory:" }
+  context 'when database is in memory' do
+    let(:database) { ':memory:' }
 
-    describe "#_create" do
+    describe '#_create' do
       it "don't do anything" do
-        ::Sequel.should_not_receive(:connect)
+        expect(::Sequel).to_not receive(:connect)
         subject._create
       end
     end
 
-    describe "#_drop" do
-      it "do not try to delete the database file" do
-        path = mock :path, :file? => true
-        subject.stub(:path).and_return path
-        path.should_not_receive :unlink
+    describe '#_drop' do
+      it 'do not try to delete the database file' do
+        path = double(:path, :file? => true)
+        allow(subject).to receive(:path).and_return path
+        expect(path).to_not receive :unlink
         subject._drop
       end
     end
 
-    describe "#_dump" do
-      it "do not dump anything" do
-        subject.should_not_receive(:`)
-        subject._dump "dump.sql"
+    describe '#_dump' do
+      it 'do not dump anything' do
+        expect(subject).to_not receive(:`)
+        subject._dump 'dump.sql'
       end
     end
 
-    describe "#_load" do
-      it "do not load anything" do
-        subject.should_not_receive(:`)
-        subject._load "dump.sql"
+    describe '#_load' do
+      it 'do not load anything' do
+        expect(subject).to_not receive(:`)
+        subject._load 'dump.sql'
       end
     end
   end