mongo_mapper_ext 0.2.4 → 0.2.5

data/lib/mongo_mapper_ext/mongo_mapper/plugins/belongs_to_with_counter_cache.rb

@@ -1,45 +1,41 @@
-module MongoMapper
-  module Plugins
-    module BelongsToWithCounterCache
-      extend ActiveSupport::Concern
+module MongoMapper::Plugins::BelongsToWithCounterCache
+  extend ActiveSupport::Concern
 
-      module ClassMethods                
-        # 
-        # CounterCache
-        # belongs_to :item, counter_cashe: true
-        # 
-        def belongs_to association_id, options={}, &extension          
-          # options.must_not.include :counter_cashe
-          if options.delete(:counter_cache)
-            association_id = association_id.to_s
-            association_key = "#{association_id}_id"
-            cache_attribute = "#{self.alias.pluralize.underscore}_count"
-            cache_class = if class_name = options[:class_name]
-              class_name.constantize
-            else
-              association_id.classify.constantize
-            end
-            raise "key :#{cache_attribute} not defined on :#{cache_class}!" unless cache_class.keys.include? cache_attribute            
-            increase_method_name = "increase_#{cache_class.alias.underscore}_#{self.alias.pluralize.underscore}_counter"
-            decrease_method_name = "decrease_#{cache_class.alias.underscore}_#{self.alias.pluralize.underscore}_counter"
-
-            define_method increase_method_name do
-              cache_class.upsert!({id: self.send(association_key)}, :$inc => {cache_attribute => 1})
-            end
-            protected increase_method_name            
+  module ClassMethods                
+    # 
+    # CounterCache
+    # belongs_to :item, counter_cashe: true
+    # 
+    def belongs_to association_id, options={}, &extension          
+      # options.must_not.include :counter_cashe
+      if options.delete(:counter_cache)
+        association_id = association_id.to_s
+        association_key = "#{association_id}_id"
+        cache_attribute = "#{self.alias.pluralize.underscore}_count"
+        cache_class = if class_name = options[:class_name]
+          class_name.constantize
+        else
+          association_id.classify.constantize
+        end
+        raise "key :#{cache_attribute} not defined on :#{cache_class}!" unless cache_class.keys.include? cache_attribute            
+        increase_method_name = "increase_#{cache_class.alias.underscore}_#{self.alias.pluralize.underscore}_counter"
+        decrease_method_name = "decrease_#{cache_class.alias.underscore}_#{self.alias.pluralize.underscore}_counter"
 
-            define_method decrease_method_name do
-              cache_class.upsert!({id: self.send(association_key)}, :$inc => {cache_attribute => -1})
-            end
-            protected decrease_method_name
+        define_method increase_method_name do
+          cache_class.upsert!({id: self.send(association_key)}, :$inc => {cache_attribute => 1})
+        end
+        protected increase_method_name            
 
-            after_create increase_method_name
-            after_destroy decrease_method_name
-          end
-          super association_id, options, &extension
+        define_method decrease_method_name do
+          cache_class.upsert!({id: self.send(association_key)}, :$inc => {cache_attribute => -1})
         end
+        protected decrease_method_name
+
+        after_create increase_method_name
+        after_destroy decrease_method_name
       end
-      
+      super association_id, options, &extension
     end
   end
+  
 end

data/lib/mongo_mapper_ext/mongo_mapper/plugins/custom_scope.rb

@@ -1,81 +1,77 @@
-module MongoMapper
-  module Plugins
-    module CustomScope
-      extend ActiveSupport::Concern
-      
-      module ClassMethods
-        def query options = {}
-          super default_scope_options.merge(options)
-        end
-        
-        def find_one options = {}
-          super default_scope_options.merge(options)
-        end
+module MongoMapper::Plugins::CustomScope
+  extend ActiveSupport::Concern
+  
+  module ClassMethods
+    def query options = {}
+      super default_scope_options.merge(options)
+    end
+    
+    def find_one options = {}
+      super default_scope_options.merge(options)
+    end
 
-        def find_many 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
+    
+    def with_exclusive_scope options = {}, &block
+      raise "exclusive scope already applied, can't apply it twice!" if Thread.current['mm_with_exclusive_scope']
+      
+      before = Thread.current['mm_with_exclusive_scope']
+      begin
+        Thread.current['mm_with_exclusive_scope'] = options
+        block.call if block
+      ensure
+        Thread.current['mm_with_exclusive_scope'] = before
+      end
+    end
+    
+    def with_scope options = {}, &block
+      raise "exclusive scope already applied, can't apply it twice!" if Thread.current['mm_with_exclusive_scope']
+      
+      before = Thread.current['mm_with_scope']
+      begin
+        options = before.merge options if before
+        Thread.current['mm_with_scope'] = options
+        block.call if block
+      ensure
+        Thread.current['mm_with_scope'] = before
+      end
+    end
+    
+    protected
+      def default_scope options = nil, &block          
+        raise "invalid option (#{options.inspect})!" if options and !options.is_a?(Hash)
+        self.write_inheritable_attribute(:default_scope, (options || block))
+      end
+              
+    private
+      def default_scope_options
+        default_scope = self.read_inheritable_attribute(:default_scope)
         
