Reworked timestamped_migration config setting

pbrumm · Jun 18, 2010 · 0c56e2c · 0c56e2c
1 parent 1122679
commit 0c56e2c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/lib/mongoid_rails_migrations/active_record_ext/migrations.rb b/lib/mongoid_rails_migrations/active_record_ext/migrations.rb
@@ -55,7 +55,7 @@ def initialize(name)
   # If you'd prefer to use numeric prefixes, you can turn timestamped migrations
   # off by setting:
   #
-  #    config.mongoid.timestamped_migrations = false
+  #    Mongoid.config.timestamped_migrations = false
   #
   # In environment.rb.
   #

diff --git a/lib/mongoid_rails_migrations/mongoid_ext/mongoid.rb b/lib/mongoid_rails_migrations/mongoid_ext/mongoid.rb
@@ -1,8 +1,12 @@
 # encoding: utf-8
 
 module Mongoid #:nodoc
-  class << self
+  class Config  #:nodoc
     # Specify whether or not to use timestamps for migration versions
-    cattr_accessor(:timestamped_migrations , :instance_writer => true) {|timestamped_migrations| timestamped_migrations = true }
+    attr_accessor :timestamped_migrations
+
+    def reset
+      @timestamped_migrations = true
+    end
   end
 end
diff --git a/lib/rails/generators/mongoid/mongoid_generator.rb b/lib/rails/generators/mongoid/mongoid_generator.rb
@@ -1,3 +1,4 @@
+require 'rails/generators/named_base'
 require 'rails/generators/migration'
 
 module Mongoid #:nodoc:
@@ -14,7 +15,7 @@ def self.source_root
       # Implement the required interface for Rails::Generators::Migration.
       def self.next_migration_number(dirname) #:nodoc:
         next_migration_number = current_migration_number(dirname) + 1
-        if Mongoid.timestamped_migrations
+        if Mongoid.config.timestamped_migrations
           [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
         else
           "%.3d" % next_migration_number

diff --git a/test/config.rb b/test/config.rb
@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../lib/mongoid_rails_migrations'
+require File.dirname(__FILE__) + '/../lib/rails/generators/mongoid/mongoid_generator'
 
 Mongoid.configure do |config|
   name = "mongoid_test"

diff --git a/test/migration_test.rb b/test/migration_test.rb
@@ -116,6 +116,12 @@ def test_migrator_with_missing_version_numbers
         Mongoid::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 500)
       end
     end
-
+
+    def test_turning_off_timestamped_migrations
+      Mongoid.config.timestamped_migrations = false
+      next_number = Mongoid::Generators::Base.next_migration_number(MIGRATIONS_ROOT + "/valid")
+      assert_equal "20100513063903", next_number
+    end
+
   end
 end