sequel-rails 0.7.0 → 0.8.0

data/spec/lib/sequel_rails/storage_spec.rb

@@ -1,138 +1,126 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe SequelRails::Storage do
   let(:environments) do
     {
-      "development" => {
-        "adapter" => "postgres",
-        "owner" => (ENV["TEST_OWNER"] || ENV["USER"]),
-        "username" => (ENV["TEST_OWNER"] || ENV["USER"]),
-        "database" => "sequel_rails_test_storage_dev",
-        "host" => "127.0.0.1",
+      'development' => {
+        'adapter' => 'postgres',
+        'owner' => (ENV['TEST_OWNER'] || ENV['USER']),
+        'username' => (ENV['TEST_OWNER'] || ENV['USER']),
+        'database' => 'sequel_rails_test_storage_dev',
+        'host' => '127.0.0.1',
       },
-      "test" => {
-        "adapter" => "postgres",
-        "owner" => (ENV["TEST_OWNER"] || ENV["USER"]),
-        "username" => (ENV["TEST_OWNER"] || ENV["USER"]),
-        "database" => "sequel_rails_test_storage_test",
-        "host" => "127.0.0.1",
+      'test' => {
+        'adapter' => 'postgres',
+        '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",
-        "host" => "10.0.0.1",
-        "database" => "sequel_rails_test_storage_remote",
+      'remote' => {
+        'adapter' => 'postgres',
+        'host' => '10.0.0.1',
+        'database' => 'sequel_rails_test_storage_remote',
       },
-      "production" => {
-        "host" => "10.0.0.1",
-        "database" => "sequel_rails_test_storage_production",
+      'production' => {
+        'host' => '10.0.0.1',
+        'database' => 'sequel_rails_test_storage_production',
       },
-      "bogus" => {},
+      'bogus' => {},
     }
   end
   before do
-    SequelRails.configuration.stub(:environments).and_return environments
+    allow(SequelRails.configuration).to receive(:environments).and_return(environments)
   end
-  describe ".create_all" do
-    it "creates all databases skipping ones on remote host or with no database name" do
-      adapter = mock :storage_adapter
-      environments.except("remote", "production", "bogus").values.each do |env|
-        SequelRails::Storage::Postgres.should_receive(:new).
-          with(env).
-          and_return adapter
+  describe '.create_all' do
+    it 'creates all databases skipping ones on remote host or with no database name' do
+      adapter = double(:storage_adapter)
+      environments.except('remote', 'production', 'bogus').values.each do |env|
+        expect(SequelRails::Storage::Postgres).to receive(:new).with(env).and_return(adapter)
       end
-      adapter.should_receive(:create).twice
+      expect(adapter).to receive(:create).twice
       capture(:stdout) do
         described_class.create_all
       end
     end
   end
-  describe ".drop_all" do
-    it "drop all databases skipping ones on remote host or with no database name" do
-      adapter = mock :storage_adapter
-      environments.except("remote", "production", "bogus").values.each do |env|
-        SequelRails::Storage::Postgres.should_receive(:new).
-          with(env).
-          and_return adapter
+  describe '.drop_all' do
+    it 'drop all databases skipping ones on remote host or with no database name' do
+      adapter = double(:storage_adapter)
+      environments.except('remote', 'production', 'bogus').values.each do |env|
+        expect(SequelRails::Storage::Postgres).to receive(:new).with(env).and_return(adapter)
       end
-      adapter.should_receive(:close_connections).twice
-      adapter.should_receive(:drop).twice
+      expect(adapter).to receive(:close_connections).twice
+      expect(adapter).to receive(:drop).twice
       capture(:stdout) do
         described_class.drop_all
       end
     end
   end
-  describe ".create_environment" do
-    it "creates database for specified environment" do
-      adapter = mock :storage_adapter
-      SequelRails::Storage::Postgres.should_receive(:new).
-        with(environments["development"]).
-        and_return adapter
-      adapter.should_receive :create
-      described_class.create_environment "development"
+  describe '.create_environment' do
+    it 'creates database for specified environment' do
+      adapter = double(:storage_adapter)
+      expect(SequelRails::Storage::Postgres).to receive(:new).with(environments['development']).and_return(adapter)
+      expect(adapter).to receive(:create)
+      described_class.create_environment 'development'
     end
   end
-  describe ".drop_environment" do
-    it "drops database for specified environment" do
-      adapter = mock :storage_adapter
-      SequelRails::Storage::Postgres.should_receive(:new).
-        with(environments["development"]).
-        and_return adapter
-      adapter.should_receive :close_connections
-      adapter.should_receive :drop
-      described_class.drop_environment "development"
+  describe '.drop_environment' do
+    it 'drops database for specified environment' do
+      adapter = double(:storage_adapter)
+      expect(SequelRails::Storage::Postgres).to receive(:new).with(environments['development']).and_return(adapter)
+      expect(adapter).to receive(:close_connections)
+      expect(adapter).to receive(:drop)
+      described_class.drop_environment 'development'
     end
   end
-  describe ".close_all_connections" do
-    it "drops opened connections to all databases on config" do
-      adapter = mock :storage_adapter
-      environments.except("production", "bogus").values.each do |env|
-        SequelRails::Storage::Postgres.should_receive(:new).
-          with(env).
-          and_return adapter
+  describe '.close_all_connections' do
+    it 'drops opened connections to all databases on config' do
+      adapter = double(:storage_adapter)
+      environments.except('production', 'bogus').values.each do |env|
+        expect(SequelRails::Storage::Postgres).to receive(:new).with(env).and_return(adapter)
       end
-      adapter.should_receive(:close_connections).exactly(3).times
+      expect(adapter).to receive(:close_connections).exactly(3).times
       capture(:stdout) do
         described_class.close_all_connections
       end
     end
   end
-  describe ".close_connections_environment" do
-    it "drops opened connections to database for specified environment" do
-      adapter = mock :storage_adapter
-      SequelRails::Storage::Postgres.should_receive(:new).
-        with(environments["development"]).
-        and_return adapter
-      adapter.should_receive :close_connections
-      described_class.close_connections_environment "development"
+  describe '.close_connections_environment' do
+    it 'drops opened connections to database for specified environment' do
+      adapter = double(:storage_adapter)
+      expect(SequelRails::Storage::Postgres).to receive(:new).with(environments['development']).and_return(adapter)
+      expect(adapter).to receive(:close_connections)
+      described_class.close_connections_environment 'development'
     end
   end
-  describe ".adapter_for" do
-    context "when passed a hash" do
+  describe '.adapter_for' do
+    context 'when passed a hash' do
       {
-        "postgres" => SequelRails::Storage::Postgres,
-        "mysql" => SequelRails::Storage::Mysql,
-        "mysql2" => SequelRails::Storage::Mysql2,
-        "sqlite" => SequelRails::Storage::Sqlite,
-        "jdbc" => SequelRails::Storage::Jdbc,
+        'postgres' => SequelRails::Storage::Postgres,
+        'mysql' => SequelRails::Storage::Mysql,
+        'mysql2' => SequelRails::Storage::Mysql2,
+        'sqlite' => SequelRails::Storage::Sqlite,
+        'jdbc' => SequelRails::Storage::Jdbc,
       }.each do |adapter, klass|
         it "returns an instance of #{klass} when adapter key is #{adapter}" do
-          config = {"adapter" => adapter}
+          config = { 'adapter' => adapter }
           adapter = described_class.adapter_for config
-          adapter.should be_instance_of klass
-          adapter.config.should be config
+          expect(adapter).to be_instance_of klass
+          expect(adapter.config).to be config
         end
       end
-      it "raises when adapter is not valid" do
+      it 'raises when adapter is not valid' do
         expect do
-          described_class.adapter_for({"adapter" => "unknown"})
-        end.to raise_error RuntimeError, "Adapter unknown not supported (:Unknown)"
+          described_class.adapter_for('adapter' => 'unknown')
+        end.to raise_error RuntimeError, 'Adapter unknown not supported (:Unknown)'
       end
     end
-    context "when passed an environment" do
-      it "returns adapter based on configured environment" do
+    context 'when passed an environment' do
+      it 'returns adapter based on configured environment' do
         adapter = described_class.adapter_for :development
-        adapter.should be_instance_of SequelRails::Storage::Postgres
-        adapter.config.should == environments["development"]
+        expect(adapter).to be_instance_of SequelRails::Storage::Postgres
+        expect(adapter.config).to eq(environments['development'])
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,19 +1,19 @@
-require "rubygems"
-require "bundler"
+require 'rubygems'
+require 'bundler'
 
 Bundler.require :default, :development, :test
 
 # Combustion initialization has to happend before loading rspec/rails
-Combustion.initialize! "sequel_rails"
+Combustion.initialize! 'sequel_rails'
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 rspec_exclusions = {}
-rspec_exclusions[:skip_jdbc] = true if SequelRails.jruby?
-rspec_exclusions[:postgres] = true unless ENV["TEST_ADAPTER"]=="postgresql"
-rspec_exclusions[:mysql] = true unless ["mysql", "mysql2"].include? ENV["TEST_ADAPTER"]
-rspec_exclusions[:sqlite] = true unless ENV["TEST_ADAPTER"]=="sqlite3"
+rspec_exclusions[:skip_jdbc] = SequelRails.jruby?
+rspec_exclusions[:postgres] = ENV['TEST_ADAPTER'] != 'postgresql'
+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
@@ -23,11 +23,17 @@ RSpec.configure do |config|
       example.run
     end
   end
+
+  [:expect_with, :mock_with].each do |method|
+    config.send(method, :rspec) do |c|
+      c.syntax = :expect
+    end
+  end
 end
 
 # Ensure db exists and clean state
 begin
-  require "sequel_rails/storage"
+  require 'sequel_rails/storage'
   silence(:stdout) do
     SequelRails::Storage.adapter_for(:test).drop
     SequelRails::Storage.adapter_for(:test).create
@@ -37,7 +43,7 @@ begin
   load "#{Rails.root}/db/schema.rb.init"
   Sequel::Migration.descendants.first.apply Sequel::Model.db, :up
 rescue Sequel::DatabaseConnectionError => e
-  puts "Database connection error: #{e.message}"
-  puts "Ensure test db exists before running specs."
+  warn "Database connection error: #{e.message}"
+  warn 'Ensure test db exists before running specs.'
   exit 1
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,8 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -32,76 +60,76 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
-  name: combustion
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: generator_spec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
-description: Integrate Sequel with Rails 3
+        version: '0'
+description: Integrate Sequel with Rails (3.x and 4.x)
 email:
 - brasten@gmail.com
 - jonathan.tron@metrilio.com
@@ -113,6 +141,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
+- .rubocop.yml
 - .travis.yml
 - Gemfile
 - History.md
@@ -130,6 +159,8 @@ files:
 - lib/generators/sequel/model/templates/model.rb.erb
 - lib/generators/sequel/observer/observer_generator.rb
 - lib/generators/sequel/observer/templates/observer.rb.erb
+- lib/generators/sequel/session_migration/session_migration_generator.rb
+- lib/generators/sequel/session_migration/templates/migration.rb.erb
 - lib/sequel-rails.rb
 - lib/sequel_rails.rb
 - lib/sequel_rails/configuration.rb
@@ -152,6 +183,7 @@ files:
 - lib/sequel_rails/storage/postgres.rb
 - lib/sequel_rails/storage/sqlite.rb
 - lib/sequel_rails/version.rb
+- rubocop-todo.yml
 - sequel-rails.gemspec
 - spec/internal/Rakefile
 - spec/internal/app/models/user.rb
@@ -162,6 +194,7 @@ files:
 - spec/internal/db/schema.rb.init
 - spec/internal/public/favicon.ico
 - spec/lib/generators/sequel/migration_spec.rb
+- spec/lib/generators/sequel/session_migration_spec.rb
 - spec/lib/sequel_rails/configuration_spec.rb
 - spec/lib/sequel_rails/jdbc_spec.rb
 - spec/lib/sequel_rails/migrations_spec.rb
@@ -173,7 +206,6 @@ files:
 - spec/lib/sequel_rails/storage/sqlite_spec.rb
 - spec/lib/sequel_rails/storage_spec.rb
 - spec/spec_helper.rb
-- tasks/spec.rake
 homepage: http://talentbox.github.io/sequel-rails/
 licenses:
 - MIT
@@ -195,10 +227,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Use Sequel with Rails 3
+summary: Use Sequel with Rails (3.x and 4.x)
 test_files:
 - spec/internal/Rakefile
 - spec/internal/app/models/user.rb
@@ -209,6 +241,7 @@ test_files:
 - spec/internal/db/schema.rb.init
 - spec/internal/public/favicon.ico
 - spec/lib/generators/sequel/migration_spec.rb
+- spec/lib/generators/sequel/session_migration_spec.rb
 - spec/lib/sequel_rails/configuration_spec.rb
 - spec/lib/sequel_rails/jdbc_spec.rb
 - spec/lib/sequel_rails/migrations_spec.rb

data/tasks/spec.rake

@@ -1,81 +0,0 @@
-begin
-  require 'rspec/core/rake_task'
-
-  desc "Run RSpec code example (default to only PostgreSQL)"
-  RSpec::Core::RakeTask.new('spec')
-
-  namespace :spec do
-    def clean_env
-      [
-        "TEST_ADAPTER",
-        "TEST_DATABASE",
-        "TEST_OWNER",
-        "TEST_USERNAME",
-        "TEST_PASSWORD",
-        "TEST_ENCODING",
-      ].each do |name|
-        ENV[name] = nil
-      end
-    end
-
-    desc "Run specs for postgresql adapter"
-    task :postgresql do
-      clean_env
-      Rake::Task["spec"].reenable
-      ENV["TEST_ADAPTER"] = "postgresql"
-      ENV["TEST_ENCODING"] = "unicode"
-      Rake::Task["spec"].invoke
-    end
-
-    desc "Run specs for mysql adapter"
-    task :mysql do
-      clean_env
-      Rake::Task["spec"].reenable
-      ENV["TEST_ADAPTER"] = "mysql"
-      ENV["TEST_ENCODING"] = "utf8"
-      Rake::Task["spec"].invoke
-    end
-
-    desc "Run specs for mysql2 adapter"
-    task :mysql2 do
-      if SequelRails.jruby?
-        warn "No mysql2 adapter for jdbc"
-      else
-        clean_env
-        Rake::Task["spec"].reenable
-        ENV["TEST_ADAPTER"] = "mysql2"
-        ENV["TEST_ENCODING"] = "utf8"
-        Rake::Task["spec"].invoke
-      end
-    end
-
-    desc "Run specs for sqlite3 adapter"
-    task :sqlite3 do
-      clean_env
-      Rake::Task["spec"].reenable
-      ENV["TEST_ADAPTER"] = "sqlite3"
-      ENV["TEST_DATABASE"] = "db/database.sqlite3"
-      Rake::Task["spec"].invoke
-    end
-
-    desc "Run specs for all adapters"
-    task :all do
-      res = [
-        "spec:postgresql",
-        "spec:mysql",
-        "spec:mysql2",
-        "spec:sqlite3"
-      ].map do |task_name|
-        Rake::Task[task_name].invoke
-      end
-      res.all?
-    end
-  end
-
-  task :default => "spec:all"
-
-rescue LoadError
-  task :spec do
-    abort 'rspec is not available. In order to run spec, you must: bundle install'
-  end
-end