mongo_mapper_ext 0.2.4 → 0.2.5

data/readme.md

@@ -63,7 +63,7 @@ For editing complex objects in forms:
 File attachments (stored on File System, S3, MongoDB-GridFS)
 
     class User
-      mount_uploader :avatar, AvatarUploader
+      file_key :avatar, AvatarUploader
     end
     
 ## more

data/spec/carrier_wave/carrier_wave_spec.rb

@@ -5,57 +5,112 @@ describe "MongoMapper & CarrierWave" do
   with_tmp_spec_dir
   
   before :all do
-    class PlaneUploader < CarrierWave::Uploader::Base
+    class PlaneImageUploader < 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
+        PlaneImageUploader.store_dir
       end
-      
+    
       def root
-        PlaneUploader.store_dir
+        PlaneImageUploader.store_dir
       end
-    end
-    
-    class Plane
-      include MongoMapper::Document
-  
-      mount_uploader :image, PlaneUploader
     end        
   end
-  after(:all){remove_constants :Plane, :PlaneUploader}
+  after(:all){remove_constants :PlaneImageUploader}
   
   before do
-    PlaneUploader.store_dir = "#{spec_dir}/data"
+    PlaneImageUploader.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
+  describe "Document" do
+    before :all do
+      class Plane
+        include MongoMapper::Document
+  
+        mount_uploader :image, PlaneImageUploader
+      end        
+    end
+    after(:all){remove_constants :Plane}
+  
+    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 "should works without model" do
+      # writing
+      uploader = PlaneImageUploader.new
+      uploader.store!(@file)
+      uploader.identifier.should == 'plane.jpg'
+      uploader.url.should == '/plane.jpg'
+      uploader.icon.url.should == '/plane.icon.jpg'
+      File.should exist("#{spec_dir}/data/plane.icon.jpg")
+      
+      # reading
+      uploader = PlaneImageUploader.new
+      uploader.retrieve_from_store! 'plane.jpg'
+      uploader.url.should == '/plane.jpg'
+      uploader.icon.url.should == '/plane.icon.jpg'
+      
+      # destroying
+      uploader = PlaneImageUploader.new
+      uploader.retrieve_from_store! 'plane.jpg'
+      uploader.remove!
+      File.should_not exist("#{spec_dir}/data/plane.icon.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/
+    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")
+      plane.image.icon.current_path.should =~ /\/plane\.icon\.jpg/
+      File.should exist("#{spec_dir}/data/plane.icon.jpg")
+    end
+  end
+  
+  describe "EmbeddedDocument" do
+    before :all do
+      class PlaneImage
+        include MongoMapper::EmbeddedDocument
+        
+        file_key :image, PlaneImageUploader
+      end
+      
+      class Plane
+        include MongoMapper::Document
+        
+        has_many :images, class_name: 'PlaneImage'                
+      end        
+    end
+    after(:all){remove_constants :Plane, :PlaneImage, :PlaneImageUploader}
+  
+    it "basic"
+    # do
+    #   plane = Plane.create! images: [PlaneImage.new(image: @file)]
+    #   plane.images.first.image.current_path.should =~ /\/plane.jpg/
+    #   File.should exist("#{spec_dir}/data/plane.jpg")
+    # end
+  
+    it "path format"
+    # do
+    # end
   end
 end

data/spec/mongo_mapper/mongo_mapper_spec.rb

@@ -1,35 +1,36 @@
-require 'mongo_mapper/spec_helper'
+require 'mongo_mapper'
 
-describe "Special test to check some errors in the MongoMapper itself" do  
+describe "Special test to check some errors in the MongoMapper" do  
   before :all do
     MongoMapper.database = 'test'
-    
-    class ::AnObject
-      include MongoMapper::Document
-      
-      key :owner_name, String
-      key :viewers, Array
-      
-      def owner_name= owner_name
-        viewers.delete self.owner_name
-        viewers << owner_name        
-        # write_attribute :owner_name, owner_name
-        super owner_name
-        owner_name
-      end
-    end
   end
   
   after :all do
-    Object.send :remove_const, :AnObject if Object.const_defined? :AnObject
-  end
-    
-  it do
-    o = AnObject.new
-    o.owner_name = 'user'
-    o.save!
-    
-    # o = AnObject.first # don't use reload, it willn't catch this error
-    o.viewers.should == %w{user}
+    Object.send :remove_const, :ThePost, :TheComment if Object.const_defined? :AnObject
   end
+      
+  # it "strange behaviour of EmbeddedDocument" do
+  #   class TheComment
+  #     include MongoMapper::EmbeddedDocument
+  #     
+  #     key :text, String
+  #     alias_method :original_text=, :text=
+  #     def text= text
+  #       $id_before_save = object_id
+  #       self.original_text = text
+  #     end
+  #     
+  #     after_save do
+  #       $id_after_save = object_id
+  #     end
+  #   end
+  #   
+  #   class ThePost
+  #     include MongoMapper::Document
+  #     has_many :comments, class_name: 'TheComment'
+  #   end    
+  #   
+  #   ThePost.create! comments: [TheComment.new(text: 'some text')]
+  #   $id_before_save.should == $id_after_save
+  # end
 end

data/spec/rad/uploading_spec.rb

@@ -15,7 +15,7 @@ describe "Uploading" do
       key :name
       validates_uniqueness_of :name
       
-      mount_uploader :image, ShipUploader
+      file_key :image, ShipUploader
     end                
   end  
   after(:all){remove_constants :Ship, :ShipUploader}  

metadata

@@ -1,170 +1,160 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mongo_mapper_ext
-version: !ruby/object:Gem::Version
-  version: 0.2.4
+version: !ruby/object:Gem::Version 
+  version: 0.2.5
   prerelease: 
 platform: ruby
-authors:
+authors: 
 - Alexey Petrushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-19 00:00:00.000000000 +04:00
+
+date: 2011-07-22 00:00:00 +04:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mongo_mapper
-  requirement: &2795840 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2795840
-- !ruby/object:Gem::Dependency
-  name: carrierwave
-  requirement: &2795620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *2795620
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: i18n
-  requirement: &2795380 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2795380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2795160 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2795160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: &2794940 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2794940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bson
-  requirement: &2794690 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2794690
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: bson_ext
-  requirement: &2794480 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2794480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: mongo
-  requirement: &2794260 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2794260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: plucky
-  requirement: &2794040 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *2794040
-- !ruby/object:Gem::Dependency
-  name: jnunemaker-validatable
-  requirement: &2793820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 1.8.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *2793820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: mini_magick
-  requirement: &2793610 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2793610
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: subexec
-  requirement: &2793400 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2793400
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: mongo_mapper
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: carrierwave
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id011
 description: 
 email: 
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Rakefile
 - readme.md
 - 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/mongo_mapper/plugins/mount_uploader.rb
+- lib/mongo_mapper_ext/carrier_wave/mongo_mapper/plugins/mount_uploaders.rb
 - lib/mongo_mapper_ext/carrier_wave.rb
 - lib/mongo_mapper_ext/gems.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
@@ -195,31 +185,35 @@ files:
 - 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/\xD1\x84\xD0\xB0\xD0\xB8\xCC\x86\xD0\xBB \xD1\x81 \xD0\xBF\xD1\x80\xD0\xBE\xD0\xB1\xD0\xB5\xD0\xBB\xD0\xB0\xD0\xBC\xD0\xB8.txt"
 - spec/rad/uploading_spec.rb
 has_rdoc: true
-homepage: http://github.com/alexeypetrushin/mongo_mapper
+homepage: http://github.com/alexeypetrushin/mongo_mapper_ext
 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
-      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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Extensions for MongoMapper
 test_files: []
+