-        def count options={}
-          super default_scope_options.merge(options)
-        end
+        exclusive_options = Thread.current['mm_with_exclusive_scope']
+        return exclusive_options if exclusive_options
         
-        def with_exclusive_scope options = {}, &block
-          raise "exclusive scope already applied, can't apply it twice!" if Thread.current['mm_with_exclusive_scope']
-          
-          before = Thread.current['mm_with_exclusive_scope']
-          begin
-            Thread.current['mm_with_exclusive_scope'] = options
-            block.call if block
-          ensure
-            Thread.current['mm_with_exclusive_scope'] = before
+        options = if default_scope
+          if default_scope.respond_to? :call
+            default_scope.call self
+          else
+            default_scope
           end
+        else
+          {}
         end
         
-        def with_scope options = {}, &block
-          raise "exclusive scope already applied, can't apply it twice!" if Thread.current['mm_with_exclusive_scope']
-          
-          before = Thread.current['mm_with_scope']
-          begin
-            options = before.merge options if before
-            Thread.current['mm_with_scope'] = options
-            block.call if block
-          ensure
-            Thread.current['mm_with_scope'] = before
-          end
+        if scope_options = Thread.current['mm_with_scope']
+          options = options.merge scope_options
         end
         
-        protected
-          def default_scope options = nil, &block          
-            raise "invalid option (#{options.inspect})!" if options and !options.is_a?(Hash)
-            self.write_inheritable_attribute(:default_scope, (options || block))
-          end
-                  
-        private
-          def default_scope_options
-            default_scope = self.read_inheritable_attribute(:default_scope)
-            
-            exclusive_options = Thread.current['mm_with_exclusive_scope']
-            return exclusive_options if exclusive_options
-            
-            options = if default_scope
-              if default_scope.respond_to? :call
-                default_scope.call self
-              else
-                default_scope
-              end
-            else
-              {}
-            end
-            
-            if scope_options = Thread.current['mm_with_scope']
-              options = options.merge scope_options
-            end
-            
-            options
-          end
+        options
       end
-      
-    end
   end
-end
+  
+end

data/lib/mongo_mapper_ext/mongo_mapper/plugins/db_config.rb

@@ -10,11 +10,11 @@ module MongoMapper
         db_options = MongoMapper.db_config[database_alias]        
         connection = Mongo::Connection.new(db_options['host'], db_options['port'], logger: MongoMapper.logger)
   
-        if defined?(PhusionPassenger)
-          PhusionPassenger.on_event(:starting_worker_process) do |forked|
-            connection.connect_to_master if forked
-          end
-        end
+        # if defined?(PhusionPassenger)
+        #   PhusionPassenger.on_event(:starting_worker_process) do |forked|
+        #     connection.connect_to_master if forked
+        #   end
+        # end
     
         self[database_alias] = connection
       end            
@@ -55,6 +55,13 @@ module MongoMapper
     def databases
       @databases ||= DatabasesPool.new
     end
+    
+    def use_database database_alias
+      database_alias = database_alias.to_s
+      raise "unknown database alias :#{database_alias}" unless MongoMapper.db_config.include? database_alias
+      MongoMapper.connection = MongoMapper.connections[database_alias]
+      MongoMapper.database = MongoMapper.db_config[database_alias]['name']
+    end
   end                              
 end
 
@@ -62,24 +69,20 @@ end
 # 
 # Plugin
 # 
-module MongoMapper
-  module Plugins
-    module DbConfig
-      extend ActiveSupport::Concern
-      
-      module ClassMethods                
-        # 
-        # Connect to database_alias specified in config
-        # 
-        def use_database database_alias
-          database_alias = database_alias.to_s
-          raise "unknown database alias :#{database_alias}" unless MongoMapper.db_config.include? database_alias
-      
-          self.connection MongoMapper.connections[database_alias]
-          set_database_name MongoMapper.db_config[database_alias]['name']
-        end                
-      end
-      
-    end
+module MongoMapper::Plugins::DbConfig
+  extend ActiveSupport::Concern
+  
+  module ClassMethods                
+    # 
+    # Connect to database_alias specified in config
+    # 
+    def use_database database_alias
+      database_alias = database_alias.to_s
+      raise "unknown database alias :#{database_alias}" unless MongoMapper.db_config.include? database_alias
+  
+      self.connection MongoMapper.connections[database_alias]
+      set_database_name MongoMapper.db_config[database_alias]['name']
+    end                
   end
