sequel-rails 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a1cd2895c74ba9e4a8a5ef09818780374a39a5a
-  data.tar.gz: d7411b415c0f316fba662ed2ef5480d100e3965d
+  metadata.gz: b6d26dfaf8ce3dc258c5310ecc590fa8ef164de5
+  data.tar.gz: 82495e78e217391ca5a50ab5ea6f45ec77516890
 SHA512:
-  metadata.gz: 56005f7d3bd105d08938c3f7f14a8b256a9015deac144b7c685481e4b2af7b90ad1d6b027eacedb5794c10745ea5778361e7b2fdbcbb05cac02b6c5dea2dbb9e
-  data.tar.gz: ad9e912ed38c60d59c73649d5b08ef1ad615ebe72e31cc31c8d176588b320db1c79bfacde4d232daa9b6ef426596e57c9016818b86cc8629c433fe6cdc7632a8
+  metadata.gz: f7d5d6dce632081523febcbe316f6cfbbb922febf43607f076649844c931ca68abbba550a8bfb9515925bafe24640cd32b887b47da50d6bb475e55b9a054f84c
+  data.tar.gz: b5f3c6394d30180d2476e4057aa3f0930990e479632a65c033eea8a2461d181f94198bcac651121e2fcf04fc4e186b633141bd6433d34042100d7b2460db59df

data/History.md

@@ -1,7 +1,16 @@
+0.9.4 (2014-07-24)
+==================
+
+* Put a note in README about plugins which could not be added to `Sequel::Model`
+  (Thanks to Dave Myron) [#68](https://github.com/TalentBox/sequel-rails/issues/68)
+* Implements `rake db:rollback` and fix `rake db:migrate:redo`
+  [#67](https://github.com/TalentBox/sequel-rails/issues/67)
+
 0.9.3 (2014-05-18)
 ==================
 
-* Use `ENV['DATABASE_URL']` for connection if set [#66](https://github.com/TalentBox/sequel-rails/issues/66)
+* 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

@@ -231,6 +231,10 @@ loaded. Loading plugins into `Sequel::Model` after subclasses are already
 created is not supported by Sequel. You can also load extensions in
 `after_connect` or perform any custom actions that you need.
 
+Please note: some plugins require a `dataset` to work, which means they can't
+be added via `Sequel::Model.plugin`, they need to be added to a `Sequel::Model`
+subclass whose underlying table exists.
+
 Using the `SequelStore` to store session in database
 ====================================================
 

data/lib/sequel_rails/migrations.rb

@@ -43,6 +43,30 @@ module SequelRails
         Rails.root.join('db/migrate')
       end
 
+      def current_migration
+        return unless available_migrations?
+
+        migrator_class = ::Sequel::Migrator.send(:migrator_class, migrations_dir)
+        migrator = migrator_class.new ::Sequel::Model.db, migrations_dir
+        if migrator.respond_to?(:applied_migrations)
+          migrator.applied_migrations.last
+        elsif migrator.respond_to?(:current_version)
+          migrator.current_version
+        end
+      end
+
+      def previous_migration
+        return unless available_migrations?
+
+        migrator_class = ::Sequel::Migrator.send(:migrator_class, migrations_dir)
+        migrator = migrator_class.new ::Sequel::Model.db, migrations_dir
+        if migrator.respond_to?(:applied_migrations)
+          migrator.applied_migrations[-2] || '0'
+        elsif migrator.respond_to?(:current_version)
+          migrator.current_version - 1
+        end
+      end
+
       def available_migrations?
         File.exist?(migrations_dir) && Dir[File.join(migrations_dir, '*')].any?
       end

data/lib/sequel_rails/railties/database.rake

@@ -163,6 +163,17 @@ namespace :db do
     Rake::Task['db:dump'].invoke if SequelRails.configuration.schema_dump
   end
 
+  desc 'Rollback the latest migration file or down to specified VERSION=x'
+  task :rollback => 'migrate:load' do
+    version = if ENV['VERSION']
+                ENV['VERSION'].to_i
+              else
+                SequelRails::Migrations.previous_migration
+              end
+    SequelRails::Migrations.migrate_down! version
+    Rake::Task['db:dump'].invoke if SequelRails.configuration.schema_dump
+  end
+
   desc 'Load the seed data from db/seeds.rb'
   task :seed => :abort_if_pending_migrations do
     seed_file = File.join(Rails.root, 'db', 'seeds.rb')

data/lib/sequel_rails/version.rb

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

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

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
-describe 'Database rake tasks' do
+describe 'Database rake tasks', :no_transaction => true do
 
   let(:app) { Combustion::Application }
   let(:app_root) { app.root }
+  let(:schema) { "#{app_root}/db/schema.rb" }
 
   around do |example|
     begin
@@ -15,8 +16,6 @@ describe 'Database rake tasks' do
   end
 
   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`
@@ -62,4 +61,31 @@ EOS
       end
     end
   end
+
+  describe 'db:rollback' do
+    it 'revert latest migration' do
+      Dir.chdir app_root do
+        begin
+          expect do
+            `rake db:rollback`
+          end.to change { SequelRails::Migrations.current_migration }.from(
+            '1273253849_add_twitter_handle_to_users.rb'
+          ).to(nil)
+        ensure
+          SequelRails::Migrations.migrate_up!
+        end
+      end
+    end
+  end
+
+  describe 'db:migrate:redo' do
+    it 'run down then up of the latest migration' do
+      Dir.chdir app_root do
+        SequelRails::Migrations.migrate_up!
+        expect do
+          `rake db:migrate:redo`
+        end.not_to change { SequelRails::Migrations.current_migration }
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -22,8 +22,12 @@ 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|
-    Sequel::Model.db.transaction(:rollback => :always) do
+    if example.metadata[:no_transaction]
       example.run
+    else
+      Sequel::Model.db.transaction(:rollback => :always) do
+        example.run
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)