carrierwave-mongoid 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 603f05991c5c6f69ff470944ad0529b5156fd7bf
-  data.tar.gz: d96a1e5f3d4da0b9ae7bffcaa19f9670897a8707
+  metadata.gz: 8dbf263632bb757b907feefed47df535df9afb48
+  data.tar.gz: bdd37086a47d6897a7dc6aed9294c263a8496c90
 SHA512:
-  metadata.gz: 2f2adeca0b2b14b951ba3202218319fcbaa280f086393256811dbd205dd80d9d99a86f2d2f1cd509635790cb43bb51219c65e20630b73d9ed67bf9ee040c4e25
-  data.tar.gz: e6e366728864fa8cec829737478c4495f80ad4e0ec749fa625b029b806cfc02b6b22da9f434f16e2496ade8bd215462753e3588021178adf40d9ffa60bf420cb
+  metadata.gz: b87c77b666919997a01c0a35b92091854ae1a4aa18580555983211482c3dbafcd7d6165bb1760f40f19c14911f49c05775cd83f6a2f88b784cd400db72bb0905
+  data.tar.gz: b1021356aafedbb825cba0ca564322e705b1e2d17a334dc2128fee57807c5344fe5f67ed92076e950c47ccac5de8500be4027ac47f16de626fa9e302b530e72a

data/.travis.yml

@@ -4,15 +4,17 @@ notifications:
   email: false
 
 language: ruby
+cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1
   - jruby-19mode
-  - rbx-19mode
 
 gemfile:
   - Gemfile
   - gemfiles/carrierwave-0.8.gemfile
+  - gemfiles/carrierwave-0.9.gemfile
   - gemfiles/carrierwave-master.gemfile
   - gemfiles/mongoid-3.0.gemfile
   - gemfiles/mongoid-3.1.gemfile

data/README.md

@@ -153,6 +153,7 @@ match '/uploads/grid/user/avatar/:id/:filename' => 'gridfs#thumb_avatar', constr
 
 | Version  | Notes                                                                           |
 |----------|---------------------------------------------------------------------------------|
+| ~> 0.7.0 | ([compare][compare-0.7], [dependencies][deps-0.7]) Mongoid 3 & 4, bug fixes     |
 | ~> 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             |
@@ -160,6 +161,7 @@ match '/uploads/grid/user/avatar/:id/:filename' => 'gridfs#thumb_avatar', constr
 | ~> 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.7]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.6.3...v0.7.0
 [compare-0.6]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.5.0...v0.6.3
 [compare-0.5]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.4.0...v0.5.0
 [compare-0.4]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.3.1...v0.4.0
@@ -167,6 +169,7 @@ match '/uploads/grid/user/avatar/:id/:filename' => 'gridfs#thumb_avatar', constr
 [compare-0.2]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.1.7...v0.2.2
 [compare-0.1]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.1.1...v0.1.7
 
+[deps-0.7]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.7.0
 [deps-0.6]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.6.3
 [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

data/carrierwave-mongoid.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "carrierwave", [">= 0.8.0", "< 0.10.0"]
+  s.add_dependency "carrierwave", [">= 0.8.0", "< 0.11.0"]
   s.add_dependency "mongoid", [">= 3.0", "< 5.0"]
   s.add_dependency "mongoid-grid_fs", ["~> 1.3"]
   s.add_development_dependency "rspec", ["~> 2.14"]

data/gemfiles/carrierwave-0.9.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "carrierwave", "~> 0.9.0"
+
+gemspec path: "../"

data/lib/carrierwave/mongoid.rb

@@ -73,7 +73,11 @@ module CarrierWave
 
         def find_previous_model_for_#{column}
           if self.embedded?
-            ancestors       = [[ self.metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.metadata.key, x.first.last._parent ]) while x.first.last.embedded? }
+            if self.respond_to?(:__metadata) # Mongoid >= 4.0.0.beta1
+              ancestors = [[ self.__metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.__metadata.key, x.first.last._parent ]) while x.first.last.embedded? }
+            else # Mongoid < 4.0.0.beta1
+              ancestors = [[ self.metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.metadata.key, x.first.last._parent ]) while x.first.last.embedded? }
+            end
             first_parent = ancestors.first.last
             reloaded_parent = first_parent.class.unscoped.find(first_parent.to_key.first)
             association = ancestors.inject(reloaded_parent) { |parent,(key,ancestor)| (parent.is_a?(Array) ? parent.find(ancestor.to_key.first) : parent).send(key) }

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "0.6.3"
+    VERSION = "0.7.0"
   end
 end

data/spec/mongoid_spec.rb

@@ -196,18 +196,36 @@ describe CarrierWave::Mongoid do
       end
 
       it "should use I18n for integrity error messages" do
-        @doc.valid?
-        @doc.errors[:image].should == ['is not of an allowed file type']
-
-        change_locale_and_store_translations(:pt, :mongoid => {
-          :errors => {
-          :messages => {
-          :carrierwave_integrity_error => 'tipo de imagem não permitido.'
-        }
-        }
-        }) do
-          @doc.should_not be_valid
-          @doc.errors[:image].should == ['tipo de imagem não permitido.']
+        if Gem::Dependency.new('CarrierWave', '>= 0.10.0').match?('CarrierWave', CarrierWave::VERSION)
+          change_locale_and_store_translations(:en, :mongoid => {
+            :errors => { :models => { :mongo_user => { :attributes => {
+              :image => { :carrierwave_integrity_error => 'is not of an allowed file type'
+          }}}}}}) do
+            @doc.should_not be_valid
+            @doc.errors[:image].should == ['is not of an allowed file type']
+          end
+          
+          change_locale_and_store_translations(:pt, :mongoid => {
+            :errors => { :models => { :mongo_user => { :attributes => {
+              :image => { :carrierwave_integrity_error => 'tipo de imagem não permitido.'
+          }}}}}}) do
+            @doc.should_not be_valid
+            @doc.errors[:image].should == ['tipo de imagem não permitido.']
+          end
+        else # Test for older versions of Carrierwave
+          @doc.valid?
+          @doc.errors[:image].should == ['is not of an allowed file type']
+
+          change_locale_and_store_translations(:pt, :mongoid => {
+            :errors => {
+            :messages => {
+            :carrierwave_integrity_error => 'tipo de imagem não permitido.'
+          }
+          }
+          }) do
+            @doc.should_not be_valid
+            @doc.errors[:image].should == ['tipo de imagem não permitido.']
+          end
         end
       end
     end
@@ -224,18 +242,36 @@ describe CarrierWave::Mongoid do
       end
 
       it "should use I18n for processing error messages" do
-        @doc.valid?
-        @doc.errors[:image].should == ['failed to be processed']
-
-        change_locale_and_store_translations(:pt, :mongoid => {
-          :errors => {
-          :messages => {
-          :carrierwave_processing_error => 'falha ao processar imagem.'
-        }
-        }
-        }) do
-          @doc.should_not be_valid
-          @doc.errors[:image].should == ['falha ao processar imagem.']
+        if Gem::Dependency.new('CarrierWave', '>= 0.10.0').match?('CarrierWave', CarrierWave::VERSION)
+          change_locale_and_store_translations(:en, :mongoid => {
+            :errors => { :models => { :mongo_user => { :attributes => {
+              :image => { :carrierwave_processing_error => 'failed to be processed'
+          }}}}}}) do
+            @doc.should_not be_valid
+            @doc.errors[:image].should == ['failed to be processed']
+          end
+          
+          change_locale_and_store_translations(:pt, :mongoid => {
+            :errors => { :models => { :mongo_user => { :attributes => {
+              :image => { :carrierwave_processing_error => 'falha ao processar imagem.'
+          }}}}}}) do
+            @doc.should_not be_valid
+            @doc.errors[:image].should == ['falha ao processar imagem.']
+          end
+        else # Test for older versions of Carrierwave
+          @doc.valid?
+          @doc.errors[:image].should == ['failed to be processed']
+
+          change_locale_and_store_translations(:pt, :mongoid => {
+            :errors => {
+            :messages => {
+            :carrierwave_processing_error => 'falha ao processar imagem.'
+          }
+          }
+          }) do
+            @doc.should_not be_valid
+            @doc.errors[:image].should == ['falha ao processar imagem.']
+          end
         end
       end
     end
@@ -290,7 +326,7 @@ describe CarrierWave::Mongoid do
           @doc.save.should be_true
           @doc.reload
           @doc.image.should be_blank
-          @doc.image_identifier.should == ''
+          @doc.image_identifier.should be_blank
         end
 
       end
@@ -547,7 +583,7 @@ describe CarrierWave::Mongoid do
 
         @class.class_eval do
           embeds_one :mongo_location
-          default_scope where(:always_false => false)
+          default_scope ->{ where(:always_false => false) }
         end
 
         @doc = @class.new
@@ -642,7 +678,7 @@ describe CarrierWave::Mongoid do
 
         @class.class_eval do
           embeds_many :mongo_locations
-          default_scope where(:always_false => false)
+          default_scope ->{ where(:always_false => false) }
         end
 
         @doc = @class.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,116 +9,116 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mongoid-grid_fs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Mongoid support for CarrierWave
@@ -128,14 +128,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - carrierwave-mongoid.gemspec
 - gemfiles/carrierwave-0.8.gemfile
+- gemfiles/carrierwave-0.9.gemfile
 - gemfiles/carrierwave-master.gemfile
 - gemfiles/mongoid-3.0.gemfile
 - gemfiles/mongoid-3.1.gemfile
@@ -164,17 +165,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: carrierwave-mongoid
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mongoid support for CarrierWave