+  
 end

data/lib/mongo_mapper_ext/mongo_mapper/plugins/micelaneous.rb

@@ -1,53 +1,49 @@
-module MongoMapper
-  module Plugins
-    module Micelaneous
-      extend ActiveSupport::Concern
-      
-      module InstanceMethods
-        def upsert! *args
-          self.class.upsert!({id: id}, *args)
-        end
-        
-        def exist?
-          self.class.find(id) != nil
-        end
-      end
-      
-      module ClassMethods                
-        # 
-        # model_name
-        # 
-        def model_name *args
-          if args.empty?
-            @model_name ||= ::ActiveModel::Name.new self, self.alias
-          else
-            @model_name = ::ActiveModel::Name.new self, args.first
-          end          
-        end
-        
-        
-        # 
-        # Sequentiall :all for big collection
-        # 
-        def all_sequentially &block
-          page, per_page = 1, 5
-          begin
-            results = paginate(page: page, per_page: per_page, order: '_id asc')
-            results.each{|o| block.call o}
-            page += 1
-          end until results.blank? or results.size < per_page
-        end
-        
-        
-        # 
-        # shortcut for upsert
-        # 
-        def upsert! query, *args
-          query[:_id] = query.delete :id if query.include? :id
-          collection.upsert! query, *args          
-        end
-      end
-      
+module MongoMapper::Plugins::Micelaneous
+  extend ActiveSupport::Concern
+  
+  module InstanceMethods
+    def upsert! *args
+      self.class.upsert!({id: id}, *args)
+    end
+    
+    def exist?
+      self.class.find(id) != nil
+    end
+  end
+  
+  module ClassMethods                
+    # 
+    # model_name
+    # 
+    def model_name *args
+      if args.empty?
+        @model_name ||= ::ActiveModel::Name.new self, self.alias
+      else
+        @model_name = ::ActiveModel::Name.new self, args.first
+      end          
+    end
+    
+    
+    # 
+    # Sequentiall :all for big collection
+    # 
+    def all_sequentially &block
+      page, per_page = 1, 5
+      begin
+        results = paginate(page: page, per_page: per_page, order: '_id asc')
+        results.each{|o| block.call o}
+        page += 1
+      end until results.blank? or results.size < per_page
+    end
+    
+    
+    # 
+    # shortcut for upsert
+    # 
+    def upsert! query, *args
+      query[:_id] = query.delete :id if query.include? :id
+      collection.upsert! query, *args          
     end
   end
+  
 end

data/lib/mongo_mapper_ext/rad.rb

@@ -3,4 +3,7 @@ require 'rad'
 require 'mongo_mapper_ext/mongo_mapper'
 require 'mongo_mapper_ext/carrier_wave'
 
+module Models
+end
+
 require 'mongo_mapper_ext/rad/file_uploader'

data/lib/mongo_mapper_ext/rad/file_uploader.rb

@@ -1,28 +1,26 @@
 require 'carrierwave/processing/mini_magick'
 
-module Models
-  class FileUploader < CarrierWave::Uploader::Base
-    include CarrierWave::MiniMagick
-    
-    storage rad.config.fs.type(:file)
+class Models::FileUploader < CarrierWave::Uploader::Base
+  include CarrierWave::MiniMagick
   
-    # def sanitize_regexp
-    #   /[^[:word:]\.\-\+\s_]/i
-    # end
-  
-    def file_path
-      "#{rad.config.fs.prefix('/fs')}/system/#{model.class.model_name.underscore}/#{model.id}"
-    end
-  
-    def store_dir
-      "#{root}#{file_path}"
-    end
-  
-    def extension_white_list
-      [/.*/]
-    end
-  
-    def cache_dir; rad.config.fs.cache_path! end  
-    def root; rad.config.fs.path! end  
+  storage rad.config.fs.type(:file)
+
+  # def sanitize_regexp
+  #   /[^[:word:]\.\-\+\s_]/i
+  # end
+
+  def file_path
+    "#{rad.config.fs.prefix('/fs')}/system/#{model.class.model_name.underscore}/#{model.id}"
   end
+
+  def store_dir
+    "#{root}#{file_path}"
+  end
+
+  def extension_white_list
+    [/.*/]
+  end
+
+  def cache_dir; rad.config.fs.cache_path! end  
+  def root; rad.config.fs.path! end  
 end