glebtv-carrierwave-mongoid 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e1bca5dfb3392fd94d0b2a8e9f6bce23e6fbe28
-  data.tar.gz: 9b54fcc0f39bc7868eef019eac4f13526d676e46
+  metadata.gz: e49a595e689f8192fa11d468acf7633009c00ea0
+  data.tar.gz: 795c3bd449d3e97c7373a158ea244ab7f703dfda
 SHA512:
-  metadata.gz: a0556f211d51b45f9fad88b21c2b1a5a2e831d406360a53879ef0aba9f6150f8ac194d4c17e7702aee0d04eb862b6d621310b9b30da78c281268056e282339e3
-  data.tar.gz: 71987c56d274d9179415f6b6714f166f1028806c8a3901293bdaf432704571c69a52d052a4f5cf6dc29395adc835f209d5b8194005aab2f99ecb0f4de18f8e5d
+  metadata.gz: 7b9d51c811e0d24fb60a7e42e1a66e7cabaebbd6db607d10e5aa837c807383ecaf6fadefd5ff0279994750359eb35dd9c148ce9c0d7685e015fff86633e9b4bd
+  data.tar.gz: d2c510e43b61ca8abb4a1a9beff384ef9d13f43a1ed6891fd43cef5c98fe9b4b24ff6bfdc82ec0125e1e123d7574b9ec773b4921583d3b21fb2e5be47d74c8f1

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p247
+2.1.1

data/.travis.yml

@@ -4,8 +4,18 @@ notifications:
   email: false
 
 language: ruby
+cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
+  - jruby-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
+  - gemfiles/mongoid-4.0.gemfile

data/Gemfile.lock

@@ -1,68 +1,57 @@
 PATH
   remote: .
   specs:
-    glebtv-carrierwave-mongoid (0.7.0)
-      carrierwave (~> 0.9.0)
-      mongoid (~> 4.0.0.alpha1)
+    glebtv-carrierwave-mongoid (0.8.0)
+      carrierwave (>= 0.8.0, < 0.11.0)
+      mongoid (>= 3.0, < 5.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-    activesupport (4.0.3)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+    activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    bson (2.2.0)
-    builder (3.1.4)
-    carrierwave (0.9.0)
+      multi_json (~> 1.0)
+    builder (3.0.4)
+    carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
+      mime-types (>= 1.16)
     coderay (1.1.0)
-    connection_pool (1.2.0)
     diff-lcs (1.2.5)
     i18n (0.6.9)
     json (1.8.1)
     method_source (0.8.2)
+    mime-types (2.2)
     mini_magick (3.7.0)
       subexec (~> 0.2.1)
-    minitest (4.7.5)
-    mongoid (4.0.0.beta1)
-      activemodel (>= 4.0.0)
-      moped (~> 2.0.beta6)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-    moped (2.0.0.beta6)
-      bson (~> 2.2)
-      connection_pool (~> 1.2)
-      optionable (~> 0.2.0)
-    multi_json (1.8.4)
-    optionable (0.2.0)
-    origin (2.1.0)
+    mongoid (3.1.6)
+      activemodel (~> 3.2)
+      moped (~> 1.4)
+      origin (~> 1.0)
+      tzinfo (~> 0.3.29)
+    moped (1.5.2)
+    multi_json (1.9.2)
+    origin (1.1.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.1.1)
+    rake (10.3.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    slop (3.4.7)
+    rspec-mocks (2.14.6)
+    slop (3.5.0)
     subexec (0.2.3)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,5 +1,9 @@
 # Fork with OPTIONAL gridfs
 
+[![Build Status](https://travis-ci.org/glebtv/carrierwave-mongoid.svg)](https://travis-ci.org/glebtv/carrierwave-mongoid)
+[![Dependency Status](https://www.versioneye.com/user/projects/534e86f5fe0d07a8e100033a/badge.png)](https://www.versioneye.com/user/projects/534e86f5fe0d07a8e100033a)
+[![Gem Version](https://badge.fury.io/rb/glebtv-carrierwave-mongoid.svg)](http://badge.fury.io/rb/glebtv-carrierwave-mongoid)
+
 # CarrierWave for Mongoid 
 
 See upstream for details: https://github.com/carrierwaveuploader/carrierwave-mongoid

data/gemfiles/carrierwave-0.8.gemfile

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

data/gemfiles/carrierwave-0.9.gemfile

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

data/gemfiles/carrierwave-master.gemfile

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

data/gemfiles/mongoid-3.0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "mongoid", github: "mongoid/mongoid", branch: "3.0.0-stable"
+gem "activemodel", "~> 3.2"
+
+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/glebtv-carrierwave-mongoid.gemspec

@@ -18,8 +18,8 @@ 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 "mongoid", '~> 4.0.0.alpha1'
-  s.add_dependency "carrierwave", '~> 0.9.0'
+  s.add_dependency "mongoid", [">= 3.0", "< 5.0"]
+  s.add_dependency "carrierwave", [">= 0.8.0", "< 0.11.0"]
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"

data/lib/carrierwave/mongoid/version.rb

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

data/spec/mongoid_spec.rb

@@ -196,17 +196,15 @@ 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
+        translations = { mongoid: { errors: { messages: { carrierwave_integrity_error: 'is not of an allowed file type' }}}}
+        change_locale_and_store_translations(:en, translations) do
+          @doc.valid?
+          @doc.errors[:image].should == ['is not of an allowed file type']
+        end
+
+        translations = { mongoid: { errors: { messages: { carrierwave_integrity_error: 'tipo de imagem não permitido.' }}}}
+        change_locale_and_store_translations(:pt, translations) do
+          @doc.valid?
           @doc.errors[:image].should == ['tipo de imagem não permitido.']
         end
       end
@@ -224,17 +222,15 @@ 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
+        translations = { mongoid: { errors: { messages: { carrierwave_processing_error: 'failed to be processed' }}}}
+        change_locale_and_store_translations(:en, translations) do
+          @doc.valid?
+          @doc.errors[:image].should == ['failed to be processed']
+        end
+
+        translations = { mongoid: { errors: { messages: { carrierwave_processing_error: 'falha ao processar imagem.' }}}}
+        change_locale_and_store_translations(:pt, translations) do
+          @doc.valid?
           @doc.errors[:image].should == ['falha ao processar imagem.']
         end
       end
@@ -290,7 +286,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - GlebTv
@@ -10,90 +10,102 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
+        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: 4.0.0.alpha1
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        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.9.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: rspec
   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: rake
   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: 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: This fork makes GridFS optional
@@ -103,15 +115,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/carrierwave-0.8.gemfile
+- gemfiles/carrierwave-0.9.gemfile
+- gemfiles/carrierwave-master.gemfile
+- gemfiles/mongoid-3.0.gemfile
+- gemfiles/mongoid-3.1.gemfile
+- gemfiles/mongoid-4.0.gemfile
 - glebtv-carrierwave-mongoid.gemspec
 - lib/carrierwave/mongoid.rb
 - lib/carrierwave/mongoid/version.rb
@@ -138,17 +156,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: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: This fork makes GridFS optional