carrierwave 0.5.3 → 0.5.4

data/README.rdoc

@@ -125,6 +125,31 @@ make the record invalid instead. Otherwise, an error is raised.
       end
     end
 
+=== Validating Uploads
+
+Standard active model validations can be used to ensure a file is uploaded.
+
+   mount_uploader :avatar, AvatarUploader 
+
+   validate_presence_of :avatar
+
+CarrierWave also supplies additional validations, such as validating the integrity of an uploaded file.
+
+    validates_integrity_of :avatar
+
+or validating that the file was sucessfully processed
+
+    validates_processing_of :avatar
+
+The validations use translated error messages and can be changed using i18n localization
+
+    en:
+      errors:
+        messages:
+          carrierwave_processing_error: failed to be processed
+          carrierwave_integrity_error: is not an allowed file type
+
+
 === Filenames and unicode chars
 
 Another security issue you should care for is the file names (see
@@ -366,7 +391,8 @@ Fog[http://github.com/geemus/fog] is used to support Amazon S3. Ensure you have
     gem install fog
 
 You'll need to provide your fog_credentials and a fog_directory (also known as a bucket) in an initializer.
-You can also pass in additional options, as documented fully in lib/storage/fog.rb. Here's a full example:
+For the sake of performance it is assumed that the directory already exists, so please create it if need be.
+You can also pass in additional options, as documented fully in lib/carrierwave/storage/fog.rb. Here's a full example:
 
     CarrierWave.configure do |config|
       config.fog_credentials = {
@@ -395,7 +421,8 @@ Fog[http://github.com/geemus/fog] is used to support Rackspace Cloud Files. Ensu
 
     gem install fog
 
-You'll need to configure a directory (also known as a container), username and api key like this in an initializer:
+You'll need to configure a directory (also known as a container), username and api key in the initializer.
+For the sake of performance it is assumed that the directory already exists, so please create it if need be.
 
     CarrierWave.configure do |config|
       config.fog_credentials = {
@@ -427,7 +454,8 @@ Fog[http://github.com/geemus/fog] is used to support Google Storage for Develope
 
     gem install fog
 
-You'll need to configure a directory (also known as a bucket), access key id and secret access key like this in an initializer:
+You'll need to configure a directory (also known as a bucket), access key id and secret access key in the initialiazer.
+For the sake of performance it is assumed that the directory already exists, so please create it if need be.
 
     CarrierWave.configure do |config|
       config.fog_credentials = {

data/lib/carrierwave.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/concern'
+require 'active_support/memoizable'
 
 module CarrierWave
 

data/lib/carrierwave/mount.rb

@@ -256,6 +256,7 @@ module CarrierWave
     # this is an internal class, used by CarrierWave::Mount so that
     # we don't pollute the model with a lot of methods.
     class Mounter #:nodoc:
+      extend ActiveSupport::Memoizable
 
       attr_reader :column, :record, :remote_url, :integrity_error, :processing_error
       attr_accessor :remove
@@ -346,6 +347,7 @@ module CarrierWave
       def option(name)
         record.class.uploader_option(column, name)
       end
+      memoize :option
 
       def serialization_column
         option(:mount_on) || column

data/lib/carrierwave/storage/fog.rb

@@ -17,7 +17,7 @@ module CarrierWave
     # You need to setup some options to configure your usage:
     #
     # [:fog_credentials]  credentials for service
-    # [:fog_directory]    specifies name of directory to store data in
+    # [:fog_directory]    specifies name of directory to store data in, assumed to already exist
     #
     # [:fog_attributes]                   (optional) additional attributes to set on files
     # [:fog_host]                         (optional) non-default host to serve files from
@@ -174,7 +174,8 @@ module CarrierWave
         # [Boolean] true for success or raises error
         #
         def delete
-          file.destroy
+          # avoid a get by just using local reference
+          directory.files.new(:key => path).destroy
         end
 
         ##
@@ -247,8 +248,22 @@ module CarrierWave
           if host = @uploader.fog_host
             "#{host}/#{path}"
           else
-            # avoid a get by just using local reference
-            directory.files.new(:key => path).public_url
+            # AWS/Google optimized for speed over correctness
+            case @uploader.fog_credentials[:provider]
+            when 'AWS'
+              # if directory is a valid subdomain, use that style for access
+              if @uploader.fog_directory.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+                "https://#{@uploader.fog_directory}.s3.amazonaws.com/#{path}"
+              else
+                # directory is not a valid subdomain, so use path style for access
+                "https://s3.amazonaws.com/#{@uploader.fog_directory}/#{path}"
+              end
+            when 'Google'
+              "https://commondatastorage.googleapis.com/#{@uploader.fog_directory}/#{path}"
+            else
+              # avoid a get by just using local reference
+              directory.files.new(:key => path).public_url
+            end
           end
         end
 
@@ -283,7 +298,7 @@ module CarrierWave
         end
 
         ##
-        # lookup directory containing file
+        # local reference to directory containing file
         #
         # === Returns
         #
@@ -291,7 +306,7 @@ module CarrierWave
         #
         def directory
           @directory ||= begin
-            connection.directories.get(@uploader.fog_directory) || connection.directories.create(
+            connection.directories.new(
               :key    => @uploader.fog_directory,
               :public => @uploader.fog_public
             )

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 +00:00
+date: 2011-05-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,10 +29,10 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
+  name: activesupport
   type: :runtime
+  prerelease: false
   requirement: *id001
-  name: activesupport
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,90 +45,81 @@ dependencies:
         - 0
         - 5
         version: 3.0.5
-  prerelease: false
+  name: rails
   type: :development
+  prerelease: false
   requirement: *id002
-  name: rails
 - !ruby/object:Gem::Dependency 
   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
-  prerelease: false
+        version: "2.0"
+  name: rspec
   type: :development
+  prerelease: false
   requirement: *id003
-  name: rspec
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
         - 0
-        - 7
-        - 1
-        version: 0.7.1
-  prerelease: false
+        version: "0"
+  name: excon
   type: :development
+  prerelease: false
   requirement: *id004
-  name: fog
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 3
         segments: 
         - 0
-        - 8
-        - 5
-        version: 0.8.5
-  prerelease: false
+        version: "0"
+  name: fog
   type: :development
+  prerelease: false
   requirement: *id005
-  name: cucumber
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 3
         segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
-  prerelease: false
+        - 0
+        version: "0"
+  name: cucumber
   type: :development
+  prerelease: false
   requirement: *id006
-  name: sqlite3
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
-  prerelease: false
+        version: "0"
+  name: sqlite3
   type: :development
+  prerelease: false
   requirement: *id007
-  name: dm-core
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -141,10 +132,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
+  name: dm-core
   type: :development
+  prerelease: false
   requirement: *id008
-  name: dm-validations
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -157,10 +148,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
+  name: dm-validations
   type: :development
+  prerelease: false
   requirement: *id009
-  name: dm-migrations
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -173,187 +164,180 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
+  name: dm-migrations
   type: :development
+  prerelease: false
   requirement: *id010
-  name: dm-sqlite-adapter
 - !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 23
         segments: 
-        - 3
-        - 14
+        - 1
         - 0
-        version: 3.14.0
-  prerelease: false
+        - 0
+        version: 1.0.0
+  name: dm-sqlite-adapter
   type: :development
+  prerelease: false
   requirement: *id011
-  name: sequel
 - !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 3
         segments: 
-        - 2
-        - 13
-        - 1
-        version: 2.13.1
-  prerelease: false
+        - 0
+        version: "0"
+  name: sequel
   type: :development
+  prerelease: false
   requirement: *id012
-  name: rmagick
 - !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 3
         segments: 
-        - 3
-        - 8
-        - 4
-        version: 3.8.4
-  prerelease: false
+        - 0
+        version: "0"
+  name: rmagick
   type: :development
+  prerelease: false
   requirement: *id013
-  name: RubyInline
 - !ruby/object:Gem::Dependency 
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 1
-        version: 1.2.1
-  prerelease: false
+        - 0
+        version: "0"
+  name: RubyInline
   type: :development
+  prerelease: false
   requirement: *id014
-  name: image_science
 - !ruby/object:Gem::Dependency 
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
-        - 2
-        - 3
-        version: "2.3"
-  prerelease: false
+        - 0
+        version: "0"
+  name: image_science
   type: :development
+  prerelease: false
   requirement: *id015
-  name: mini_magick
 - !ruby/object:Gem::Dependency 
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 4
-        version: 1.2.4
-  prerelease: false
+        - 0
+        version: "0"
+  name: mini_magick
   type: :development
+  prerelease: false
   requirement: *id016
-  name: bson_ext
 - !ruby/object:Gem::Dependency 
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196421
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
-  prerelease: false
+        version: "0"
+  name: bson_ext
   type: :development
+  prerelease: false
   requirement: *id017
-  name: mongoid
 - !ruby/object:Gem::Dependency 
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 5
-        version: 0.3.5
-  prerelease: false
+        version: "0"
+  name: mongoid
   type: :development
+  prerelease: false
   requirement: *id018
-  name: timecop
 - !ruby/object:Gem::Dependency 
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  prerelease: false
+        - 0
+        version: "0"
+  name: timecop
   type: :development
+  prerelease: false
   requirement: *id019
-  name: json
 - !ruby/object:Gem::Dependency 
   version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 3
         segments: 
-        - 1
-        - 4
-        - 12
-        version: 1.4.12
-  prerelease: false
+        - 0
+        version: "0"
+  name: json
   type: :development
+  prerelease: false
   requirement: *id020
-  name: cloudfiles
 - !ruby/object:Gem::Dependency 
   version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 3
         segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
-  prerelease: false
+        - 0
+        version: "0"
+  name: cloudfiles
   type: :development
+  prerelease: false
   requirement: *id021
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: sham_rack
+  type: :development
+  prerelease: false
+  requirement: *id022
 description: Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends.
 email: 
 - jonas.nicklas@gmail.com
@@ -434,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: carrierwave
-rubygems_version: 1.5.0
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Ruby file upload library