mongoid_rails_migrations 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc240d64d9693691c9f524848a1c71be452a0e93
-  data.tar.gz: e9246baeb9bea0b58213b6d488bf503f31840277
+  metadata.gz: c66ba09b162f9b2a9db6aadc8ed14fc0126795c5
+  data.tar.gz: b11d88f13706aaa7cbfa3040548eff78277d0c37
 SHA512:
-  metadata.gz: 8e74c99e75a4b94ff48aa564b99249c91a7e71c28b1ab8c814a0ee675816ce505d750c1c9f20af18f7e71377902c97a9ab5581eebfaf4528301333e72d694326
-  data.tar.gz: 9b33ed0e64fa3c6d92d2aee5d287f353d673b28c5057c159fd97ea05892697d2644a058f225e4294cce8d1af483d7c571b390edfccea34760c67cbaa1016c0e4
+  metadata.gz: 7bb0036dce3aa488e344cb4d1e12e5db545568fc1e0191609fe7c980a287a3e0653586baeb8e678572d625fcd868e3883e7ce1aeb7abe792ced976e3be3a8cea
+  data.tar.gz: 1ee702dd69a9031212409283a5d70b3e1c0caf6d2d685f47cd22074bfbe3b4b77fcd13fa7059db4b2edaf4cd5ce03dfeda3fd10cef3276574ab6cefe5ab1dd22

data/Gemfile

@@ -4,5 +4,4 @@ gemspec :name => 'mongoid_rails_migrations'
 group :test do
   gem 'minitest'
   gem 'pry'
-  gem 'rake'
 end

data/Gemfile.lock

