paperclip 3.0.3 → 3.0.4

data/Appraisals

@@ -9,6 +9,6 @@ appraise "3.1" do
 end
 
 appraise "3.2" do
-  gem "rails", "~> 3.2.2"
+  gem "rails", "~> 3.2.3"
   gem "paperclip", :path => "../"
 end

data/README.md

@@ -244,7 +244,7 @@ This would load the hypothetical class Paperclip::Ocr, which would have the
 hash "{ :quality => :better }" passed to it along with the uploaded file. For
 more information about defining processors, see Paperclip::Processor.
 
-The default processor is Paperclip::Thumbnail. For backwards compatability
+The default processor is Paperclip::Thumbnail. For backwards compatibility
 reasons, you can pass a single geometry string or an array containing a
 geometry and a format, which the file will be converted to, like so:
 
@@ -400,10 +400,10 @@ processors, where a defined `watermark` processor is invoked after the
       attr_accessor :watermark
     end
 
-Deploy
-------
+Deployment
+----------
 
-Paperclip is aware of new attachment styles you have added in previous deploy. The only thing you should do after each deployment is to call
+Paperclip is aware of new attachment styles you have added in previous deploys. The only thing you should do after each deployment is to call
 `rake paperclip:refresh:missing_styles`.  It will store current attachment styles in `RAILS_ROOT/public/system/paperclip_attachments.yml`
 by default. You can change it by:
 
@@ -420,11 +420,11 @@ Here is an example for Capistrano:
 
     after("deploy:update_code", "deploy:build_missing_paperclip_styles")
 
-Now you don't have to remember to refresh thumbnails in production everytime you add new style.
+Now you don't have to remember to refresh thumbnails in production every time you add a new style.
 Unfortunately it does not work with dynamic styles - it just ignores them.
 
-If you already have working app and don't want `rake paperclip:refresh:missing_styles` to refresh old pictures, you need to tell
-Paperclip about existing styles. Simply create paperclip\_attachments.yml file by hand. For example:
+If you already have a working app and don't want `rake paperclip:refresh:missing_styles` to refresh old pictures, you need to tell
+Paperclip about existing styles. Simply create a `paperclip_attachments.yml` file by hand. For example:
 
     class User < ActiveRecord::Base
       has_attached_file :avatar, :styles => {:thumb => 'x100', :croppable => '600x600>', :big => '1000x1000>'}

data/gemfiles/3.2.gemfile

@@ -5,7 +5,7 @@ source "http://rubygems.org"
 gem "jruby-openssl", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "sqlite3", :platform=>:ruby
-gem "rails", "~> 3.2.2"
+gem "rails", "~> 3.2.3"
 gem "paperclip", :path=>"../"
 
 gemspec :path=>"../"

data/lib/paperclip/processor.rb

@@ -32,6 +32,18 @@ module Paperclip
     def self.make file, options = {}, attachment = nil
       new(file, options, attachment).make
     end
+
+    # The convert method runs the convert binary with the provided arguments.
+    # See Paperclip.run for the available options.
+    def convert(arguments = "", local_options = {})
+      Paperclip.run('convert', arguments, local_options)
+    end
+
+    # The identify method runs the identify binary with the provided arguments.
+    # See Paperclip.run for the available options.
+    def identify(arguments = "", local_options = {})
+      Paperclip.run('identify', arguments, local_options)
+    end
   end
 
   module ProcessorHelpers

data/lib/paperclip/storage/s3.rb

@@ -39,8 +39,9 @@ module Paperclip
     #     :s3_permissions => :private
     #
     # * +s3_protocol+: The protocol for the URLs generated to your S3 assets. Can be either
