carrierwave 0.7.1 → 0.8.0

data/README.md

@@ -386,11 +386,11 @@ end
 You might come to a situation where you want to retroactively change a version
 or add a new one. You can use the recreate_versions! method to recreate the
 versions from the base file. This uses a naive approach which will re-upload and
-process all versions.
+process the specified version or all versions, if none is passed as an argument.
 
 ```ruby
 instance = MyUploader.new
-instance.recreate_versions!
+instance.recreate_versions!(:thumb, :large)
 ```
 
 Or on a mounted uploader:
@@ -505,15 +505,16 @@ You can also pass in additional options, as documented fully in lib/carrierwave/
 ```ruby
 CarrierWave.configure do |config|
   config.fog_credentials = {
-    :provider               => 'AWS',       # required
-    :aws_access_key_id      => 'xxx',       # required
-    :aws_secret_access_key  => 'yyy',       # required
-    :region                 => 'eu-west-1'  # optional, defaults to 'us-east-1'
+    :provider               => 'AWS',                        # required
+    :aws_access_key_id      => 'xxx',                        # required
+    :aws_secret_access_key  => 'yyy',                        # required
+    :region                 => 'eu-west-1',                  # optional, defaults to 'us-east-1'
+    :hosts                  => 's3.example.com',             # optional, defaults to nil
+    :endpoint               => 'https://s3.example.com:8080' # optional, defaults to nil
   }
   config.fog_directory  = 'name_of_directory'                     # required
   config.fog_public     = false                                   # optional, defaults to true
   config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}  # optional, defaults to {}
-  config.asset_host     = 'https://assets.example.com'            # optional, defaults to nil
 end
 ```
 
@@ -579,6 +580,10 @@ gem "fog", "~> 1.3.1"
 You'll need to configure a directory (also known as a bucket), access key id and secret access key in the initializer.
 For the sake of performance it is assumed that the directory already exists, so please create it if need be.
 
+Sign up [here](http://gs-signup-redirect.appspot.com/) and get your credentials [here](https://storage.cloud.google.com/m)
+under the section “Interoperable Access”.
+
+
 ```ruby
 CarrierWave.configure do |config|
   config.fog_credentials = {
@@ -658,7 +663,7 @@ of ImageMagick without having to worry about installing all the RMagick librarie
 
 See the MiniMagick site for more details:
 
-https://github.com/minimagic/minimagick
+https://github.com/minimagick/minimagick
 
 And the ImageMagick command line options for more for whats on offer:
 
@@ -736,46 +741,11 @@ This has only been tested with the local filesystem store.
 
 ## Contributing to CarrierWave
 
-CarrierWave thrives on a large number of [contributors](https://github.com/jnicklas/carrierwave/contributors),
-and pull requests are very welcome. Before submitting a pull request, please make sure that your changes are well tested.
-
-First, make sure you have `imagemagick` and `ghostscript` installed.
-
-Then, you'll need to install bundler and the gem dependencies:
-
-	gem install bundler
-	bundle install
-
-You should now be able to run the local tests:
-
-	bundle exec rake
-
-You can also run the remote specs by creating a ~/.fog file:
-
-```yaml
-:carrierwave:
-  :aws_access_key_id: xxx
-  :aws_secret_access_key: yyy
-  :rackspace_username: xxx
-  :rackspace_api_key: yyy
-  :google_storage_access_key_id: xxx
-  :google_storage_secret_access_key: yyy
-```
-
-You should now be able to run the remote tests:
-
-	REMOTE=true bundle exec rake
-
-Please test with the latest Ruby 1.8.x and 1.9.x versions using RVM if possible.
-
-### Running active record tests
-
-Make sure you have a local MySQL database named `carrierwave_test` with the username
-`root` and empty password.
+See [CONTRIBUTING.md](https://github.com/jnicklas/carrierwave/blob/master/CONTRIBUTING.md)
 
 ## License
 
-Copyright (c) 2008-2012 Jonas Nicklas
+Copyright (c) 2008-2013 Jonas Nicklas
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/carrierwave.rb

@@ -3,7 +3,6 @@
 require 'fileutils'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/class/attribute'
-
 require 'active_support/concern'
 
 module CarrierWave
@@ -20,53 +19,6 @@ module CarrierWave
     end
   end
 
-  class UploadError < StandardError; end
-  class IntegrityError < UploadError; end
-  class InvalidParameter < UploadError; end
-  class ProcessingError < UploadError; end
-  class DownloadError < UploadError; end
-
-  autoload :SanitizedFile, 'carrierwave/sanitized_file'
-  autoload :Mount, 'carrierwave/mount'
-  autoload :RMagick, 'carrierwave/processing/rmagick'
-  autoload :ImageScience, 'carrierwave/processing/image_science'
-  autoload :MiniMagick, 'carrierwave/processing/mini_magick'
-  autoload :MimeTypes, 'carrierwave/processing/mime_types'
-  autoload :VERSION, 'carrierwave/version'
-
-  module Storage
-    autoload :Abstract, 'carrierwave/storage/abstract'
-    autoload :File, 'carrierwave/storage/file'
-    autoload :Fog, 'carrierwave/storage/fog'
-  end
-
-  module Uploader
-    autoload :Base, 'carrierwave/uploader'
-    autoload :Cache, 'carrierwave/uploader/cache'
-    autoload :Store, 'carrierwave/uploader/store'
-    autoload :Download, 'carrierwave/uploader/download'
-    autoload :Callbacks, 'carrierwave/uploader/callbacks'
-    autoload :Processing, 'carrierwave/uploader/processing'
-    autoload :Versions, 'carrierwave/uploader/versions'
-    autoload :Remove, 'carrierwave/uploader/remove'
-    autoload :ExtensionWhitelist, 'carrierwave/uploader/extension_whitelist'
-    autoload :ExtensionBlacklist, 'carrierwave/uploader/extension_blacklist'
-    autoload :DefaultUrl, 'carrierwave/uploader/default_url'
-    autoload :Proxy, 'carrierwave/uploader/proxy'
-    autoload :Url, 'carrierwave/uploader/url'
-    autoload :Mountable, 'carrierwave/uploader/mountable'
-    autoload :Configuration, 'carrierwave/uploader/configuration'
-    autoload :Serialization, 'carrierwave/uploader/serialization'
-  end
-
-  module Compatibility
-    autoload :Paperclip, 'carrierwave/compatibility/paperclip'
-  end
-
-  module Test
-    autoload :Matchers, 'carrierwave/test/matchers'
-  end
-
 end
 
 if defined?(Merb)
@@ -108,5 +60,14 @@ elsif defined?(Sinatra)
       Sinatra::Application.public
     end
   end
-
 end
+
+require "carrierwave/error"
+require "carrierwave/sanitized_file"
+require "carrierwave/mount"
+require "carrierwave/processing"
+require "carrierwave/version"
+require "carrierwave/storage"
+require "carrierwave/uploader"
+require "carrierwave/compatibility/paperclip"
+require "carrierwave/test/matchers"

data/lib/carrierwave/error.rb

@@ -0,0 +1,7 @@
+module CarrierWave
+  class UploadError < StandardError; end
+  class IntegrityError < UploadError; end
+  class InvalidParameter < UploadError; end
+  class ProcessingError < UploadError; end
+  class DownloadError < UploadError; end
+end

data/lib/carrierwave/mount.rb

@@ -141,10 +141,15 @@ module CarrierWave
     def mount_uploader(column, uploader=nil, options={}, &block)
       if block_given?
         uploader = Class.new(uploader || CarrierWave::Uploader::Base)
+        const_set("Uploader#{uploader.object_id}".gsub('-', '_'), uploader)
         uploader.class_eval(&block)
         uploader.recursively_apply_block_to_versions(&block)
       else
-        uploader ||= Class.new(CarrierWave::Uploader::Base)
+        uploader ||= begin
+          u = Class.new(CarrierWave::Uploader::Base)
+          const_set("Uploader#{u.object_id}".gsub('-', '_'), u)
+          u
+        end
       end
 
       uploaders[column.to_sym] = uploader
@@ -344,7 +349,7 @@ module CarrierWave
         @integrity_error = nil
 
         @remote_url = url
-        
+
         uploader.download!(url)
 
       rescue CarrierWave::DownloadError => e

data/lib/carrierwave/processing.rb

@@ -0,0 +1,3 @@
+require "carrierwave/processing/rmagick"
+require "carrierwave/processing/mini_magick"
+require "carrierwave/processing/mime_types"

data/lib/carrierwave/processing/mime_types.rb

@@ -1,4 +1,4 @@
-require 'mime/types'
+# encoding: utf-8
 
 module CarrierWave
 
@@ -26,6 +26,15 @@ module CarrierWave
   module MimeTypes
     extend ActiveSupport::Concern
 
+    included do
+      begin
+        require "mime/types"
+      rescue LoadError => e
+        e.message << " (You may need to install the mime-types gem)"
+        raise e
+      end
+    end
+
     module ClassMethods
       def set_content_type(override=false)
         process :set_content_type => override

data/lib/carrierwave/processing/mini_magick.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'mini_magick'
-
 module CarrierWave
 
   ##
@@ -51,12 +49,21 @@ module CarrierWave
   #
   # http://mini_magick.rubyforge.org/
   # and
-  # http://github.com/probablycorey/mini_magick/
+  # https://github.com/minimagic/minimagick/
   #
   #
   module MiniMagick
     extend ActiveSupport::Concern
 
+    included do
+      begin
+        require "mini_magick"
+      rescue LoadError => e
+        e.message << " (You may need to install the mini_magick gem)"
+        raise e
+      end
+    end
+
     module ClassMethods
       def convert(format)
         process :convert => format

data/lib/carrierwave/processing/rmagick.rb

@@ -1,15 +1,5 @@
 # encoding: utf-8
 
-unless defined? Magick
-  begin
-    require 'rmagick'
-  rescue LoadError
-    require 'RMagick'
-  rescue LoadError
-    puts "WARNING: Failed to require rmagick, image processing may fail!"
-  end
-end
-
 module CarrierWave
 
   ##
@@ -70,6 +60,17 @@ module CarrierWave
   module RMagick
     extend ActiveSupport::Concern
 
+    included do
+      begin
+        require "rmagick"
+      rescue LoadError
+        require "RMagick"
+      rescue LoadError => e
+        e.message << " (You may need to install the rmagick gem)"
+        raise e
+      end
+    end
+
     module ClassMethods
       def convert(format)
         process :convert => format

data/lib/carrierwave/storage.rb

@@ -0,0 +1,9 @@
+require "carrierwave/storage/abstract"
+require "carrierwave/storage/file"
+
+begin
+  require "fog"
+rescue LoadError
+end
+
+require "carrierwave/storage/fog" if defined?(Fog)

data/lib/carrierwave/storage/fog.rb

@@ -1,10 +1,6 @@
 # encoding: utf-8
 
-begin
-  require 'fog'
-rescue LoadError
-  raise "You don't have the 'fog' gem installed"
-end
+require "fog"
 
 module CarrierWave
   module Storage
@@ -16,11 +12,10 @@ module CarrierWave
     #
     # You need to setup some options to configure your usage:
     #
-    # [:fog_credentials]  credentials for service
+    # [:fog_credentials]  host info and credentials for service
     # [:fog_directory]    specifies name of directory to store data in, assumed to already exist
     #
     # [:fog_attributes]                   (optional) additional attributes to set on files
-    # [:fog_endpoint]                     (optional) non-default host to connect with
     # [:fog_public]                       (optional) public readability, defaults to true
     # [:fog_authenticated_url_expiration] (optional) time (in seconds) that authenticated urls
     #   will be valid, when fog_public is false and provider is AWS or Google, defaults to 600
@@ -103,14 +98,6 @@ module CarrierWave
       def connection
         @connection ||= begin
           options = credentials = uploader.fog_credentials
-          endpoint_url = if uploader.fog_endpoint.respond_to? :call
-            URI.parse( uploader.fog_endpoint.call(self) )
-          elsif uploader.fog_endpoint
-            URI.parse( uploader.fog_endpoint )
-          end
-          if host_string = endpoint_url && (endpoint_url.host || endpoint_url.to_s)
-            options.merge!( { :host => host_string } )
-          end
           self.class.connection_cache[credentials] ||= ::Fog::Storage.new(options)
         end
       end
@@ -139,7 +126,7 @@ module CarrierWave
 
         ##
         # Return a temporary authenticated url to a private file, if available
-        # Only supported for AWS and Google providers
+        # Only supported for AWS, Rackspace and Google providers
         #
         # === Returns
         #
@@ -148,12 +135,14 @@ module CarrierWave
         # [NilClass] no authenticated url available
         #
         def authenticated_url(options = {})
-          if ['AWS', 'Google'].include?(@uploader.fog_credentials[:provider])
+          if ['AWS', 'Google', 'Rackspace'].include?(@uploader.fog_credentials[:provider])
             # avoid a get by using local references
             local_directory = connection.directories.new(:key => @uploader.fog_directory)
             local_file = local_directory.files.new(:key => path)
             if @uploader.fog_credentials[:provider] == "AWS"
               local_file.url(::Fog::Time.now + @uploader.fog_authenticated_url_expiration, options)
+            elsif @uploader.fog_credentials[:provider] == "Rackspace"
+              connection.get_object_https_url(@uploader.fog_directory, path, ::Fog::Time.now + @uploader.fog_authenticated_url_expiration)
             else
               local_file.url(::Fog::Time.now + @uploader.fog_authenticated_url_expiration)
             end
@@ -196,6 +185,17 @@ module CarrierWave
           directory.files.new(:key => path).destroy
         end
 
+        ##
+        # Return extension of file
+        #
+        # === Returns
+        #
+        # [String] extension of file
+        #
+        def extension
+          path.split('.').last
+        end
+
         ##
         # deprecated: All attributes from file (includes headers)
         #
@@ -285,12 +285,17 @@ module CarrierWave
             # 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}"
+              # check if some endpoint is set in fog_credentials
+              if @uploader.fog_credentials.has_key?(:endpoint)
+                "#{@uploader.fog_credentials[:endpoint]}/#{@uploader.fog_directory}/#{path}"
               else
-                # directory is not a valid subdomain, so use path style for access
-                "https://s3.amazonaws.com/#{@uploader.fog_directory}/#{path}"
+                # 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
               end
             when 'Google'
               "https://commondatastorage.googleapis.com/#{@uploader.fog_directory}/#{path}"

data/lib/carrierwave/uploader.rb

@@ -1,5 +1,22 @@
 # encoding: utf-8
 
+require "carrierwave/uploader/configuration"
+require "carrierwave/uploader/callbacks"
+require "carrierwave/uploader/proxy"
+require "carrierwave/uploader/url"
+require "carrierwave/uploader/mountable"
+require "carrierwave/uploader/cache"
+require "carrierwave/uploader/store"
+require "carrierwave/uploader/download"
+require "carrierwave/uploader/remove"
+require "carrierwave/uploader/extension_whitelist"
+require "carrierwave/uploader/extension_blacklist"
+require "carrierwave/uploader/processing"
+require "carrierwave/uploader/versions"
+require "carrierwave/uploader/default_url"
+
+require "carrierwave/uploader/serialization"
+
 module CarrierWave
 
   ##
@@ -25,6 +42,7 @@ module CarrierWave
     class Base
       attr_reader :file
 
+      include CarrierWave::Uploader::Configuration
       include CarrierWave::Uploader::Callbacks
       include CarrierWave::Uploader::Proxy
       include CarrierWave::Uploader::Url
@@ -38,7 +56,6 @@ module CarrierWave
       include CarrierWave::Uploader::Processing
       include CarrierWave::Uploader::Versions
       include CarrierWave::Uploader::DefaultUrl
-      include CarrierWave::Uploader::Configuration
       include CarrierWave::Uploader::Serialization
     end # Base
 

data/lib/carrierwave/uploader/cache.rb

@@ -70,6 +70,10 @@ module CarrierWave
       # require the file to be stored on the local filesystem.
       #
       def cache_stored_file!
+        cache!
+      end
+
+      def sanitized_file
         _content = file.read
         if _content.is_a?(File) # could be if storage is Fog
           sanitized = CarrierWave::Storage::Fog.new(self).retrieve!(File.basename(_content.path))
@@ -79,8 +83,7 @@ module CarrierWave
           sanitized = SanitizedFile.new :tempfile => StringIO.new(file.read),
             :filename => File.basename(path), :content_type => file.content_type
         end
-
-        cache! sanitized
+        sanitized
       end
 
       ##
@@ -110,7 +113,7 @@ module CarrierWave
       #
       # [CarrierWave::FormNotMultipart] if the assigned parameter is a string
       #
-      def cache!(new_file)
+      def cache!(new_file = sanitized_file)
         new_file = CarrierWave::SanitizedFile.new(new_file)
 
         unless new_file.empty?

data/lib/carrierwave/uploader/configuration.rb

@@ -26,7 +26,6 @@ module CarrierWave
         add_config :fog_attributes
         add_config :fog_credentials
         add_config :fog_directory
-        add_config :fog_endpoint
         add_config :fog_public
         add_config :fog_authenticated_url_expiration
 

data/lib/carrierwave/uploader/download.rb

@@ -37,8 +37,8 @@ module CarrierWave
           end
           @file
 
-        rescue
-          raise CarrierWave::DownloadError, "could not download file"
+        rescue Exception => e
+          raise CarrierWave::DownloadError, "could not download file: #{e.message}"
         end
 
         def method_missing(*args, &block)

data/lib/carrierwave/uploader/versions.rb

@@ -52,6 +52,7 @@ module CarrierWave
           name = name.to_sym
           unless versions[name]
             uploader = Class.new(self)
+            const_set("Uploader#{uploader.object_id}".gsub('-', '_'), uploader)
             uploader.versions = {}
 
             # Define the enable_processing method for versions so they get the
@@ -164,16 +165,20 @@ module CarrierWave
       # Recreate versions and reprocess them. This can be used to recreate
       # versions if their parameters somehow have changed.
       #
-      def recreate_versions!
+      def recreate_versions!(*versions)
         # 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!
+        if versions.any?
+          file = sanitized_file if !cached?
+          store_versions!(file, versions)
+        else
+          cache! if !cached?
+          store!
+        end
       end
 
     private
@@ -233,8 +238,12 @@ module CarrierWave
         end
       end
 
-      def store_versions!(new_file)
-        active_versions.each { |name, v| v.store!(new_file) }
+      def store_versions!(new_file, versions=nil)
+        if versions
+          versions.each { |v| Hash[active_versions][v].store!(new_file) }
+        else
+          active_versions.each { |name, v| v.store!(new_file) }
+        end
       end
 
       def remove_versions!

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement
@@ -213,16 +213,19 @@ extra_rdoc_files:
 - README.md
 files:
 - lib/carrierwave/compatibility/paperclip.rb
+- lib/carrierwave/error.rb
 - lib/carrierwave/locale/en.yml
 - lib/carrierwave/mount.rb
 - lib/carrierwave/orm/activerecord.rb
 - lib/carrierwave/processing/mime_types.rb
 - lib/carrierwave/processing/mini_magick.rb
 - lib/carrierwave/processing/rmagick.rb
+- lib/carrierwave/processing.rb
 - lib/carrierwave/sanitized_file.rb
 - lib/carrierwave/storage/abstract.rb
 - lib/carrierwave/storage/file.rb
 - lib/carrierwave/storage/fog.rb
+- lib/carrierwave/storage.rb
 - lib/carrierwave/test/matchers.rb
 - lib/carrierwave/uploader/cache.rb
 - lib/carrierwave/uploader/callbacks.rb
@@ -272,3 +275,4 @@ signing_key:
 specification_version: 3
 summary: Ruby file upload library
 test_files: []
+has_rdoc: