carrierwave-mongoid 0.1.6 → 0.1.7

data/lib/carrierwave/mongoid/version.rb

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

data/lib/carrierwave/storage/grid_fs.rb

@@ -38,26 +38,23 @@ module CarrierWave
     class GridFS < Abstract
 
       class File
+        attr_reader :path
 
         def initialize(uploader, path)
           @path = path
           @uploader = uploader
         end
 
-        def path
-          @path
-        end
-
         def url
           unless @uploader.grid_fs_access_url
             nil
           else
-            [@uploader.grid_fs_access_url.chomp("/"), @path].join("/")
+            ::File.join(@uploader.grid_fs_access_url, path)
           end
         end
 
         def read
-          grid.open(@path, 'r').data
+          grid.open(path, 'r').data
         end
 
         def write(file)
@@ -67,15 +64,15 @@ module CarrierWave
         end
 
         def delete
-          grid.delete(@path)
+          grid.delete(path)
         end
 
         def content_type
-          grid.open(@path, 'r').content_type
+          grid.open(path, 'r').content_type
         end
 
         def file_length
-          grid.open(@path, 'r').file_length
+          grid.open(path, 'r').file_length
         end
         alias :size :file_length
 

data/spec/storage/grid_fs_spec.rb

@@ -38,7 +38,6 @@ shared_examples_for "a GridFS connection" do
     it "should have a file length" do
       @grid_fs_file.file_length.should == 13
     end
-
   end
 
   describe '#retrieve!' do
@@ -56,16 +55,21 @@ shared_examples_for "a GridFS connection" do
       @grid_fs_file.path.should == 'uploads/bar.txt'
     end
 
-    it "should not have a URL unless set" do
+    it "should not have a URL unless access_url is set" do
       @grid_fs_file.url.should be_nil
     end
 
-    it "should return a URL path if configured" do
+    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("/")
+      @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")
       @grid_fs_file.url.should == "/image/show/uploads/bar.txt"
     end
 
-    it "should return an absolute URL if configured" do
+    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/")
       @grid_fs_file.url.should == "http://example.com/images/uploads/bar.txt"
     end
@@ -73,6 +77,19 @@ shared_examples_for "a GridFS connection" do
     it "should be deletable" do
       @grid_fs_file.delete
       lambda {@grid.open('uploads/bar.txt', 'r')}.should raise_error(Mongo::GridFileNotFound)
+
+    end
+  end
+
+  describe '#retrieve! on a store_dir with leading slash' do
+    before do
+      @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("/")
+      @grid_fs_file.url.should == "/uploads/bar.txt"
     end
   end
 
@@ -131,8 +148,7 @@ describe CarrierWave::Storage::GridFS do
       end
     end
 
-
-   describe "resize_to_fill" do
+    describe "resize_to_fill" do
       before do
         @uploader_class = Class.new(CarrierWave::Uploader::Base)
         @uploader_class.class_eval{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-31 00:00:00.000000000 Z
+date: 2012-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70244342360100 !ruby/object:Gem::Requirement
+  requirement: &70216819494840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70244342360100
+  version_requirements: *70216819494840
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70244342346100 !ruby/object:Gem::Requirement
+  requirement: &70216819480940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70244342346100
+  version_requirements: *70216819480940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70244342345260 !ruby/object:Gem::Requirement
+  requirement: &70216819480100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70244342345260
+  version_requirements: *70216819480100
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70244342344600 !ruby/object:Gem::Requirement
+  requirement: &70216819479460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70244342344600
+  version_requirements: *70216819479460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70244342344100 !ruby/object:Gem::Requirement
+  requirement: &70216819478840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70244342344100
+  version_requirements: *70216819478840
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &70244342343680 !ruby/object:Gem::Requirement
+  requirement: &70216819478440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244342343680
+  version_requirements: *70216819478440
 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: -703899468836926150
+      hash: -3626845613401080446
 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: -703899468836926150
+      hash: -3626845613401080446
 requirements: []
 rubyforge_project: carrierwave-mongoid
 rubygems_version: 1.8.11