rails-ext 0.2.15 → 0.2.16

data/.git/logs/HEAD

@@ -29,3 +29,5 @@ fec19d13244f6b439e234e1af2e2e6d1f886b2fb 5f483b0c41645f8882f549c1c6d0274bb592140
 a0d595c78f280787659a2a4400f5d63578b53dce e7e790ff7c580a636d0de69956834c9b47ad771b alex <alex@amac.local> 1266000303 +0300	commit: upd
 e7e790ff7c580a636d0de69956834c9b47ad771b a59472e8ecb5d06647adeec11ae931b956508191 alex <alex@amac.local> 1266630067 +0300	commit: upd
 a59472e8ecb5d06647adeec11ae931b956508191 08f5dafa9123b7f8d1f22a796c4cba4a4063ad0d alex <alex@amac.local> 1266772739 +0300	commit: upd
+08f5dafa9123b7f8d1f22a796c4cba4a4063ad0d b533c1c1bca9eae5b7e75c639fff8ec2c2f9fea1 alex <alex@amac.local> 1267048597 +0300	commit: refactor mongo connections and add multitenant migration with specs
+b533c1c1bca9eae5b7e75c639fff8ec2c2f9fea1 288e20f19c6662b1425e0a0797ae443f7eddcc4a alex <alex@amac.local> 1267051247 +0300	commit: upd

data/.git/logs/refs/heads/master

@@ -29,3 +29,5 @@ fec19d13244f6b439e234e1af2e2e6d1f886b2fb 5f483b0c41645f8882f549c1c6d0274bb592140
 a0d595c78f280787659a2a4400f5d63578b53dce e7e790ff7c580a636d0de69956834c9b47ad771b alex <alex@amac.local> 1266000303 +0300	commit: upd
 e7e790ff7c580a636d0de69956834c9b47ad771b a59472e8ecb5d06647adeec11ae931b956508191 alex <alex@amac.local> 1266630067 +0300	commit: upd
 a59472e8ecb5d06647adeec11ae931b956508191 08f5dafa9123b7f8d1f22a796c4cba4a4063ad0d alex <alex@amac.local> 1266772739 +0300	commit: upd
+08f5dafa9123b7f8d1f22a796c4cba4a4063ad0d b533c1c1bca9eae5b7e75c639fff8ec2c2f9fea1 alex <alex@amac.local> 1267048597 +0300	commit: refactor mongo connections and add multitenant migration with specs
+b533c1c1bca9eae5b7e75c639fff8ec2c2f9fea1 288e20f19c6662b1425e0a0797ae443f7eddcc4a alex <alex@amac.local> 1267051247 +0300	commit: upd

data/.git/logs/refs/remotes/origin/master

@@ -27,3 +27,5 @@ fec19d13244f6b439e234e1af2e2e6d1f886b2fb 5f483b0c41645f8882f549c1c6d0274bb592140
 a0d595c78f280787659a2a4400f5d63578b53dce e7e790ff7c580a636d0de69956834c9b47ad771b alex <alex@amac.local> 1266000307 +0300	update by push
 e7e790ff7c580a636d0de69956834c9b47ad771b a59472e8ecb5d06647adeec11ae931b956508191 alex <alex@amac.local> 1266630072 +0300	update by push
 a59472e8ecb5d06647adeec11ae931b956508191 08f5dafa9123b7f8d1f22a796c4cba4a4063ad0d alex <alex@amac.local> 1266772749 +0300	update by push
+08f5dafa9123b7f8d1f22a796c4cba4a4063ad0d b533c1c1bca9eae5b7e75c639fff8ec2c2f9fea1 alex <alex@amac.local> 1267048616 +0300	update by push
+b533c1c1bca9eae5b7e75c639fff8ec2c2f9fea1 288e20f19c6662b1425e0a0797ae443f7eddcc4a alex <alex@amac.local> 1267051254 +0300	update by push

data/.git/objects/1b/83175202b0bdd9e8aac50c186533c1730aa220

@@ -0,0 +1,5 @@
+x
uRKo�@�ٿb�TXr�*�E��	�j
+n6�f��JD-c"U	W���Y2�L���0�����WU���w��X
+&�^�rcK�s��#���Ŝ��Cs�1W�?�B�VkJ���碬`J9��B�nE�$M����&�
+Z�q]�*O�B��
+\����������e4�u>�Lg���C8�#�{\v���C�ӫ��!�t���Nm�|�v_��6|�A���E��"�rJ^���*��D�\�����$�mx{=�\����@��������6�F���'͉�#IX���?�Gd����R

data/.git/objects/b5/33c1c1bca9eae5b7e75c639fff8ec2c2f9fea1

