locomotive_carrierwave 0.5.0.1 → 0.5.4.beta1

data/lib/carrierwave/uploader/download.rb

@@ -13,11 +13,11 @@ module CarrierWave
 
       class RemoteFile
         def initialize(uri)
-          @uri = URI.parse(URI.escape(uri))
+          @uri = uri
         end
 
         def original_filename
-          File.basename(@uri.path)
+          File.basename(file.base_uri.path)
         end
 
         def respond_to?(*args)
@@ -52,13 +52,24 @@ module CarrierWave
       #
       def download!(uri)
         unless uri.blank?
-          file = RemoteFile.new(uri)
+          processed_uri = process_uri(uri)
+          file = RemoteFile.new(processed_uri)
           raise CarrierWave::DownloadError, "trying to download a file which is not served over HTTP" unless file.http?
-          cache!(file) 
+          cache!(file)
         end
       end
 
+      ##
+      # Processes the given URL by parsing and escaping it. Public to allow overriding.
+      #
+      # === Parameters
+      #
+      # [url (String)] The URL where the remote file is stored
+      #
+      def process_uri(uri)
+        URI.parse(URI.escape(URI.unescape(uri)))
+      end
+
     end # Download
   end # Uploader
 end # CarrierWave
-

data/lib/carrierwave/uploader/extension_whitelist.rb

@@ -11,11 +11,15 @@ module CarrierWave
 
       ##
       # Override this method in your uploader to provide a white list of extensions which
-      # are allowed to be uploaded.
+      # are allowed to be uploaded. Compares the file's extension case insensitive.
+      # Furthermore, not only strings but Regexp are allowed as well.
+      #
+      # When using a Regexp in the white list, `\A` and `\z` are automatically added to
+      # the Regexp expression, also case insensitive.
       #
       # === Returns
       #
-      # [NilClass, Array[String]] a white list of extensions which are allowed to be uploaded
+      # [NilClass, Array[String,Regexp]] a white list of extensions which are allowed to be uploaded
       #
       # === Examples
       #
@@ -23,12 +27,19 @@ module CarrierWave
       #       %w(jpg jpeg gif png)
       #     end
       #
+      # Basically the same, but using a Regexp:
+      #
+      #     def extension_white_list
+      #       [/jpe?g/, 'gif', 'png']
+      #     end
+      #
       def extension_white_list; end
 
     private
 
       def check_whitelist!(new_file)
