mongoid_rails_migrations 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42339e4043e1ab4647e09def69fbc4d2fc674486da3113a83d461696d50d1b0c
-  data.tar.gz: ec3472e01a1071ced5db4da967c6c6b1627a4d9219b8abda84b19871514766fa
+  metadata.gz: b1cdcaae2175713473f25909c60c736f37218da298585497c56f58a86274116c
+  data.tar.gz: 84f515ba8cae1c34cb15d28f5377c1ae1a0c11d2c16a12715094529e1825aebf
 SHA512:
-  metadata.gz: 84b7956dcac388376845c973fd0c1744c396fa38bff504257c361bfdda9b6c00b618000f418fb2d20f0c6ffae9a3a1a6649d0ec9728c3639bef583252ad1f620
-  data.tar.gz: 54a713f8b7d3c3280e5b83a6233ffa8eecbef7254d20a55b08c705b85342511191fad0e9bd8fcf0162dd8e8ab3ff6b1fca296e58fbe9a779a436f06b1a18b61f
+  metadata.gz: 6f96c8b356f100235344c478b384912600f43ab32258c2c7b8b7df481b45b1ca15a3f00fa6415b797169a0eb0999011455e5e5f37a877ed41b4493722bb18270
+  data.tar.gz: e7cc9cf652e98c709ce35077502793fcd1134f16629a273825612d9a7785f3bf6890a36b902349fd1bf90b58d2d6515d998618f2a698b5d2dec799f6d67ede7a

data/lib/mongoid_rails_migrations/active_record_ext/migrations.rb

@@ -55,7 +55,7 @@ module Mongoid #:nodoc
   # If you'd prefer to use numeric prefixes, you can turn timestamped migrations
   # off by setting:
   #
-  #    Mongoid.config.timestamped_migrations = false
+  #    Mongoid.configure.timestamped_migrations = false
   #
   # In environment.rb.
   #
@@ -103,7 +103,6 @@ module Mongoid #:nodoc
       # it is safe for the call to proceed.
       def singleton_method_added(sym) #:nodoc:
         return if defined?(@ignore_new_methods) && @ignore_new_methods
-
         begin
           @ignore_new_methods = true
 
@@ -152,22 +151,10 @@ module Mongoid #:nodoc
       end
 
       def connection
-        # ActiveRecord::Base.connection
-        if ::Mongoid.respond_to?(:default_client)
-          ::Mongoid.default_client
+        if ENV['MONGOID_CLIENT_NAME']
+          Mongoid.client(ENV['MONGOID_CLIENT_NAME'])
         else
-          ::Mongoid.default_session
-        end
-      end
-
-      def method_missing(method, *arguments, &block)
-        arg_list = arguments.map(&:inspect) * ', '
-
-        say_with_time "#{method}(#{arg_list})" do
-          # unless arguments.empty? || method == :execute
-          #   arguments[0] = Migrator.proper_table_name(arguments.first)
-          # end
-          connection.send(method, *arguments, &block)
+          Mongoid.default_client
         end
       end
     end
@@ -176,25 +163,25 @@ module Mongoid #:nodoc
   # MigrationProxy is used to defer loading of the actual migration classes
   # until they are needed
   class MigrationProxy
-
-    attr_accessor :name, :version, :filename
+    attr_accessor :name, :version, :filename, :sharded
 
     delegate :migrate, :announce, :write, :to=>:migration
 
     private
 
-      def migration
-        @migration ||= load_migration
-      end
-
-      def load_migration
-        require(File.expand_path(filename))
-        name.constantize
-      end
+    def migration
+      @migration ||= load_migration
+    end
 
+    def load_migration
+      require(File.expand_path(filename))
+      name.constantize
+    end
   end
 
   class Migrator#:nodoc:
+    delegate :with_mongoid_client, :to => "self.class"
+
     class << self
       attr_writer :migrations_path
 
@@ -216,7 +203,10 @@ module Mongoid #:nodoc
 
       def rollback_to(migrations_path, target_version)
         all_versions = get_all_versions
-        rollback_to = all_versions.index(target_version.to_i) + 1
+        target_version_index = all_versions.index(target_version.to_i)
+        raise UnknownMigrationVersionError.new(target_version) if target_version_index.nil?
+
+        rollback_to = target_version_index + 1
         rollback_steps = all_versions.size - rollback_to
         rollback migrations_path, rollback_steps
       end
@@ -241,31 +231,22 @@ module Mongoid #:nodoc
         @migrations_path ||= ['db/migrate']
       end
 
-      # def schema_migrations_table_name
-      #   # Base.table_name_prefix + 'schema_migrations' + Base.table_name_suffix
-      #   'data_migrations'
-      # end
-
       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
+        with_mongoid_client(ENV['MONGOID_CLIENT_NAME']) do
+          DataMigration.all.map { |datamigration| datamigration.version.to_i }.sort
+        end
       end
 
       def current_version
-        # sm_table = schema_migrations_table_name
-        # if Base.connection.table_exists?(sm_table)
-        #   get_all_versions.max || 0
-        # else
-        #   0
-        # end
         get_all_versions.max || 0
       end
 
-      def proper_table_name(name)
-        # Use the Active Record objects own table_name, or pre/suffix from ActiveRecord::Base if name is a symbol/string
-        # name.table_name rescue "#{ActiveRecord::Base.table_name_prefix}#{name}#{ActiveRecord::Base.table_name_suffix}"
-        name
+      def with_mongoid_client(mongoid_client_name, &block)
+        previous_mongoid_client_name = Mongoid::Threaded.client_override
+        Mongoid.override_client(mongoid_client_name)
+        block.call
+      ensure
+        Mongoid.override_client(previous_mongoid_client_name)
       end
 
       private
@@ -283,9 +264,12 @@ module Mongoid #:nodoc
     end
 
     def initialize(direction, migrations_path, target_version = nil)
-      # raise StandardError.new("This database does not yet support migrations") unless Base.connection.supports_migrations?
-      # Base.connection.initialize_schema_migrations_table
       @direction, @migrations_path, @target_version = direction, migrations_path, target_version
+
+      @mongoid_client_name = ENV["MONGOID_CLIENT_NAME"]
+      if @mongoid_client_name && !Mongoid.clients.has_key?(@mongoid_client_name)
+        raise Mongoid::Errors::NoClientConfig.new(@mongoid_client_name)
+      end
     end
 
     def current_version
@@ -299,9 +283,12 @@ module Mongoid #:nodoc
     def run
       target = migrations.detect { |m| m.version == @target_version }
       raise UnknownMigrationVersionError.new(@target_version) if target.nil?
+
       unless (up? && migrated.include?(target.version.to_i)) || (down? && !migrated.include?(target.version.to_i))
         target.migrate(@direction)
-        record_version_state_after_migrating(target.version)
+        with_mongoid_client(@mongoid_client_name) do
+          record_version_state_after_migrating(target.version)
+        end
       end
     end
 
@@ -320,18 +307,11 @@ module Mongoid #:nodoc
           next
         end
 
-        # begin
-        #   ddl_transaction do
-        #     migration.migrate(@direction)
-        #     record_version_state_after_migrating(migration.version)
-        #   end
-        # rescue => e
-        #   canceled_msg = Base.connection.supports_ddl_transactions? ? "this and " : ""
-        #   raise StandardError, "An error has occurred, #{canceled_msg}all later migrations canceled:\n\n#{e}", e.backtrace
-        # end
         begin
           migration.migrate(@direction)
-          record_version_state_after_migrating(migration.version)
+          with_mongoid_client(@mongoid_client_name) do
+            record_version_state_after_migrating(migration.version)
+          end
         rescue => e
           output = Migration.buffer_output + "An error has occurred, #{migration.version} and all later migrations canceled:\n\n#{e}\n#{e.backtrace.join("\n")}"
           begin
@@ -360,7 +340,7 @@ module Mongoid #:nodoc
     def migrations
       @migrations ||= begin
         files = Array(@migrations_path).inject([]) do |files, path|
-          files += Dir["#{path}/[0-9]*_*.rb"]
+          files += Dir["#{path}/**/[0-9]*_*.rb"]
         end
 
         migrations = files.inject([]) do |klasses, file|
@@ -378,10 +358,15 @@ module Mongoid #:nodoc
           end
 
           migration = MigrationProxy.new
