mongo_mapper_ext 0.2.2 → 0.2.3

data/spec/micelaneous_spec.rb

@@ -1,53 +1,134 @@
 require 'spec_helper'
 
-require "mongo_mapper_ext/micelaneous"
-require "mongo_mapper_ext/plugins/micelaneous"
-
 describe "MongoMapper micelaneous" do
-  before :all do
-    @db = Mongo::Connection.new.db('test')
-    MongoMapper.database = 'test'
-  end
+  with_mongo_mapper
   
-  before :each do
-    @db.collection('test').drop
-    @coll = @db.collection('test')
-  end
+  after(:all){remove_constants %w(UpsertSample AsStringSample TranslationCheck)}    
     
-  it "upsert should update" do
-    id = @coll.save :count => 2
-    @coll.upsert id, :$inc => {:count => 1}
-    @coll.find(:_id => id).first['count'].should == 3
+  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
   
-  it "upsert should set" do
-    id = @coll.save({})
-    @coll.upsert id, :$inc => {:count => 1}
-    @coll.find(:_id => id).first['count'].should == 1
+  describe "i18n" do
+    it "should translate error messages" do
+      class ::TranslationCheck
+        include MongoMapper::Document
+
+        key :name, String
+        validates_uniqueness_of :name
+      end
+
+      TranslationCheck.destroy_all
+      TranslationCheck.create! name: 'a'
+      t = TranslationCheck.new name: 'a'
+      t.should_not be_valid
+      t.errors[:name].first.should =~ /already been taken/
+    end
   end
     
   describe "handy upsert" do
     class ::UpsertSample
       include MongoMapper::Document
-      plugin MongoMapper::Plugins::Micelaneous
+      include MongoMapper::Plugins::Micelaneous
       
-      key :counter, Integer, :default => 1
+      key :counter, Integer, default: 1
     end  
     
-    before :each do 
+    before do 
       @model = UpsertSample.create!
     end
   
     it "class upsert" do
-      UpsertSample.upsert @model.id, :$inc => {:counter => 1}
+      UpsertSample.upsert!({id: @model.id}, :$inc => {counter: 1})
       @model.reload
       @model.counter.should == 2
     end
   
     it "model upsert" do
-      @model.upsert :$inc => {:counter => 1}
+      @model.upsert! :$inc => {counter: 1}
       @model.reload
       @model.counter.should == 2
     end
   end
+  
+  describe "as_string" do
+    before do
+      @convertors = MongoMapper::Plugins::AttributeConvertors::ClassMethods::ATTRIBUTE_CONVERTORS
+      @convertors[:test_convertor] = {
+        from_string: -> s {"from_string: #{s}"},
+        to_string:   -> v {"to_string: #{v}"}
+      }
+    end
+    
+    it ":line convertor" do      
+      v = ['a', 'b']
+      str_v = 'a, b'
+      @convertors[:line][:from_string].call(str_v).should == v
+      @convertors[:line][:to_string].call(v).should == str_v
+    end
+    
+    it ":yaml convertor" do
+      v = {'a' => 'b'}
+      str_v = v.to_yaml.strip
+      
+      @convertors[:yaml][:from_string].call(str_v).should == v
+      @convertors[:yaml][:to_string].call(v).should == str_v
+    end
+    
+    it ":json convertor" do
+      v = {'a' => 'b'}
+      str_v = v.to_json.strip
+      @convertors[:json][:from_string].call(str_v).should == v
+      @convertors[:json][:to_string].call(v).should == str_v
+    end
+    
+    it ":key extension" do
+      class ::AsStringSample
+        include MongoMapper::Document
+        include MongoMapper::Plugins::Micelaneous
+        
+        key :key, String, as_string: :test_convertor
+        key :protected_key, String, as_string: :test_convertor, protected: true
+      end
+    
+      o = AsStringSample.new
+      
+      # get
+      o.key_as_string.should == 'to_string: '
+      o.key = 'value'
+      o.clear_cache
+      o.key_as_string.should == 'to_string: value'
+      
+      # set
+      o.key_as_string = ''
+      o.key.should == 'from_string: '
+      o.key_as_string = 'value'
+      o.key.should == 'from_string: value'
+      
+      # mass assignment
+      o.key = ''
+      o.update_attributes key_as_string: 'value'
+      o.key.should == 'from_string: value'
+      
+      # protection
+      o.protected_key = ''
+      o.update_attributes protected_key_as_string: 'value'
+      o.protected_key.should == ''
+    end
+  end
 end

data/spec/migration_spec.rb

@@ -1,8 +1,5 @@
 require 'spec_helper'
 