@@ -0,0 +1 @@
+x
��Aj�0E��)f_(cY�%�W���%[�=~������<��^kd<��C��D�ip�� k�͚l�3����7�qh�!���8�e[sHs6k�be��e� q���~v��ˋ_�����O��_�Wz�y�����7�C3d<?jo�N�[S����!%��}��

data/.git/objects/c5/208dea612df35fb84ceeda0649c103c32e2240

@@ -0,0 +1,2 @@
+x
M�K
+�@����S�MN!�;4����1���qp�(�^e|E����%�.ֳֻU}�pI��42c +mPQ��#Av4Q"�r�|�FY4}w0�c�r��#�im�`M���4[�}ʵ�,��|��[ql0�Xd�

data/.git/refs/heads/master

@@ -1 +1 @@
-08f5dafa9123b7f8d1f22a796c4cba4a4063ad0d
+288e20f19c6662b1425e0a0797ae443f7eddcc4a

data/.git/refs/remotes/origin/master

@@ -1 +1 @@
-08f5dafa9123b7f8d1f22a796c4cba4a4063ad0d
+288e20f19c6662b1425e0a0797ae443f7eddcc4a

data/Rakefile

@@ -18,7 +18,7 @@ require 'fileutils'
 
 spec = Gem::Specification.new do |s|
 	s.name = "rails-ext"
-	s.version = "0.2.15"
+	s.version = "0.2.16"
 	s.summary = "Set of common Ruby on Rails extensions"
 	s.description = "Set of common Ruby on Rails extensions"
 	s.author = "Alexey Petrushin"

data/lib/mongo_mapper_ext/fixes.rb

@@ -0,0 +1,9 @@
+MongoMapper::Plugins::Keys::Key.class_eval do
+  def get(value)
+    if value.nil? && !default_value.nil?
+      return default_value.respond_to?(:clone) ? default_value.clone : default_value
+    end
+
+    type.from_mongo(value)
+  end
+end

data/lib/mongo_mapper_ext/migration.rb

@@ -0,0 +1,109 @@
+module MongoMapper::Migration
+  class MigrationDefinition
+    def upgrade &block
+      if block
+        @upgrade = block
+      else
+        @upgrade
+      end
+    end
+    alias_method :up, :upgrade
+    
+    def downgrade &block
+      if block
+        @downgrade = block
+      else
+        @downgrade
+      end
+    end
+    alias_method :down, :downgrade
+  end
+  
+  class << self
+    def define_migration version, &block
+      version.should! :be_a, Integer
+      definition = MigrationDefinition.new
+      block.call definition
+      migration_definitions[version] = definition
+    end
+    
+    def define_global_migration version, &block
+      version.should! :be_a, Integer
+      definition = MigrationDefinition.new
+      block.call definition
+      global_migration_definitions[version] = definition
+    end
+        
+    def update_global_database_to version  
+      puts "Migration for Global Database:"
+      update_database MongoMapper.global_database, global_migration_definitions, version
+    end
+    
+    def update_database_to version      
+      puts "Migration for Accounts Databases:"
+      results = {}
+      MongoMapper.accounts_names.each do |account_name|
+        MongoMapper.account_database account_name do |db|
+          result = update_database db, migration_definitions, version
+          results[db.name] = result
+        end
+      end
+      results
+    end
+    
+    def metadata db
+      col = db.collection 'db_metadata'
+      metadata = (col.find_one || {:version => 0}).to_openobject
+    end
+    
+    def global_migration_definitions; @global_migration_definitions ||= [] end
+    def migration_definitions; @migration_definitions ||= [] end    
+    
+    protected
+      def increase_db_version migration_definitions, db
+        m = metadata(db)
+        migration = migration_definitions[m.version + 1]        
+        raise "No upgrade for version #{m.version + 1}" unless migration and migration.up
+        
+        migration.up.call
+        
+        m.version += 1
+        update_metadata db, m
+        
+        puts "Database #{db.name} upgraded to version #{m.version}"
+      end
+      
+      def decrease_db_version migration_definitions, db
+        m = metadata(db)
+        migration = migration_definitions[m.version]        
+        raise "No downgrade for version #{m.version}" unless migration and migration.down
+        
+        migration.down.call
+        
+        m.version -= 1
+        update_metadata db, m
+        
+        puts "Database #{db.name} downgraded to version #{m.version}"
+      end
+      
+      def update_database db, migrations, version      
+        if metadata(db).version == version
+          puts "Database #{db.name} already is of #{version} version, no migration needed"
+          return false
+        end
+
+        increase_db_version migrations, db while metadata(db).version < version
+        decrease_db_version migrations, db while metadata(db).version > version
+        true
+      end
+      
+      def update_metadata db, metadata
+        col = db.collection 'db_metadata'
+        col.save metadata.to_hash
+      end
+          
+      def reset
+        [global_migration_definitions, migration_definitions].every.clear
+      end
+  end
+end

data/lib/mongo_mapper_ext/mongo_mapper.rb

@@ -0,0 +1,160 @@
+MongoMapper.class_eval do
+  const_set :ACCOUNT_TOKEN, ':account'
+  class << self
+    # 
+    # Config
+    # 
+    attr_accessor :custom_config
+    
+    def config      
+      unless @config
+        @config = if defined?(Rails)
+          global_database = DATABASE["#{Rails.env}!"].global_database!
+          accounts_database = DATABASE["#{Rails.env}!"].accounts_database!
+          config = {
+            :global_database => {
+              :name => global_database.name!,
+              :host => global_database.host(nil),
+              :port => global_database.port(nil)
+            }.to_openobject,
+            :accounts_database => {
+              :name => accounts_database.name!,
+              :host => accounts_database.host(nil),
+              :port => accounts_database.port(nil)
+            }.to_openobject
+          }.to_openobject
+        else
+          raise "If you don't using Rails you must override this method and provide your own custom_config!" if custom_config.blank?
+          custom_config
+        end
+        
+        # Global database should't looks the same as Account database. We need to distinguish it by names!
+        db_pattern = accounts_database.name
+        re = Regexp.new(db_pattern.gsub(MongoMapper::ACCOUNT_TOKEN, '.+'))
+        raise "Global Database Name shouldn't be similar to Account Database Name!" if global_database.name =~ re
+      end
+      @config
+    end
+    
+    # 
+    # Global Database
+    # 
+    def global_connection      
+      unless @global_connection
+        @global_connection = Mongo::Connection.new(config.global_database.host, config.global_database.port, :logger => logger)
+      
+        if defined?(PhusionPassenger)
+          PhusionPassenger.on_event(:starting_worker_process) do |forked|
+            @global_connection.connect_to_master if forked
+          end
+        end
+      end
+      @global_connection
+    end
+    
+    def global_database
+      @global_database ||= global_connection.db config.global_database.name
+    end
+    
+    def current_global_database
+      global_database
+    end
+    
+    
+    # 
+    # Accounts Database
+    # 
+    def account_connection
+      unless @account_connection
+        @account_connection = Mongo::Connection.new(config.accounts_database.host, config.accounts_database.port, :logger => logger)
+      
+        if defined?(PhusionPassenger)
+          PhusionPassenger.on_event(:starting_worker_process) do |forked|
+            @account_connection.connect_to_master if forked
+          end
+        end
+      end
+      @account_connection
+    end
+    
+    attr_accessor :multitenant_mode
+    def multitenant_mode?; !!@multitenant_mode end
+    
+    def account_database_name account_name
+      db_name_template = config.accounts_database.name
+      db_name_template.should! :include, MongoMapper::ACCOUNT_TOKEN
+      db_name = db_name_template.gsub(MongoMapper::ACCOUNT_TOKEN, account_name)
+    end
+    
+    def account_database account_name, &block
+      self.logger.warn "Previous database #{self.database.name} has note be closed!" if multitenant_mode?
+      
+      db_name = account_database_name account_name
+      
+      begin          
+        self.connection = account_connection
+        self.database = db_name
+        self.multitenant_mode = true
+        block.call self.database if block
+      ensure
+        if block
+          self.multitenant_mode = false
+          self.database = nil
+          self.connection = nil
+        else
+          self.logger.warn "Account Database #{self.database.name} will not be closed automatically!"
+        end
+      end
+    end
+    
+    def current_account_database
+      multitenant_mode? ? database : nil
+    end
+    
+    def logger
+      return @logger ||= Logger.new(nil) if defined?(Spec)
+            
+      @logger ||= ("irb" == $0) ? Logger.new(STDOUT) : (defined?(Rails) ? Rails.logger : Logger.new(STDOUT))
+    end
+    
+    def accounts_names
+      accounts_names = []
+      db_pattern = MongoMapper.config.accounts_database.name
+      re = Regexp.new(db_pattern.gsub(MongoMapper::ACCOUNT_TOKEN, '.+'))
+      
+      token_start = db_pattern.index MongoMapper::ACCOUNT_TOKEN
+      token_size = MongoMapper::ACCOUNT_TOKEN.size
+      
+      prefix_size = token_start
+      postfix_size = db_pattern.size -  prefix_size - token_size
+      
+      MongoMapper.account_connection.database_names.each do |name|
+        if name =~ re
+          account_name = name[prefix_size..-(postfix_size + 1)]
+          accounts_names << account_name
+        end
+      end
+      accounts_names
+    end
+  end
+end
+
+
+# 
+# cache
+#
+MongoMapper::Document::InstanceMethods.class_eval do
+  def cache
+    @cache ||= {}
+  end
+
+  def clear_cache
+    @cache = {}
+  end
+
+  def reload_with_cache
+    @cache.clear if @cache
+    reload_without_cache
+  end
+  alias_method_chain :reload, :cache
+end

data/lib/mongo_mapper_ext/multitenant.rb

@@ -0,0 +1,8 @@
+[MongoMapper::EmbeddedDocument::ClassMethods, MongoMapper::Document::ClassMethods].each do |aclass|
+  aclass.class_eval do
+    def connect_to_global_database!      
+      self.connection MongoMapper.global_connection
+      self.set_database_name MongoMapper.config.global_database.name
+    end
+  end
+end

data/lib/mongo_mapper_ext/object_id.rb

@@ -0,0 +1,12 @@
+# 
+# ObjectID
+# 
+Mongo::ObjectID.class_eval do  
+  def == other
+    self.to_s == other.to_s
+  end
+
+  def to_yaml *args
+    to_s.to_yaml *args
+  end
+end

data/lib/mongo_mapper_ext/spec_helper.rb

@@ -0,0 +1,14 @@
+MongoMapper.account_database 'development'
+
+Spec::Runner.configure do |config|
+  config.before(:each) do    
+    dbs = [MongoMapper.current_global_database]
+    dbs << MongoMapper.current_account_database unless MongoMapper.current_account_database.blank?
+
+    dbs.each do |db|
+      db.collection_names.each do |name|
+        db.collection(name).drop
+      end
+    end
+  end
+end

data/lib/mongo_mapper_ext/view_helpers.rb

@@ -0,0 +1,20 @@
+# 
+# HTML helpers
+# 
+[MongoMapper::EmbeddedDocument::InstanceMethods, MongoMapper::Document::InstanceMethods].each do |aclass|
+  aclass.class_eval do
+    def original_id; id end
+  
+    def dom_id
+      new_record? ? "new_#{self.class.original_class.name.underscore}" : original_id.to_s
+    end
+
+    def to_param; original_id.to_s end
+  end
+end
+
+[MongoMapper::EmbeddedDocument::ClassMethods, MongoMapper::Document::ClassMethods].each do |aclass|
+  aclass.class_eval do
+    def original_class; self end
+  end
+end

data/lib/mongo_mapper_ext.rb

@@ -0,0 +1,5 @@
+require 'mongo_mapper'
+
+%w{fixes migration mongo_mapper multitenant object_id view_helpers}.each do |file|
+  require "#{File.dirname __FILE__}/mongo_mapper_ext/#{file}"
+end

data/lib/rails_ext/config_files.rb

@@ -1,7 +1,7 @@
 # Converts any non standart fname.yml file in /config folder into FNAME constant with loaded YAML content wrapped into SafeHash.
 config_dir = "#{RAILS_ROOT}/config/"
 files = Dir.glob("#{config_dir}*.yml")
-ignore = ["asset_packages\\.yml", "database\\.yml", "\\..+\\."].collect{|expr| Regexp.new expr}
+ignore = ["asset_packages\\.yml", "\\..+\\."].collect{|expr| Regexp.new expr}
 files.delete_if{|fname| ignore.any?{|template| template =~ fname}}
 files.delete_if{|fname| /^[a-zA-Z0-9_]+\.yml$/ !~ fname.sub(config_dir, '')}
 

data/lib/rails_ext.rb

@@ -6,7 +6,7 @@ require 'rails_ext/active_record'
 
 require 'rails_ext/model'
 
-require 'rails_ext/mongo_mapper'
+# require 'rails_ext/mongo_mapper'
 
 require 'rails_ext/config_files/safe_hash'
 require 'rails_ext/config_files'

data/spec/mongo_mapper_migration_spec.rb

@@ -0,0 +1,137 @@
+require 'spec'
+require 'ruby_ext'
+require "#{File.dirname __FILE__}/../lib/mongo_mapper_ext"
+
+MongoMapper.custom_config = {
+  :global_database => {
+    :name => 'global_development_test'
+  }.to_openobject,
+  :accounts_database => {
+    :name => "accounts_#{MongoMapper::ACCOUNT_TOKEN}_test"
+  }.to_openobject
+}.to_openobject
+require "#{File.dirname __FILE__}/../lib/mongo_mapper_ext/spec_helper"
+
+
+describe "MongoMapper Migration" do
+  Migration = MongoMapper::Migration
+  
+  before :each do
+    Migration.send :reset
+  end
+  
+  describe "Global Database" do    
+    before :all do
+      class GlobalSample
+        include MongoMapper::Document
+        connect_to_global_database! 
+  
+        key :name, String
+      end
+    end
+  
+    after :all do
+      Object.send :remove_const, :GlobalSample if defined?(GlobalSample)
+    end
+    
+    it "Shouldn't update if versions are the same" do
+      Migration.update_global_database_to(0).should be_false
+    end
+  
+    it "increase_db_version" do
+      GlobalSample.count.should == 0
+      Migration.define_global_migration 1 do |m|
+        m.up{GlobalSample.create :name => 'name'}
+      end
+    
+      Migration.update_global_database_to(1).should be_true    
+      GlobalSample.count.should == 1
+      Migration.metadata(MongoMapper.global_database).should == 1
+    end
+  
+    it "decrease_db_version" do    
+      Migration.define_global_migration 1 do |m|
+        m.up{GlobalSample.create :name => 'name'}
+        m.down{GlobalSample.destroy_all}
+      end
+      Migration.update_global_database_to(1).should be_true
+      GlobalSample.count.should == 1
+    
+      Migration.update_global_database_to(0).should be_true
+      GlobalSample.count.should == 0
+      Migration.metadata(MongoMapper.global_database).should == 0
+    end
+  end
+  
+  describe "Acccounts Database" do
+    before :all do
+      class Sample
+        include MongoMapper::Document
+  
+        key :name, String
+      end
+    end
+  
+    after :all do
+      Object.send :remove_const, :Sample if defined?(Sample)
+    end
+    
+    before :each do       
+      @account_db_name = 'accounts_development_test'
+      MongoMapper.accounts_names.each do |acccount_name|
+        next if acccount_name == 'development'
+        MongoMapper.account_connection.drop_database MongoMapper.account_database_name(acccount_name) 
+      end
+      MongoMapper.current_account_database.collection('stub').save('a' => 'b') # Creating empty database
+      MongoMapper.accounts_names.should == ['development']      
+    end
+    
+    after :each do
+      MongoMapper.account_database 'development'
+    end
+    
+    it "Shouldn't update if versions are the same" do
+      results = Migration.update_database_to(0)
+      results[@account_db_name].should be_false
+    end
+  
+    it "increase_db_version" do
+      Sample.count.should == 0
+      Migration.define_migration 1 do |m|
+        m.up{Sample.create :name => 'name'}
+      end
+    
+      results = Migration.update_database_to(1)
+      results.size.should == 1
+      results[@account_db_name].should be_true    
+      
+      MongoMapper.account_database 'development'
+      Sample.count.should == 1
+      Migration.metadata(MongoMapper.current_account_database).should == 1
+    end
+  
+    it "decrease_db_version" do    
+      Migration.define_migration 1 do |m|
+        m.up{Sample.create :name => 'name'}
+        m.down{Sample.destroy_all}
+      end
+      
+      # Up
+      results = Migration.update_database_to(1)
+      results.size.should == 1
+      results[@account_db_name].should be_true
+      
+      MongoMapper.account_database 'development'
+      Sample.count.should == 1
+    
+      # Down
+      results = Migration.update_database_to(0)
+      results.size.should == 1
+      results[@account_db_name].should be_true
+      
+      MongoMapper.account_database 'development'      
+      Sample.count.should == 0
+      Migration.metadata(MongoMapper.database).should == 0
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails-ext
 version: !ruby/object:Gem::Version 
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors: 
 - Alexey Petrushin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 +03:00
+date: 2010-02-25 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,7 @@ files:
 - .git/objects/0b/3b3d1048f25fdc0de3f680cdbbd867a42b5a95
 - .git/objects/0b/e101a0586410212b4ee5905881ad726b7b4907
 - .git/objects/0d/aa3468e187093eff222b8094a6e702dea9ba4e
+- .git/objects/0d/b63ec7380f5132ca02be93c82f5295e33c10a9
 - .git/objects/0f/92cb7ae358323d43d026b83f7d1a4969cf7568
 - .git/objects/0f/d3ac42b07c2d3102263bd939704f5633db304e
 - .git/objects/10/1f52d83027dfe5798f87aec1118f02d19e5cf8
@@ -80,6 +81,7 @@ files:
 - .git/objects/18/77033b90ed3dd55a3034b7e3ca1c5c9f66868d
 - .git/objects/18/adbbbcd043a3ef3e19854df8476b02d69544d0
 - .git/objects/19/1f68644a3646d774f2546c4cd49ac7d66f4cc2
+- .git/objects/1b/83175202b0bdd9e8aac50c186533c1730aa220
 - .git/objects/1c/65c12ac1816d1b56c7c3892acc61512696c673
 - .git/objects/1c/7fd48742e76d2cd6605e1a569e65e79ddd8f92
 - .git/objects/1d/d49713de2942dc974e55adc3684f55b2b817e2
@@ -87,6 +89,7 @@ files:
 - .git/objects/1f/1be5b8e4dce8787367b3a607b0695ca70d4e82
 - .git/objects/21/e143c036491275aaa7d6e45ed4683f5defdae2
 - .git/objects/23/926daa53cee50268bd329a8b4cbd853cb3a45b
+- .git/objects/28/8e20f19c6662b1425e0a0797ae443f7eddcc4a
 - .git/objects/28/c44da9255a78bf7105a1c251e4e1cd643b8f44
 - .git/objects/29/7a2c413b11f78b69dd8caa4f334c9536088f8a
 - .git/objects/29/b1f8abaed4aea1da8f8bd5f1bd81c26058c41a
@@ -107,12 +110,14 @@ files:
 - .git/objects/3a/797683953be7e6d0ffa0e34514f3e8e9c3ceb0
 - .git/objects/3a/ff2a7bfdf3a677812899ede62d084369c7c5f4
 - .git/objects/3e/c0da65fe2e572ad31203f9412baa09dfdf49d3
+- .git/objects/3e/f23cf310c5eebac930a19d36a0561dd362d3ee
 - .git/objects/3f/3db6bb5a5204ae58e303959c4c0da3a70d8b35
 - .git/objects/3f/8f2086049359d8b2b2500a7145afe3040e9c37
 - .git/objects/40/215c0554202fc46dc2fca94ed21e2920ce1e84
 - .git/objects/40/7adfb7f6188b0bb0b88cf9391943e1aaa32374
 - .git/objects/40/b5d1a81a061ce0e2f315b7e741ec70e0defe1d
 - .git/objects/46/d12e0420cd6341a2720730cc45703fc835efb6
+- .git/objects/47/28fde4426b545c73552bd5e0f79296a2b4be19
 - .git/objects/49/66cd792ea3e03d5091aa7a332f2a082e479a76
 - .git/objects/4a/80705702f499ef1278630257a33c6088238ba3
 - .git/objects/4a/be35eba6ed159578e3f43f6ffa8ea7541598e2
@@ -124,6 +129,7 @@ files:
 - .git/objects/4d/f726437dcbd106a583c07863e56076b245e8e3
 - .git/objects/4f/2c09cf4d187a86ce37983eb76211ebabdb45d0
 - .git/objects/4f/fa8f1c9b7e3fdbb23ab600722d1011dcb48cec
+- .git/objects/52/5fcb274029ec36780b264166ea3d487d968997
 - .git/objects/53/8aca7c60ef3cdfde25d4698e8e133ce18e512e
 - .git/objects/55/6c13b26b6cecd286427a7f16c60c86c7df7885
 - .git/objects/55/d1f1efc344266d472094b1fd2f247b97de1c8b
@@ -133,6 +139,7 @@ files:
 - .git/objects/59/0ef6ba9931d75fbddc7a940044dbaaa50efc76
 - .git/objects/59/7b19d2ba6f1d46f75f702cbacf8828b7b506f9
 - .git/objects/5a/35fa85474278f3c817aa59d07b725428c41a28
+- .git/objects/5c/95be85f2a2a984454fed4941a5ae00062634c5
 - .git/objects/5c/d7e89f2b29ed92fd51e2c6b2ee74db376d17d7
 - .git/objects/5f/483b0c41645f8882f549c1c6d0274bb592140a
 - .git/objects/60/a681e873ca0ae0b7da3f37dbc5701f6e42b970
@@ -143,6 +150,7 @@ files:
 - .git/objects/64/96d7c4cc0c824e706bf757f9ec63b5553c9caf
 - .git/objects/65/51094fa3b996ff25b88d7ddb21d21a811d53fc
 - .git/objects/66/37f98202acb1895cb347d7c5fb5c414dd9e6db
+- .git/objects/67/2396778b142df8b0b7ab212b7564039c48cf39
 - .git/objects/67/850cf1ede94d80c9b07ceace074a4d62f15249
 - .git/objects/68/8ce506ac4f7c160bd6880d8507820761a3b3b7
 - .git/objects/68/a8fc1e77fc27530430b55046609ee80cd9b2ad
@@ -154,6 +162,7 @@ files:
 - .git/objects/6d/f725e3519872a75bc763045f00d8844eb890cf
 - .git/objects/6e/a04c6c0a52b9c7da1de6364b530553dfd78c4a
 - .git/objects/71/e6b43e9d41f9903992fd86d483b7d3e4dd28cd
+- .git/objects/73/667b7ae341d478513ba0bd6ec8af0aa1f62f0d
 - .git/objects/74/ce4a58ebf96006e1e9be0980b99ac3b5b820c7
 - .git/objects/74/d8411c7276b4e1c1f614606af7f69ab4526d30
 - .git/objects/75/d0b250bcdf241d981313b1d6eb153b96e4b05f
@@ -171,6 +180,7 @@ files:
 - .git/objects/82/03c2c6cdd29e1e20e88fbb81e63b7ea1ec2899
 - .git/objects/83/6f33959bcf517b9952aefb3fdfdd7ff3c1f207
 - .git/objects/85/eee9f4c1a6f710ed87bf28a0531275777f8848
+- .git/objects/85/fd531f7352ad8f5ac030eed2204a662dd10a66
 - .git/objects/86/b31b604469e9b261f4e5b927932504bca8c402
 - .git/objects/87/fc827fd223cac6b4e55d823a9ea86bb0726a3b
 - .git/objects/89/2697494eb70fdccaf26bf547bb8d7428c0e5ff
@@ -179,6 +189,7 @@ files:
 - .git/objects/8d/4dcde8df4da8f53f5f5313757b907e9aa1af66
 - .git/objects/8e/3cfb391de711b5fecfbdf2860fa37b019e8036
 - .git/objects/8e/69b6cf3ec8b49270091b4a206ccf326679dc20
+- .git/objects/8e/a47de58a27dd343b3ecd3dd5e0fab88e268a72
 - .git/objects/90/ca84ea326afab5fcc92a50469c2052ebc46f11
 - .git/objects/92/e1c250edfca72ed0932934257ef3cfc7122ec5
 - .git/objects/92/e1f3936e7c33007d0a466b836804450992a1eb
@@ -194,12 +205,14 @@ files:
 - .git/objects/a3/4e4e8572d323de26965619321576f903fa7935
 - .git/objects/a3/5c311b625d863b50d51e2385259d487e277c90
 - .git/objects/a3/6956ff51b72b69d1ac2c1ad0d78bb9ad1ade75
+- .git/objects/a3/84715546f6a11dc7d56a32784dbdd5d7d92e8e
 - .git/objects/a5/4db1bec30f7dc8981c4d5ccf9c9a90c1e13662
 - .git/objects/a5/9472e8ecb5d06647adeec11ae931b956508191
 - .git/objects/a6/438da91846df9ac940b59f6d11d5019a5580be
 - .git/objects/a7/6c4944dc009628cb65b4962464a8eb484d6a71
 - .git/objects/a7/a902aeac4af3f10b474c23c2a3750fde007a02
 - .git/objects/a9/d2b84a743094002fef87a193e681ee721d76ed
+- .git/objects/ab/6b7d6c5c5fee246e184a58448682b73b574d6b
 - .git/objects/ab/825cde00e626431c6045e6886d470327c63001
 - .git/objects/ac/92bcf6c74d23824c3c7ce341f667507592c7f9
 - .git/objects/ac/a1ad63cec98e0b3dae23fbe088f5a5d2125a7a
@@ -214,6 +227,7 @@ files:
 - .git/objects/b4/228251babf3a84ac181d462fdd383816bd23b8
 - .git/objects/b4/eb909dd819bf870d2445bddc0d7f00678b11b6
 - .git/objects/b5/15828bb32356501aa81bb4e808ea5d7d77f068
+- .git/objects/b5/33c1c1bca9eae5b7e75c639fff8ec2c2f9fea1
 - .git/objects/b5/edd343ceb8e87d1a73922612aec210b393f839
 - .git/objects/b7/88e3ac322b164a2a223f80f8a6da0836d9d1dd
 - .git/objects/ba/67eef0f58a44e4b39af605d45e1e958023588d
@@ -227,9 +241,13 @@ files:
 - .git/objects/c1/424cadd8817a7e927742e52945f303b38e7222
 - .git/objects/c3/dd5ae1e005efb09ef758da1ec17781c616ae9d
 - .git/objects/c4/524d9d99c6072949bfc565f78b7a62577ffa3f
+- .git/objects/c5/208dea612df35fb84ceeda0649c103c32e2240
+- .git/objects/c5/3b27c9641ea1c2aed192672b67ba8c4034b2ad
 - .git/objects/c5/64ac68ebc8e0db7a6355a45f3299829ef2a825
+- .git/objects/c6/9db405143490c407206cf8afd7537a49ea30b2
 - .git/objects/c7/a9ce2f4c2230143a30c77952c14ddf6507f511
 - .git/objects/c8/e50fcfb3ed2c892a6c75e8d703552bb8edd4ca
+- .git/objects/ca/a9edd4de82aa3abec99946e92da9225efb83bc
 - .git/objects/ca/c13b06411cdb70ac35d51ecf9efb0907645bd1
 - .git/objects/cd/cf979816bbea77b6000145a1e23921553bf497
 - .git/objects/d0/ca1129a25def590908081d9dc166d5288fddf0
@@ -259,6 +277,7 @@ files:
 - .git/objects/e4/1d46e33f52e07b836b966d58677fc2a864a4a4
 - .git/objects/e4/d7cacac2d7e66df5a7c21eaae71c0a90f1439d
 - .git/objects/e5/7fa5fd7f10f6f532742b0cc2dc3edaed6c0763
+- .git/objects/e6/4d9b4d86a001e4f882a9842a8dd4368001c470
 - .git/objects/e6/ed7d272f8c48a28904007d653837bfe761be36
 - .git/objects/e7/e790ff7c580a636d0de69956834c9b47ad771b
 - .git/objects/e7/f4b26a3258b7788ffe2665773387e19c01095a
@@ -279,11 +298,16 @@ files:
 - .git/objects/f3/7784042bc99c16c02fd104dda82aafa42d4c9c
 - .git/objects/f4/2863a866b6cd3bb09d0482052cbf2da7fb4e5a
 - .git/objects/f5/91a5c39e03e2102c9101db957b48c8c76e194c
+- .git/objects/f6/0fd8c2582e0f7688877f12f78ddb97a291046c
 - .git/objects/f6/3ad03a8daa1602df63aab3838947c18fa63797
+- .git/objects/f7/b177b2c6b25dd886d23d6be87bcf802af9b513
 - .git/objects/f9/8d0f95460a7a3f63ab4c08ad5508fd32d1b5c2
 - .git/objects/f9/ef6dd08a60dec5d5e4e7a9b08f693ebf76da39
 - .git/objects/fa/4e345a8b9a12bf1cf7af254b3caa111b04191b
+- .git/objects/fa/854db299be87a6e6a65d906e7c2f9b122d9980
 - .git/objects/fb/05e1cc9825c59c7edc596c05077a1eed9c321e
+- .git/objects/fc/022a0a2ed82b2361292833c0cb90f996aae858
+- .git/objects/fc/bf66b949d823f884d1aff2f3e192943cb195a2
 - .git/objects/fd/25e0c8e44fb97a7c7d76280cec51886b51abf6
 - .git/objects/fe/c19d13244f6b439e234e1af2e2e6d1f886b2fb
 - .git/objects/fe/ce95626cedcc0682e6fcc20fe019aab60938f2
@@ -298,6 +322,14 @@ files:
 - lib/asset_packager/asset_packager.rb
 - lib/asset_packager/jsmin.rb
 - lib/asset_packager/tasks.rb
+- lib/mongo_mapper_ext/fixes.rb
+- lib/mongo_mapper_ext/migration.rb
+- lib/mongo_mapper_ext/mongo_mapper.rb
+- lib/mongo_mapper_ext/multitenant.rb
+- lib/mongo_mapper_ext/object_id.rb
+- lib/mongo_mapper_ext/spec_helper.rb
+- lib/mongo_mapper_ext/view_helpers.rb
+- lib/mongo_mapper_ext.rb
 - lib/rails_ext/action_controller.rb
 - lib/rails_ext/action_controller_ext.rb
 - lib/rails_ext/action_view.rb
@@ -325,13 +357,12 @@ files:
 - lib/rails_ext/merge_default_scope.rb
 - lib/rails_ext/micelaneous.rb
 - lib/rails_ext/model.rb
-- lib/rails_ext/mongo_mapper.rb
-- lib/rails_ext/mongo_mapper_spec_helper.rb
 - lib/rails_ext/persistent_params.rb
 - lib/rails_ext/redirect_helper.rb
 - lib/rails_ext/reload_page.rb
 - lib/rails_ext/user_error.rb
 - lib/rails_ext.rb
+- spec/mongo_mapper_migration_spec.rb
 - spec/safe_hash_spec.rb
 - spec/spec.opts
 - public/rails_ext/rails_ext.css

data/lib/rails_ext/mongo_mapper.rb

@@ -1,48 +0,0 @@
-# require 'mm-paginate'
-
-# 
-# dom_id
-# 
-# MongoMapper::Document.class_eval do
-#   def dom_id
-#     new_record? ? "new_#{self.class.name.underscore}" : "#{id}"
-#   end
-# end
-
-# 
-# cache
-#
-MongoMapper::Document::InstanceMethods.class_eval do
-  def cache
-    @cache ||= {}
-  end
-  
-  def clear_cache
-    @cache = {}
-  end
-  
-  def reload_with_cache
-    @cache.clear if @cache
-    reload_without_cache
-  end
-  alias_method_chain :reload, :cache
-end
-
-# 
-# ObjectID
-# 
-Mongo::ObjectID.class_eval do 
-  def == other
-    self.to_s == other.to_s
-  end
-  
-  def to_yaml *args
-    to_s.to_yaml *args
-  end
-end
-
-# String.class_eval do
-#   def to_mongo_id
-#     ObjectId.to_mongo self
-#   end
-# end

data/lib/rails_ext/mongo_mapper_spec_helper.rb

@@ -1,8 +0,0 @@
-Spec::Runner.configure do |config|
-  config.before(:each) do
-    db = MongoMapper.database
-    db.collection_names.each do |name|
-      db.collection(name).drop
-    end
-  end
-end