@@ -11,121 +11,123 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0)
-      activesupport (= 4.2.0)
-      globalid (>= 0.3.0)
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
-      builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
-      arel (~> 6.0)
-    activesupport (4.2.0)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
+      globalid (>= 0.3.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
-    bson (2.3.0)
-    builder (3.2.2)
-    coderay (1.1.0)
-    connection_pool (2.1.0)
-    erubis (2.7.0)
-    globalid (0.3.0)
-      activesupport (>= 4.1.0)
-    hike (1.2.3)
-    i18n (0.7.0)
-    json (1.8.1)
-    loofah (2.0.1)
+    arel (9.0.0)
+    bson (4.3.0)
+    builder (3.2.3)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    erubi (1.7.1)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    method_source (0.8.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.2)
-    minitest (5.5.0)
-    mongoid (4.0.0)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-    moped (2.0.2)
-      bson (~> 2.2)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    multi_json (1.10.1)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    optionable (0.2.0)
-    origin (2.1.1)
-    pry (0.10.1)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    mongo (2.6.1)
+      bson (>= 4.3.0, < 5.0.0)
+    mongoid (7.0.1)
+      activemodel (>= 5.1, < 6.0.0)
+      mongo (>= 2.5.1, < 3.0.0)
+    nio4r (2.3.1)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.0)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.2.0)
-      actionmailer (= 4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
-      activemodel (= 4.2.0)
-      activerecord (= 4.2.0)
-      activesupport (= 4.2.0)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
-      loofah (~> 2.0)
-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+      method_source (~> 0.9.0)
+    rack (2.0.5)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    slop (3.6.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tzinfo (1.2.2)
+    rake (12.3.1)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -135,3 +137,6 @@ DEPENDENCIES
   mongoid_rails_migrations!
   pry
   rake
+
+BUNDLED WITH
+   1.13.7

data/Rakefile

@@ -1,4 +1,5 @@
 $:.unshift(File.dirname(__FILE__))
+require "bundler/gem_tasks"
 
 task :default => ['test:mongoid:migrations']
 

data/lib/mongoid_rails_migrations.rb

@@ -1,13 +1,9 @@
 # encoding: utf-8
-require 'bundler/setup'
-Bundler.require(:mongoid_rails_migrations)
 
-# Add base to path incase not included as a gem
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require 'mongoid'
 
 require 'mongoid_rails_migrations/version'
 require 'mongoid_rails_migrations/models/data_migration'
 require 'mongoid_rails_migrations/mongoid_ext/mongoid'
 require 'mongoid_rails_migrations/mongoid_ext/railtie'
-require 'mongoid_rails_migrations/active_record_ext/migrations'
+require 'mongoid_rails_migrations/active_record_ext/migrations'

data/lib/mongoid_rails_migrations/active_record_ext/migrations.rb

@@ -31,14 +31,14 @@ module Mongoid #:nodoc
 
   # Data migrations can manage the modification of data. It's a solution to the common problem of modifying
   # data between code revisions within a document oriented database.
-  # 
+  #
   # Example of simple migration for a system dependency:
-  # 
+  #
   #   class AddBaselineSurveySchema < Mongoid::Migration
   #     def self.up
   #       SurveySchema.create(:label => 'Baseline Survey')
   #     end
-  #     
+  #
   #     def self.down
   #       SurveySchema.where(:label => 'Baseline Survey').first.destroy
   #     end
@@ -103,7 +103,8 @@ module Mongoid #:nodoc
 
           case sym
             when :up, :down
-              singleton_class.send(:alias_method_chain, sym, "benchmarks")
+              singleton_class.send(:alias_method, "#{sym}_without_benchmarks".to_sym, sym)
+              singleton_class.send(:alias_method, sym, "#{sym}_with_benchmarks".to_sym)
           end
         ensure
           @ignore_new_methods = false
@@ -144,7 +145,11 @@ module Mongoid #:nodoc
 
       def connection
         # ActiveRecord::Base.connection
-        ::Mongoid.default_session
+        if ::Mongoid.respond_to?(:default_client)
+          ::Mongoid.default_client
+        else
+          ::Mongoid.default_session
+        end
       end
 
       def method_missing(method, *arguments, &block)
@@ -183,6 +188,8 @@ module Mongoid #:nodoc
 
   class Migrator#:nodoc:
     class << self
+      attr_writer :migrations_path
+
       def migrate(migrations_path, target_version = nil)
         case
           when target_version.nil?              then up(migrations_path, target_version)
@@ -212,7 +219,7 @@ module Mongoid #:nodoc
       end
 
       def migrations_path
-        'db/migrate'
+        @migrations_path ||= ['db/migrate']
       end
 
       # def schema_migrations_table_name
@@ -223,7 +230,7 @@ module Mongoid #:nodoc
       def get_all_versions
         # table = Arel::Table.new(schema_migrations_table_name)
         #         Base.connection.select_values(table.project(table['version']).to_sql).map(&:to_i).sort
-        DataMigration.all.map {|datamigration| datamigration.version.to_i }.sort
+        DataMigration.all.map { |datamigration| datamigration.version.to_i }.sort
       end
 
       def current_version
@@ -326,7 +333,9 @@ module Mongoid #:nodoc
 
     def migrations
       @migrations ||= begin
-        files = Dir["#{@migrations_path}/[0-9]*_*.rb"]
+        files = Array(@migrations_path).inject([]) do |files, path|
+          files += Dir["#{path}/[0-9]*_*.rb"]
+        end
 
         migrations = files.inject([]) do |klasses, file|
           version, name = file.scan(/([0-9]+)_([_a-z0-9]*).rb/).first
@@ -402,4 +411,4 @@ module Mongoid #:nodoc
         block.call
       end
   end
-end
+end

data/lib/mongoid_rails_migrations/mongoid_ext/railties/database.rake

@@ -39,7 +39,7 @@ namespace :db do
   desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
   task :migrate => :environment do
     Mongoid::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-    Mongoid::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+    Mongoid::Migrator.migrate(Mongoid::Migrator.migrations_path, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
   end
 
   namespace :migrate do
@@ -62,21 +62,21 @@ namespace :db do
     task :up => :environment do
       version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless version
-      Mongoid::Migrator.run(:up, "db/migrate/", version)
+      Mongoid::Migrator.run(:up, Mongoid::Migrator.migrations_path, version)
     end
 
     desc 'Runs the "down" for a given migration VERSION.'
     task :down => :environment do
       version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless version
-      Mongoid::Migrator.run(:down, "db/migrate/", version)
+      Mongoid::Migrator.run(:down, Mongoid::Migrator.migrations_path, version)
     end
   end
 
   desc 'Rolls the database back to the previous migration. Specify the number of steps with STEP=n'
   task :rollback => :environment do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    Mongoid::Migrator.rollback('db/migrate/', step)
+    Mongoid::Migrator.rollback(Mongoid::Migrator.migrations_path, step)
   end
 
   namespace :schema do

data/lib/mongoid_rails_migrations/version.rb

@@ -1,3 +1,3 @@
 module MongoidRailsMigrations #:nodoc:
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/test/migration_test.rb

@@ -16,8 +16,13 @@ module Mongoid
 
     def setup
       Mongoid::Migration.verbose = true
+      Mongo::Logger.logger.level = 1
       # same as db:drop command in lib/mongoid_rails_migrations/mongoid_ext/railties/database.rake
-      Mongoid.default_session.drop
+      if Mongoid.respond_to?(:default_client)
+        Mongoid.default_client.database.drop
+      else
+        Mongoid.default_session.drop
+      end
     end
 
     def teardown; end
@@ -26,11 +31,26 @@ module Mongoid
       assert_equal 0, Mongoid::Migrator.current_version, "db:drop should take us down to version 0"
     end
 
+    def test_migrations_path
+      assert_equal ["db/migrate"], Mongoid::Migrator.migrations_path
+
+      Mongoid::Migrator.migrations_path += ["engines/my_engine/db/migrate"]
+
+      assert_equal ["db/migrate", "engines/my_engine/db/migrate"], Mongoid::Migrator.migrations_path
+    end
+
     def test_finds_migrations
       assert Mongoid::Migrator.new(:up, MIGRATIONS_ROOT + "/valid").migrations.size == 2
       assert_equal 2, Mongoid::Migrator.new(:up, MIGRATIONS_ROOT + "/valid").pending_migrations.size
     end
 
+    def test_finds_migrations_in_multiple_paths
+      migration_paths = [MIGRATIONS_ROOT + "/valid", MIGRATIONS_ROOT + "/other_valid"]
+
+      assert Mongoid::Migrator.new(:up, migration_paths).migrations.size == 3
+      assert_equal 3, Mongoid::Migrator.new(:up, migration_paths).pending_migrations.size
+    end
+
     def test_migrator_current_version
       Mongoid::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 20100513054656)
       assert_equal(20100513054656, Mongoid::Migrator.current_version)
@@ -137,5 +157,9 @@ module Mongoid
       assert_equal "20100513063903", next_number
     end
 
+    def test_migration_returns_connection_without_error
+      Mongoid::Migration.connection
+    end
+
   end
-end
+end

data/test/migrations/other_valid/20160509073459_add_other_plan_survey_schema.rb

@@ -0,0 +1,9 @@
+class AddOtherPlanSurveySchema < Mongoid::Migration
+  def self.up
+    SurveySchema.create(:label => 'Other Plan Survey')
+  end
+
+  def self.down
+    SurveySchema.where(:label => 'Other Plan Survey').first.destroy
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_rails_migrations
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alan Da Costa
@@ -123,6 +123,7 @@ files:
 - test/migrations/duplicate/names/20100513073724_add_duplicate_survey_schema.rb
 - test/migrations/duplicate/versions/20100513073457_add_another_duplicate_survey_schema.rb
 - test/migrations/duplicate/versions/20100513073457_add_duplicate_survey_schema.rb
+- test/migrations/other_valid/20160509073459_add_other_plan_survey_schema.rb
 - test/migrations/valid/20100513054656_add_baseline_survey_schema.rb
 - test/migrations/valid/20100513063902_add_improvement_plan_survey_schema.rb
 - test/models/survey_schema.rb
@@ -146,18 +147,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Data migrations for Mongoid in Active Record style, minus column input.
 test_files:
-- test/config.rb
-- test/helper.rb
-- test/migration_test.rb
-- test/migrations/duplicate/names/20100513073457_add_duplicate_survey_schema.rb
 - test/migrations/duplicate/names/20100513073724_add_duplicate_survey_schema.rb
-- test/migrations/duplicate/versions/20100513073457_add_another_duplicate_survey_schema.rb
+- test/migrations/duplicate/names/20100513073457_add_duplicate_survey_schema.rb
 - test/migrations/duplicate/versions/20100513073457_add_duplicate_survey_schema.rb
+- test/migrations/duplicate/versions/20100513073457_add_another_duplicate_survey_schema.rb
+- test/migrations/other_valid/20160509073459_add_other_plan_survey_schema.rb
 - test/migrations/valid/20100513054656_add_baseline_survey_schema.rb
 - test/migrations/valid/20100513063902_add_improvement_plan_survey_schema.rb
+- test/migration_test.rb
+- test/helper.rb
+- test/config.rb
 - test/models/survey_schema.rb