carrierwave-mongoid 0.6.0 → 0.6.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!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=
+SHA1:
+  metadata.gz: 2c4cb70605ad487c0a0bc63a1e56a13aa35972e7
+  data.tar.gz: 290b467324f4e499eceba2a1ee28a7dff4e4cf36
+SHA512:
+  metadata.gz: 550171721afa4e19fa32c87ac862cb80511738111440e0a88c413dc1fbcf83c10a808b5d170a3bf9a2ea22e3e592998cf78a964a7a32cd4988d29c975359f4aa
+  data.tar.gz: 1151676161af15142e4302ee52ac7ea42e164a8b801ddbbb35634ff7e4e82e1ab4c8628a365450b8a240045a0bb2b3ab570f4355025a4f636875a4cc55903c08

data/.travis.yml

@@ -12,6 +12,7 @@ rvm:
 
 gemfile:
   - Gemfile
+  - gemfiles/carrierwave-0.8.gemfile
   - gemfiles/carrierwave-master.gemfile
   - gemfiles/mongoid-3.0.gemfile
   - gemfiles/mongoid-3.1.gemfile

data/README.md

@@ -1,7 +1,7 @@
-# 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)
+# 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/carrierwaveuploader/carrierwave-mongoid.png?branch=master)](http://travis-ci.org/carrierwaveuploader/carrierwave-mongoid) [![Code Climate](https://codeclimate.com/github/carrierwaveuploader/carrierwave-mongoid.png)](https://codeclimate.com/github/carrierwaveuploader/carrierwave-mongoid)
 
 This gem adds support for Mongoid and MongoDB's GridFS to
-[CarrierWave](https://github.com/jnicklas/carrierwave/)
+[CarrierWave](https://github.com/carrierwaveuploader/carrierwave/)
 
 This functionality used to be part of CarrierWave but has since been extracted
 into this gem.
@@ -27,7 +27,7 @@ gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
 ## Getting Started
 
 Follow the "Getting Started" directions in the main
-[Carrierwave repository](https://raw.github.com/jnicklas/carrierwave/).
+[Carrierwave repository](https://raw.github.com/carrierwaveuploader/carrierwave/).
 
 [Suggested] Add the field to your attr_accessor list for mass assignment
 protection:
@@ -55,10 +55,42 @@ class AvatarUploader < CarrierWave::Uploader::Base
 end
 ```
 
+Bringing it all together, you can also configure Carrierwave to use Mongoid's
+database connection and default all storage to GridFS. That might look something
+like this:
+
+```ruby
+CarrierWave.configure do |config|
+  config.storage = :grid_fs
+  config.root = Rails.root.join('tmp')
+  config.cache_dir = "uploads"
+end
+```
+
+## Serving uploading files
+
 Since GridFS doesn't make the files available via HTTP, you'll need to stream
-them yourself. In Rails for example, you could use the `send_data` method. You
-can optionally tell CarrierWave the URL you will serve your images from,
-allowing it to generate the correct URL, by setting eg:
+them yourself. For example, in Rails, you could use the `send_data` method:
+
+```ruby
+class UsersController < ApplicationController
+  def avatar
+    content = @user.avatar.read
+    if stale?(etag: content, last_modified: @user.updated_at.utc, public: true)
+      send_data content, type: @user.avatar.file.content_type, disposition: "inline"
+      expires_in 0, public: true
+    end
+  end
+end
+
+# and in routes.rb
+resources :users do
+  get :avatar, on: :member
+end
+```
+
+You can optionally tell CarrierWave the URL you will serve your images from,
+allowing it to generate the correct URL, by setting `grid_fs_access_url`:
 
 ```ruby
 CarrierWave.configure do |config|
@@ -66,18 +98,50 @@ CarrierWave.configure do |config|
 end
 ```
 
-Bringing it all together, you can also configure Carrierwave to use Mongoid's
-database connection and default all storage to GridFS. That might look something
-like this:
+## Route configuration
+
+If you follow the instruction to this point, the uploaded images will be
+stored to GridFS, and you are responsible for serving the images a public
+endpoint. If you would like to use the `#url` method on the uploaded file, you
+will need to take some additional steps.
+
+The `grid_fs_access_url` configuration option is the prefix for the path of
+the stored file in carrierwave.
+
+Let's assume that we have a mounted `avatar` uploader on a `User` model and a
+`GridfsController`. Let's also assume that your uploader definition
+(i.e. `app/uploaders/avatar_uploader.rb`) defines `store_dir` like this:
 
 ```ruby
-CarrierWave.configure do |config|
-  config.storage = :grid_fs
-  config.root = Rails.root.join('tmp')
-  config.cache_dir = "uploads"
+def store_dir
+  "#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
 end
 ```
 
+If `grid_fs_access_url` (in `config/initializers/carrierwave.rb`) were:
+
+```ruby
+config.grid_fs_access_url = '/uploads/grid'
+```
+
+You would need to define a route in your `config/routes.rb` like so:
+
+```ruby
+match '/uploads/grid/user/avatar/:id/:filename' => 'gridfs#avatar'
+```
+
+Now, `user.avatar.url` should return an appropriate url path to use in your
+views.
+
+### Different uploaded versions
+
+If you need to include different versions (e.g. thumbnails), additional routes
+will help:
+
+```ruby
+match '/uploads/grid/user/avatar/:id/:filename' => 'gridfs#thumb_avatar', constraints: { filename: /thumb.*/ }
+```
+
 ## Version differences
 
 | Version  | Notes                                                                           |
@@ -89,14 +153,14 @@ end
 | ~> 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
+[compare-0.6]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.5.0...v0.6.1
+[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
+[compare-0.3]: https://github.com/carrierwaveuploader/carrierwave-mongoid/compare/v0.2.1...v0.3.1
+[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.6]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.6.0
+[deps-0.6]: https://rubygems.org/gems/carrierwave-mongoid/versions/0.6.1
 [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
@@ -143,4 +207,4 @@ class User
 end
 ```
 
-You can read more about this [here](https://github.com/jnicklas/carrierwave/issues#issue/81)
+You can read more about this [here](https://github.com/carrierwaveuploader/carrierwave/issues#issue/81)

data/carrierwave-mongoid.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jonas Nicklas", "Trevor Turk"]
   s.email       = ["jonas.nicklas@gmail.com"]
-  s.homepage    = "https://github.com/jnicklas/carrierwave-mongoid"
+  s.homepage    = "https://github.com/carrierwaveuploader/carrierwave-mongoid"
   s.summary     = %q{Mongoid support for CarrierWave}
   s.description = %q{Mongoid support for CarrierWave}
   s.license     = "MIT"
@@ -20,10 +20,10 @@ 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"]
+  s.add_dependency "carrierwave", [">= 0.8.0", "< 0.10.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 "rspec", ["~> 2.14"]
   s.add_development_dependency "rake", ["~> 10.0"]
   s.add_development_dependency "mini_magick"
   s.add_development_dependency "pry"

data/gemfiles/carrierwave-0.8.gemfile

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

data/gemfiles/carrierwave-master.gemfile

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

data/gemfiles/mongoid-3.0.gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "mongoid", github: "mongoid/mongoid", branch: "3.0.0-stable"
+gem "activemodel", "~> 3.2"
 
 gemspec path: "../"

data/lib/carrierwave/mongoid/version.rb

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

data/spec/mongoid_spec.rb

@@ -126,7 +126,7 @@ describe CarrierWave::Mongoid do
         @doc[:image] = 'test.jpeg'
         @doc.save!
         @doc.reload
-        JSON.parse(@doc.to_json({:only => [:_id]})).should == {"_id" => @doc.id.to_s}
+        JSON.parse(@doc.to_json({:only => [:_id]})).should == {"_id" => @doc.id.as_json}
       end
 
       it "should respect options[:except] when passed to to_json for the serializable hash" do
@@ -396,7 +396,7 @@ describe CarrierWave::Mongoid do
       end
 
       it "should not remove old file if old file had a different path but config is false" do
-        @uploader.stub!(:remove_previously_stored_files_after_update).and_return(false)
+        @uploader.stub(:remove_previously_stored_files_after_update).and_return(false)
         @doc.image = stub_file('new.jpeg')
         @doc.save.should be_true
         File.exists?(public_path('uploads/new.jpeg')).should be_true
@@ -456,7 +456,7 @@ describe CarrierWave::Mongoid do
       end
 
       it "should not remove old file if old file had a different path but config is false" do
-        @embedded_doc.image.stub!(:remove_previously_stored_files_after_update).and_return(false)
+        @embedded_doc.image.stub(:remove_previously_stored_files_after_update).and_return(false)
         @embedded_doc.image = stub_file('new.jpeg')
         @embedded_doc.save.should be_true
         File.exists?(public_path('uploads/new.jpeg')).should be_true
@@ -494,7 +494,7 @@ describe CarrierWave::Mongoid do
       end
 
       it "should not remove old file if old file had a different path but config is false" do
-        @double_embedded_doc.image.stub!(:remove_previously_stored_files_after_update).and_return(false)
+        @double_embedded_doc.image.stub(:remove_previously_stored_files_after_update).and_return(false)
         @double_embedded_doc.image = stub_file('new.jpeg')
         @double_embedded_doc.save.should be_true
         File.exists?(public_path('uploads/new.jpeg')).should be_true

data/spec/spec_helper.rb

@@ -35,9 +35,9 @@ module CarrierWave
         t = Tempfile.new(filename)
         FileUtils.copy_file(file_path(filename), t.path)
 
-        t.stub!(:local_path => "",
-                :original_filename => filename || fake_name,
-                :content_type => mime_type)
+        t.stub(:local_path => "",
+               :original_filename => filename || fake_name,
+               :content_type => mime_type)
 
         return t
       end
@@ -59,12 +59,12 @@ module CarrierWave
   end
 end
 
-class SIO < StringIO 
-  attr_accessor :filename 
- 
-  def initialize(filename, *args, &block) 
-    @filename = filename 
-    super(*args, &block) 
+class SIO < StringIO
+  attr_accessor :filename
+
+  def initialize(filename, *args, &block)
+    @filename = filename
+    super(*args, &block)
   end
 end
 

data/spec/storage/grid_fs_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 shared_examples_for "a GridFS connection" do
   describe '#store!' do
     before do
-      @uploader.stub!(:store_path).and_return('uploads/bar.txt')
+      @uploader.stub(:store_path).and_return('uploads/bar.txt')
       @grid_fs_file = @storage.store!(@file)
     end
 
@@ -49,7 +49,7 @@ shared_examples_for "a GridFS connection" do
     before do
       @grid.clear
       @grid['uploads/bar.txt'] = StringIO.new('A test, 1234')
-      @uploader.stub!(:store_path).with('bar.txt').and_return('uploads/bar.txt')
+      @uploader.stub(:store_path).with('bar.txt').and_return('uploads/bar.txt')
       @grid_fs_file = @storage.retrieve!('bar.txt')
     end
 
@@ -66,17 +66,17 @@ shared_examples_for "a GridFS connection" do
     end
 
     it "should return a relative URL path if access_url is set to the root path" do
-      @uploader.stub!(:grid_fs_access_url).and_return("/")
+      @uploader.stub(:grid_fs_access_url).and_return("/")
       @grid_fs_file.url.should == "/uploads/bar.txt"
     end
 
     it "should return a URL path if access_url is set to a file path" do
-      @uploader.stub!(:grid_fs_access_url).and_return("/image/show")
+      @uploader.stub(:grid_fs_access_url).and_return("/image/show")
       @grid_fs_file.url.should == "/image/show/uploads/bar.txt"
     end
 
     it "should return an absolute URL if access_url is set to an absolute URL" do
-      @uploader.stub!(:grid_fs_access_url).and_return("http://example.com/images/")
+      @uploader.stub(:grid_fs_access_url).and_return("http://example.com/images/")
       @grid_fs_file.url.should == "http://example.com/images/uploads/bar.txt"
     end
 
@@ -88,12 +88,12 @@ shared_examples_for "a GridFS connection" do
 
   describe '#retrieve! on a store_dir with leading slash' do
     before do
-      @uploader.stub!(:store_path).with('bar.txt').and_return('/uploads/bar.txt')
+      @uploader.stub(:store_path).with('bar.txt').and_return('/uploads/bar.txt')
       @grid_fs_file = @storage.retrieve!('bar.txt')
     end
 
     it "should return a relative URL path if access_url is set to the root path" do
-      @uploader.stub!(:grid_fs_access_url).and_return("/")
+      @uploader.stub(:grid_fs_access_url).and_return("/")
       @grid_fs_file.url.should == "/uploads/bar.txt"
     end
   end
@@ -103,13 +103,13 @@ end
 describe CarrierWave::Storage::GridFS do
 
   before do
-    @uploader = mock('an uploader')
-    @uploader.stub!(:grid_fs_access_url).and_return(nil)
+    @uploader = double('an uploader')
+    @uploader.stub(:grid_fs_access_url).and_return(nil)
   end
 
   context "when reusing an existing connection manually" do
     before do
-      @uploader.stub!(:grid_fs_connection).and_return(@database)
+      @uploader.stub(:grid_fs_connection).and_return(@database)
 
       @grid = ::Mongoid::GridFs
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,112 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-07-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
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.0
-  type: :runtime
-  prerelease: false
-  name: carrierwave
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.10.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'
-  type: :runtime
-  prerelease: false
-  name: mongoid
 - !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'
-  type: :runtime
-  prerelease: false
-  name: mongoid-grid_fs
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.14'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
-  prerelease: false
-  name: rspec
+        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'
-  type: :development
-  prerelease: false
-  name: rake
 - !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'
-  type: :development
-  prerelease: false
-  name: mini_magick
 - !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'
-  type: :development
-  prerelease: false
-  name: pry
 description: Mongoid support for CarrierWave
 email:
 - jonas.nicklas@gmail.com
@@ -129,6 +135,7 @@ files:
 - README.md
 - Rakefile
 - carrierwave-mongoid.gemspec
+- gemfiles/carrierwave-0.8.gemfile
 - gemfiles/carrierwave-master.gemfile
 - gemfiles/mongoid-3.0.gemfile
 - gemfiles/mongoid-3.1.gemfile
@@ -147,7 +154,7 @@ files:
 - spec/mongoid_spec.rb
 - spec/spec_helper.rb
 - spec/storage/grid_fs_spec.rb
-homepage: https://github.com/jnicklas/carrierwave-mongoid
+homepage: https://github.com/carrierwaveuploader/carrierwave-mongoid
 licenses:
 - MIT
 metadata: {}
@@ -157,12 +164,12 @@ 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: []