mongo_mapper_ext 0.2.4 → 0.2.5

data/Rakefile

@@ -2,9 +2,9 @@ require 'rake_ext'
 
 project(
   name: "mongo_mapper_ext",
-  version: "0.2.4",
   summary: "Extensions for MongoMapper",
+  gem: true,
 
   author: "Alexey Petrushin",
-  homepage: "http://github.com/alexeypetrushin/mongo_mapper"
+  homepage: "http://github.com/alexeypetrushin/mongo_mapper_ext"
 )

data/lib/mongo_mapper_ext/carrier_wave.rb

@@ -6,7 +6,9 @@ require 'mongo_mapper_ext/mongo_mapper'
 %w(
   fixes
   micelaneous
-  mongo_mapper/plugins/carrier_wave
+  mongo_mapper/plugins/mount_uploader
+  mongo_mapper/plugins/mount_uploaders
 ).each{|f| require "mongo_mapper_ext/carrier_wave/#{f}"}
 
-MongoMapper::Document.send :include, MongoMapper::Plugins::CarrierWave
+MongoMapper::Document.send :include, MongoMapper::Plugins::MountUploader
+MongoMapper::EmbeddedDocument.send :include, MongoMapper::Plugins::MountUploader

data/lib/mongo_mapper_ext/carrier_wave/mongo_mapper/plugins/mount_uploader.rb

@@ -0,0 +1,31 @@
+# 
+# mount_uploader
+# 
+module MongoMapper::Plugins::MountUploader
+  extend ActiveSupport::Concern
+  
+  module ClassMethods
+    include ::CarrierWave::Mount
+
+    def mount_uploader(column, uploader, options={}, &block)
+      options[:mount_on] ||= "#{column}_filename"
+      name = options[:mount_on]
+      key name
+
+      super
+
+      alias_method :read_uploader, :read_attribute
+      alias_method :write_uploader, :write_attribute
+
+      include ::CarrierWave::Validations::ActiveModel
+
+      validates_integrity_of  column if uploader_option(column.to_sym, :validate_integrity)
+      validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
+
+      after_save "store_#{column}!".to_sym
+      before_save "write_#{column}_identifier".to_sym
+      after_destroy "remove_#{column}!".to_sym
+    end
+    alias_method :file_key, :mount_uploader
+  end
+end

data/lib/mongo_mapper_ext/carrier_wave/mongo_mapper/plugins/mount_uploaders.rb

@@ -0,0 +1,137 @@
+# # 
+# # mount_uploaders
+# # 
+# module MongoMapper::Plugins::MountUploaders
+#   extend ActiveSupport::Concern
+#   
+#   class FileHelper
+#     attr_reader :data
+#     def initialize data
+#       data.must_be.a String, File, Hash
+#       if data.is_a?(Hash)
+#         data.must.include('filename') 
+#         data.must.include('tempfile')
+#       end
+#       @data = data      
+#     end
+#     
+#     def real_file?
+#       data.is_a?(File) or data.is_a?(Hash) 
+#     end
+#     
+#     def file_name
+#       real_file? 
+#     end
+#   end
+#   
+#   module InstanceMethods
+#     def set_uploaders attr_name, files
+#       before = get_uploaders attr_name
+#       after = files
+#       
+#       # selecting File and HTTP TempFile
+#       added = files.select{|file| FileHelper.new(file).real_file?}
+#       deleted = files.
+#       
+#       
+#       added = after - before
+#       deleted = before - after
+#   
+#       added.each do |name|
+#         if tag = Tag.find_by_name(name)
+#           tag.update_count!
+#         else
+#           tag = Tag.new name: name
+#           tag.count = 1 
+#           tag.save!
+#         end
+#       end
+#     
+#       deleted.each do |name|
+#         if tag = Tag.find_by_name(name)
+#           tag.update_count! 
+#           tag.destroy if tag.count == 0
+#         end
+#       end
+#       
+#       
+#       # tags.join(", ")
+#     end
+# 
+#     def get_uploaders attr_name
+#       # self.tags = tags_as_string.split(Tag::TAG_LIST_DELIMITER).collect{|name| name.strip}.sort
+#     end
+# 
+#     after_save :update_tags
+#     def update_tags
+#       return unless changed.include? 'tags'
+#   
+#       before, after = changes['tags']
+#       added = after - before
+#       deleted = before - after
+#   
+#       added.each do |name|
+#         if tag = Tag.find_by_name(name)
+#           tag.update_count!
+#         else
+#           tag = Tag.new name: name
+#           tag.count = 1 
+#           tag.save!
+#         end
+#       end
+#     
+#       deleted.each do |name|
+#         if tag = Tag.find_by_name(name)
+#           tag.update_count! 
+#           tag.destroy if tag.count == 0
+#         end
+#       end
+#     end
+#     protected :update_tags
+# 
+#     after_destroy :delete_tags
+#     def delete_tags
+#       raise "Can't destroy item with changed tags!" if changed.include? 'tags'
+#   
+#       tags.each do |name|
+#         if tag = Tag.find_by_name(name)
+#           tag.update_count! 
+#           tag.destroy if tag.count == 0
+#         end
+#       end
+#     end
+#     protected :delete_tags
+#     
+#     protected
+#       def parse_file_name obj
+#         if obj.is_a
+#       end
+#       
+#       def 
+#   end
+#   
+#   module ClassMethods
+#     include ::CarrierWave::Mount
+# 
+#     def mount_uploaders(column, uploader, options={}, &block)
+#       options[:mount_on] ||= "#{column}_filename"
+#       name = options[:mount_on]
+#       key name
+# 
+#       # super
+#       # 
+#       # alias_method :read_uploader, :read_attribute
+#       # alias_method :write_uploader, :write_attribute
+#       # 
+#       # include ::CarrierWave::Validations::ActiveModel
+#       # 
+#       # validates_integrity_of  column if uploader_option(column.to_sym, :validate_integrity)
+#       # validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
+#       # 
+#       # after_save "store_#{column}!".to_sym
+#       # before_save "write_#{column}_identifier".to_sym
+#       # after_destroy "remove_#{column}!".to_sym
+#     end
+#     alias_method :file_keys, :mount_uploaders
+#   end
+# end

data/lib/mongo_mapper_ext/gems.rb

@@ -1,8 +1,3 @@
-# core gems
-gem 'mongo_mapper', '0.9.0'
-
-gem 'carrierwave',   '0.5.3'
-
 # dependencies for core gems
 gem 'i18n', '0.5.0'
 gem 'activesupport', '3.0.7'
@@ -11,7 +6,11 @@ gem 'bson', '1.3.0'
 gem 'bson_ext', '1.3.0'
 gem 'mongo', '1.3.0'
 gem 'plucky', '0.3.6'
-gem 'jnunemaker-validatable', '1.8.4'
 
 gem 'mini_magick',   '3.2.1'
-gem 'subexec',       '0.0.4'
+gem 'subexec',       '0.0.4'
+
+# core gems
+gem 'mongo_mapper', '0.9.0'
+
+gem 'carrierwave',   '0.5.3'

data/lib/mongo_mapper_ext/mongo_mapper.rb

@@ -3,14 +3,14 @@ require 'mongo_mapper'
 
 require 'mongo_mapper_ext/mongo_db'
 
+
 %w(
   fixes
   hacks
   support
   
   migration  
-  view_helpers  
-  logging
+  view_helpers
   
   plugins/attribute_cache
   plugins/attribute_convertors
@@ -24,11 +24,14 @@ require 'mongo_mapper_ext/mongo_db'
 # 
 # Default plugins
 # 
-module MongoMapper::Plugins
-  [CustomScope, AttributeCache, AttributeConvertors, BelongsToWithCounterCache, Micelaneous, DbConfig].each do |plugin|
-    ::MongoMapper::Document.send :include, plugin
-  end
-end
+[
+  MongoMapper::Plugins::CustomScope, 
+  MongoMapper::Plugins::AttributeCache, 
+  MongoMapper::Plugins::AttributeConvertors, 
+  MongoMapper::Plugins::BelongsToWithCounterCache, 
+  MongoMapper::Plugins::Micelaneous, 
+  MongoMapper::Plugins::DbConfig
+].each{|plugin| ::MongoMapper::Document.send :include, plugin}
   
   
 # 
@@ -42,5 +45,5 @@ end
 # 
 # Locales
 # 
-dir = __FILE__.dirname
-I18n.load_path += Dir["#{dir}/mongo_mapper/locales/**/*.{rb,yml}"]
+dir = File.expand_path "#{__FILE__}/../../.."
+I18n.load_path += Dir["#{dir}/config/locales/**/*.{rb,yml}"]

data/lib/mongo_mapper_ext/mongo_mapper/fixes.rb

@@ -23,17 +23,13 @@ end
 # Problem after destroying model the :to_param method returns :nill, 
 # and we can't use :to_param in view (for example in ajax to remove element with id from the screen).
 #
-module MongoMapper
-  module Plugins
-    module Rails
-      module InstanceMethods
-        # def to_param
-        #   id.to_s if persisted? # old realization
-        # end
-        def to_param
-          id.to_s
-        end
-      end
+module MongoMapper::Plugins::Rails
+  module InstanceMethods
+    # def to_param
+    #   id.to_s if persisted? # old realization
+    # end
+    def to_param
+      id.to_s
     end
   end
 end
@@ -43,15 +39,11 @@ end
 # Use class alias instead of class name, because it causes foreign keys like 'models_account_id' instead of 'account_id' if
 # for models like Models::Account
 # 
-module MongoMapper
-  module Plugins
-    module Associations
-      class ManyDocumentsProxy
-          def foreign_key
-            # options[:foreign_key] || proxy_owner.class.name.to_s.underscore.gsub("/", "_") + "_id"
-            options[:foreign_key] || proxy_owner.class.alias.to_s.underscore.gsub("/", "_") + "_id"
-          end
+module MongoMapper::Plugins::Associations
+  class ManyDocumentsProxy
+      def foreign_key
+        # options[:foreign_key] || proxy_owner.class.name.to_s.underscore.gsub("/", "_") + "_id"
+        options[:foreign_key] || proxy_owner.class.alias.to_s.underscore.gsub("/", "_") + "_id"
       end
-    end
   end
-end
+end

data/lib/mongo_mapper_ext/mongo_mapper/hacks.rb

@@ -1,3 +1,6 @@
+# 
+# Allow to specify different model name than class name
+# 
 ActiveModel::Name.class_eval do
   def initialize klass, name = nil
     name ||= klass.name
@@ -13,4 +16,60 @@ ActiveModel::Name.class_eval do
     @partial_path = "#{@collection}/#{@element}".freeze
     @i18n_key = ActiveSupport::Inflector.underscore(self).tr('/', '.').to_sym
   end
+  
+  # def initialize(klass)
+  #   super(klass.name)
+  #   @klass = klass
+  #   @singular = ActiveSupport::Inflector.underscore(self).tr('/', '_').freeze
+  #   @plural = ActiveSupport::Inflector.pluralize(@singular).freeze
+  #   @element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).freeze
+  #   @human = ActiveSupport::Inflector.humanize(@element).freeze
+  #   @collection = ActiveSupport::Inflector.tableize(self).freeze
+  #   @partial_path = "#{@collection}/#{@element}".freeze
+  #   @i18n_key = ActiveSupport::Inflector.underscore(self).tr('/', '.').to_sym
+  # end
 end
+
+
+# 
+# Logger
+# 
+MongoMapper.class_eval do
+  class << self
+    attr_writer :logger
+  end
+end
+
+Mongo::Connection.class_eval do
+  attr_writer :logger
+end
+
+
+# 
+# Silence Logger
+# 
+MongoMapper.class_eval do
+  def self.silince_logger &block
+    logger, nil_logger = self.logger, Logger.new(nil)
+    
+    begin  
+      MongoMapper.logger = nil_logger
+      connections.each{|name, connection| connection.logger = nil_logger}
+      block.call
+    ensure
+      MongoMapper.logger = logger
+      connections.each{|name, connection| connection.logger = logger}
+    end
+  end
+end
+
+
+# 
+# Silent index creation
+# 
+MongoMapper::Plugins::Indexes::ClassMethods.class_eval do
+  def ensure_index_with_silent_logger *a
+    MongoMapper.silince_logger{ensure_index_without_silent_logger *a}
+  end  
+  alias_method_chain :ensure_index, :silent_logger
+end

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

@@ -1,23 +1,19 @@
-module MongoMapper
-  module Plugins
-    module AttributeCache
-      extend ActiveSupport::Concern
-      
-      module InstanceMethods
-        def cache
-          @cache ||= {}
-        end
+module MongoMapper::Plugins::AttributeCache
+  extend ActiveSupport::Concern
+  
+  module InstanceMethods
+    def cache
+      @cache ||= {}
+    end
 
-        def clear_cache
-          @cache = {}
-        end
+    def clear_cache
+      @cache = {}
+    end
 
-        def reload
-          @cache.clear if @cache
-          super
-        end
-      end
-      
+    def reload
+      @cache.clear if @cache
+      super
     end
   end
+  
 end

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

@@ -1,79 +1,75 @@
-module MongoMapper
-  module Plugins
-    module AttributeConvertors
-      extend ActiveSupport::Concern
-      
-      module ClassMethods
-        ATTRIBUTE_CONVERTORS = {
-          line: {
-            from_string: -> s {(s || "").split(',').collect{|s| s.strip}},
-            to_string:   -> v {v.join(', ')}
-          },
-          column: {
-            from_string: -> s {(s || "").split("\n").collect{|s| s.strip}},
-            to_string:   -> v {v.join("\n")}
-          },
-          yaml: {
-            from_string: -> s {YAML.load s rescue {}},
-            to_string:   -> v {              
-              # MongoMapper uses it's internal Hash that doesn't support to_yaml
-              hash = {}; v.each{|k, v| hash[k] = v}               
-              hash.to_yaml.strip
-            }
-          },
-          json: {
-            from_string: -> s {JSON.parse s rescue {}},
-            to_string:   -> v {
-              # MongoMapper uses it's internal Hash that doesn't support to_yaml
-              hash = {}; v.each{|k, v| hash[k] = v}               
-              hash.to_json.strip
-            }
-          }
+module MongoMapper::Plugins::AttributeConvertors
+  extend ActiveSupport::Concern
+  
+  module ClassMethods
+    ATTRIBUTE_CONVERTORS = {
+      line: {
+        from_string: -> s {(s || "").split(',').collect{|s| s.strip}},
+        to_string:   -> v {v.join(', ')}
+      },
+      column: {
+        from_string: -> s {(s || "").split("\n").collect{|s| s.strip}},
+        to_string:   -> v {v.join("\n")}
+      },
+      yaml: {
+        from_string: -> s {YAML.load s rescue {}},
+        to_string:   -> v {              
+          # MongoMapper uses it's internal Hash that doesn't support to_yaml
+          hash = {}; v.each{|k, v| hash[k] = v}               
+          hash.to_yaml.strip
+        }
+      },
+      json: {
+        from_string: -> s {JSON.parse s rescue {}},
+        to_string:   -> v {
+          # MongoMapper uses it's internal Hash that doesn't support to_yaml
+          hash = {}; v.each{|k, v| hash[k] = v}               
+          hash.to_json.strip
         }
-        
-        
-        # 
-        # supporf for :as_string option
-        # 
-        def key(*args)
-          key = super                    
-          if converter_name = key.options[:as_string]
-            key_name = key.name.to_sym            
-            available_as_string key_name, converter_name
-            attr_protected "#{key_name}_as_string".to_sym if key.options[:protected]            
-          end
-          key
-        end
-        
-        def available_as_string key_name, converter_name
-          converter = ATTRIBUTE_CONVERTORS[converter_name]
-          raise "unknown converter name :#{converter_name} for :#{key_name} key!" unless converter
-          
-          from_string, to_string = converter[:from_string], converter[:to_string]
-          key_name_as_string = "#{key_name}_as_string".to_sym
-          define_method key_name_as_string do
-            cache[key_name_as_string] ||= to_string.call(self.send(key_name))
-          end
-          define_method "#{key_name_as_string}=" do |value|
-            cache.delete key_name_as_string                        
-            self.send "#{key_name}=", from_string.call(value)
-          end
-        end
-        
-        def available_as_yaml key_name
-          raise "delimiter not specified for :#{key_name} key!" unless delimiter
-          method = "#{key_name}_as_string"
-          define_method method do
-            self.send(key_name).join(delimiter)
-          end
-          define_method "#{method}=" do |value|            
-            value = (value || "").split(delimiter.strip).collect{|s| s.strip}
-            self.send "#{key_name}=", value
-          end
-        end
-        
+      }
+    }
+    
+    
+    # 
+    # supporf for :as_string option
+    # 
+    def key(*args)
+      key = super                    
+      if converter_name = key.options[:as_string]
+        key_name = key.name.to_sym            
+        available_as_string key_name, converter_name
+        attr_protected "#{key_name}_as_string".to_sym if key.options[:protected]            
       end
+      key
+    end
+    
+    def available_as_string key_name, converter_name
+      converter = ATTRIBUTE_CONVERTORS[converter_name]
+      raise "unknown converter name :#{converter_name} for :#{key_name} key!" unless converter
       
+      from_string, to_string = converter[:from_string], converter[:to_string]
+      key_name_as_string = "#{key_name}_as_string".to_sym
+      define_method key_name_as_string do
+        cache[key_name_as_string] ||= to_string.call(self.send(key_name))
+      end
+      define_method "#{key_name_as_string}=" do |value|
+        cache.delete key_name_as_string                        
+        self.send "#{key_name}=", from_string.call(value)
+      end
+    end
+    
+    def available_as_yaml key_name
+      raise "delimiter not specified for :#{key_name} key!" unless delimiter
+      method = "#{key_name}_as_string"
+      define_method method do
+        self.send(key_name).join(delimiter)
+      end
+      define_method "#{method}=" do |value|            
+        value = (value || "").split(delimiter.strip).collect{|s| s.strip}
+        self.send "#{key_name}=", value
+      end
     end
+    
   end
+  
 end