carrierwave-mongoid 0.1.5 → 0.1.6

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008-2012 Jonas Nicklas
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/carrierwave/mongoid.rb

@@ -38,6 +38,16 @@ module CarrierWave
           super
         end
 
+        # Overrides Mongoid's default dirty behavior to instead work more like
+        # ActiveRecord's. Mongoid doesn't deem an attribute as changed unless
+        # the new value is different than the original. Given that CarrierWave
+        # caches files before save, it's necessary to know that there's a
+        # pending change even though the attribute value itself might not
+        # reflect that yet.
+        def #{column}_changed?
+          changed_attributes.has_key?("#{column}")
+        end
+
         def find_previous_model_for_#{column}
           if self.embedded?
             ancestors       = [[ self.metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.metadata.key, x.first.last._parent ]) while x.first.last.embedded? }

data/lib/carrierwave/mongoid/version.rb

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

data/lib/carrierwave/storage/grid_fs.rb

@@ -52,7 +52,7 @@ module CarrierWave
           unless @uploader.grid_fs_access_url
             nil
           else
-            [@uploader.grid_fs_access_url, @path].join("/").squeeze("/")
+            [@uploader.grid_fs_access_url.chomp("/"), @path].join("/")
           end
         end
 

data/spec/mongoid_spec.rb

@@ -256,7 +256,6 @@ describe CarrierWave::Mongoid do
       end
 
       it "should mark image as changed when saving a new image" do
-        pending "This isn't working with Mongoid's current Dirty module. Mongoid's *_changed? methods don't behave the same as ActiveModel's *_changed? methods."
         @doc.image_changed?.should be_false
         @doc.image = stub_file("test.jpeg")
         @doc.image_changed?.should be_true

data/spec/storage/grid_fs_spec.rb

@@ -60,11 +60,16 @@ shared_examples_for "a GridFS connection" do
       @grid_fs_file.url.should be_nil
     end
 
-    it "should return a URL if configured" do
+    it "should return a URL path if configured" 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
+      @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
+
     it "should be deletable" do
       @grid_fs_file.delete
       lambda {@grid.open('uploads/bar.txt', 'r')}.should raise_error(Mongo::GridFileNotFound)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 Z
+date: 2012-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70093414050040 !ruby/object:Gem::Requirement
+  requirement: &70244342360100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70093414050040
+  version_requirements: *70244342360100
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70093414036060 !ruby/object:Gem::Requirement
+  requirement: &70244342346100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70093414036060
+  version_requirements: *70244342346100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70093414035240 !ruby/object:Gem::Requirement
+  requirement: &70244342345260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70093414035240
+  version_requirements: *70244342345260
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70093414034580 !ruby/object:Gem::Requirement
+  requirement: &70244342344600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70093414034580
+  version_requirements: *70244342344600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70093414034080 !ruby/object:Gem::Requirement
+  requirement: &70244342344100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70093414034080
+  version_requirements: *70244342344100
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &70093414033660 !ruby/object:Gem::Requirement
+  requirement: &70244342343680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093414033660
+  version_requirements: *70244342343680
 description: Mongoid support for CarrierWave
 email:
 - jonas.nicklas@gmail.com
@@ -87,6 +87,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - carrierwave-mongoid.gemspec
@@ -118,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 887805465808785246
+      hash: -703899468836926150
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 887805465808785246
+      hash: -703899468836926150
 requirements: []
 rubyforge_project: carrierwave-mongoid
 rubygems_version: 1.8.11