carrierwave-mongoid 0.5.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWNhYTI4NzQ3MTI0YzFlMmVlYzI0ZDFkZWU0MGM1NmNhNzUxN2M1NA==
+  data.tar.gz: !binary |-
+    OGU0YWEyZTZjMDlmNzdmNDJhYmQyY2YzZDg2NGMzYzA2NzZhMWFkZg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OTEwM2FjYzRhYTA3NWUwMmE5NThiZTc3MDgwMGY3NGIzOGQ3Y2NmNzhmOTQ5
+    OWVjYTgwNzc1NTk3ZjEyM2QxYzNlNTA2ODgyNmYzMmFmYTdlM2E5ZWJhOTdm
+    OTBkNWVjNTZhNmYyZWRhMmE0NmM0M2RiNDk1MTM1NTJlYWM0MGM=
+  data.tar.gz: !binary |-
+    MTYyOWFlODkwMGFjYWM1NjhmMDdlNDBhNjQ4MTcxNmM3Mzk3ZDFjM2FiNWI3
+    ZDU5YzdlZDVkNzIzNDBiNTA3ZDBjOTMzMDQ0OTAzODExNDI1NWVjNjFjNzM3
+    ZTY0YTFkNzc0YTA4ZGM0YjM4YTViNWEyNTllYjY1YjU3MTRlMzc=

data/.gitignore

@@ -6,4 +6,5 @@ spec/public
 .rvmrc
 .ruby-version
 Gemfile.lock
+gemfiles/*.lock
 log/*

data/.travis.yml

@@ -6,5 +6,13 @@ notifications:
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
   - jruby-19mode
   - rbx-19mode
+
+gemfile:
+  - Gemfile
+  - gemfiles/carrierwave-master.gemfile
+  - gemfiles/mongoid-3.0.gemfile
+  - gemfiles/mongoid-3.1.gemfile
+  - gemfiles/mongoid-4.0.gemfile

data/README.md

@@ -1,4 +1,4 @@
-# CarrierWave for Mongoid [![Gem Version](https://badge.fury.io/rb/carrierwave-mongoid.png)](http://badge.fury.io/rb/carrierwave-mongoid) [![Build Status](https://travis-ci.org/jnicklas/carrierwave-mongoid.png?branch=master)](http://travis-ci.org/jnicklas/carrierwave-mongoid)
+# CarrierWave for Mongoid [![Gem Version](https://badge.fury.io/rb/carrierwave-mongoid.png)](http://badge.fury.io/rb/carrierwave-mongoid) [![Build Status](https://travis-ci.org/jnicklas/carrierwave-mongoid.png?branch=master)](http://travis-ci.org/jnicklas/carrierwave-mongoid) [![Code Climate](https://codeclimate.com/github/jnicklas/carrierwave-mongoid.png)](https://codeclimate.com/github/jnicklas/carrierwave-mongoid)
 
 This gem adds support for Mongoid and MongoDB's GridFS to
 [CarrierWave](https://github.com/jnicklas/carrierwave/)
@@ -14,11 +14,15 @@ Install the latest release:
 
 Require it in your code:
 
-    require 'carrierwave/mongoid'
+```ruby
+require 'carrierwave/mongoid'
+```
 
 Or, in Rails you can add it to your Gemfile:
 
-    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
+```ruby
+gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
+```
 
 ## Getting Started
 
@@ -28,14 +32,18 @@ Follow the "Getting Started" directions in the main
 [Suggested] Add the field to your attr_accessor list for mass assignment
 protection:
 
-    attr_accessible :avatar, :avatar_cache
+```ruby
+attr_accessible :avatar, :avatar_cache
+```
 
 Now you can cache files by assigning them to the attribute; they will
 automatically be stored when the record is saved. Ex:
 
-    u = User.new
-    u.avatar = File.open('somewhere')
-    u.save!
+```ruby
+u = User.new
+u.avatar = File.open('somewhere')
+u.save!
+```
 
 ## Using MongoDB's GridFS store
 
@@ -74,16 +82,22 @@ end
 
 | Version  | Notes                                                                           |
 |----------|---------------------------------------------------------------------------------|
-| ~> 0.4.0 | ([compare][compare-0.4], [dependencies][deps-0.4])                              |
+| ~> 0.6.0 | ([compare][compare-0.6], [dependencies][deps-0.6]) Mongoid 3 & 4, bug fixes     |
+| ~> 0.5.0 | ([compare][compare-0.5], [dependencies][deps-0.5]) Mongoid::Paranoia support    |
+| ~> 0.4.0 | ([compare][compare-0.4], [dependencies][deps-0.4]) Carrierwave bump             |
 | ~> 0.3.0 | ([compare][compare-0.3], [dependencies][deps-0.3]) Mongoid >= 3.0               |
 | ~> 0.2.0 | ([compare][compare-0.2], [dependencies][deps-0.2]) Rails >= 3.2, Mongoid ~> 2.0 |
 | ~> 0.1.0 | ([compare][compare-0.1], [dependencies][deps-0.1]) Rails <= 3.1                 |
 
+[compare-0.6]: https://github.com/jnicklas/carrierwave-mongoid/compare/v0.5.0...v0.6.0
+[compare-0.5]: https://github.com/jnicklas/carrierwave-mongoid/compare/v0.4.0...v0.5.0
 [compare-0.4]: https://github.com/jnicklas/carrierwave-mongoid/compare/v0.3.1...v0.4.0
 [compare-0.3]: https://github.com/jnicklas/carrierwave-mongoid/compare/v0.2.1...v0.3.1
 [compare-0.2]: https://github.com/jnicklas/carrierwave-mongoid/compare/v0.1.7...v0.2.2
 [compare-0.1]: https://github.com/jnicklas/carrierwave-mongoid/compare/v0.1.1...v0.1.7
 
+[deps-0.6]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.6.0
+[deps-0.5]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.5.0
 [deps-0.4]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.4.0
 [deps-0.3]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.3.1
 [deps-0.2]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.2.2

data/carrierwave-mongoid.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "carrierwave", ["~> 0.8.0"]
-  s.add_dependency "mongoid", ["~> 3.0"]
+  s.add_dependency "mongoid", [">= 3.0", "< 5.0"]
   s.add_dependency "mongoid-grid_fs", ["~> 1.3"]
   s.add_development_dependency "rspec", ["~> 2.6"]
   s.add_development_dependency "rake", ["~> 10.0"]

data/gemfiles/carrierwave-master.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "carrierwave", github: "jnicklas/carrierwave", branch: "master"
+
+gemspec path: "../"

data/gemfiles/mongoid-3.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "mongoid", github: "mongoid/mongoid", branch: "3.0.0-stable"
+
+gemspec path: "../"

data/gemfiles/mongoid-3.1.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "mongoid", github: "mongoid/mongoid", branch: "3.1.0-stable"
+
+gemspec path: "../"

data/gemfiles/mongoid-4.0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "mongoid-grid_fs", github: "ahoward/mongoid-grid_fs", branch: "master"
+gem "mongoid", github: "mongoid/mongoid", branch: "master"
+
+gemspec path: "../"

data/lib/carrierwave/mongoid.rb

@@ -35,12 +35,16 @@ module CarrierWave
       class_eval <<-RUBY, __FILE__, __LINE__+1
         def #{column}=(new_file)
           column = _mounter(:#{column}).serialization_column
+
+          # mongoid won't upload a new file if there was no file previously.
+          write_uploader(column, '_old_') if self.persisted? && read_uploader(column).nil?
+
           send(:"\#{column}_will_change!")
           super
         end
 
         def remove_#{column}!
-          super unless paranoid? && flagged_for_destroy?
+          super unless respond_to?(:paranoid?) && paranoid? && flagged_for_destroy?
         end
 
         # Overrides Mongoid's default dirty behavior to instead work more like

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/spec/mongoid_spec.rb

@@ -568,7 +568,7 @@ describe CarrierWave::Mongoid do
         end
 
         @class.class_eval do
-          embeds_many :mongo_locations
+          embeds_many :mongo_locations, cascade_callbacks: true
         end
 
         @doc = @class.new
@@ -579,6 +579,19 @@ describe CarrierWave::Mongoid do
 
       include_examples "embedded documents"
 
+      it "attaches a new file to an existing document that had no file at first" do
+        doc = @class.new
+        doc.mongo_locations.build
+        doc.save.should be_true
+        doc.reload
+
+        doc.mongo_locations.first.image = stub_file('test.jpeg')
+        doc.save.should be_true
+        doc.reload
+
+        doc.mongo_locations.first[:image].should == 'test.jpeg'
+      end
+
       describe 'with double embedded documents' do
 
         before do
@@ -766,30 +779,34 @@ describe CarrierWave::Mongoid do
     end
   end
 
-  describe "with paranoia enabled" do
-    before do
-      @class = reset_mongo_class
-      @class.collection.drop
-      @class.class_eval do
-        include Mongoid::Paranoia
-      end
+  # Mongoid::Paranoia support is only part of Mongoid 3.x. It was removed from
+  # Mongoid 4.x.
+  if defined?(Mongoid::Paranoia)
+    describe "with paranoia enabled" do
+      before do
+        @class = reset_mongo_class
+        @class.collection.drop
+        @class.class_eval do
+          include Mongoid::Paranoia
+        end
 
-      @doc = @class.new(image: stub_file("old.jpeg"))
-      @doc.save.should be_true
-    end
+        @doc = @class.new(image: stub_file("old.jpeg"))
+        @doc.save.should be_true
+      end
 
-    it "should not remove underlying image after #destroy" do
-      @doc.destroy.should be_true
-      @class.count.should eql(0)
-      @class.deleted.count.should eql(1)
-      File.exist?(public_path('uploads/old.jpeg')).should be_true
-    end
+      it "should not remove underlying image after #destroy" do
+        @doc.destroy.should be_true
+        @class.count.should eql(0)
+        @class.deleted.count.should eql(1)
+        File.exist?(public_path('uploads/old.jpeg')).should be_true
+      end
 
-    it "should remove underlying image after #destroy!" do
-      @doc.destroy!.should be_true
-      @class.count.should eql(0)
-      @class.deleted.count.should eql(0)
-      File.exist?(public_path('uploads/old.jpeg')).should be_false
+      it "should remove underlying image after #destroy!" do
+        @doc.destroy!.should be_true
+        @class.count.should eql(0)
+        @class.deleted.count.should eql(0)
+        File.exist?(public_path('uploads/old.jpeg')).should be_false
+      end
     end
   end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -10,120 +9,112 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
+  type: :runtime
+  prerelease: false
+  name: carrierwave
 - !ruby/object:Gem::Dependency
-  name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
-  prerelease: false
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  name: mongoid
 - !ruby/object:Gem::Dependency
-  name: mongoid-grid_fs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+  type: :runtime
+  prerelease: false
+  name: mongoid-grid_fs
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
+  type: :development
+  prerelease: false
+  name: rspec
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+  type: :development
+  prerelease: false
+  name: rake
 - !ruby/object:Gem::Dependency
-  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  name: mini_magick
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  name: pry
 description: Mongoid support for CarrierWave
 email:
 - jonas.nicklas@gmail.com
@@ -138,6 +129,10 @@ files:
 - README.md
 - Rakefile
 - carrierwave-mongoid.gemspec
+- gemfiles/carrierwave-master.gemfile
+- gemfiles/mongoid-3.0.gemfile
+- gemfiles/mongoid-3.1.gemfile
+- gemfiles/mongoid-4.0.gemfile
 - lib/carrierwave/mongoid.rb
 - lib/carrierwave/mongoid/version.rb
 - lib/carrierwave/storage/grid_fs.rb
@@ -155,33 +150,26 @@ files:
 homepage: https://github.com/jnicklas/carrierwave-mongoid
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1710824902897794014
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1710824902897794014
 requirements: []
 rubyforge_project: carrierwave-mongoid
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mongoid support for CarrierWave
 test_files:
 - spec/fixtures/new.jpeg