carrierwave 0.6.1 → 0.6.2

data/lib/carrierwave/processing/rmagick.rb

@@ -243,19 +243,24 @@ module CarrierWave
     #
     # [CarrierWave::ProcessingError] if manipulation failed.
     #
-    def manipulate!(options={})
+    def manipulate!(options={}, &block)
       cache_stored_file! if !cached?
       image = ::Magick::Image.read(current_path)
 
       frames = if image.size > 1
         list = ::Magick::ImageList.new
-        image.each do |frame|
-          list << (block_given? ? yield( frame ) : frame)
+        image.each_with_index do |frame, index|
+          processed_frame = if block_given?
+            yield *[frame, index].take(block.arity)
+          else
+            frame
+          end
+          list << processed_frame if processed_frame
         end
         block_given? ? list : list.append(true)
       else
         frame = image.first
-        frame = yield( frame ) if block_given?
+        frame = yield( *[frame, 0].take(block.arity) ) if block_given?
         frame
       end
 

data/lib/carrierwave/uploader/download.rb

@@ -67,7 +67,7 @@ module CarrierWave
       # [url (String)] The URL where the remote file is stored
       #
       def process_uri(uri)
-        URI.parse(URI.escape(URI.unescape(uri)).gsub("[", "%5B").gsub("]", "%5D"))
+        URI.parse(URI.escape(URI.unescape(uri)).gsub("[", "%5B").gsub("]", "%5D").gsub("+", "%2B"))
       end
 
     end # Download

data/lib/carrierwave/uploader/versions.rb

@@ -216,6 +216,7 @@ module CarrierWave
         active_versions.each do |name, v|
           next if v.cached?
 
+          v.send(:cache_id=, cache_id)
           # If option :from_version is present, create cache using cached file from
           # version indicated
           if self.class.versions[name][:options] && self.class.versions[name][:options][:from_version]
@@ -229,7 +230,6 @@ module CarrierWave
           else
             v.cache!(processed_parent)
           end
-          v.send(:cache_id=, cache_id)
         end
       end
 

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427625320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+  version_requirements: *70103427625320
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427624520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+  version_requirements: *70103427624520
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427623860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70103427623860
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427623000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,31 +54,21 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+  version_requirements: *70103427623000
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427622140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.4
+  version_requirements: *70103427622140
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427621460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70103427621460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427620560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *70103427620560
 - !ruby/object:Gem::Dependency
   name: sham_rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427620060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70103427620060
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427619580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,15 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70103427619580
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427619000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,15 +120,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+  version_requirements: *70103427619000
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427618580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,15 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70103427618580
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70103427618120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,12 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70103427618120
 description: Upload files in your Ruby applications, map them to a range of ORMs,
   store them on different backends.
 email:
@@ -266,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: carrierwave
-rubygems_version: 1.8.21
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby file upload library