-require "mongo_mapper_ext"
-require "mongo_mapper_ext/spec/helper"
-
 describe "MongoMapper Migration" do
   with_mongo_mapper
   
@@ -11,28 +8,22 @@ describe "MongoMapper Migration" do
   before :all do
     MongoMapper.logger = Logger.new(nil)
     MongoMapper.db_config = {
-      'global' => {'name' => 'global_test'},
-      'accounts' => {'name' => "accounts_test"}
+      'default' => {'name' => "default_test"},
+      'global' => {'name' => 'global_test'}
     }
     
     class ::Sample
       include MongoMapper::Document
-      use_database :global
+      _use_database :global
 
       key :name, String
     end
         
-    # MongoMapper.call_deferred
     Migration.logger = nil        
   end
-
-  after :all do
-    Object.send :remove_const, :Sample if Object.const_defined? :Sample    
-  end
+  after(:all){remove_constants :Sample}
   
-  before :each do
-    Migration.definitions.clear
-  end
+  before{Migration.definitions.clear}
   
   it "Shouldn't update if versions are the same" do
     Migration.update(:global, 0).should be_false
@@ -42,7 +33,7 @@ describe "MongoMapper Migration" do
     Sample.count.should == 0    
     Migration.define :global, 1 do |m|
       m.up do |db|
-        Sample.create :name => 'name'
+        Sample.create name: 'name'
         coll = db.collection 'samples'
         coll.find.count.should == 1
       end
@@ -55,7 +46,7 @@ describe "MongoMapper Migration" do
   it "increase_db_version" do
     Sample.count.should == 0
     Migration.define :global, 1 do |m|
-      m.up{Sample.create :name => 'name'}
+      m.up{Sample.create name: 'name'}
     end
   
     Migration.update(:global, 1).should be_true    
@@ -65,7 +56,7 @@ describe "MongoMapper Migration" do
   
   it "decrease_db_version" do    
     Migration.define :global, 1 do |m|
-      m.up{Sample.create :name => 'name'}
+      m.up{Sample.create name: 'name'}
       m.down{Sample.destroy_all}
     end
     Migration.update(:global, 1).should be_true

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
 require 'rspec_ext'
 
-lib_dir = "#{__FILE__.parent_dirname}/lib"
-$LOAD_PATH << lib_dir unless $LOAD_PATH.include? lib_dir
-
-gem 'mongo_mapper', '>=0.8'
 require "mongo_mapper"
 
-require 'ruby_ext'
+require "mongo_mapper_ext"
+require "mongo_mapper_ext/spec"

data/spec/uploading_spec//321/204/320/260/320/270/314/206/320/273 /321/201 /320/277/321/200/320/276/320/261/320/265/320/273/320/260/320/274/320/270.txt"

@@ -0,0 +1 @@
+1

data/spec/uploading_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require "mongo_mapper_ext/rad"
+
+describe "Uploading" do  
+  with_tmp_spec_dir
+  with_mongo_mapper
+  with_files  
+  
+  before :all do
+    class ShipUploader < Models::FileUploader      
+    end
+    
+    class Ship
+      include MongoMapper::Document
+
+      key :name
+      validates_uniqueness_of :name
+      
+      mount_uploader :image, ShipUploader
+    end                
+  end  
+  after(:all){remove_constants :Ship, :ShipUploader}  
+  
+  it "should upload images" do    
+    ship = nil
+    File.open "#{spec_dir}/ship.jpg" do |f|
+      ship = Ship.new image: f
+      ship.save!
+    end
+    ship.image.url.should =~ /\/ship\.jpg/
+    ship.image_filename.should =~ /ship\.jpg/
+    ship.image.path.should =~ /\/ship\.jpg/
+  end
+  
+  it "should preserve spaces and unicode characters in filename" do
+    File.open "#{spec_dir}/файл с пробелами.txt" do |f|
+      ship = Ship.new image: f
+
+      ship.image.url.should =~ /\/файл с пробелами\.txt/
+      ship.image.filename =~ /файл с пробелами\.txt/
+      ship.image.path =~ /\/файл с пробелами\.txt/
+    
+      # ship.smart_url.should =~ /files\/file with spaces\/file with spaces\.txt\?\d/
+      # f.smart_url.should =~ /files\/data\/ship\?\d+/
+      # f.smart_url(:icon).should =~ /images\/mime\/dat_icon\.png/
+      # f.smart_url(:thumb).should =~ /images\/mime\/dat_thumb\.png/
+    end
+  end
+end

metadata

@@ -1,120 +1,212 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongo_mapper_ext
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+version: !ruby/object:Gem::Version
+  version: 0.2.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Alexey Petrushin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-15 00:00:00 +04:00
+date: 2011-05-19 00:00:00.000000000 +04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongo_mapper
+  requirement: &2795830 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2795830
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: &2795590 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *2795590
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2795370 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2795370
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2795150 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.0.7
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2795150
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &2794920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 8
-        - 6
-        version: 0.8.6
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.0.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2794920
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: &2794680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2794680
+- !ruby/object:Gem::Dependency
   name: bson_ext
+  requirement: &2794460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2794460
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: &2794250 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2794250
+- !ruby/object:Gem::Dependency
+  name: plucky
+  requirement: &2794030 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2794030
+- !ruby/object:Gem::Dependency
+  name: jnunemaker-validatable
+  requirement: &2793810 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 1
-        - 1
-        version: 1.1.1
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.8.4
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2793810
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: &2793600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2793600
+- !ruby/object:Gem::Dependency
+  name: subexec
+  requirement: &2793390 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *2793390
 description: 
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - readme.md
-- lib/mongo_mapper_ext/db_config.rb
+- lib/mongo_db_ext/micelaneous.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/hacks/time_measuring.rb
-- lib/mongo_mapper_ext/micelaneous.rb
-- lib/mongo_mapper_ext/migrate.rake
+- lib/mongo_mapper_ext/logging.rb
 - lib/mongo_mapper_ext/migration.rb
 - lib/mongo_mapper_ext/mongo_mapper.rb
-- lib/mongo_mapper_ext/plugins/attributes_cache.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/default_scope.rb
 - lib/mongo_mapper_ext/plugins/micelaneous.rb
-- lib/mongo_mapper_ext/spec/helper.rb
+- lib/mongo_mapper_ext/rad/file_uploader.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/mm_spec.rb
-- spec/scope_spec.rb
+- spec/mongo_mapper_spec.rb
 - spec/spec_helper.rb
+- spec/uploading_spec/ship.jpg
+- spec/uploading_spec/файл с пробелами.txt
+- spec/uploading_spec.rb
 has_rdoc: true
 homepage: http://github.com/alexeypetrushin/mongo_mapper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Extensions for MongoMapper
 test_files: []
-

data/lib/mongo_mapper_ext/db_config.rb

@@ -1,67 +0,0 @@
-module MongoMapper
-  class ConnectionsPool < Hash
-    def [](database_alias)
-      database_alias = database_alias.to_s
-      unless connection = super(database_alias)            
-        MongoMapper.db_config.must.include database_alias
-        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
-        
-        self[database_alias] = connection
-      end            
-      return connection
-    end
-  end
-  
-  class DatabasesPool < Hash
-    def [](database_alias)
-      database_alias = database_alias.to_s
-      unless db = super(database_alias)
-        MongoMapper.db_config.must.include database_alias
-        db_options = MongoMapper.db_config[database_alias]
-        db = MongoMapper.connections[database_alias].db db_options['name'].must_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
-    end
-    
-    def databases
-      @databases ||= DatabasesPool.new
-    end
-  end
-              
-end

data/lib/mongo_mapper_ext/hacks/time_measuring.rb

@@ -1,44 +0,0 @@
-# Measures MongoDB requests time and adds it to log
-
-if defined?(Rails) and RAILS_ENV == 'development'
-  Mongo::Connection.class_eval do  
-    def send_message_with_time operation, message, log_message=nil
-      begin
-        logger = @logger
-        @logger = nil      
-        t = Time.now
-        send_message_without_time operation, message, log_message
-      ensure
-        logger.debug("  MONGODB (#{Time.now - t}) #{log_message || message}") if logger
-        @logger = logger
-      end
-    end
-    alias_method_chain :send_message, :time
-  
-    def send_message_with_safe_check_with_time operation, message, db_name, log_message=nil    
-      begin
-        logger = @logger
-        @logger = nil      
-        t = Time.now
-        send_message_with_safe_check_without_time operation, message, db_name, log_message
-      ensure
-        logger.debug("  MONGODB (#{Time.now - t}) #{log_message || message}") if logger
-        @logger = logger
-      end
-    end
-    alias_method_chain :send_message_with_safe_check, :time
-  
-    def receive_message_with_time operation, message, log_message=nil, socket=nil
-      begin
-        logger = @logger
-        @logger = nil      
-        t = Time.now
-        receive_message_without_time operation, message, log_message, socket
-      ensure
-        logger.debug("  MONGODB (#{Time.now - t}) #{log_message || message}") if logger
-        @logger = logger
-      end
-    end
-    alias_method_chain :receive_message, :time
-  end
-end