mongo_mapper_ext 0.2.3 → 0.2.4

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake_ext'
 
 project(
   name: "mongo_mapper_ext",
-  version: "0.2.3",
+  version: "0.2.4",
   summary: "Extensions for MongoMapper",
 
   author: "Alexey Petrushin",

data/lib/mongo_mapper_ext/carrier_wave.rb

@@ -0,0 +1,12 @@
+require 'carrierwave'
+require 'carrierwave/validations/active_model'
+
+require 'mongo_mapper_ext/mongo_mapper'
+
+%w(
+  fixes
+  micelaneous
+  mongo_mapper/plugins/carrier_wave
+).each{|f| require "mongo_mapper_ext/carrier_wave/#{f}"}
+
+MongoMapper::Document.send :include, MongoMapper::Plugins::CarrierWave

data/lib/mongo_mapper_ext/carrier_wave/fixes.rb

@@ -0,0 +1,12 @@
+CarrierWave::SanitizedFile.class_eval do
+  def sanitize_regexp
+    /[^[:word:]\.\-\+\s_]/i
+  end
+end
+
+CarrierWave::Uploader::Cache.class_eval do
+  def original_filename=(filename)
+    raise CarrierWave::InvalidParameter, "invalid filename" unless filename =~ /\A[[:word:]\.\-\+\s_]+\z/i
+    @original_filename = filename
+  end
+end

data/lib/mongo_mapper_ext/carrier_wave/micelaneous.rb

@@ -0,0 +1,26 @@
+# 
+# Changing filename format from <version>_<filename_with_extension> to <name>.<version>.<extension>
+# 
+CarrierWave::Uploader::Versions.class_eval do
+  def full_filename(for_file)
+    name = super
+    if version_name
+      ext = File.extname name
+      base = File.basename name, ext
+      "#{base}.#{version_name}#{ext}"
+    else
+      name
+    end    
+  end
+
+  def full_original_filename
+    name = super
+    if version_name
+      ext = File.extname name
+      base = File.basename name, ext
+      "#{base}.#{version_name}#{ext}"
+    else
+      name
+    end
+  end
+end

data/lib/mongo_mapper_ext/{plugins/carrierwave.rb → carrier_wave/mongo_mapper/plugins/carrier_wave.rb}

@@ -1,22 +1,3 @@
-require 'carrierwave/validations/active_model'
-
-# 
-# Hacks
-# 
-CarrierWave::SanitizedFile.class_eval do
-  def sanitize_regexp
-    /[^[:word:]\.\-\+\s_]/i
-  end
-end
-
-CarrierWave::Uploader::Cache.class_eval do
-  def original_filename=(filename)
-    raise CarrierWave::InvalidParameter, "invalid filename" unless filename =~ /\A[[:word:]\.\-\+\s_]+\z/i
-    @original_filename = filename
-  end
-end
-
-
 # 
 # mount_uploader
 # 

data/lib/mongo_mapper_ext/mongo_db.rb

@@ -0,0 +1 @@
+require 'mongo_mapper_ext/mongo_db/upsert'

data/lib/{mongo_db_ext/micelaneous.rb → mongo_mapper_ext/mongo_db/upsert.rb}

@@ -3,9 +3,9 @@
 # 
 Mongo::Collection.class_eval do
   def upsert! query, opt
-    opt.size.must == 1
-    opt.must_be.a Hash
-    opt.values.first.must_be.a Hash
+    # opt.size.must == 1
+    # opt.must_be.a Hash
+    # opt.values.first.must_be.a Hash
     
     update(query, opt, {upsert: true, safe: true})
   end

data/lib/mongo_mapper_ext/mongo_mapper.rb

@@ -0,0 +1,46 @@
+require 'mongo_mapper_ext/gems'
+require 'mongo_mapper'
+
+require 'mongo_mapper_ext/mongo_db'
+
+%w(
+  fixes
+  hacks
+  support
+  
+  migration  
+  view_helpers  
+  logging
+  
+  plugins/attribute_cache
+  plugins/attribute_convertors
+  plugins/belongs_to_with_counter_cache
+  plugins/custom_scope
+  plugins/db_config  
+  plugins/micelaneous  
+).each{|file| require "mongo_mapper_ext/mongo_mapper/#{file}"}
+
+
+# 
+# Default plugins
+# 
+module MongoMapper::Plugins
+  [CustomScope, AttributeCache, AttributeConvertors, BelongsToWithCounterCache, Micelaneous, DbConfig].each do |plugin|
+    ::MongoMapper::Document.send :include, plugin
+  end
+end
+  
+  
+# 
+# Attribute protection
+# 
+MongoMapper::Document.included do
+  attr_protected :id, :_id, :_type, :created_at, :updated_at
+end
+
+
+# 
+# Locales
+# 
+dir = __FILE__.dirname
+I18n.load_path += Dir["#{dir}/mongo_mapper/locales/**/*.{rb,yml}"]

data/lib/mongo_mapper_ext/mongo_mapper/locales/activemodel/ru.yml

@@ -0,0 +1,27 @@
+ru:
+  errors:
+    # The default format to use in full error messages.
+    format: "%{attribute} %{message}"
+
+    # The values :model, :attribute and :value are always available for interpolation
+    # The value :count is available when applicable. Can be used for pluralization.
+    messages:
+      inclusion: "недопустимое значение"
+      exclusion: "недопустимо"
+      invalid: "неверно"
+      confirmation: "не совпадает с подтверждением"
+      accepted: "долно быть принято"
+      empty: "не может быть пустым"
+      blank: "не может быть пустым"
+      too_long: "слишком длинно (максимально допустимо %{count})"
+      too_short: "слищком коротко (минимально допустимо %{count})"
+      wrong_length: "неверная длинна (должно быть %{count})"
+      not_a_number: "не номер"
+      not_an_integer: "долно быть целочисленно"
+      greater_than: "должно быть больше чем %{count}"
+      greater_than_or_equal_to: "должно быть больше чем или равно %{count}"
+      equal_to: "должно быть равно %{count}"
+      less_than: "должно быть меньше чем %{count}"
+      less_than_or_equal_to: "должно быть меньше чем или равно %{count}"
+      odd: "должно быть не четно"
+      even: "должно быть четно"

data/lib/mongo_mapper_ext/mongo_mapper/locales/mongo_mapper/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    messages:
+      taken: "has already been taken"

data/lib/mongo_mapper_ext/mongo_mapper/locales/mongo_mapper/ru.yml

@@ -0,0 +1,4 @@
+ru:
+  errors:
+    messages:
+      taken: "уже занято"

data/lib/mongo_mapper_ext/{logging.rb → mongo_mapper/logging.rb}

@@ -54,7 +54,7 @@ MongoMapper.class_eval do
   
   def self.use_database database_alias
     database_alias = database_alias.to_s
-    MongoMapper.db_config.must.include database_alias 
+    raise "unknown database alias :#{database_alias}" unless MongoMapper.db_config.include? database_alias
     MongoMapper.connection = MongoMapper.connections['default']
     MongoMapper.database = MongoMapper.db_config['default']['name']
   end

data/lib/mongo_mapper_ext/{migration.rb → mongo_mapper/migration.rb}

@@ -41,7 +41,7 @@ module MongoMapper::Migration
     def define database_alias, version, &block
       database_alias = database_alias.to_s
       
-      version.must_be.a Integer
+      raise "version should be an Integer! (but you provided '#{version}' instad)!" unless version.is_a? Integer
       definition = MigrationDefinition.new
       block.call definition
       definitions[database_alias][version] = definition
@@ -51,21 +51,21 @@ module MongoMapper::Migration
       database_alias = database_alias.to_s
       db = MongoMapper.databases[database_alias]
       
-      if metadata(db).version == version
+      if metadata(db)['version'] == version
         logger.info "Database '#{database_alias}' already is of #{version} version, no migration needed."
         return false
       else
         logger.info "Migration for '#{database_alias}' Database:"
       end
       
-      increase_db_version database_alias, db while metadata(db).version < version
-      decrease_db_version database_alias, db while metadata(db).version > version
+      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
+      col.find_one || {'version' => 0}
     end
     
     def definitions
@@ -75,28 +75,28 @@ module MongoMapper::Migration
     protected
       def increase_db_version database_alias, db    
         m = metadata(db)
-        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 = 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 db
         
-        m.version += 1        
+        m['version'] += 1        
         update_metadata db, m
         
-        logger.info "Database '#{database_alias}' upgraded to version #{m.version}."
+        logger.info "Database '#{database_alias}' upgraded to version #{m['version']}."
       end
       
       def decrease_db_version database_alias, db
         m = metadata(db)
-        migration = definitions[database_alias][m.version]        
-        raise "No downgrade for version #{m.version} of '#{database_alias}' Database!" 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 db
         
-        m.version -= 1
+        m['version'] -= 1
         update_metadata db, m
         
-        logger.info "Database '#{database_alias}' downgraded to version #{m.version}."
+        logger.info "Database '#{database_alias}' downgraded to version #{m['version']}."
       end
 
       

data/lib/mongo_mapper_ext/{plugins → mongo_mapper/plugins}/belongs_to_with_counter_cache.rb

@@ -9,8 +9,8 @@ module MongoMapper
         # belongs_to :item, counter_cashe: true
         # 
         def belongs_to association_id, options={}, &extension          
-          options.must_not.include :counter_cashe
-          if options.delete(:counter_cache) || options.delete('counter_cache')
+          # 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"
@@ -19,7 +19,7 @@ module MongoMapper
             else
               association_id.classify.constantize
             end
-            cache_class.keys.must.include cache_attribute            
+            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"
 

data/lib/mongo_mapper_ext/{plugins → mongo_mapper/plugins}/custom_scope.rb

@@ -21,7 +21,7 @@ module MongoMapper
         end
         
         def with_exclusive_scope options = {}, &block
-          Thread.current['mm_with_exclusive_scope'].must_be.nil
+          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
@@ -33,7 +33,7 @@ module MongoMapper
         end
         
         def with_scope options = {}, &block
-          Thread.current['mm_with_exclusive_scope'].must_be.nil
+          raise "exclusive scope already applied, can't apply it twice!" if Thread.current['mm_with_exclusive_scope']
           
           before = Thread.current['mm_with_scope']
           begin
@@ -47,7 +47,7 @@ module MongoMapper
         
         protected
           def default_scope options = nil, &block          
-            options.must_be.a NilClass, Hash
+            raise "invalid option (#{options.inspect})!" if options and !options.is_a?(Hash)
             self.write_inheritable_attribute(:default_scope, (options || block))
           end
                   

data/lib/mongo_mapper_ext/{plugins → mongo_mapper/plugins}/db_config.rb

@@ -6,7 +6,7 @@ module MongoMapper
     def [](database_alias)
       database_alias = database_alias.to_s
       unless connection = super(database_alias)            
-        MongoMapper.db_config.must.include database_alias
+        raise "unknown database alias :#{database_alias}" unless MongoMapper.db_config.include? database_alias
         db_options = MongoMapper.db_config[database_alias]        
         connection = Mongo::Connection.new(db_options['host'], db_options['port'], logger: MongoMapper.logger)
   
@@ -30,9 +30,11 @@ module MongoMapper
     def [](database_alias)
       database_alias = database_alias.to_s
       unless db = super(database_alias)
-        MongoMapper.db_config.must.include database_alias
+        raise "unknown database alias :#{database_alias}" unless MongoMapper.db_config.include? database_alias
         db_options = MongoMapper.db_config[database_alias]
-        db = MongoMapper.connections[database_alias].db db_options['name'].must_be.a(String)
+        name = db_options['name']
+        raise "database name should be a string (#{name})!" unless name.is_a?(String)
+        db = MongoMapper.connections[database_alias].db name
         self[database_alias] = db
       end
       return db
@@ -70,13 +72,11 @@ module MongoMapper
         # Connect to database_alias specified in config
         # 
         def use_database database_alias
-          # defer do
           database_alias = database_alias.to_s
-          MongoMapper.db_config.must.include database_alias
+          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/{spec.rb → mongo_mapper/spec.rb}

@@ -1,5 +1,3 @@
-require 'mongo_mapper_ext'
-
 # 
 # disabling :use_database, all tests will use the same :test database.
 # 
@@ -64,40 +62,4 @@ if defined? Paperclip
       @logger ||= Logger.new(nil)
     end
   end
-end
-
-
-# 
-# Files
-# 
-rspec do
-  class << self
-    def with_files
-      path, cache_path = '/tmp/spec_fs', '/tmp/spec_fs_cache'
-      
-      before do
-        rad.config.merge!({fs: {path: path, cache_path: cache_path}}, override: true)
-        
-        Models::FileUploader.storage :file
-        
-        CarrierWave.configure do |config|          
-          config.storage = :file
-          config.enable_processing = false
-          
-          config.cache_dir = rad.config.fs.cache_path!
-          config.root = rad.config.fs.path!
-        end
-      end
-      
-      before do
-        path.to_dir.destroy
-        cache_path.to_dir.destroy
-      end
-      
-      after do
-        path.to_dir.destroy
-        cache_path.to_dir.destroy
-      end
-    end    
-  end
 end

data/lib/mongo_mapper_ext/mongo_mapper/support.rb

@@ -0,0 +1,13 @@
+unless Class.method_defined? :alias
+  Class.class_eval do
+    def alias name = nil
+      if name
+        name.must_be.a String
+        name.must_not_be.blank
+        @alias = name.to_s
+      else
+        @alias ||= self.name.split('::').last
+      end
+    end
+  end
+end

data/lib/mongo_mapper_ext/rad.rb

@@ -1,2 +1,6 @@
 require 'rad'
+
+require 'mongo_mapper_ext/mongo_mapper'
+require 'mongo_mapper_ext/carrier_wave'
+
 require 'mongo_mapper_ext/rad/file_uploader'

data/lib/mongo_mapper_ext/rad/spec.rb

@@ -0,0 +1,38 @@
+require 'mongo_mapper_ext/rad'
+
+require 'mongo_mapper_ext/mongo_mapper/spec'
+
+# 
+# Files
+# 
+rspec do
+  class << self
+    def with_files
+      path, cache_path = '/tmp/spec_fs', '/tmp/spec_fs_cache'
+      
+      before do
+        rad.config.merge!({fs: {path: path, cache_path: cache_path}}, override: true)
+        
+        Models::FileUploader.storage :file
+        
+        CarrierWave.configure do |config|          
+          config.storage = :file
+          config.enable_processing = false
+          
+          config.cache_dir = rad.config.fs.cache_path!
+          config.root = rad.config.fs.path!
+        end
+      end
+      
+      before do
+        path.to_dir.destroy
+        cache_path.to_dir.destroy
+      end
+      
+      after do
+        path.to_dir.destroy
+        cache_path.to_dir.destroy
+      end
+    end    
+  end
+end

data/readme.md

@@ -27,8 +27,8 @@
       m.down{Sample.destroy_all}
     end
     
-    # Tell it the version of database You need, and it's smart enough to figure out all needed :up or :down
-    Migration.update(:global, 1)
+    # Tell it database and version, and it's smart enough to figure out all needed :up or :down
+    Migration.update(:default, 1)
     
 
 ## Custom Scope
@@ -70,6 +70,15 @@ File attachments (stored on File System, S3, MongoDB-GridFS)
 
 Attribute Cache, Spec Helpers (auto-clean db before each test).
 
+# Installation
+
+    gem install 'mongo_mapper_ext'
+    
+    require 'mongo_mapper_ext/mongo_mapper'
+        
+    # support for CarrierWave is optional
+    # require 'mongo_mapper_ext/carrier_wave'
+
 # License
 
 Copyright (c) Alexey Petrushin [http://4ire.net](http://4ire.net), released under the MIT license.

data/spec/carrier_wave/carrier_wave_spec.rb

@@ -0,0 +1,61 @@
+require 'carrier_wave/spec_helper'
+
+describe "MongoMapper & CarrierWave" do  
+  with_mongo_mapper
+  with_tmp_spec_dir
+  
+  before :all do
+    class PlaneUploader < CarrierWave::Uploader::Base
+      require 'carrierwave/processing/mini_magick'
+
+      include CarrierWave::MiniMagick      
+      
+      storage :file
+      
+      version :icon do
+        process convert: :png
+        process resize_to_fit: [50, 50]
+      end
+      
+      class << self
+        attr_accessor :store_dir
+      end      
+      
+      def store_dir
+        PlaneUploader.store_dir
+      end
+      
+      def root
+        PlaneUploader.store_dir
+      end
+    end
+    
+    class Plane
+      include MongoMapper::Document
+  
+      mount_uploader :image, PlaneUploader
+    end        
+  end
+  after(:all){remove_constants :Plane, :PlaneUploader}
+  
+  before do
+    PlaneUploader.store_dir = "#{spec_dir}/data"
+    @file = File.new "#{spec_dir}/plane.jpg"
+  end
+  after{@file.close}
+  
+  it "basic" do
+    plane = Plane.create! image: @file
+    plane.image.current_path.should =~ /\/plane.jpg/
+    File.should exist("#{spec_dir}/data/plane.jpg")
+  end
+  
+  it "path format" do
+    plane = Plane.create! image: @file
+    plane.image.url.should == '/plane.jpg'
+    plane.image.icon.url.should =~ /\/plane\.icon\.jpg/
+    
+    plane.image.icon.current_path.should =~ /\/plane\.icon\.jpg/
+    File.should exist("#{spec_dir}/data/plane.icon.jpg")
+  end
+end

data/spec/carrier_wave/spec_helper.rb

@@ -0,0 +1,8 @@
+require "mongo_mapper"
+
+require 'rspec_ext'
+
+require "mongo_mapper_ext/mongo_mapper"
+require "mongo_mapper_ext/carrier_wave"
+
+require "mongo_mapper_ext/mongo_mapper/spec"

data/spec/mongo_db/spec_helper.rb

@@ -0,0 +1,4 @@
+require "mongo_mapper"
+require 'mongo_mapper_ext/mongo_db'
+
+require 'rspec_ext'

data/spec/mongo_db/upsert_spec.rb

@@ -0,0 +1,20 @@
+require 'mongo_db/spec_helper'
+
+describe "MongoMapper micelaneous" do
+  before do
+    connection = Mongo::Connection.new.db('test')
+    @collection = connection.collection('test')
+  end
+  
+  it "upsert should update" do
+    id = @collection.save count: 2
+    @collection.upsert!({_id: id}, :$inc => {count: 1})
+    @collection.find(_id: id).first['count'].should == 3
+  end
+
+  it "upsert should set" do
+    id = @collection.save({})
+    @collection.upsert!({_id: id}, :$inc => {count: 1})
+    @collection.find(_id: id).first['count'].should == 1
+  end
+end

data/spec/{attribute_convertors_spec.rb → mongo_mapper/attribute_convertors_spec.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'mongo_mapper/spec_helper'
 
 describe "Attribute Convertors" do
   with_mongo_mapper

data/spec/mongo_mapper/belongs_to_with_counter_cache_spec.rb

@@ -0,0 +1,43 @@
+require 'mongo_mapper/spec_helper'
+
+describe "BelongsToWithCounterCache" do
+  with_mongo_mapper
+  
+  before :all do
+    class ::Post
+      include MongoMapper::Document      
+      include MongoMapper::Plugins::Micelaneous
+      
+      key :comments_count, Integer, default: 0
+      has_many :comments
+    end
+    
+    class ::Comment
+      include MongoMapper::Document
+      include MongoMapper::Plugins::Micelaneous
+      
+      key :post_id
+      belongs_to :post, counter_cache: true
+    end
+  end  
+  after(:all){remove_constants :Post, :Comment}
+  
+  it "should increase count of comments" do
+    post = Post.create!
+    comment = post.comments.create!
+    
+    post.reload
+    post.comments_count.should == 1
+  end
+  
+  it "should decrease count of comments" do
+    post = Post.create!
+    comment = post.comments.create!
+    post.reload
+    post.comments_count.should == 1
+    
+    comment.destroy    
+    post.reload
+    post.comments_count.should == 0
+  end  
+end

data/spec/{custom_scope_spec.rb → mongo_mapper/custom_scope_spec.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'mongo_mapper/spec_helper'
 
 describe "MongoMapper Default Scope" do
   with_mongo_mapper
@@ -72,13 +72,13 @@ describe "MongoMapper Default Scope" do
       ScopeSample.with_exclusive_scope do
         ScopeSample.with_exclusive_scope{}
       end
-    }.should raise_error(AssertionError)
+    }.should raise_error(/exclusive scope already applied/)
     
     -> {
       ScopeSample.with_exclusive_scope do
         ScopeSample.with_scope{}
       end
-    }.should raise_error(AssertionError)
+    }.should raise_error(/exclusive scope already applied/)
   end
       
   it "with_exclusive_scope should clear other scopes" do

data/spec/mongo_mapper/micelaneous_plugin_spec.rb

@@ -0,0 +1,39 @@
+require 'mongo_mapper/spec_helper'
+
+describe "Micelaneous" do
+  with_mongo_mapper
+  
+  after(:all){remove_constants :Article, :Post, :Namespace}
+  
+  describe "model_name" do
+    it "basic" do      
+      class Article
+        include MongoMapper::Document      
+        include MongoMapper::Plugins::Micelaneous
+      end
+      
+      Article.model_name.should == "Article"
+      Article.model_name "SuperArticle"
+      Article.model_name.should == "SuperArticle"
+    end
+    
+    it "by default should be initialized from class alias" do
+      class ::Post
+        include MongoMapper::Document      
+        include MongoMapper::Plugins::Micelaneous
+
+        self.alias 'PostAlias'
+      end
+      
+      module ::Namespace
+        class Post
+          include MongoMapper::Document      
+          include MongoMapper::Plugins::Micelaneous
+        end
+      end
+      
+      Post.model_name.should == 'PostAlias'
+      Namespace::Post.model_name.should == 'Post' # not the Namespace::Post
+    end
+  end
+end

data/spec/{micelaneous_spec.rb → mongo_mapper/micelaneous_spec.rb}

@@ -1,29 +1,10 @@
-require 'spec_helper'
+require 'mongo_mapper/spec_helper'
 
 describe "MongoMapper micelaneous" do
   with_mongo_mapper
   
   after(:all){remove_constants %w(UpsertSample AsStringSample TranslationCheck)}    
     
-  describe "Collection extensions" do
-    before do
-      connection = Mongo::Connection.new.db('test')
-      @collection = connection.collection('test')
-    end
-    
-    it "upsert should update" do
-      id = @collection.save count: 2
-      @collection.upsert!({_id: id}, :$inc => {count: 1})
-      @collection.find(_id: id).first['count'].should == 3
-    end
-  
-    it "upsert should set" do
-      id = @collection.save({})
-      @collection.upsert!({_id: id}, :$inc => {count: 1})
-      @collection.find(_id: id).first['count'].should == 1
-    end
-  end
-  
   describe "i18n" do
     it "should translate error messages" do
       class ::TranslationCheck

data/spec/{migration_spec.rb → mongo_mapper/migration_spec.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'mongo_mapper/spec_helper'
 
 describe "MongoMapper Migration" do
   with_mongo_mapper
@@ -51,7 +51,7 @@ describe "MongoMapper Migration" do
   
     Migration.update(:global, 1).should be_true    
     Sample.count.should == 1
-    Migration.metadata(MongoMapper.databases[:global]).version.should == 1
+    Migration.metadata(MongoMapper.databases[:global])['version'].should == 1
   end
   
   it "decrease_db_version" do    
@@ -64,7 +64,7 @@ describe "MongoMapper Migration" do
   
     Migration.update(:global, 0).should be_true
     Sample.count.should == 0
-    Migration.metadata(MongoMapper.databases[:global]).version.should == 0
+    Migration.metadata(MongoMapper.databases[:global])['version'].should == 0
   end
     
 end

data/spec/{mongo_mapper_spec.rb → mongo_mapper/mongo_mapper_spec.rb}

@@ -1,4 +1,4 @@
-require 'mongo_mapper'
+require 'mongo_mapper/spec_helper'
 
 describe "Special test to check some errors in the MongoMapper itself" do  
   before :all do

data/spec/mongo_mapper/spec_helper.rb

@@ -0,0 +1,7 @@
+require "mongo_mapper"
+
+require 'rspec_ext'
+
+require "mongo_mapper_ext/mongo_mapper"
+
+require "mongo_mapper_ext/mongo_mapper/spec"

data/spec/rad/spec_helper.rb

@@ -0,0 +1,10 @@
+require "mongo_mapper"
+
+require 'rspec_ext'
+
+require "mongo_mapper_ext/mongo_mapper"
+require "mongo_mapper_ext/carrier_wave"
+require "mongo_mapper_ext/rad"
+
+require "mongo_mapper_ext/mongo_mapper/spec"
+require "mongo_mapper_ext/rad/spec"

data/spec/{uploading_spec.rb → rad/uploading_spec.rb}

@@ -1,5 +1,4 @@
-require 'spec_helper'
-require "mongo_mapper_ext/rad"
+require 'rad/spec_helper'
 
 describe "Uploading" do  
   with_tmp_spec_dir

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_mapper_ext
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &2795830 !ruby/object:Gem::Requirement
+  requirement: &2795840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2795830
+  version_requirements: *2795840
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &2795590 !ruby/object:Gem::Requirement
+  requirement: &2795620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *2795590
+  version_requirements: *2795620
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2795370 !ruby/object:Gem::Requirement
+  requirement: &2795380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2795370
+  version_requirements: *2795380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2795150 !ruby/object:Gem::Requirement
+  requirement: &2795160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2795150
+  version_requirements: *2795160
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2794920 !ruby/object:Gem::Requirement
+  requirement: &2794940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2794920
+  version_requirements: *2794940
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2794680 !ruby/object:Gem::Requirement
+  requirement: &2794690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2794680
+  version_requirements: *2794690
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2794460 !ruby/object:Gem::Requirement
+  requirement: &2794480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2794460
+  version_requirements: *2794480
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2794250 !ruby/object:Gem::Requirement
+  requirement: &2794260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -99,10 +99,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2794250
+  version_requirements: *2794260
 - !ruby/object:Gem::Dependency
   name: plucky
-  requirement: &2794030 !ruby/object:Gem::Requirement
+  requirement: &2794040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -110,10 +110,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *2794030
+  version_requirements: *2794040
 - !ruby/object:Gem::Dependency
   name: jnunemaker-validatable
-  requirement: &2793810 !ruby/object:Gem::Requirement
+  requirement: &2793820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -121,10 +121,10 @@ dependencies:
         version: 1.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *2793810
+  version_requirements: *2793820
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &2793600 !ruby/object:Gem::Requirement
+  requirement: &2793610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -132,10 +132,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2793600
+  version_requirements: *2793610
 - !ruby/object:Gem::Dependency
   name: subexec
-  requirement: &2793390 !ruby/object:Gem::Requirement
+  requirement: &2793400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -143,7 +143,7 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2793390
+  version_requirements: *2793400
 description: 
 email: 
 executables: []
@@ -152,38 +152,51 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - readme.md
-- lib/mongo_db_ext/micelaneous.rb
+- lib/mongo_mapper_ext/carrier_wave/fixes.rb
+- lib/mongo_mapper_ext/carrier_wave/micelaneous.rb
+- lib/mongo_mapper_ext/carrier_wave/mongo_mapper/plugins/carrier_wave.rb
+- lib/mongo_mapper_ext/carrier_wave.rb
 - lib/mongo_mapper_ext/gems.rb
-- lib/mongo_mapper_ext/hacks/active_model.rb
-- lib/mongo_mapper_ext/hacks/fixes.rb
-- lib/mongo_mapper_ext/logging.rb
-- lib/mongo_mapper_ext/migration.rb
+- lib/mongo_mapper_ext/mongo_db/upsert.rb
+- lib/mongo_mapper_ext/mongo_db.rb
+- lib/mongo_mapper_ext/mongo_mapper/fixes.rb
+- lib/mongo_mapper_ext/mongo_mapper/hacks.rb
+- lib/mongo_mapper_ext/mongo_mapper/locales/activemodel/ru.yml
+- lib/mongo_mapper_ext/mongo_mapper/locales/mongo_mapper/en.yml
+- lib/mongo_mapper_ext/mongo_mapper/locales/mongo_mapper/ru.yml
+- lib/mongo_mapper_ext/mongo_mapper/logging.rb
+- lib/mongo_mapper_ext/mongo_mapper/migration.rb
+- lib/mongo_mapper_ext/mongo_mapper/plugins/attribute_cache.rb
+- lib/mongo_mapper_ext/mongo_mapper/plugins/attribute_convertors.rb
+- lib/mongo_mapper_ext/mongo_mapper/plugins/belongs_to_with_counter_cache.rb
+- lib/mongo_mapper_ext/mongo_mapper/plugins/custom_scope.rb
+- lib/mongo_mapper_ext/mongo_mapper/plugins/db_config.rb
+- lib/mongo_mapper_ext/mongo_mapper/plugins/micelaneous.rb
+- lib/mongo_mapper_ext/mongo_mapper/spec.rb
+- lib/mongo_mapper_ext/mongo_mapper/support.rb
+- lib/mongo_mapper_ext/mongo_mapper/view_helpers.rb
 - lib/mongo_mapper_ext/mongo_mapper.rb
-- lib/mongo_mapper_ext/plugins/attribute_cache.rb
-- lib/mongo_mapper_ext/plugins/attribute_convertors.rb
-- lib/mongo_mapper_ext/plugins/belongs_to_with_counter_cache.rb
-- lib/mongo_mapper_ext/plugins/carrierwave.rb
-- lib/mongo_mapper_ext/plugins/custom_scope.rb
-- lib/mongo_mapper_ext/plugins/db_config.rb
-- lib/mongo_mapper_ext/plugins/micelaneous.rb
 - lib/mongo_mapper_ext/rad/file_uploader.rb
+- lib/mongo_mapper_ext/rad/spec.rb
 - lib/mongo_mapper_ext/rad.rb
-- lib/mongo_mapper_ext/spec.rb
 - lib/mongo_mapper_ext/tasks.rb
-- lib/mongo_mapper_ext/view_helpers.rb
-- lib/mongo_mapper_ext.rb
-- spec/attribute_convertors_spec.rb
-- spec/carrierwave_spec/plane.jpg
-- spec/carrierwave_spec.rb
-- spec/custom_scope_spec.rb
-- spec/micelaneous_plugin_spec.rb
-- spec/micelaneous_spec.rb
-- spec/migration_spec.rb
-- spec/mongo_mapper_spec.rb
-- spec/spec_helper.rb
-- spec/uploading_spec/ship.jpg
-- spec/uploading_spec/файл с пробелами.txt
-- spec/uploading_spec.rb
+- spec/carrier_wave/carrier_wave_spec/plane.jpg
+- spec/carrier_wave/carrier_wave_spec.rb
+- spec/carrier_wave/spec_helper.rb
+- spec/mongo_db/spec_helper.rb
+- spec/mongo_db/upsert_spec.rb
+- spec/mongo_mapper/attribute_convertors_spec.rb
+- spec/mongo_mapper/belongs_to_with_counter_cache_spec.rb
+- spec/mongo_mapper/custom_scope_spec.rb
+- spec/mongo_mapper/micelaneous_plugin_spec.rb
+- spec/mongo_mapper/micelaneous_spec.rb
+- spec/mongo_mapper/migration_spec.rb
+- spec/mongo_mapper/mongo_mapper_spec.rb
+- spec/mongo_mapper/spec_helper.rb
+- spec/rad/spec_helper.rb
+- spec/rad/uploading_spec/ship.jpg
+- spec/rad/uploading_spec/файл с пробелами.txt
+- spec/rad/uploading_spec.rb
 has_rdoc: true
 homepage: http://github.com/alexeypetrushin/mongo_mapper
 licenses: []

data/lib/mongo_mapper_ext.rb

@@ -1,49 +0,0 @@
-require 'mongo_mapper_ext/gems'
-
-require 'mongo_mapper'
-require 'carrierwave'
-
-%w(
-  micelaneous
-).each{|file| require "mongo_db_ext/#{file}"}
-
-%w(
-  hacks/fixes
-  hacks/active_model
-  
-  migration
-  mongo_mapper
-  view_helpers  
-  logging
-  
-  plugins/db_config
-  plugins/custom_scope
-  plugins/attribute_cache
-  plugins/carrierwave
-  plugins/attribute_convertors
-  plugins/micelaneous
-  plugins/belongs_to_with_counter_cache
-).each{|file| require "mongo_mapper_ext/#{file}"}
-
-# 
-# Default plugins and settings
-# 
-module MongoMapper::Plugins
-  [CustomScope, AttributeCache, AttributeConvertors, BelongsToWithCounterCache, Micelaneous, CarrierWave, DbConfig].each do |plugin|
-    ::MongoMapper::Document.send :include, plugin
-  end
-end
-  
-# 
-# Attribute protection
-# 
-MongoMapper::Document.included do
-  attr_protected :id, :_id, :_type, :created_at, :updated_at
-end
-
-
-# 
-# Locales
-# 
-dir = File.expand_path("#{__FILE__}/../..")
-I18n.load_path += Dir["#{dir}/locales/**/*.{rb,yml}"]

data/spec/carrierwave_spec.rb

@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-describe "MongoMapper & CarrierWave" do  
-  with_mongo_mapper
-  with_tmp_spec_dir
-  
-  before :all do
-    class PlaneUploader < CarrierWave::Uploader::Base
-      storage :file
-      
-      class << self
-        attr_accessor :store_dir
-      end      
-      
-      def store_dir
-        self.class.store_dir
-      end
-    end
-    
-    class Plane
-      include MongoMapper::Document
-  
-      mount_uploader :image, PlaneUploader
-    end        
-  end
-  after(:all){remove_constants :Plane, :PlaneUploader}
-  
-  before do
-    PlaneUploader.store_dir = "#{spec_dir}/data"
-  end    
-  
-  it "basic" do
-    plane = Plane.new
-    File.open "#{spec_dir}/plane.jpg" do |f|
-      plane.image = f
-      plane.save!
-    end
-    
-    plane.image.current_path.should == '/tmp/carrierwave_spec/data/plane.jpg'
-    File.should exist("#{spec_dir}/data/plane.jpg")
-  end
-end

data/spec/micelaneous_plugin_spec.rb

@@ -1,70 +0,0 @@
-require 'spec_helper'
-
-describe "MongoMapper Default Scope" do
-  with_mongo_mapper
-  
-  before :all do
-    class ::Post
-      include MongoMapper::Document      
-      include MongoMapper::Plugins::Micelaneous
-      
-      key :comments_count, Integer, default: 0
-      has_many :comments
-    end
-    
-    class ::Comment
-      include MongoMapper::Document
-      include MongoMapper::Plugins::Micelaneous
-      
-      key :post_id
-      belongs_to :post, counter_cache: true
-    end
-  end  
-  after(:all){remove_constants %w{Post Comment Post2 Namespace}}
-  
-  it "should increase count of comments" do
-    post = Post.create!
-    comment = post.comments.create!
-    
-    post.reload
-    post.comments_count.should == 1
-  end
-  
-  it "should decrease count of comments" do
-    post = Post.create!
-    comment = post.comments.create!
-    post.reload
-    post.comments_count.should == 1
-    
-    comment.destroy    
-    post.reload
-    post.comments_count.should == 0
-  end
-  
-  describe "model_name" do
-    it "basic" do
-      Post.model_name.should == "Post"
-      Post.model_name "SuperPost"
-      Post.model_name.should == "SuperPost"
-    end
-    
-    it "by default should be initialized from class alias" do
-      class ::Post2
-        include MongoMapper::Document      
-        include MongoMapper::Plugins::Micelaneous
-
-        self.alias 'PostAlias'
-      end
-      
-      module ::Namespace
-        class Post
-          include MongoMapper::Document      
-          include MongoMapper::Plugins::Micelaneous
-        end
-      end
-      
-      Post2.model_name.should == 'PostAlias'
-      Namespace::Post.model_name.should == 'Post' # not the Namespace::Post
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,6 +0,0 @@
-require 'rspec_ext'
-
-require "mongo_mapper"
-
-require "mongo_mapper_ext"
-require "mongo_mapper_ext/spec"