+          migration.sharded  = file.match?(/\/shards\/#{version}_#{name}\.rb/)
           migration.name     = name.camelize
           migration.version  = version
           migration.filename = file
-          klasses << migration
+
+          if (@mongoid_client_name && migration.sharded) || (!@mongoid_client_name && !migration.sharded)
+            klasses << migration
+          end
+          klasses
         end
 
         migrations = migrations.sort_by(&:version)
@@ -417,42 +402,24 @@ module Mongoid #:nodoc
     end
 
     private
-      def record_version_state_after_migrating(version)
-        # table = Arel::Table.new(self.class.schema_migrations_table_name)
-
-        @migrated_versions ||= []
-        # if down?
-        #   @migrated_versions.delete(version)
-        #   table.where(table["version"].eq(version.to_s)).delete
-        # else
-        #   @migrated_versions.push(version).sort!
-        #   table.insert table["version"] => version.to_s
-        # end
-        if down?
-          @migrated_versions.delete(version)
-          DataMigration.where(:version => version.to_s).first.destroy
-        else
-          @migrated_versions.push(version).sort!
-          DataMigration.create(:version => version.to_s)
-        end
-      end
 
-      def up?
-        @direction == :up
+    def record_version_state_after_migrating(version)
+      @migrated_versions ||= []
+      if down?
+        @migrated_versions.delete(version)
+        DataMigration.where(:version => version.to_s).destroy_all
+      else
+        @migrated_versions.push(version).sort!
+        DataMigration.find_or_create_by(:version => version.to_s)
       end
+    end
 
-      def down?
-        @direction == :down
-      end
+    def up?
+      @direction == :up
+    end
 
-      # Wrap the migration in a transaction only if supported by the adapter.
-      def ddl_transaction(&block)
-        # if Base.connection.supports_ddl_transactions?
-        #   Base.transaction { block.call }
-        # else
-        #   block.call
-        # end
-        block.call
-      end
+    def down?
+      @direction == :down
+    end
   end
 end

data/lib/mongoid_rails_migrations/models/data_migration.rb

@@ -2,4 +2,4 @@ class DataMigration
   include Mongoid::Document
 
   field :version
-end
+end

data/lib/mongoid_rails_migrations/mongoid_ext/mongoid.rb

@@ -1,21 +1,7 @@
 # encoding: utf-8
 module Mongoid
   # Specify whether or not to use timestamps for migration versions
-  # NOTE: newer style is a module
-  # Config.module_eval would work for both but still need to determine the type
-  # that's why we do it the ug way.
-  if Config.is_a? Class
-    # older mongoid style; pre 2.0.0.rc.1
-    Config.module_eval do
-      cattr_accessor :timestamped_migrations
-      class_variable_set(:@@timestamped_migrations, true) unless class_variable_get(:@@timestamped_migrations)
-
-      def self.reset
-        @@timestamped_migrations = true
-      end
-    end
-  else # module
-    # newer mongoid style; >= 2.0.0.rc.1
-    Config.option :timestamped_migrations, :default => true
-  end
-end
+  Config.option :timestamped_migrations, default: true
+  # Specify whether or not to use shards migrations as default type
+  Config.option :shards_migration_as_default, default: false
+end

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

@@ -1,34 +1,12 @@
 namespace :db do
-  unless Rake::Task.task_defined?("db:drop")
-    desc 'Drops all the collections for the database for the current Rails.env'
-    task :drop => :environment do
-      Mongoid.master.collections.each {|col| col.drop_indexes && col.drop unless ['system.indexes', 'system.users'].include?(col.name) }
-    end
-  end
-
-  unless Rake::Task.task_defined?("db:seed")
-    # if another ORM has defined db:seed, don't run it twice.
-    desc 'Load the seed data from db/seeds.rb'
-    task :seed => :environment do
-      seed_file = File.join(Rails.application.root, 'db', 'seeds.rb')
-      load(seed_file) if File.exist?(seed_file)
-    end
+  if Rake::Task.task_defined?("db:drop")
+    Rake::Task["db:drop"].clear
   end
 
-  unless Rake::Task.task_defined?("db:setup")
-    desc 'Create the database, and initialize with the seed data'
-    task :setup => [ 'db:create', 'db:seed' ]
-  end
-
-  unless Rake::Task.task_defined?("db:reseed")
-    desc 'Delete data and seed'
-    task :reseed => [ 'db:drop', 'db:seed' ]
-  end
-
-  unless Rake::Task.task_defined?("db:create")
-    task :create => :environment do
-      # noop
-    end
+  desc 'Drops the database for the current Mongoid client'
+  task :drop => :environment do
+    # Unlike Mongoid's default, this implementation supports the MONGOID_CLIENT_NAME override
+    Mongoid::Migration.connection.database.drop
   end
 
   desc 'Current database version'
@@ -43,7 +21,7 @@ namespace :db do
   end
 
   namespace :migrate do
-    desc  'Rollback the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with VERSION=x.'
+    desc 'Rollback the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with VERSION=x.'
     task :redo => :environment do
       if ENV["VERSION"]
         Rake::Task["db:migrate:down"].invoke
@@ -90,16 +68,4 @@ namespace :db do
     raise "VERSION is required" unless version
     Mongoid::Migrator.rollback_to(Mongoid::Migrator.migrations_path, version)
   end
-
-  namespace :schema do
-    task :load do
-      # noop
-    end
-  end
-
-  namespace :test do
-    task :prepare do
-      # Stub out for MongoDB
-    end
-  end
 end

data/lib/mongoid_rails_migrations/version.rb

@@ -1,3 +1,3 @@
 module MongoidRailsMigrations #:nodoc:
-  VERSION = '1.4.0'
+  VERSION = '1.6.0'
 end

data/lib/rails/generators/mongoid/migration/migration_generator.rb

@@ -3,9 +3,16 @@ require 'rails/generators/mongoid/mongoid_generator'
 module Mongoid
   module Generators
     class MigrationGenerator < Base
+      class_option :shards, type: :boolean, optional: true, desc: "Create migration in shards subfolder"
 
       def create_migration_file
-        migration_template "migration.rb", "db/migrate/#{file_name}.rb"
+        destination_folder = "db/migrate"
+        if options.fetch(:shards, Config.shards_migration_as_default)
+          destination_folder = "#{destination_folder}/shards"
+          FileUtils.mkdir_p("#{Rails.root}/#{destination_folder}")
+        end
+
+        migration_template "migration.rb", "#{destination_folder}/#{file_name}.rb"
       end
 
       protected
@@ -13,4 +20,4 @@ module Mongoid
 
     end
   end
-end
+end

data/lib/rails/generators/mongoid/migration/templates/migration.rb

@@ -4,4 +4,4 @@ class <%= migration_class_name %> < Mongoid::Migration
 
   def self.down
   end
-end
+end

data/mongoid_rails_migrations.gemspec

@@ -5,8 +5,8 @@ require 'mongoid_rails_migrations/version'
 Gem::Specification.new do |spec|
   spec.name        = 'mongoid_rails_migrations'
   spec.version     = MongoidRailsMigrations::VERSION
-  spec.authors     = ['Alan Da Costa']
-  spec.email      = ['alandacosta@gmail.com']
+  spec.authors     = ['Alan Da Costa', 'Adrien Rey-Jarthon']
+  spec.email      = ['alandacosta@gmail.com', 'jobs@adrienjarthon.com']
 
   spec.summary     = 'Data migrations for Mongoid.'
   spec.description = 'Data migrations for Mongoid in Active Record style, minus column input.'
@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   rails_version = '>= 4.2.0'
 
   spec.add_runtime_dependency('bundler', '>= 1.0.0')
-  spec.add_runtime_dependency('mongoid', '>= 4.0.0')
+  # 9.0.0 broke client override isolation: https://jira.mongodb.org/browse/MONGOID-5815
+  spec.add_runtime_dependency('mongoid', '>= 5.0.0', '< 9.0.0')
   spec.add_runtime_dependency('rails',  rails_version)
   spec.add_runtime_dependency('railties',  rails_version)
   spec.add_runtime_dependency('activesupport',  rails_version)

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_rails_migrations
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Alan Da Costa
-autorequire: 
+- Adrien Rey-Jarthon
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +31,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 9.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +118,7 @@ dependencies:
 description: Data migrations for Mongoid in Active Record style, minus column input.
 email:
 - alandacosta@gmail.com
+- jobs@adrienjarthon.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -130,7 +138,7 @@ homepage: http://github.com/adacosta/mongoid_rails_migrations
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,8 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.22
+signing_key:
 specification_version: 4
 summary: Data migrations for Mongoid.
 test_files: []