-        if extension_white_list and not extension_white_list.include?(new_file.extension.to_s)
+        extension = new_file.extension.to_s
+        if extension_white_list and not extension_white_list.detect { |item| extension =~ /\A#{item}\z/i }
           raise CarrierWave::IntegrityError, "You are not allowed to upload #{new_file.extension.inspect} files, allowed types: #{extension_white_list.inspect}"
         end
       end

data/lib/carrierwave/uploader/mountable.rb

@@ -4,7 +4,7 @@ module CarrierWave
   module Uploader
     module Mountable
 
-      attr_reader :model, :mounted_as, :original_file
+      attr_reader :model, :mounted_as
 
       ##
       # If a model is given as the first parameter, it will stored in the uploader, and

data/lib/carrierwave/uploader/processing.rb

@@ -8,23 +8,14 @@ module CarrierWave
       include CarrierWave::Uploader::Callbacks
 
       included do
+        class_inheritable_accessor :processors, :instance_reader => false, :instance_writer => false
+        self.processors = []
+
         after :cache, :process!
-        after :recreate_versions, :process!
       end
 
       module ClassMethods
 
-        ##
-        # Lists processor callbacks declared
-        #
-        # === Returns
-        #
-        # [Array[Array[Symbol, Array]]] a list of processor callbacks which have been declared for this uploader
-        #
-        def processors
-          @processors ||= []
-        end
-
         ##
         # Adds a processor callback which applies operations as a file is uploaded.
         # The argument may be the name of any method of the uploader, expressed as a symbol,
@@ -41,6 +32,8 @@ module CarrierWave
         #
         #       process :sepiatone, :vignette
         #       process :scale => [200, 200]
+        #       process :scale => [200, 200], :if => :image?
+        #       process :sepiatone, :if => :image?
         #
         #       def sepiatone
         #         ...
@@ -53,16 +46,27 @@ module CarrierWave
         #       def scale(height, width)
         #         ...
         #       end
+        #
+        #       def image?
+        #         ...
+        #       end
+        #
         #     end
         #
         def process(*args)
+          if !args.first.is_a?(Hash) && args.last.is_a?(Hash)
+            conditions = args.pop
+            args.map!{ |arg| {arg => []}.merge(conditions) }
+          end
+
           args.each do |arg|
             if arg.is_a?(Hash)
+              condition = arg.delete(:if)
               arg.each do |method, args|
-                processors.push([method, args])
+                processors.push([method, args, condition])
               end
             else
-              processors.push([arg, []])
+              processors.push([arg, [], nil])
             end
           end
         end
@@ -74,7 +78,8 @@ module CarrierWave
       #
       def process!(new_file=nil)
         if enable_processing
-          self.class.processors.each do |method, args|
+          self.class.processors.each do |method, args, condition|
+            next if condition && !self.send(condition, new_file)
             self.send(method, *args)
           end
         end

data/lib/carrierwave/uploader/proxy.rb

@@ -57,6 +57,21 @@ module CarrierWave
         file.respond_to?(:size) ? file.size : 0
       end
 
+      ##
+      # Return the size of the file when asked for its length
+      #
+      # === Returns
+      #
+      # [Integer] size of the file
+      #
+      # === Note
+      #
+      # This was added because of the way Rails handles length/size validations in 3.0.6 and above.
+      #
+      def length
+        size
+      end
+
     end # Proxy
   end # Uploader
-end # CarrierWave
+end # CarrierWave

data/lib/carrierwave/uploader/store.rb

@@ -27,10 +27,6 @@ module CarrierWave
         @filename
       end
 
-      def delete_original_file?
-        @original_file && @original_file.path != @file.path # if the path hasn't changed, no need to delete it
-      end
-
       ##
       # Calculates the path where the file should be stored. If +for_file+ is given, it will be
       # used as the filename, otherwise +CarrierWave::Uploader#filename+ is assumed.
@@ -60,12 +56,10 @@ module CarrierWave
         cache!(new_file) if new_file
         if @file and @cache_id
           with_callbacks(:store, new_file) do
-            @file = storage.store!(@file)
-
-            @original_file.delete if self.delete_original_file?
-
+            new_file = storage.store!(@file)
+            @file.delete if delete_tmp_file_after_storage
+            @file = new_file
             @cache_id = nil
-            @original_file = nil
           end
         end
       end

data/lib/carrierwave/uploader/url.rb

@@ -22,10 +22,11 @@ module CarrierWave
       ##
       # === Returns
       #
-      # [String] A JSON serializtion containing this uploader's URL
+      # [String] A JSON serialization containing this uploader's URL(s)
       #
       def as_json(options = nil)
-        { :url => url }
+        h = { :url => url }
+        h.merge Hash[versions.map { |name, version| [name, { :url => version.url }] }]
       end
 
     end # Url

data/lib/carrierwave/uploader/versions.rb

@@ -8,6 +8,12 @@ module CarrierWave
       include CarrierWave::Uploader::Callbacks
 
       included do
+        class_inheritable_accessor :versions, :instance_reader => false, :instance_writer => false
+        self.versions = {}
+
+        class_inheritable_accessor :version_names, :instance_reader => false, :instance_writer => false
+        self.version_names = []
+
         after :cache, :cache_versions!
         after :store, :store_versions!
         after :remove, :remove_versions!
@@ -17,43 +23,71 @@ module CarrierWave
 
       module ClassMethods
 
-        def version_names
-          @version_names ||= []
-        end
-
         ##
         # Adds a new version to this uploader
         #
         # === Parameters
         #
         # [name (#to_sym)] name of the version
+        # [options (Hash)] optional options hash
         # [&block (Proc)] a block to eval on this version of the uploader
         #
-        def version(name, &block)
+        # === Examples
+        #
+        #     class MyUploader < CarrierWave::Uploader::Base
+        #
+        #       version :thumb do
+        #         process :scale => [200, 200]
+        #       end
+        #
+        #       version :preview, :if => :image? do
+        #         process :scale => [200, 200]
+        #       end
+        #
+        #     end
+        #
+        def version(name, options = {}, &block)
           name = name.to_sym
           unless versions[name]
-            versions[name] = Class.new(self)
-            versions[name].version_names.push(*version_names)
-            versions[name].version_names.push(name)
+            uploader = Class.new(self)
+
+            # Define the enable_processing method for versions so they get the
+            # value from the parent class unless explicitly overwritten
+            uploader.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def self.enable_processing(value=nil)
+                self.enable_processing = value if value
+                if !@enable_processing.nil?
+                  @enable_processing
+                else
+                  superclass.enable_processing
+                end
+              end
+            RUBY
+
+            versions[name] = {
+              :uploader => uploader,
+              :options => options,
+            }
+            versions[name][:uploader].version_names.push(name)
             class_eval <<-RUBY
               def #{name}
                 versions[:#{name}]
               end
             RUBY
+            # as the processors get the output from the previous processors as their
+            # input we must not stack the processors here
+            versions[name][:uploader].processors.clear
           end
-          versions[name].class_eval(&block) if block
+          versions[name][:uploader].class_eval(&block) if block
           versions[name]
         end
 
-        ##
-        # === Returns
-        #
-        # [Hash{Symbol => Class}] a list of versions available for this uploader
-        #
-        def versions
-          @versions ||= {}
+        def recursively_apply_block_to_versions(&block)
+          versions.each do |name, version|
+            version[:uploader].class_eval(&block)
+            version[:uploader].recursively_apply_block_to_versions(&block)
+          end
         end
-
       end # ClassMethods
 
       ##
@@ -66,8 +100,8 @@ module CarrierWave
       def versions
         return @versions if @versions
         @versions = {}
-        self.class.versions.each do |name, klass|
-          @versions[name] = klass.new(model, mounted_as)
+        self.class.versions.each do |name, version|
+          @versions[name] = version[:uploader].new(model, mounted_as)
         end
         @versions
       end
@@ -114,13 +148,26 @@ module CarrierWave
       # versions if their parameters somehow have changed.
       #
       def recreate_versions!
-        with_callbacks(:recreate_versions, file) do
-          versions.each { |name, v| v.store!(file) }
-        end
+        # Some files could possibly not be stored on the local disk. This
+        # doesn't play nicely with processing. Make sure that we're only
+        # processing a cached file
+        #
+        # The call to store! will trigger the necessary callbacks to both
+        # process this version and all sub-versions
+        cache_stored_file! if !cached?
+
+        store!
       end
 
     private
 
+      def active_versions
+        versions.select do |name, uploader|
+          condition = self.class.versions[name][:options][:if]
+          not condition or send(condition, file)
+        end
+      end
+
       def full_filename(for_file)
         [version_name, super(for_file)].compact.join('_')
       end
@@ -130,14 +177,20 @@ module CarrierWave
       end
 
       def cache_versions!(new_file)
-        versions.each do |name, v|
+        # We might have processed the new_file argument after the callbacks were
+        # initialized, so get the actual file based off of the current state of
+        # our file
+        processed_parent = SanitizedFile.new :tempfile => self.file,
+          :filename => new_file.original_filename
+
+        active_versions.each do |name, v|
           v.send(:cache_id=, cache_id)
-          v.cache!(new_file)
+          v.cache!(processed_parent)
         end
       end
 
       def store_versions!(new_file)
-        versions.each { |name, v| v.store!(new_file) }
+        active_versions.each { |name, v| v.store!(new_file) }
       end
 
       def remove_versions!

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.5.0.1"
+  VERSION = "0.5.4.beta1"
 end

data/lib/generators/templates/uploader.rb

@@ -8,7 +8,7 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
 
   # Choose what kind of storage to use for this uploader:
   storage :file
-  # storage :s3
+  # storage :fog
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
@@ -40,6 +40,7 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   # end
 
   # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
   # def filename
   #   "something.jpg" if original_filename
   # end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: locomotive_carrierwave
 version: !ruby/object:Gem::Version 
-  hash: 101
-  prerelease: false
+  hash: 62196433
+  prerelease: 6
   segments: 
   - 0
   - 5
-  - 0
+  - 4
+  - beta
   - 1
-  version: 0.5.0.1
+  version: 0.5.4.beta1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -17,13 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
-default_executable: 
+date: 2011-06-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: activesupport
+  prerelease: false
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -36,9 +36,9 @@ dependencies:
         version: "3.0"
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: rails
+  prerelease: false
+  type: :development
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,45 +48,41 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        version: "3.0"
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: rspec
+  prerelease: false
+  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 3
+        - 2
         - 0
-        version: 1.3.0
+        version: "2.0"
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: excon
   prerelease: false
-  name: fog
+  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 7
-        version: 0.3.7
+        version: "0"
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: fog
   prerelease: false
-  name: cucumber
+  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -98,9 +94,9 @@ dependencies:
         version: "0"
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: cucumber
   prerelease: false
-  name: sqlite3-ruby
+  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,9 +108,9 @@ dependencies:
         version: "0"
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: sqlite3
   prerelease: false
-  name: dm-core
+  type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,9 +122,9 @@ dependencies:
         version: "0"
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rmagick
   prerelease: false
-  name: dm-validations
+  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -140,9 +136,9 @@ dependencies:
         version: "0"
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: RubyInline
   prerelease: false
-  name: dm-migrations
+  type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -154,9 +150,9 @@ dependencies:
         version: "0"
   requirement: *id009
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: image_science
   prerelease: false
-  name: dm-sqlite-adapter
+  type: :development
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -168,9 +164,9 @@ dependencies:
         version: "0"
   requirement: *id010
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: mini_magick
   prerelease: false
-  name: sequel
+  type: :development
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -182,9 +178,9 @@ dependencies:
         version: "0"
   requirement: *id011
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: bson_ext
   prerelease: false
-  name: rmagick
+  type: :development
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -196,9 +192,9 @@ dependencies:
         version: "0"
   requirement: *id012
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: mongoid
   prerelease: false
-  name: RubyInline
+  type: :development
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -210,9 +206,9 @@ dependencies:
         version: "0"
   requirement: *id013
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: timecop
   prerelease: false
-  name: image_science
+  type: :development
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -224,43 +220,10 @@ dependencies:
         version: "0"
   requirement: *id014
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: mini_magick
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
-  requirement: *id015
-- !ruby/object:Gem::Dependency 
-  type: :development
+  name: json
   prerelease: false
-  name: mongoid
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 62196417
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 17
-        version: 2.0.0.beta.17
-  requirement: *id016
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  name: bson_ext
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -269,12 +232,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id017
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: cloudfiles
   prerelease: false
-  name: timecop
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -283,12 +246,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id018
+  requirement: *id016
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: sham_rack
   prerelease: false
-  name: json
-  version_requirements: &id019 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -297,7 +260,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id019
+  requirement: *id017
 description: Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends.
 email: 
 - jonas.nicklas@gmail.com
@@ -307,15 +270,13 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.md
 files: 
 - lib/carrierwave/compatibility/paperclip.rb
 - lib/carrierwave/locale/en.yml
 - lib/carrierwave/mount.rb
 - lib/carrierwave/orm/activerecord.rb
-- lib/carrierwave/orm/datamapper.rb
 - lib/carrierwave/orm/mongoid.rb
-- lib/carrierwave/orm/sequel.rb
 - lib/carrierwave/processing/image_science.rb
 - lib/carrierwave/processing/mini_magick.rb
 - lib/carrierwave/processing/rmagick.rb
@@ -323,6 +284,7 @@ files:
 - lib/carrierwave/storage/abstract.rb
 - lib/carrierwave/storage/cloud_files.rb
 - lib/carrierwave/storage/file.rb
+- lib/carrierwave/storage/fog.rb
 - lib/carrierwave/storage/grid_fs.rb
 - lib/carrierwave/storage/right_s3.rb
 - lib/carrierwave/storage/s3.rb
@@ -337,7 +299,6 @@ files:
 - lib/carrierwave/uploader/processing.rb
 - lib/carrierwave/uploader/proxy.rb
 - lib/carrierwave/uploader/remove.rb
-- lib/carrierwave/uploader/rename.rb
 - lib/carrierwave/uploader/store.rb
 - lib/carrierwave/uploader/url.rb
 - lib/carrierwave/uploader/versions.rb
@@ -347,15 +308,14 @@ files:
 - lib/carrierwave.rb
 - lib/generators/templates/uploader.rb
 - lib/generators/uploader_generator.rb
-- README.rdoc
-has_rdoc: true
-homepage: http://carrierwave.rubyforge.org
+- README.md
+homepage: https://github.com/jnicklas/carrierwave
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
-- README.rdoc
+- README.md
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -370,16 +330,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: carrierwave
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Ruby file upload library