carrierwave-mongoid 0.3.0 → 0.3.1

data/.travis.yml

@@ -0,0 +1,10 @@
+services: mongodb
+
+notifications:
+  email: false
+
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-19mode
+  - rbx-19mode

data/Gemfile

@@ -1,4 +1,8 @@
 source "http://rubygems.org"
 
+group :development, :test do
+  gem 'json', :platforms => [:jruby]
+end
+
 # Specify your gem's dependencies in carrierwave-mongoid.gemspec
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# CarrierWave for Mongoid
+# CarrierWave for Mongoid [![Build Status](https://travis-ci.org/jnicklas/carrierwave-mongoid.png?branch=master)](http://travis-ci.org/jnicklas/carrierwave-mongoid)
 
 This gem adds support for Mongoid and MongoDB's GridFS to
 [CarrierWave](https://github.com/jnicklas/carrierwave/)
@@ -64,7 +64,6 @@ like this:
 
 ```ruby
 CarrierWave.configure do |config|
-  config.grid_fs_connection = Mongoid.database
   config.storage = :grid_fs
   config.root = Rails.root.join('tmp')
   config.cache_dir = "uploads"
@@ -73,6 +72,10 @@ end
 
 ## Version differences
 
+### 0.3.x
+
+carrierwave-mongoid ~> 0.3.0 is only compatible with Mongoid 3.0 or higher.
+
 ### 0.2.x
 
 carrierwave-mongoid ~> 0.2.0 is only compatible with Rails 3.2 or higher.

data/lib/carrierwave/mongoid.rb

@@ -63,9 +63,13 @@ module CarrierWave
 
         def serializable_hash(options=nil)
           hash = {}
+
+          except = options && options[:except] && Array.wrap(options[:except]).map(&:to_s)
+          only   = options && options[:only]   && Array.wrap(options[:only]).map(&:to_s)
+
           self.class.uploaders.each do |column, uploader|
-            if (!options[:only] && !options[:except]) || (options[:only] && options[:only].include?(column)) || (options[:except] && !options[:except].include?(column))
-              hash[column.to_s] = _mounter(:#{column}).uploader.serializable_hash
+            if (!only && !except) || (only && only.include?(column.to_s)) || (except && !except.include?(column.to_s))
+              hash[column.to_s] = _mounter(column.to_sym).uploader.serializable_hash
             end
           end
           super(options).merge(hash)

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/mongoid_spec.rb

@@ -20,6 +20,7 @@ def define_mongo_class(class_name, &block)
 end
 
 class MongoUploader < CarrierWave::Uploader::Base; end
+class AnotherMongoUploader < CarrierWave::Uploader::Base; end
 
 class IntegrityErrorUploader < CarrierWave::Uploader::Base
   process :monkey
@@ -765,4 +766,25 @@ describe CarrierWave::Mongoid do
     end
   end
 
+  context "JSON serialization with multiple uploaders" do
+    before do
+      @class = reset_mongo_class
+      @class.send(:mount_uploader, :textfile,AnotherMongoUploader)
+      @event = @class.new
+      @event.image = stub_file('old.jpeg')
+      @event.textfile = stub_file('old.txt')
+    end
+
+    it "serializes the correct values" do
+      @event.serializable_hash["image"]["url"].should match(/old\.jpeg$/)
+      @event.serializable_hash["textfile"]["url"].should match(/old\.txt$/)
+    end
+
+    it "should have JSON for each uploader" do
+      parsed = JSON.parse(@event.to_json)
+      parsed["image"]["url"].should match(/old\.jpeg$/)
+      parsed["textfile"]["url"].should match(/old\.txt$/)
+    end
+  end
+
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  version: 0.3.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -10,120 +10,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
   name: carrierwave
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
-- !ruby/object:Gem::Dependency
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
   name: mongoid
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: mongoid-grid_fs
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  type: :development
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.6'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
+- !ruby/object:Gem::Dependency
   name: mini_magick
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: pry
-  prerelease: false
   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'
 description: Mongoid support for CarrierWave
 email:
 - jonas.nicklas@gmail.com
@@ -132,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -162,19 +163,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 177635873472418624
-      version: '0'
+      hash: -2540774415107593561
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 177635873472418624
-      version: '0'
+      hash: -2540774415107593561
 requirements: []
 rubyforge_project: carrierwave-mongoid
 rubygems_version: 1.8.23