locomotive_carrierwave 0.5.4.beta2 → 0.5.4.beta3

data/README.md

@@ -569,6 +569,8 @@ The RMagick module gives you a few methods, like
 `CarrierWave::RMagick#resize_to_fill` which manipulate the image file in some
 way. You can set a `process` callback, which will call that method any time a
 file is uploaded.
+There is a demonstration of convert here.
+Convert will only work if the file has the same file extension, thus the use of the filename method.
 
 ``` ruby
 class AvatarUploader < CarrierWave::Uploader::Base
@@ -578,7 +580,7 @@ class AvatarUploader < CarrierWave::Uploader::Base
   process :convert => 'png'
 
   def filename
-    super + '.png'
+    super.chomp(File.extname(super)) + '.png'
   end
 end
 ```

data/lib/carrierwave.rb

@@ -3,7 +3,12 @@
 require 'fileutils'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/class/inheritable_attributes'
+
+begin
+  require 'active_support/core_ext/class/inheritable_attributes'
+rescue LoadError
+end
+
 require 'active_support/concern'
 require 'active_support/memoizable'
 
@@ -32,6 +37,7 @@ module CarrierWave
   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

data/lib/carrierwave/orm/mongoid.rb

@@ -39,9 +39,11 @@ module CarrierWave
             value = value.duplicable? ? value.clone : value
           rescue TypeError, NoMethodError
           end
-          @modifications[column] = value
+          setup_modifications
 
-          super
+          super.tap do
+            @modifications[column] = [value, __send__(column)]
+          end
         end
 
         def #{column}_changed?

data/lib/carrierwave/processing/image_science.rb

@@ -26,8 +26,6 @@ module CarrierWave
     # specified in the smaller dimension but will not be larger than the
     # specified values.
     #
-    # See even http://www.imagemagick.org/RMagick/doc/image3.html#resize_to_fit
-    #
     # === Parameters
     #
     # [width (Integer)] the width to scale the image to
@@ -49,8 +47,6 @@ module CarrierWave
     # the aspect ratio of the original image. If necessary, crop the image in
     # the larger dimension.
     #
-    # See even http://www.imagemagick.org/RMagick/doc/image3.html#resize_to_fill
-    #
     # === Parameters
     #
     # [width (Integer)] the width to scale the image to

data/lib/carrierwave/processing/mime_types.rb

@@ -0,0 +1,58 @@
+require 'mime/types'
+
+module CarrierWave
+
+  ##
+  # This module simplifies the use of the mime-types gem to intelligently
+  # guess and set the content-type of a file. If you want to use this, you'll
+  # need to require this file:
+  #
+  #     require 'carrierwave/processing/mime_types'
+  #
+  # And then include it in your uploader:
+  #
+  #     class MyUploader < CarrierWave::Uploader::Base
+  #       include CarrierWave::MimeTypes
+  #     end
+  #
+  # You can now use the provided helper:
+  #
+  #     class MyUploader < CarrierWave::Uploader::Base
+  #       include CarrierWave::MimeTypes
+  #
+  #       process :set_content_type
+  #     end
+  #
+  module MimeTypes
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def set_content_type(override=false)
+        process :set_content_type => override
+      end
+    end
+
+    ##
+    # Changes the file content_type using the mime-types gem
+    #
+    # === Parameters
+    #
+    # [override (Boolean)] whether or not to override the file's content_type
+    #                      if it is already set and not a generic content-type,
+    #                      false by default
+    #
+    def set_content_type(override=false)
+      if override || file.content_type.blank? || file.content_type == 'application/octet-stream'
+        new_content_type = ::MIME::Types.type_for(file.original_filename).first.to_s
+        if file.respond_to?(:content_type=)
+          file.content_type = new_content_type
+        else
+          file.set_instance_variable(:@content_type, new_content_type)
+        end
+      end
+    rescue ::MIME::InvalidContentType => e
+      raise CarrierWave::ProcessingError.new("Failed to process file with MIME::Types, maybe not valid content-type? Original Error: #{e}")
+    end
+
+  end # MimeTypes
+end # CarrierWave

data/lib/carrierwave/processing/mini_magick.rb

@@ -129,12 +129,9 @@ module CarrierWave
     end
 
     ##
-    # From the RMagick documentation: "Resize the image to fit within the
-    # specified dimensions while retaining the original aspect ratio. The
-    # image may be shorter or narrower than specified in the smaller dimension
-    # but will not be larger than the specified values."
-    #
-    # See even http://www.imagemagick.org/RMagick/doc/image3.html#resize_to_fit
+    # Resize the image to fit within the specified dimensions while retaining
+    # the original aspect ratio. The image may be shorter or narrower than
+    # specified in the smaller dimension but will not be larger than the specified values.
     #
     # === Parameters
     #
@@ -154,15 +151,9 @@ module CarrierWave
     end
 
     ##
-    # From the RMagick documentation: "Resize the image to fit within the
-    # specified dimensions while retaining the aspect ratio of the original
-    # image. If necessary, crop the image in the larger dimension."
-    #
-    # See even http://www.imagemagick.org/RMagick/doc/image3.html#resize_to_fill
-    #
-    # and
-    #
-    # http://www.clipclip.org/clips/detail/4365/jerrett-net-»-crop_resized-in-rmagick
+    # Resize the image to fit within the specified dimensions while retaining
+    # the aspect ratio of the original image. If necessary, crop the image in the
+    # larger dimension.
     #
     # === Parameters
     #
@@ -229,7 +220,7 @@ module CarrierWave
     end
 
     ##
-    # Manipulate the image with RMagick. This method will load up an image
+    # Manipulate the image with MiniMagick. This method will load up an image
     # and then pass each of its frames to the supplied block. It will then
     # save the image to disk.
     #

data/lib/carrierwave/sanitized_file.rb

@@ -16,10 +16,10 @@ module CarrierWave
   class SanitizedFile
 
     attr_accessor :file
-    
+
     class << self
       attr_writer :sanitize_regexp
-      
+
       def sanitize_regexp
         @sanitize_regexp ||= /[^a-zA-Z0-9\.\-\+_]/
       end
@@ -228,6 +228,17 @@ module CarrierWave
       @file.content_type.chomp if @file.respond_to?(:content_type) and @file.content_type
     end
 
+    ##
+    # Sets the content type of the file.
+    #
+    # === Returns
+    #
+    # [String] the content type of the file
+    #
+    def content_type=(type)
+      @content_type = type
+    end
+
     ##
     # Used to sanitize the file name. Public to allow overriding for non-latin characters.
     #

data/lib/carrierwave/uploader/configuration.rb

@@ -5,7 +5,7 @@ module CarrierWave
       extend ActiveSupport::Concern
 
       included do
-        class_inheritable_accessor :_storage, :instance_reader => false, :instance_writer => false
+        class_attribute :_storage, :instance_writer => false
 
         add_config :root
         add_config :permissions
@@ -37,6 +37,7 @@ module CarrierWave
         add_config :enable_processing
         add_config :ensure_multipart_form
         add_config :delete_tmp_file_after_storage
+        add_config :delete_cache_id_after_storage
         add_config :remove_previously_stored_files_after_update
 
         # fog
@@ -144,6 +145,7 @@ module CarrierWave
             config.store_dir = 'uploads'
             config.cache_dir = 'uploads/tmp'
             config.delete_tmp_file_after_storage = true
+            config.delete_cache_id_after_storage = true
             config.remove_previously_stored_files_after_update = true
             config.ignore_integrity_errors = true
             config.ignore_processing_errors = true

data/lib/carrierwave/uploader/processing.rb

@@ -8,7 +8,7 @@ module CarrierWave
       include CarrierWave::Uploader::Callbacks
 
       included do
-        class_inheritable_accessor :processors, :instance_reader => false, :instance_writer => false
+        class_attribute :processors, :instance_writer => false
         self.processors = []
 
         after :cache, :process!
@@ -63,10 +63,10 @@ module CarrierWave
             if arg.is_a?(Hash)
               condition = arg.delete(:if)
               arg.each do |method, args|
-                processors.push([method, args, condition])
+                self.processors += [[method, args, condition]]
               end
             else
-              processors.push([arg, [], nil])
+              self.processors += [[arg, [], nil]]
             end
           end
         end

data/lib/carrierwave/uploader/store.rb

@@ -58,11 +58,22 @@ module CarrierWave
           with_callbacks(:store, new_file) do
             new_file = storage.store!(@file)
             @file.delete if delete_tmp_file_after_storage
+            delete_cache_id if delete_cache_id_after_storage
             @file = new_file
             @cache_id = nil
           end
         end
       end
+      
+      ##
+      # Deletes a cache id (tmp dir in cache)
+      #
+      def delete_cache_id
+        if @cache_id
+          path = File.join(cache_dir, @cache_id)
+          FileUtils.rm_rf(path) if File.exists?(path) && File.directory?(path)
+        end
+      end
 
       ##
       # Retrieves the file from the storage.

data/lib/carrierwave/uploader/versions.rb

@@ -8,10 +8,20 @@ module CarrierWave
       include CarrierWave::Uploader::Callbacks
 
       included do
-        class_inheritable_accessor :versions, :instance_reader => false, :instance_writer => false
-        self.versions = {}
+        ##
+        # Add configuration options for versions
+        # class_inheritable_accessor was deprecated in Rails 3.1 and removed for 3.2.
+        # class_attribute was added in 3.0, but doesn't support omitting the instance_reader until 3.0.10
+        # For max compatibility, always use class_inheritable_accessor when possible
+        if respond_to?(:class_inheritable_accessor)
+          ActiveSupport::Deprecation.silence do
+            class_inheritable_accessor :versions, :version_names, :instance_reader => false, :instance_writer => false
+          end
+        else
+          class_attribute :versions, :version_names, :instance_reader => false, :instance_writer => false
+        end
 
-        class_inheritable_accessor :version_names, :instance_reader => false, :instance_writer => false
+        self.versions = {}
         self.version_names = []
 
         after :cache, :cache_versions!
@@ -50,6 +60,7 @@ module CarrierWave
           name = name.to_sym
           unless versions[name]
             uploader = Class.new(self)
+            uploader.versions = {}
 
             # Define the enable_processing method for versions so they get the
             # value from the parent class unless explicitly overwritten
@@ -64,11 +75,16 @@ module CarrierWave
               end
             RUBY
 
-            versions[name] = {
+            # Add the current version hash to class attribute :versions
+            current_version = {}
+            current_version[name] = {
               :uploader => uploader,
-              :options => options,
+              :options  => options
             }
-            versions[name][:uploader].version_names.push(name)
+            self.versions = versions.merge(current_version)
+
+            versions[name][:uploader].version_names += [name]
+
             class_eval <<-RUBY
               def #{name}
                 versions[:#{name}]
@@ -76,6 +92,7 @@ module CarrierWave
             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 = versions[name][:uploader].processors.dup
             versions[name][:uploader].processors.clear
           end
           versions[name][:uploader].class_eval(&block) if block

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.5.4.beta2"
+  VERSION = "0.5.4.beta3"
 end

metadata

@@ -1,24 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: locomotive_carrierwave
 version: !ruby/object:Gem::Version 
-  hash: 62196439
+  hash: 62196437
   prerelease: 6
   segments: 
   - 0
   - 5
   - 4
   - beta
-  - 2
-  version: 0.5.4.beta2
+  - 3
+  version: 0.5.4.beta3
 platform: ruby
 authors: 
 - Jonas Nicklas
-- Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 Z
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -264,7 +263,6 @@ dependencies:
 description: Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends.
 email: 
 - jonas.nicklas@gmail.com
-- didier@nocoffee.fr
 executables: []
 
 extensions: []
@@ -278,6 +276,7 @@ files:
 - lib/carrierwave/orm/activerecord.rb
 - lib/carrierwave/orm/mongoid.rb
 - lib/carrierwave/processing/image_science.rb
+- lib/carrierwave/processing/mime_types.rb
 - lib/carrierwave/processing/mini_magick.rb
 - lib/carrierwave/processing/rmagick.rb
 - lib/carrierwave/sanitized_file.rb
@@ -315,7 +314,6 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README.md
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement