carrierwave 0.5.8 → 0.6.0

data/lib/carrierwave/uploader/serialization.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+require "active_support/json"
+require "active_support/core_ext/hash"
+
+module CarrierWave
+  module Uploader
+    module Serialization
+      extend ActiveSupport::Concern
+
+      def serializable_hash
+        {"url" => url}.merge Hash[versions.map { |name, version| [name, { "url" => version.url }] }]
+      end
+
+      def as_json(options=nil)
+        Hash[mounted_as || "uploader", serializable_hash]
+      end
+
+      def to_json
+        ActiveSupport::JSON.encode(as_json)
+      end
+
+      def to_xml(options={})
+        merged_options = options.merge(:root => mounted_as || "uploader", :type => 'uploader')
+        serializable_hash.to_xml(merged_options)
+      end
+
+    end
+  end
+end

data/lib/carrierwave/uploader/store.rb

@@ -79,8 +79,6 @@ module CarrierWave
             # Ignore: path is not a dir
           rescue Errno::ENOTEMPTY, Errno::EEXIST
             # Ignore: dir is not empty
-          rescue SystemCallError
-            # no such directory on JRuby
           end
         end
       end

data/lib/carrierwave/uploader/url.rb

@@ -7,39 +7,24 @@ module CarrierWave
       include CarrierWave::Uploader::Configuration
 
       ##
+      # === Parameters
+      #
+      # [Hash] optional, the query params (only AWS)
+      #
       # === Returns
       #
       # [String] the location where this file is accessible via a url
       #
-      def url
+      def url(options = {})
         if file.respond_to?(:url) and not file.url.blank?
-          file.url
+          file.method(:url).arity == 0 ? file.url : file.url(options)
         elsif current_path
           (base_path || "") + File.expand_path(current_path).gsub(File.expand_path(root), '')
         end
       end
 
-      alias_method :to_s, :url
-
-      ##
-      # === Returns
-      #
-      # [Hash] the locations where this file and versions are accessible via a url
-      #
-      def as_json(options = nil)
-        h = { :url => url }
-        h.merge Hash[versions.map { |name, version| [name, { :url => version.url }] }]
-      end
-
-      ##
-      # FIXME to_xml should work like to_json, but this is the best we've been able to do so far.
-      # This hack fixes issue #337.
-      #
-      # === Returns
-      #
-      # [nil]
-      #
-      def to_xml(options = nil)
+      def to_s
+        url || ''
       end
 
     end # Url

data/lib/carrierwave/uploader/versions.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'active_support/deprecation'
-
 module CarrierWave
   module Uploader
     module Versions
@@ -10,18 +8,7 @@ module CarrierWave
       include CarrierWave::Uploader::Callbacks
 
       included do
-        ##
-        # 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_attribute :versions, :version_names, :instance_reader => false, :instance_writer => false
 
         self.versions = {}
         self.version_names = []
@@ -140,28 +127,36 @@ module CarrierWave
       ##
       # When given a version name as a parameter, will return the url for that version
       # This also works with nested versions.
+      # When given a query hash as a parameter, will return the url with signature that contains query params
+      # Query hash only works with AWS (S3 storage).
       #
       # === Example
       #
       #     my_uploader.url                 # => /path/to/my/uploader.gif
       #     my_uploader.url(:thumb)         # => /path/to/my/thumb_uploader.gif
       #     my_uploader.url(:thumb, :small) # => /path/to/my/thumb_small_uploader.gif
+      #     my_uploader.url(:query => {"response-content-disposition" => "attachment"})
+      #     my_uploader.url(:version, :sub_version, :query => {"response-content-disposition" => "attachment"})
       #
       # === Parameters
       #
       # [*args (Symbol)] any number of versions
+      # OR/AND
+      # [Hash] query params
       #
       # === Returns
       #
       # [String] the location where this file is accessible via a url
       #
       def url(*args)
-        if(args.first)
-          raise ArgumentError, "Version #{args.first} doesn't exist!" if versions[args.first.to_sym].nil?
+        if (version = args.first) && version.respond_to?(:to_sym)
+          raise ArgumentError, "Version #{version} doesn't exist!" if versions[version.to_sym].nil?
           # recursively proxy to version
-          versions[args.first.to_sym].url(*args[1..-1])
+          versions[version.to_sym].url(*args[1..-1])
+        elsif args.first
+          super(args.first)
         else
-          super()
+          super
         end
       end
 
@@ -191,7 +186,15 @@ module CarrierWave
       def active_versions
         versions.select do |name, uploader|
           condition = self.class.versions[name][:options][:if]
-          not condition or send(condition, file)
+          if(condition)
+            if(condition.respond_to?(:call))
+              condition.call(self, :version => name, :file => file)
+            else
+              send(condition, file)
+            end
+          else
+            true
+          end
         end
       end
 
@@ -211,8 +214,22 @@ module CarrierWave
           :filename => new_file.original_filename
 
         active_versions.each do |name, v|
+          next if v.cached?
+
+          # If option :from_version is present, create cache using cached file from
+          # version indicated
+          if self.class.versions[name][:options] && self.class.versions[name][:options][:from_version]
+            # Maybe the reference version has not been cached yet
+            unless versions[self.class.versions[name][:options][:from_version]].cached?
+              versions[self.class.versions[name][:options][:from_version]].cache!(processed_parent)
+            end
+            processed_version = SanitizedFile.new :tempfile => versions[self.class.versions[name][:options][:from_version]],
+              :filename => new_file.original_filename
+            v.cache!(processed_version)
+          else
+            v.cache!(processed_parent)
+          end
           v.send(:cache_id=, cache_id)
-          v.cache!(processed_parent)
         end
       end
 

data/lib/carrierwave/validations/active_model.rb

@@ -3,7 +3,6 @@
 require 'active_model/validator'
 require 'active_support/concern'
 
-
 module CarrierWave
 
   # == Active Model Presence Validator
@@ -61,4 +60,4 @@ module CarrierWave
   end
 end
 
-I18n.load_path << File.join(File.dirname(__FILE__), "..", "locale", 'en.yml')
+I18n.load_path << File.join(File.dirname(__FILE__), "..", "locale", 'en.yml')

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end

data/lib/generators/templates/uploader.rb

@@ -6,6 +6,10 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   # include CarrierWave::RMagick
   # include CarrierWave::MiniMagick
 
+  # Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility:
+  # include Sprockets::Helpers::RailsHelper
+  # include Sprockets::Helpers::IsolatedHelper
+
   # Choose what kind of storage to use for this uploader:
   storage :file
   # storage :fog
@@ -18,6 +22,9 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
 
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
   #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   # end
 

metadata

@@ -1,204 +1,157 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: carrierwave
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 8
-  version: 0.5.8
 platform: ruby
-authors: 
+authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-10 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: &70154105280420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70154105280420
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70154105279720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70154105279720
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: &70154105279120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70154105279120
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70154105278160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: cucumber
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70154105278160
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70154105277620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70154105277620
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70154105277040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70154105277040
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70154105272120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  name: sham_rack
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70154105272120
+- !ruby/object:Gem::Dependency
+  name: sham_rack
+  requirement: &70154105271520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: timecop
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70154105271520
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &70154105270720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  name: cloudfiles
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70154105270720
+- !ruby/object:Gem::Dependency
   name: fog
+  requirement: &70154105269600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70154105269600
+- !ruby/object:Gem::Dependency
   name: mini_magick
+  requirement: &70154105269140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70154105269140
+- !ruby/object:Gem::Dependency
   name: rmagick
+  requirement: &70154105268620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id012
-description: Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends.
-email: 
+  version_requirements: *70154105268620
+description: Upload files in your Ruby applications, map them to a range of ORMs,
+  store them on different backends.
+email:
 - jonas.nicklas@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - lib/carrierwave/compatibility/paperclip.rb
 - lib/carrierwave/locale/en.yml
 - lib/carrierwave/mount.rb
@@ -208,11 +161,8 @@ files:
 - lib/carrierwave/processing/rmagick.rb
 - lib/carrierwave/sanitized_file.rb
 - lib/carrierwave/storage/abstract.rb
-- lib/carrierwave/storage/cloud_files.rb
 - lib/carrierwave/storage/file.rb
 - lib/carrierwave/storage/fog.rb
-- lib/carrierwave/storage/right_s3.rb
-- lib/carrierwave/storage/s3.rb
 - lib/carrierwave/test/matchers.rb
 - lib/carrierwave/uploader/cache.rb
 - lib/carrierwave/uploader/callbacks.rb
@@ -224,6 +174,7 @@ files:
 - lib/carrierwave/uploader/processing.rb
 - lib/carrierwave/uploader/proxy.rb
 - lib/carrierwave/uploader/remove.rb
+- lib/carrierwave/uploader/serialization.rb
 - lib/carrierwave/uploader/store.rb
 - lib/carrierwave/uploader/url.rb
 - lib/carrierwave/uploader/versions.rb
@@ -234,39 +185,29 @@ files:
 - lib/generators/templates/uploader.rb
 - lib/generators/uploader_generator.rb
 - README.md
-has_rdoc: true
 homepage: https://github.com/jnicklas/carrierwave
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: carrierwave
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby file upload library
 test_files: []
-