rails-ext 0.2.17 → 0.2.18

data/.git/logs/HEAD

@@ -32,3 +32,7 @@ a59472e8ecb5d06647adeec11ae931b956508191 08f5dafa9123b7f8d1f22a796c4cba4a4063ad0
 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
 288e20f19c6662b1425e0a0797ae443f7eddcc4a 480602886685e84f2a257eb8e95acfc8af1166b6 alex <alex@amac.local> 1268137298 +0300	commit: upd
+480602886685e84f2a257eb8e95acfc8af1166b6 158eef048d128710bfc0cb60114f7405e45f9b6c alex <alex@amac.local> 1268680881 +0300	commit: add default_scope to MM
+158eef048d128710bfc0cb60114f7405e45f9b6c b8efcaff7f11cc584ac44303449d96592853c528 alex <alex@amac.local> 1268692589 +0300	commit: refactor MM and switch to single DB for accounts
+b8efcaff7f11cc584ac44303449d96592853c528 1c14e28ef05892ccfe61da3dc28e16f87040fe43 alex <alex@amac.local> 1268699329 +0300	commit: update mongo-mapper migrations
+1c14e28ef05892ccfe61da3dc28e16f87040fe43 94afd196cc89d60f0a06d4cad619eaa79921a9ae alex <alex@amac.local> 1268706470 +0300	commit: upd

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

@@ -32,3 +32,7 @@ a59472e8ecb5d06647adeec11ae931b956508191 08f5dafa9123b7f8d1f22a796c4cba4a4063ad0
 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
 288e20f19c6662b1425e0a0797ae443f7eddcc4a 480602886685e84f2a257eb8e95acfc8af1166b6 alex <alex@amac.local> 1268137298 +0300	commit: upd
+480602886685e84f2a257eb8e95acfc8af1166b6 158eef048d128710bfc0cb60114f7405e45f9b6c alex <alex@amac.local> 1268680881 +0300	commit: add default_scope to MM
+158eef048d128710bfc0cb60114f7405e45f9b6c b8efcaff7f11cc584ac44303449d96592853c528 alex <alex@amac.local> 1268692589 +0300	commit: refactor MM and switch to single DB for accounts
+b8efcaff7f11cc584ac44303449d96592853c528 1c14e28ef05892ccfe61da3dc28e16f87040fe43 alex <alex@amac.local> 1268699329 +0300	commit: update mongo-mapper migrations
+1c14e28ef05892ccfe61da3dc28e16f87040fe43 94afd196cc89d60f0a06d4cad619eaa79921a9ae alex <alex@amac.local> 1268706470 +0300	commit: upd

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

@@ -30,3 +30,4 @@ a59472e8ecb5d06647adeec11ae931b956508191 08f5dafa9123b7f8d1f22a796c4cba4a4063ad0
 08f5dafa9123b7f8d1f22a796c4cba4a4063ad0d b533c1c1bca9eae5b7e75c639fff8ec2c2f9fea1 alex <alex@amac.local> 1267048616 +0300	update by push
 b533c1c1bca9eae5b7e75c639fff8ec2c2f9fea1 288e20f19c6662b1425e0a0797ae443f7eddcc4a alex <alex@amac.local> 1267051254 +0300	update by push
 288e20f19c6662b1425e0a0797ae443f7eddcc4a 480602886685e84f2a257eb8e95acfc8af1166b6 alex <alex@amac.local> 1268137307 +0300	update by push
+480602886685e84f2a257eb8e95acfc8af1166b6 94afd196cc89d60f0a06d4cad619eaa79921a9ae alex <alex@amac.local> 1268706480 +0300	update by push

data/.git/objects/15/8eef048d128710bfc0cb60114f7405e45f9b6c

@@ -0,0 +1,2 @@
+x
��K
+�0@]��$��D�@� �d�BjJM���9���y<x���C��U$�$$���>�z�lit�3�#�Ȫ��c�c&����c�TKA$�dd뷶�T}��ˋ̒�%�g@GLl���h�I����Fr��E�گ����`��nLB�

data/.git/objects/6b/779e60dfa44ba3daa26badf65b3422f30c7b9b

@@ -0,0 +1,2 @@
+x
U��
+�0�=�9n =���Qd�m6�)�v����

data/.git/objects/75/c64796b5ffb6107b861cfa77fa28e8e43a1156

@@ -0,0 +1 @@
+x
mM=�0u�W��v!F�B$88JLgS� M���~,�xK%���޽ww�^�L��~�*��M!��l�(�ܝ^B�548R��@��:(��d�,=�V��b3��>��fZ*��ۤ�6g�@

data/.git/objects/9d/9f28ff50236f1e7f78cbd17b8aa25a0bf8b6fc

@@ -0,0 +1,4 @@
+x
�TK��0�9�b�H���^Z	)ͩ�V���c�B��wLmHZE���!���	b�y}��x�����_���+P�Y��e���(�-�X|<=)�,Q6�{�8~���k�C��G+Z����wJ��j�d�B�S�3��l���V	��O�~#!�<���Y�$f�JX��T:
��9��P�Aj,��
+�s�^ �u�v�r<B�a�"A�e|üC�qi+�rї�\��Qo�r���_
+�֪/��f���q���,�-���B�0G�5��A��ވ��5%m���\�����9��V�J'ۈT_�5�|��ф�w��`B%�6�]W�xr�	&�Q��px&A�J'|o���
:��Q'$�A;ڙ��r��5V�ˁI�q�ѡf�O�(�����x��ݜ3O�fy��X��%pX��eP)̡r��K4:PD=R�H^&k��`t��9.�����{��S�^��
+t{ƴc�.�g45��.m��u�m$éE��ŅF(

data/.git/objects/a2/d43a3a789e655cc306618d480193709d580c30

@@ -0,0 +1,2 @@
+x
�P�j�0��x�k�R��24�j�d+���9H:c�����+;Ť����Aw��{w����~��ɱ�mww��H��"v&@�}zR�5
+!�m���V���e9�{�W/���4���Z�?p��i(�Gא֤��FG>ųQzEŎu�M��?yo���'���
矘뚎�&<�
M-x0㥭�.a4��-�f���<��)���2�d۳�X�f+�#1z�NN3��Bqi'"�aV�<���� ]�����Ğ'�e�0p-�K�?қ/.1��s�/Q�

data/.git/objects/b8/efcaff7f11cc584ac44303449d96592853c528

@@ -0,0 +1,2 @@
+x
��Aj�0E��)f(�X�5J)���Ѩ1�V�'��o�t�V���u�
+�О	"����~
x_K�

data/.git/objects/b9/ecca04b12de69ffab2cc5d22cb52d5babef24f

@@ -0,0 +1,2 @@
+x
U��j�0E��W	%�FYJ�.�
+

data/.git/refs/heads/master

@@ -1 +1 @@
-480602886685e84f2a257eb8e95acfc8af1166b6
+94afd196cc89d60f0a06d4cad619eaa79921a9ae

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

@@ -1 +1 @@
-480602886685e84f2a257eb8e95acfc8af1166b6
+94afd196cc89d60f0a06d4cad619eaa79921a9ae

data/Rakefile

@@ -18,7 +18,7 @@ require 'fileutils'
 
 spec = Gem::Specification.new do |s|
 	s.name = "rails-ext"
-	s.version = "0.2.17"
+	s.version = "0.2.18"
 	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/db_config.rb

@@ -0,0 +1,76 @@
+module MongoMapper
+  class ConnectionsPool < Hash
+    attr_accessor :mongo_mapper
+    def initialize mongo_mapper
+      self.mongo_mapper = mongo_mapper
+    end
+    
+    def [](database_alias)
+      database_alias = database_alias.to_s
+      unless connection = super(database_alias)            
+        mongo_mapper.db_config.should! :include, database_alias
+        db_options = mongo_mapper.db_config[database_alias]        
+        connection = Mongo::Connection.new(db_options['host'], db_options['port'], :logger => mongo_mapper.logger)
+      
+        if defined?(PhusionPassenger)
+          PhusionPassenger.on_event(:starting_worker_process) do |forked|
+            connection.connect_to_master if forked
+          end
+        end
+        
+        self[database_alias] = connection
+      end            
+      return connection
+    end
+  end
+  
+  class DatabasesPool < Hash
+    attr_accessor :mongo_mapper
+    def initialize mongo_mapper
+      self.mongo_mapper = mongo_mapper
+    end
+    
+    def [](database_alias)
+      database_alias = database_alias.to_s
+      unless db = super(database_alias)
+        mongo_mapper.db_config.should! :include, database_alias
+        db_options = mongo_mapper.db_config[database_alias]
+        db = mongo_mapper.connections[database_alias].db db_options['name'].should!(:be_a, String)
+        self[database_alias] = db
+      end
+      return db
+    end
+  end
+  
+  class << self
+    attr_accessor :db_config
+    
+    def db_config      
+      unless @db_config            
+        if defined?(::Rails) and defined?(DATABASE)              
+          @db_config = {}
+          DATABASE["#{::Rails.env}!"].to_h.each do |db_alias, options|
+            @db_config[db_alias.to_s] = {
+              'name' => options.name!,
+              'host' => options.host(nil),
+              'port' => options.port(nil)
+            }
+          end
+        else
+          @db_config = {}
+          # raise "If you don't using Rails you must override this method and provide your own config!"
+        end          
+      end
+      @db_config
+    end
+    
+    def connections
+      @connections ||= ConnectionsPool.new(self)
+    end
+    
+    def databases
+      @databases ||= DatabasesPool.new(self)
+    end
+  end
+              
+end

data/lib/mongo_mapper_ext/fixes.rb

@@ -1,9 +1,12 @@
-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
+# 
+# ObjectID
+# 
+Mongo::ObjectID.class_eval do  
+  def == other
+    self.to_s == other.to_s
+  end
 
-    type.from_mongo(value)
+  def to_yaml *args
+    to_s.to_yaml *args
   end
 end

data/lib/mongo_mapper_ext/migration.rb

@@ -20,90 +20,71 @@ module MongoMapper::Migration
   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
+    def define database_alias, version, &block
+      database_alias = database_alias.to_s
+      
       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
+      definitions[database_alias][version] = definition
     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
+            
+    def update database_alias, version  
+      database_alias = database_alias.to_s
+      db = MongoMapper.databases[database_alias]
+      
+      if metadata(db).version == version
+        MongoMapper.logger.info "Database #{database_alias} already is of #{version} version, no migration needed."
+        return false
+      else
+        MongoMapper.logger.info "Migration for '#{database_alias}' Database:"
       end
-      results
+      
+      increase_db_version database_alias, db while metadata(db).version < version
+      decrease_db_version database_alias, db while metadata(db).version > version
+      true
     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    
+    def definitions
+      @definitions ||= Hash.new{|h, k| h[k] = []} 
+    end
     
     protected
-      def increase_db_version migration_definitions, db
+      def increase_db_version database_alias, db    
         m = metadata(db)
-        migration = migration_definitions[m.version + 1]        
-        raise "No upgrade for version #{m.version + 1}" unless migration and migration.up
+        migration = definitions[database_alias][m.version + 1]        
+        raise "No upgrade for version #{m.version + 1} of #{database_alias} Database!" unless migration and migration.up
         
-        migration.up.call
+        migration.up.call db
         
-        m.version += 1
+        m.version += 1        
         update_metadata db, m
         
-        puts "Database #{db.name} upgraded to version #{m.version}"
+        MongoMapper.logger.info "Database #{database_alias} upgraded to version #{m.version}."
       end
       
-      def decrease_db_version migration_definitions, db
+      def decrease_db_version database_alias, db
         m = metadata(db)
-        migration = migration_definitions[m.version]        
-        raise "No downgrade for version #{m.version}" unless migration and migration.down
+        migration = definitions[database_alias][m.version]        
+        raise "No downgrade for version #{m.version} of #{database_alias} Database!" unless migration and migration.down
         
-        migration.down.call
+        migration.down.call db
         
         m.version -= 1
         update_metadata db, m
         
-        puts "Database #{db.name} downgraded to version #{m.version}"
+        MongoMapper.logger.info "Database #{database_alias} 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

@@ -1,160 +1,11 @@
 MongoMapper.class_eval do
-  const_set :ACCOUNT_TOKEN, ':account'
   class << self
-    # 
-    # Config
-    # 
-    attr_accessor :custom_config
-    
-    def config      
-      unless @config
-        @config = if defined?(Rails) and defined?(DATABASE)
-          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/plugins/attributes_cache.rb

@@ -0,0 +1,22 @@
+module MongoMapper
+  module Plugins
+    module AttributesCache
+      
+      module InstanceMethods
+        def cache
+          @cache ||= {}
+        end
+
+        def clear_cache
+          @cache = {}
+        end
+
+        def reload
+          @cache.clear if @cache
+          super
+        end
+      end
+      
+    end
+  end
+end

data/lib/mongo_mapper_ext/plugins/default_scope.rb

@@ -0,0 +1,40 @@
+module MongoMapper
+  module Plugins
+    module DefaultScope
+      
+      module ClassMethods
+        def default_scope options = nil, &block          
+          options.should! :be_a, [NilClass, Hash]
+          self.write_inheritable_attribute(:default_scope, (options || block))
+        end
+        
+        def find_one options = {}
+          super default_scope_options.merge(options)
+        end
+
+        def find_many options = {}
+          super default_scope_options.merge(options)
+        end
+        
+        def count options={}
+          super default_scope_options.merge(options)
+        end
+        
+        protected
+          def default_scope_options
+            default_scope = self.read_inheritable_attribute(:default_scope)
+            if default_scope
+              if default_scope.respond_to? :call
+                default_scope.call self
+              else
+                default_scope
+              end
+            else
+              {}
+            end
+          end
+      end
+      
+    end
+  end
+end

data/lib/mongo_mapper_ext/plugins/micelaneous.rb

@@ -0,0 +1,17 @@
+module MongoMapper
+  module Plugins
+    module Micelaneous
+      
+      module ClassMethods
+        def use_database database_alias          
+          database_alias = database_alias.to_s
+          MongoMapper.db_config.should! :include, database_alias
+
+          self.connection MongoMapper.connections[database_alias]
+          set_database_name MongoMapper.db_config[database_alias]['name']
+        end
+      end
+      
+    end
+  end
+end

data/lib/mongo_mapper_ext/spec_helper.rb

@@ -1,11 +1,7 @@
-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|
+    MongoMapper.db_config.each do |db_alias, opt|
+      db = MongoMapper.databases[db_alias]
       db.collection_names.each do |name|
         db.collection(name).drop
       end