carrierwave 0.5.0 → 0.5.1

data/README.rdoc

@@ -26,6 +26,11 @@ In Rails, add it to your Gemfile:
 
     gem 'carrierwave'
 
+CarrierWave is only compatible with Rails 3 and later as of version 0.5. If you want to use
+Rails 2, please use the latest gem in the 0.4.X series. You may also consider trying
+{this plugin}[http://github.com/gbuesing/carrierwave_rails23_compat] which allows CarrierWave
+to be used with a Rails 2.3 app.
+
 == Quick Start
 
 Start off by generating an uploader:
@@ -322,8 +327,7 @@ CarrierWave comes with some RSpec matchers which you may find useful:
 
 == Using Amazon S3
 
-Older versions of CarrierWave used the +aws+, +aws-s3+, and/or +right_aws+ libraries.
-Now fog[http://github.com/geemus/fog] is now used instead. Ensure you have it installed:
+Fog[http://github.com/geemus/fog] is used to support Amazon S3. Ensure you have it installed:
 
     gem install fog
 
@@ -483,10 +487,10 @@ happily accepted.
 The activerecord validations use the Rails i18n framework. Add these keys to
 your translations file:
 
-    carrierwave:
-      errors:
-        integrity: 'Not an image.'
-        processing: 'Cannot resize image.'
+    errors:
+      messages:
+        carrierwave_processing_error: 'Cannot resize image.'
+        carrierwave_integrity_error: 'Not an image.'
 
 == License
 
@@ -524,6 +528,7 @@ And then install the dependencies:
 
 You should now be able to run the tests:
 
-    bundle exec rake spec
+    bundle exec rake
 
 Issues are reported on GitHub, pull requests are very welcome!
+

data/lib/carrierwave.rb

@@ -94,7 +94,7 @@ elsif defined?(Sinatra)
 end
 
 
-require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'activerecord') if defined?(ActiveRecord)
-require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'datamapper') if defined?(DataMapper)
-require File.join(File.dirname(__FILE__), "carrierwave", "orm", 'sequel') if defined?(Sequel)
-require File.join(File.dirname(__FILE__), "carrierwave", "orm", "mongoid") if defined?(Mongoid)
+require 'carrierwave/orm/activerecord' if defined?(ActiveRecord)
+require 'carrierwave/orm/datamapper' if defined?(DataMapper)
+require 'carrierwave/orm/sequel' if defined?(Sequel)
+require 'carrierwave/orm/mongoid' if defined?(Mongoid)

data/lib/carrierwave/mount.rb

@@ -60,9 +60,7 @@ module CarrierWave
     # retrieve files like this:
     #
     #     @user.image # => <Uploader>
-    #     @user.image = some_file_object
-    #
-    #     @user.store_image!
+    #     @user.image.store!(some_file_object)
     #
     #     @user.image.url # => '/some_url.png'
     #

data/lib/carrierwave/orm/activerecord.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'active_record'
-require File.expand_path(File.dirname(__FILE__) + "../../validations/active_model")
+require 'carrierwave/validations/active_model'
 
 module CarrierWave
   module ActiveRecord

data/lib/carrierwave/orm/mongoid.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
+
 require 'mongoid'
-require File.expand_path(File.dirname(__FILE__) + "../../validations/active_model")
+require 'carrierwave/validations/active_model'
 
 module CarrierWave
   module Mongoid
@@ -11,17 +12,17 @@ module CarrierWave
     def mount_uploader(column, uploader, options={}, &block)
       options[:mount_on] ||= "#{column}_filename"
       field options[:mount_on]
-      
+
       super
-      
+
       alias_method :read_uploader, :read_attribute
       alias_method :write_uploader, :write_attribute
-      
+
       include CarrierWave::Validations::ActiveModel
 
       validates_integrity_of  column if uploader_option(column.to_sym, :validate_integrity)
       validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
-      
+
       after_save "store_#{column}!".to_sym
       before_save "write_#{column}_identifier".to_sym
       after_destroy "remove_#{column}!".to_sym

data/lib/carrierwave/processing/mini_magick.rb

@@ -249,11 +249,11 @@ module CarrierWave
     # [CarrierWave::ProcessingError] if manipulation failed.
     #
     def manipulate!
-      image = ::MiniMagick::Image.from_file(current_path)
+      image = ::MiniMagick::Image.open(current_path)
       image = yield(image)
       image.write(current_path)
-      ::MiniMagick::Image.from_file(current_path)
-    rescue ::MiniMagick::Error => e
+      ::MiniMagick::Image.open(current_path)
+    rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
       raise CarrierWave::ProcessingError.new("Failed to manipulate with MiniMagick, maybe it is not an image? Original Error: #{e}")
     end
 

data/lib/carrierwave/storage/file.rb

@@ -23,8 +23,7 @@ module CarrierWave
       #
       def store!(file)
         path = ::File.expand_path(uploader.store_path, uploader.root)
-        file.move_to(path, uploader.permissions)
-        file
+        file.copy_to(path, uploader.permissions)
       end
 
       ##

data/lib/carrierwave/storage/grid_fs.rb

@@ -7,6 +7,34 @@ module CarrierWave
     ##
     # The GridFS store uses MongoDB's GridStore file storage system to store files
     #
+    # There are two ways of configuring the GridFS connection. Either you create a
+    # connection or you reuse an existing connection.
+    #
+    # Creating a connection looks something like this:
+    # 
+    #     CarrierWave.configure do |config|
+    #       config.storage = :grid_fs
+    #       config.grid_fs_host = "your-host.com"
+    #       config.grid_fs_port = "27017"
+    #       config.grid_fs_database = "your_dbs_app_name"
+    #       config.grid_fs_username = "user"
+    #       config.grid_fs_password = "verysecret"
+    #       config.grid_fs_access_url = "/images"
+    #     end
+    #
+    #   In the above example your documents url will look like:
+    #   
+    #      http://your-app.com/images/:document-identifier-here
+    #
+    # When you already have a Mongo connection object (for example through Mongoid)
+    # you can also reuse this connection:
+    #
+    #     CarrierWave.configure do |config|
+    #       config.storage = :grid_fs
+    #       config.grid_fs_connection = Mongoid.database
+    #       config.grid_fs_access_url = "/images"
+    #     end
+    #
     class GridFS < Abstract
 
       class File
@@ -53,7 +81,7 @@ module CarrierWave
       protected
 
         def database
-          @connection ||= begin
+          @connection ||= @uploader.grid_fs_connection || begin
             host = @uploader.grid_fs_host
             port = @uploader.grid_fs_port
             database = @uploader.grid_fs_database

data/lib/carrierwave/storage/s3.rb

@@ -21,15 +21,14 @@ module CarrierWave
     # You can set the access policy for the uploaded files:
     #
     #     CarrierWave.configure do |config|
-    #       config.s3_access_policy = 'public-read'
+    #       config.s3_access_policy = :public_read
     #     end
     #
-    # The default is 'public-read'. For more options see:
+    # The default is :public_read. For more options see:
     #
     # http://docs.amazonwebservices.com/AmazonS3/latest/RESTAccessPolicy.html#RESTCannedAccessPolicies
     #
-    # For backwards compatability with the original aws-s3 library, if the old +config.s3_access+ is set it
-    # will be converted to the appropriate access policy:
+    # The following access policies are available:
     #
     # [:private]              No one else has any access rights.
     # [:public_read]          The anonymous principal is granted READ access.
@@ -54,6 +53,19 @@ module CarrierWave
     #
     #     http://bucketname.domain.tld.s3.amazonaws.com/path/to/file
     #
+    # You can specify a region. US Standard "us-east-1" is the default.
+    #
+    #     CarrierWave.configure do |config|
+    #       config.s3_region = 'eu-west-1'
+    #     end
+    #
+    # Available options are defined in Fog Storage[http://github.com/geemus/fog/blob/master/lib/fog/aws/storage.rb]
+    #
+    #     'eu-west-1' => 's3-eu-west-1.amazonaws.com'
+    #     'us-east-1' => 's3.amazonaws.com'
+    #     'ap-southeast-1' => 's3-ap-southeast-1.amazonaws.com'
+    #     'us-west-1' => 's3-us-west-1.amazonaws.com'
+    #
     class S3 < Abstract
 
       class File
@@ -103,37 +115,35 @@ module CarrierWave
         # [String] file's url
         #
         def url
-          if @uploader.s3_cnamed
-            ["http://#{@uploader.s3_bucket}", @path].compact.join('/')
+          if access_policy == :authenticated_read
+            authenticated_url
           else
-            ["http://#{@uploader.s3_bucket}.s3.amazonaws.com", @path].compact.join('/')
+            public_url
           end
         end
 
+        def public_url
+          if cnamed?
+            ["http://#{bucket}", path].compact.join('/')
+          else
+            ["http://#{bucket}.s3.amazonaws.com", path].compact.join('/')
+          end
+        end
+
+        def authenticated_url
+          connection.get_object_url(bucket, path, Time.now + 60 * 10)
+        end
+
         def store(file)
           content_type ||= file.content_type # this might cause problems if content type changes between read and upload (unlikely)
-          connection.put_object(bucket, @path, file.read,
+          connection.put_object(bucket, path, file.read,
             {
-              'x-amz-acl' => access_policy,
+              'x-amz-acl' => access_policy.to_s.gsub('_', '-'),
               'Content-Type' => content_type
             }.merge(@uploader.s3_headers)
           )
         end
 
-        # The Amazon S3 Access policy ready to send in storage request headers.
-        def access_policy
-          return @access_policy unless @access_policy.blank?
-          if @uploader.s3_access_policy.blank?
-            if !@uploader.s3_access.blank?
-              @access_policy = @uploader.s3_access.to_s.gsub(/_/, '-')
-            else
-              @access_policy = 'public-read'
-            end
-          else
-            @access_policy = @uploader.s3_access_policy
-          end
-        end
-
         def content_type
           headers["Content-Type"]
         end
@@ -143,16 +153,28 @@ module CarrierWave
         end
 
         def size
-         	headers['content-length'].to_i
+           headers['Content-Length'].to_i
         end
 
         # Headers returned from file retrieval
         def headers
-          @headers ||= connection.head(bucket, @path)
+          @headers ||= begin
+            connection.head_object(bucket, @path).headers
+          rescue Excon::Errors::NotFound # Don't die, just return no headers
+            {}
+          end
         end
 
       private
 
+        def cnamed?
+          @uploader.s3_cnamed
+        end
+
+        def access_policy
+          @uploader.s3_access_policy
+        end
+
         def bucket
           @uploader.s3_bucket
         end
@@ -195,12 +217,14 @@ module CarrierWave
       end
 
       def connection
-        @connection ||= Fog::AWS::S3.new(
+        @connection ||= Fog::AWS::Storage.new(
           :aws_access_key_id => uploader.s3_access_key_id,
-          :aws_secret_access_key => uploader.s3_secret_access_key
+          :aws_secret_access_key => uploader.s3_secret_access_key,
+          :region => uploader.s3_region
         )
       end
 
     end # S3
   end # Storage
 end # CarrierWave
+

data/lib/carrierwave/test/matchers.rb

@@ -154,7 +154,7 @@ module CarrierWave
         end
 
         def initialize(filename)
-          @image = ::MiniMagick::Image.from_file(filename)
+          @image = ::MiniMagick::Image.open(filename)
         end
       end
 

data/lib/carrierwave/uploader/cache.rb

@@ -45,7 +45,7 @@ module CarrierWave
           Dir.glob(File.expand_path(File.join(cache_dir, '*'), CarrierWave.root)).each do |dir|
             time = dir.scan(/(\d{4})(\d{2})(\d{2})-(\d{2})(\d{2})/).first.map { |t| t.to_i }
             time = Time.utc(*time)
-            if time < (Time.now - (60*60*24))
+            if time < (Time.now.utc - (60*60*24))
               FileUtils.rm_rf(dir)
             end
           end

data/lib/carrierwave/uploader/configuration.rb

@@ -8,17 +8,18 @@ module CarrierWave
         add_config :root
         add_config :permissions
         add_config :storage_engines
-        add_config :s3_access # for old s3 support
-        add_config :s3_access_policy # for new s3 support
+        add_config :s3_access_policy
         add_config :s3_bucket
         add_config :s3_access_key_id
         add_config :s3_secret_access_key
         add_config :s3_cnamed
         add_config :s3_headers
+        add_config :s3_region
         add_config :cloud_files_username
         add_config :cloud_files_api_key
         add_config :cloud_files_container
         add_config :cloud_files_cdn_host
+        add_config :grid_fs_connection
         add_config :grid_fs_database
         add_config :grid_fs_host
         add_config :grid_fs_port
@@ -29,14 +30,15 @@ module CarrierWave
         add_config :cache_dir
         add_config :enable_processing
         add_config :ensure_multipart_form
-        
+        add_config :delete_tmp_file_after_storage
+
         # Mounting
         add_config :ignore_integrity_errors
         add_config :ignore_processing_errors
         add_config :validate_integrity
         add_config :validate_processing
         add_config :mount_on
-        
+
         configure do |config|
           config.permissions = 0644
           config.storage_engines = {
@@ -48,11 +50,14 @@ module CarrierWave
           }
           config.storage = :file
           config.s3_headers = {}
+          config.s3_access_policy = :public_read
+          config.s3_region = 'us-east-1'
           config.grid_fs_database = 'carrierwave'
           config.grid_fs_host = 'localhost'
           config.grid_fs_port = 27017
           config.store_dir = 'uploads'
           config.cache_dir = 'uploads/tmp'
+          config.delete_tmp_file_after_storage = true
           config.ignore_integrity_errors = true
           config.ignore_processing_errors = true
           config.validate_integrity = true

data/lib/carrierwave/uploader/store.rb

@@ -56,7 +56,9 @@ module CarrierWave
         cache!(new_file) if new_file
         if @file and @cache_id
           with_callbacks(:store, new_file) do
-            @file = storage.store!(@file)
+            new_file = storage.store!(@file)
+            @file.delete if delete_tmp_file_after_storage
+            @file = new_file
             @cache_id = nil
           end
         end

data/lib/carrierwave/uploader/url.rb

@@ -24,8 +24,8 @@ module CarrierWave
       #
       # [String] A JSON serializtion containing this uploader's URL
       #
-      def to_json(*args)
-        { 'url' => url }.to_json(*args)
+      def as_json(options = nil)
+        { :url => url }
       end
 
     end # Url

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 +02:00
+date: 2010-12-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,11 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,6 +41,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -55,6 +57,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -70,11 +73,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
-        - 2
-        - 30
-        version: 0.2.30
+        - 3
+        - 7
+        version: 0.3.7
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -85,6 +89,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -98,6 +103,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -111,6 +117,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -124,6 +131,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -137,6 +145,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -150,6 +159,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -163,6 +173,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -176,6 +187,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -189,6 +201,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -202,6 +215,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -215,40 +229,45 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 2
-        - 1
-        version: "2.1"
+        - 3
+        version: "2.3"
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: mongoid
+  name: bson_ext
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 17
-        version: 2.0.0.beta.17
+        - 1
+        - 1
+        - 1
+        version: 1.1.1
   type: :development
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: mongoid
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 62196421
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        - beta
+        - 19
+        version: 2.0.0.beta.19
   type: :development
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
@@ -259,6 +278,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -272,6 +292,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -340,6 +361,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -348,6 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"