-    #   'http' or 'https'. Defaults to 'http' when your :s3_permissions are :public_read (the
-    #   default), and 'https' when your :s3_permissions are anything else.
+    #   'http', 'https', or an empty string to generate scheme-less URLs. Defaults to 'http'
+    #   when your :s3_permissions are :public_read (the default), and 'https' when your
+    #   :s3_permissions are anything else.
     # * +s3_headers+: A hash of headers or a Proc. You may specify a hash such as
     #   {'Expires' => 1.year.from_now.httpdate}. If you use a Proc, headers are determined at
     #   runtime. Paperclip will call that Proc with attachment as the only argument.
@@ -60,12 +61,19 @@ module Paperclip
     #   Normally, this won't matter in the slightest and you can leave the default (which is
     #   path-style, or :s3_path_url). But in some cases paths don't work and you need to use
     #   the domain-style (:s3_domain_url). Anything else here will be treated like path-style.
-    #   NOTE: If you use a CNAME for use with CloudFront, you can NOT specify https as your
-    #   :s3_protocol; This is *not supported* by S3/CloudFront. Finally, when using the host
-    #   alias, the :bucket parameter is ignored, as the hostname is used as the bucket name
-    #   by S3. The fourth option for the S3 url is :asset_host, which uses Rails' built-in
-    #   asset_host settings. NOTE: To get the full url from a paperclip'd object, use the
-    #   image_path helper; this is what image_tag uses to generate the url for an img tag.
+    #   
+    #   Notes:
+    #   * The value of this option is a string, not a symbol.
+    #     <b>right:</b> <tt>":s3_domain_url"</tt>
+    #     <b>wrong:</b> <tt>:s3_domain_url</tt>
+    #   * If you use a CNAME for use with CloudFront, you can NOT specify https as your
+    #     :s3_protocol;
+    #     This is *not supported* by S3/CloudFront. Finally, when using the host
+    #     alias, the :bucket parameter is ignored, as the hostname is used as the bucket name
+    #     by S3. The fourth option for the S3 url is :asset_host, which uses Rails' built-in
+    #     asset_host settings.
+    #   * To get the full url from a paperclip'd object, use the
+    #     image_path helper; this is what image_tag uses to generate the url for an img tag.
     # * +path+: This is the key under the bucket in which the file will be stored. The
     #   URL will be constructed from the bucket and the path. This is what you will want
     #   to interpolate. Keys should be unique, like filenames, and despite the fact that
@@ -140,14 +148,15 @@ module Paperclip
 
           @http_proxy = @options[:http_proxy] || nil
         end
+
         Paperclip.interpolates(:s3_alias_url) do |attachment, style|
-          "#{attachment.s3_protocol(style)}://#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{^/}, "")}"
+          "#{attachment.s3_protocol(style)}//#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{^/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_alias_url
         Paperclip.interpolates(:s3_path_url) do |attachment, style|
-          "#{attachment.s3_protocol(style)}://#{attachment.s3_host_name}/#{attachment.bucket_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
+          "#{attachment.s3_protocol(style)}//#{attachment.s3_host_name}/#{attachment.bucket_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_path_url
         Paperclip.interpolates(:s3_domain_url) do |attachment, style|
-          "#{attachment.s3_protocol(style)}://#{attachment.bucket_name}.#{attachment.s3_host_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
+          "#{attachment.s3_protocol(style)}//#{attachment.bucket_name}.#{attachment.s3_host_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_domain_url
         Paperclip.interpolates(:asset_host) do |attachment, style|
           "#{attachment.path(style).gsub(%r{^/}, "")}"
@@ -272,11 +281,14 @@ module Paperclip
       end
 
       def s3_protocol(style = default_style)
-        if @s3_protocol.is_a?(Proc)
+        protocol = if @s3_protocol.is_a?(Proc)
           @s3_protocol.call(style, self)
         else
           @s3_protocol
         end
+
+        protocol = protocol.split(":").first + ":" unless protocol.empty?
+        protocol
       end
 
       def create_bucket
@@ -348,7 +360,7 @@ module Paperclip
       private :find_credentials
 
       def use_secure_protocol?(style_name)
-        s3_protocol(style_name) == "https"
+        s3_protocol(style_name) == "https:"
       end
       private :use_secure_protocol?
     end

data/lib/paperclip/thumbnail.rb

@@ -73,7 +73,7 @@ module Paperclip
 
         parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
 
-        success = Paperclip.run("convert", parameters, :source => "#{File.expand_path(src.path)}#{'[0]' unless animated?}", :dest => File.expand_path(dst.path))
+        success = convert(parameters, :source => "#{File.expand_path(src.path)}#{'[0]' unless animated?}", :dest => File.expand_path(dst.path))
       rescue Cocaine::ExitStatusError => e
         raise Paperclip::Error, "There was an error processing the thumbnail for #{@basename}" if @whiny
       rescue Cocaine::CommandNotFoundError => e

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "3.0.3" unless defined? Paperclip::VERSION
+  VERSION = "3.0.4" unless defined? Paperclip::VERSION
 end

data/test/processor_test.rb

@@ -7,4 +7,20 @@ class ProcessorTest < Test::Unit::TestCase
     Paperclip::Processor.expects(:new).with(:one, :two, :three).returns(processor)
     Paperclip::Processor.make(:one, :two, :three)
   end
+
+  context "Calling #convert" do
+    should "run the convert command with Cocaine" do
+      Paperclip.options[:log_command] = false
+      Cocaine::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
+      Paperclip::Processor.new('filename').convert("stuff")
+    end
+  end
+
+  context "Calling #identify" do
+    should "run the identify command with Cocaine" do
+      Paperclip.options[:log_command] = false
+      Cocaine::CommandLine.expects(:new).with("identify", "stuff", {}).returns(stub(:run))
+      Paperclip::Processor.new('filename').identify("stuff")
+    end
+  end
 end

data/test/storage/s3_test.rb

@@ -128,6 +128,38 @@ class S3Test < Test::Unit::TestCase
 
   end
 
+  context ":s3_protocol => 'https'" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {},
+                    :s3_protocol => 'https',
+                    :bucket => "bucket",
+                    :path => ":attachment/:basename.:extension"
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+    end
+
+    should "return a url based on an S3 path" do
+      assert_match %r{^https://s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+    end
+  end
+
+  context ":s3_protocol => ''" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {},
+                    :s3_protocol => '',
+                    :bucket => "bucket",
+                    :path => ":attachment/:basename.:extension"
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+    end
+
+    should "return a url based on an S3 path" do
+      assert_match %r{^//s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+    end
+  end
+
   context "An attachment that uses S3 for storage and has the style in the path" do
     setup do
       rebuild_model :storage => :s3,

data/test/thumbnail_test.rb

@@ -113,10 +113,9 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:run).with do |*arg|
-          arg[0] == 'convert' &&
-          arg[1] == ':source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
-          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+        @thumb.expects(:convert).with do |*arg|
+          arg[0] == ':source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
+          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -139,10 +138,9 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:run).with do |*arg|
-          arg[0] == 'convert' &&
-          arg[1] == '-strip :source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
-          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+        @thumb.expects(:convert).with do |*arg|
+          arg[0] == '-strip :source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
+          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -181,10 +179,9 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:run).with do |*arg|
-          arg[0] == 'convert' &&
-          arg[1] == ':source -resize "x50" -crop "100x50+114+0" +repage -strip -depth 8 :dest' &&
-          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+        @thumb.expects(:convert).with do |*arg|
+          arg[0] == ':source -resize "x50" -crop "100x50+114+0" +repage -strip -depth 8 :dest' &&
+          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000 Z
+date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -530,7 +530,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord
@@ -601,4 +601,3 @@ test_files:
 - test/validators/attachment_presence_validator_test.rb
 - test/validators/attachment_size_validator_test.rb
 - test/validators_test.rb
-has_rdoc: