dynamic_image 2.0.0.beta5 → 2.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd6783a5824c2de5a61c549f88613c5461779e9b
-  data.tar.gz: f1f6a7b013b1ec0a0bdac1dd1dcd48fc72305112
+  metadata.gz: 051d5b39accd268d9cc110266aedd9fdb8f1cdd1
+  data.tar.gz: b1269f69f608a7bc858b508bbfebdb307af95bed
 SHA512:
-  metadata.gz: 0f1a9443802ed6be61bd135800c748a85da7b2c72cc3bf3a832a21ac91f3c02bce47aec16e0a259b5fbd3ba7bccef78e5ba4c7b3063dfc752dbf08d09384ed7b
-  data.tar.gz: eb357b816a71f5b6e3d58a851bbdfd9795d75ba91a5f8629c7922fcc929e203bcc3c8970d1f9c04b23fff0a5ac40db37883fb8b17f4d63fdf0b8e93a172d84c7
+  metadata.gz: 02c062771c93bbfde82f595c4410450c3934502de7fa042a51692bd55614fd3b51c3a31ed0eece6aeb22efa94df4d49f3fa0a645164d2b73e6101403ef0561d8
+  data.tar.gz: bab5fd5bd153d5a6181d8e8fccba6a8f484c390e04567d9b24a8052b13f4bcf9f52850eff7b5c0e9ac052e47b84c2266724874319f2a2eaf20d7839bfaebba88

data/README.md

@@ -1,6 +1,33 @@
 # DynamicImage [![Build Status](https://travis-ci.org/elektronaut/dynamic_image.png)](https://travis-ci.org/elektronaut/dynamic_image) [![Code Climate](https://codeclimate.com/github/elektronaut/dynamic_image.png)](https://codeclimate.com/github/elektronaut/dynamic_image) [![Code Climate](https://codeclimate.com/github/elektronaut/dynamic_image/coverage.png)](https://codeclimate.com/github/elektronaut/dynamic_image)
 
-Requires Rails 4.1+ and Ruby 1.9.3+.
+Need to handle image uploads in your Rails app?
+Give DynamicImage a try.
+
+Rather than creating a pre-defined set of images when a file is
+uploaded, DynamicImage stores the original file and generates images
+on demand. It handles cropping, resizing, format and colorspace
+conversion.
+
+Supported formats at the moment are JPEG, PNG, GIF and TIFF. The
+latter will automatically be converted to JPG. CMYK images will be
+converted to RGB, and RGB images will be converted to the sRGB
+colorspace for consistent appearance in all browsers.
+
+DynamicImage is built on [Dis](https://github.com/elektronaut/dis)
+and [MiniMagick](https://github.com/minimagick/minimagick).
+
+All URLs are signed with a HMAC to protect against denial of service
+and enumeration attacks.
+
+## Requirements
+
+* Rails 4.2
+* Ruby 1.9.3+
+* ImageMagick command line tools
+
+## Documentation
+
+[Documentation is available on RubyDoc.info](http://rdoc.info/gems/dynamic_image)
 
 ## Installation
 
@@ -40,6 +67,15 @@ declaration.
 image_resources :images, path: "dynamic_images/:digest(/:size)"
 ```
 
+## Storing an image
+
+To save an image, simply assign the file attribute to your uploaded file.
+
+```ruby
+image_params = params.require(:image).permit(:file)
+Image.create(image_params)
+```
+
 ## Rendering images in your views
 
 You should use the provided helpers for displaying images, this will ensure
@@ -49,26 +85,26 @@ To display the image at it's original size, use `dynamic_image_tag` without
 any options.
 
 ```erb
-<%= dynamic_image_tag image %>
+<%= dynamic_image_tag(image) %>
 ```
 
 To resize it, specify a max size. This will scale the image down to fit, but
 no cropping will occur.
 
 ```erb
-<%= dynamic_image_tag image, size: '400x400' %>
+<%= dynamic_image_tag(image, size: '400x400') %>
 ```
 
 Setting `crop: true` will crop the image to the exact size.
 
 ```erb
-<%= dynamic_image_tag image, size: '400x400', crop: true %>
+<%= dynamic_image_tag(image, size: '400x400', crop: true) %>
 ```
 
 Omitting either dimension will render the image at an exact width or height.
 
 ```erb
-<%= dynamic_image_tag image, size: '400x' %>
+<%= dynamic_image_tag(image, size: '400x') %>
 ```
 
 `dynamic_image_path` and `dynamic_image_url` act pretty much like regular URL
@@ -78,6 +114,22 @@ helpers.
 <%= link_to "See image", dynamic_image_path(image) %>
 ```
 
+## Caching
+
+Generating images on the fly is expensive. This is less of a problem
+in development mode, as DynamicImage respects the If-Modified-Since
+header. In production, you should absolutely cache the results.
+
+DynamicImage doesn't do any caching on it's own, but it is designed to
+play well with others. Here's a few options:
+
+* [CloudFlare](https://www.cloudflare.com)
+* [Rack::Cache](http://rtomayko.github.io/rack-cache/)
+* [actionpack-page_caching](https://github.com/rails/actionpack-page_caching)
+
+It's perfectly safe to cache images indefinitely. The URL is
+timestamped, and will change if the object changes.
+
 ## License
 
 Copyright 2006-2014 Inge Jørgensen

data/lib/dynamic_image/controller.rb

@@ -14,7 +14,6 @@ module DynamicImage
       before_action :verify_signed_params
       before_action :find_record
       after_action :cache_expiration_header
-      respond_to :html, :gif, :jpeg, :png, :tiff
       helper_method :requested_size
     end
 
@@ -31,7 +30,7 @@ module DynamicImage
     # Renders the original image data, without any processing.
     def original
       if stale?(@record)
-        respond_with(@record) do |format|
+        respond_to do |format|
           format.any(:gif, :jpeg, :png, :tiff) do
             send_data(
               @record.data,
@@ -61,7 +60,7 @@ module DynamicImage
     def render_image(options)
       processed_image = DynamicImage::ProcessedImage.new(@record, options)
       if stale?(@record)
-        respond_with(@record) do |format|
+        respond_to do |format|
           format.html do
             render(file: File.join(File.dirname(__FILE__), 'templates/show'),
                    layout: false, locals: {options: options})

data/lib/dynamic_image/helper.rb

@@ -30,7 +30,7 @@ module DynamicImage
     #   dynamic_image_tag(image, size: "100x100", alt="Avatar")
     #   # => <img alt="Avatar" height="62" src="..." width="100" />
     def dynamic_image_tag(record_or_array, options={})
-      record = extract_record(record_or_array)
+      record = extract_dynamic_image_record(record_or_array)
       options = {
         alt: image_alt(record.filename)
       }.merge(options)
@@ -130,7 +130,7 @@ module DynamicImage
     end
 
     def dynamic_image_url_with_size(record_or_array, size=nil, options={})
-      record = extract_record(record_or_array)
+      record = extract_dynamic_image_record(record_or_array)
       options = {
         routing_type: :url,
         action: nil,
@@ -141,8 +141,17 @@ module DynamicImage
       polymorphic_url(record_or_array, options)
     end
 
+    def extract_dynamic_image_record(record_or_array)
+      case record_or_array
+      when Array
+        record_or_array.last
+      else
+        record_or_array
+      end
+    end
+
     def fit_size!(record_or_array, options)
-      record = extract_record(record_or_array)
+      record = extract_dynamic_image_record(record_or_array)
       action = options[:action].try(:to_s)
       size_opts = options.extract!(:size, :crop, :upscale)
 
@@ -151,10 +160,10 @@ module DynamicImage
           record,
           uncropped: (action == "uncropped")
         ).fit(size_opts[:size], size_opts).floor.to_s
-      elsif action != "original"
-        record.size.floor.to_s
+      elsif action == "original"
+        record.real_size.floor.to_s
       else
-        nil
+        record.size.floor.to_s
       end
     end
   end

data/lib/dynamic_image/processed_image.rb

@@ -10,7 +10,7 @@ module DynamicImage
       @record    = record
       @uncropped = options[:uncropped] ? true : false
       @format    = options[:format].to_s.upcase if options[:format]
-      @format    = "JPEG" if @format == "JPG"
+      @format    = "JPEG" if defined?(@format) && @format == "JPG"
     end
 
     # Returns the content type of the processed image.
@@ -79,7 +79,7 @@ module DynamicImage
     end
 
     def format
-      @format || record_format
+      @format ||= record_format
     end
 
     def gif?

data/lib/dynamic_image/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module DynamicImage
-  VERSION = "2.0.0.beta5"
+  VERSION = "2.0.0.beta6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta5
+  version: 2.0.0.beta6
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: vector2d
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement