imageproxy 0.4.3 → 1.0.0

data/README.mdown

@@ -41,8 +41,9 @@ Feel free to help out with some of these :)
   * nice error messages for improper API use
   * performance
 
+See also the [release notes](https://github.com/eahanson/imageproxy/blob/master/release-notes.mdown)
 
-PERFORMANCE
+Performance
 -----------
 
 imageproxy doesn't do any sort of caching. That kind of thing is better left up to CDNs (like Amazon CloudFront or VoxCast CDN) or to caching proxies such as Varnish.
@@ -50,7 +51,7 @@ imageproxy doesn't do any sort of caching. That kind of thing is better left up
 Also, imageproxy itself isn't nearly as fast as it could be. It's written in an interpreted language, and it shells out to curl and ImageMagick to do its work. Presumably, it would be way faster written in C as an Apache module or something.
 
 
-REQUIREMENTS
+Requirements
 ------------
 
   * [Ruby](http://www.ruby-lang.org/)
@@ -59,7 +60,7 @@ REQUIREMENTS
   * [Curl](http://curl.haxx.se)
 
 
-INSTALLING
+Installing
 ----------
 
   gem install imageproxy
@@ -169,6 +170,9 @@ Example Ruby code to generate the signature:
 
 `IMAGEPROXY_MAX_SIZE` The maximum dimension allowed for a `resize` or `thumbnail` operation. Specifying `20` would cause a resize of `10x30` to fail because the maximum dimension of `20` is less than the largest requested dimension of `30`.
 
+`IMAGEPROXY_WORLD_READABLE_TEMPFILE` set to `true` if you want the generated tempfiles to be `-rw-r--r--` instead of the default `-rw-------`
+
+
 ### Obfuscating Requests
 
 You may obfuscate your requests by Base64 encoding and then URL encoding your query string or path. The parameter name for this encoded value is `_` if you're using a query string or `-` if you're using a path. Example:
@@ -316,6 +320,12 @@ To run the specs
 
     rake spec
 
+Related
+-------
+
+  * [Thumbor](https://github.com/globocom/thumbor) is similar but has "smart crop" using various detection algorithms and some other features.
+  
+
 Thanks
 ------
 

data/VERSION

@@ -1 +1 @@
-0.4.3
+1.0.0

data/imageproxy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "imageproxy"
-  s.version = "0.4.3"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Hanson"]
-  s.date = "2012-11-26"
+  s.date = "2013-02-23"
   s.description = "A image processing proxy server, written in Ruby as a Rack application. Requires ImageMagick."
   s.email = "erik@eahanson.com"
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "public/background.png",
     "public/sample.png",
     "public/sample_10x20.png",
+    "release-notes.mdown",
     "spec/command_spec.rb",
     "spec/convert_spec.rb",
     "spec/identify_format_spec.rb",

data/lib/imageproxy/convert.rb

@@ -1,11 +1,14 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "command")
+require "timeout"
 
 module Imageproxy
   class Convert < Imageproxy::Command
     attr_reader :options
 
-    def initialize(options)
+    def initialize(options, settings={})
       @options = options
+      @settings = settings
+
       if (!(options.resize || options.thumbnail || options.rotate || options.flip || options.format ||
         options.quality || options.overlay))
         raise "Missing action or illegal parameter value"
@@ -83,9 +86,14 @@ module Imageproxy
     def new_format
       options.format ? "#{options.format}:" : ""
     end
-
+    
     def file
-      @tempfile ||= Tempfile.new("imageproxy").tap(&:close)
+      @tempfile ||= begin
+        file = Tempfile.new("imageproxy")
+        file.chmod 0644 if @settings[:world_readable_tempfile]
+        file.close
+        file
+      end
     end
   end
-end
+end

data/lib/imageproxy/server.rb

@@ -51,7 +51,9 @@ module Imageproxy
     private
 
     def convert_file(options, user_agent)
-      Convert.new(options).execute(user_agent, config(:timeout))
+      Convert.
+        new(options, world_readable_tempfile: config?(:world_readable_tempfile)).
+        execute(user_agent, config(:timeout))
     end
 
     def config(symbol)
@@ -122,4 +124,4 @@ module Imageproxy
       Imageproxy::IdentifyFormat.new(file).execute
     end
   end
-end
+end

data/release-notes.mdown

@@ -0,0 +1,47 @@
+Imageproxy Release Notes
+========================
+
+See the [Imageproxy readme](https://github.com/eahanson/imageproxy/blob/master/README.mdown) for more info.
+
+### 1.0 - February 22, 2013
+
+  * Bumped version to 1.0 -- imageproxy has been in production for over 1.5 years at this point and deserves a real version number
+  * Added `world_readable_tempfile` option to make the permissions of the generated tempfiles to be `-rw-r--r--` instead of the default `-rw-------`
+
+### 0.4.3 - November 26, 2012
+
+  * Fix error on Heroku Cedar (thanks Daniel Szmulewicz!)
+  * Retry `curl` command after 10 second timeout
+
+### 0.4.2 - August 8, 2012
+
+  * Have `curl` report errors to standard error
+
+### 0.4.1 - July 24, 2012
+
+  * Improve logging on errors
+
+### 0.4.0 - May 16, 2012
+
+  * Add ability to composite two images
+
+### 0.3.0 - May 15, 2012
+
+  * Allow '.' characters in base 64-encoded path, which gets replaced with '=' characters before decoding
+
+### 0.2.0 - August 28, 2011
+
+  * When a command fails, only raise an exception in Ruby 1.9, not 1.8
+
+### 0.1.4 - August 24, 2011
+
+  * Add timeout option
+
+### 0.1.3 - June 9, 2011
+
+  * Use ImageMagick's `identify` command to figure out the content type of the image
+  * Follow redirects when requesting images
+
+### 0.1.0 - June 8, 2011
+
+  * Initial version

data/spec/convert_spec.rb

@@ -32,6 +32,18 @@ describe Imageproxy::Convert do
     end
   end
 
+  describe "#file" do
+    it "should create a world-readable tempfile if requested" do
+      convert = Imageproxy::Convert.new(
+        Imageproxy::Options.new("", {:resize=> "20x20", :source => "http%3A%2F%2Fexample.com%2Fdog.jpg"}),
+        world_readable_tempfile: true)
+      mock_file = mock("Tempfile", close: nil, path: "")
+      mock_file.should_receive(:chmod).with(0644)
+      Tempfile.should_receive(:new).and_return(mock_file)
+      convert.file
+    end
+  end
+
   context "when resizing" do
     it("with no extra args") do
       command(:resize => "10x20").convert_options.should ==

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imageproxy
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -186,6 +186,7 @@ files:
 - public/background.png
 - public/sample.png
 - public/sample_10x20.png
+- release-notes.mdown
 - spec/command_spec.rb
 - spec/convert_spec.rb
 - spec/identify_format_spec.rb
@@ -208,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1087416563410215419
+      hash: 3085346647419398487
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: