carrierwave-mongoid 0.1.7 → 0.2.0

data/README.md

@@ -48,17 +48,36 @@ CarrierWave.configure do |config|
 end
 ```
 
-## Changes from earlier versions of CarrierWave with Mongoid support built in
+## Version differences
 
-This version supports ONLY version of mongoid ~> 2.1
+### 0.2.0
 
-You can use `upload_identifier` to retrieve the original name of the uploaded file.
+carrierwave-mongoid ~> 0.2.0 is only compatible with Rails 3.2 or higher.
+
+### 0.1.x
+
+carrierwave-mongoid ~> 0.1.1 depends on carrierwave ~> 0.5.7. This version of
+carrierwave is only compatible with Rails 3.1 or earlier.
 
-In the earlier version, the mount_uploader-method for mongoid had been defined in lib/carrierwave/orm/mongoid. This code has been moved to carrierwave/mongoid. If you update from earlier versions, don't forget to adjust your require accordingly in your carrierwave-initializer.
+### Changes from earlier versions of CarrierWave <= 0.5.6
+
+CarrierWave used to have built-in Mongoid support. This gem replaces that
+support and only only supports Mongoid ~> 2.1
+
+You can use `upload_identifier` to retrieve the original name of the uploaded file.
 
-The default mount column used to be the name of the upload column plus  `_filename`. Now it is simply the name of the column. Most of the time, the column was called `upload`, so it would have been mounted to `upload_filename`.
-If you'd like to avoid a database migration, simply use the `:mount_on` option to specify
-the field name explicitly. Therefore, you only have to add a `_filename` to your column name. For example, if your column is called `:upload`:
+In the earlier version, the mount_uploader-method for mongoid had been defined
+in lib/carrierwave/orm/mongoid. This code has been moved to
+carrierwave/mongoid. If you update from earlier versions, don't forget to adjust
+your require accordingly in your carrierwave-initializer.
+
+The default mount column used to be the name of the upload column plus
+`_filename`. Now it is simply the name of the column. Most of the time, the
+column was called `upload`, so it would have been mounted to `upload_filename`.
+If you'd like to avoid a database migration, simply use the `:mount_on` option
+to specify the field name explicitly. Therefore, you only have to add a
+`_filename` to your column name. For example, if your column is called
+`:upload`:
 
 ```ruby
 class Dokument

data/carrierwave-mongoid.gemspec

@@ -19,7 +19,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.5.6"]
+  s.add_dependency "carrierwave", ["~> 0.6.1"]
   s.add_dependency "mongoid", ["~> 2.1"]
   s.add_development_dependency "rspec", ["~> 2.6"]
   s.add_development_dependency "bson_ext", ["~> 1.3"]

data/lib/carrierwave/mongoid.rb

@@ -59,9 +59,36 @@ module CarrierWave
             self.class.find(to_key.first)
           end
         end
+
+        def serializable_hash(options=nil)
+          hash = {}
+          self.class.uploaders.each do |column, uploader|
+            hash[column.to_s] = _mounter(:#{column}).uploader.serializable_hash
+          end
+          super(options).merge(hash)
+        end
       RUBY
     end
   end # Mongoid
 end # CarrierWave
 
+CarrierWave::Storage.autoload :GridFS, 'carrierwave/storage/grid_fs'
+
+class CarrierWave::Uploader::Base
+  add_config :grid_fs_connection
+  add_config :grid_fs_database
+  add_config :grid_fs_host
+  add_config :grid_fs_port
+  add_config :grid_fs_username
+  add_config :grid_fs_password
+  add_config :grid_fs_access_url
+
+  configure do |config|
+    config.storage_engines[:grid_fs] = "CarrierWave::Storage::GridFS"
+    config.grid_fs_database = "carrierwave"
+    config.grid_fs_host = "localhost"
+    config.grid_fs_port = 27017
+  end
+end
+
 Mongoid::Document::ClassMethods.send(:include, CarrierWave::Mongoid)

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "0.1.7"
+    VERSION = "0.2.0"
   end
 end

data/spec/mongoid_spec.rb

@@ -97,6 +97,31 @@ describe CarrierWave::Mongoid do
         @doc.image.current_path.should == public_path('uploads/test.jpg')
       end
 
+      it "should return valid JSON when to_json is called when image is nil" do
+        @doc[:image] = nil
+        hash = JSON.parse(@doc.to_json)
+        hash.keys.should include("image")
+        hash["image"].keys.should include("url")
+        hash["image"]["url"].should be_nil
+      end
+
+      it "should return valid JSON when to_json is called when image is present" do
+        @doc[:image] = 'test.jpeg'
+        @doc.save!
+        @doc.reload
+
+        JSON.parse(@doc.to_json)["image"].should == {"url" => "/uploads/test.jpeg"}
+      end
+
+      it "should return valid JSON when to_json is called on a collection containing uploader from a model" do
+        @doc[:image] = 'test.jpeg'
+        @doc.save!
+        @doc.reload
+
+        JSON.parse({:data => @doc.image}.to_json).should == {"data"=>{"image"=>{"url"=>"/uploads/test.jpeg"}}}
+      end
+
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-08 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70216819494840 !ruby/object:Gem::Requirement
+  requirement: &70329431625080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70216819494840
+  version_requirements: *70329431625080
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70216819480940 !ruby/object:Gem::Requirement
+  requirement: &70329431624400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70216819480940
+  version_requirements: *70329431624400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70216819480100 !ruby/object:Gem::Requirement
+  requirement: &70329431623900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70216819480100
+  version_requirements: *70329431623900
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70216819479460 !ruby/object:Gem::Requirement
+  requirement: &70329431623420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70216819479460
+  version_requirements: *70329431623420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70216819478840 !ruby/object:Gem::Requirement
+  requirement: &70329431622880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70216819478840
+  version_requirements: *70329431622880
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &70216819478440 !ruby/object:Gem::Requirement
+  requirement: &70329431622380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70216819478440
+  version_requirements: *70329431622380
 description: Mongoid support for CarrierWave
 email:
 - jonas.nicklas@gmail.com
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3626845613401080446
+      hash: 1522479817545957250
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3626845613401080446
+      hash: 1522479817545957250
 requirements: []
 rubyforge_project: carrierwave-mongoid
 rubygems_version: 1.8.11