dynamic_image 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dee05cad2916e34c6f71212ac5cc79aca2c40caf
-  data.tar.gz: 4e7eb46f42e851d3872f8733d033519bdc059167
+  metadata.gz: d1600a4e263630c8a9936e6f8309add967434b81
+  data.tar.gz: 1ad5ff2c9b894a0fd774797cc64395ed72d7b556
 SHA512:
-  metadata.gz: 3078b6597ecd6ccc2b01a6724c06850517f266bfc7e71087bd7f4c1e22fccc107d4554062aa58fac90f47a2b46f70b00aca8e0d870bf9341117649eee2bddbd4
-  data.tar.gz: 30aeeb19d93a6dac8de7aec60ac06fa4d287410bbc4231fcfadb51efbb59d05b1d0ba4d831f68c6a97132af3979d3c46d71cdba119401b8337b32ad882ce037a
+  metadata.gz: 6f60bf400b04b6c8b9b7fe9d59ea967796bd58171fbf258ba326349e128bd35bd50cbe49b779a82e6d7d3db0f70636ff7808d79dae2a1f0d1a4f15b96516bf00
+  data.tar.gz: 74063c221b4948e5121f0be2f5b6a8244ed4bb25b9c3a44609cfcab902e648ccfee69697b060bdda5186183061ad950f2e71b9e382d674939d7b1367953b7f20

data/Rakefile

@@ -1,8 +1,8 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-APP_RAKEFILE = 'spec/internal/Rakefile'.freeze
-load 'rails/tasks/engine.rake'
+APP_RAKEFILE = "spec/internal/Rakefile".freeze
+load "rails/tasks/engine.rake"
 
 RSpec::Core::RakeTask.new
 

data/lib/dynamic_image.rb

@@ -1,21 +1,21 @@
 # encoding: utf-8
 
-require 'mini_magick'
-require 'dis'
-require 'vector2d'
+require "mini_magick"
+require "dis"
+require "vector2d"
 
-require 'dynamic_image/belongs_to'
-require 'dynamic_image/controller'
-require 'dynamic_image/digest_verifier'
-require 'dynamic_image/errors'
-require 'dynamic_image/helper'
-require 'dynamic_image/image_reader'
-require 'dynamic_image/image_sizing'
-require 'dynamic_image/metadata'
-require 'dynamic_image/model'
-require 'dynamic_image/processed_image'
-require 'dynamic_image/railtie'
-require 'dynamic_image/routing'
+require "dynamic_image/belongs_to"
+require "dynamic_image/controller"
+require "dynamic_image/digest_verifier"
+require "dynamic_image/errors"
+require "dynamic_image/helper"
+require "dynamic_image/image_reader"
+require "dynamic_image/image_sizing"
+require "dynamic_image/metadata"
+require "dynamic_image/model"
+require "dynamic_image/processed_image"
+require "dynamic_image/railtie"
+require "dynamic_image/routing"
 
 module DynamicImage
   cattr_accessor :digest_verifier

data/lib/dynamic_image/controller.rb

@@ -35,7 +35,7 @@ module DynamicImage
           send_data(
             @record.data,
             content_type: @record.content_type,
-            disposition:  'inline'
+            disposition:  "inline"
           )
         end
       end
@@ -60,7 +60,7 @@ module DynamicImage
       return unless stale?(@record)
       respond_to do |format|
         format.html do
-          render(file: File.join(File.dirname(__FILE__), 'templates/show'),
+          render(file: File.join(File.dirname(__FILE__), "templates/show"),
                  layout: false, locals: { options: options })
         end
         format.any(:gif, :jpeg, :png, :tiff) do
@@ -77,14 +77,14 @@ module DynamicImage
       send_data(
         image.cropped_and_resized(requested_size),
         content_type: image.content_type,
-        disposition:  'inline'
+        disposition:  "inline"
       )
     end
 
     def verify_signed_params
       key = [:action, :id, :size].map do |k|
         k == :id ? params.require(k).to_i : params.require(k)
-      end.join('-')
+      end.join("-")
       DynamicImage.digest_verifier.verify(key, params[:digest])
     end
   end

data/lib/dynamic_image/digest_verifier.rb

@@ -20,7 +20,7 @@ module DynamicImage
   class DigestVerifier
     def initialize(secret, options = {})
       @secret = secret
-      @digest = options[:digest] || 'SHA1'
+      @digest = options[:digest] || "SHA1"
     end
 
     # Generates a digest for a string.
@@ -47,11 +47,11 @@ module DynamicImage
 
       res = 0
       b.each_byte { |byte| res |= byte ^ l.shift }
-      res == 0
+      res.zero?
     end
 
     def generate_digest(data)
-      require 'openssl' unless defined?(OpenSSL)
+      require "openssl" unless defined?(OpenSSL)
       OpenSSL::HMAC.hexdigest(
         OpenSSL::Digest.const_get(@digest).new,
         @secret,

data/lib/dynamic_image/errors.rb

@@ -7,5 +7,6 @@ module DynamicImage
     class InvalidHeader < DynamicImage::Errors::Error; end
     class InvalidSignature < DynamicImage::Errors::Error; end
     class InvalidSizeOptions < DynamicImage::Errors::Error; end
+    class InvalidTransformation < DynamicImage::Errors::Error; end
   end
 end

data/lib/dynamic_image/helper.rb

@@ -115,7 +115,7 @@ module DynamicImage
     end
 
     def dynamic_image_digest(record, action, size = nil)
-      key = [action || 'show', record.id, size].compact.join('-')
+      key = [action || "show", record.id, size].compact.join("-")
       DynamicImage.digest_verifier.generate(key)
     end
 
@@ -152,9 +152,9 @@ module DynamicImage
       action = options[:action].try(:to_s)
       size_opts = options.extract!(:size, :crop, :upscale)
       if size_opts[:size]
-        image_sizing(record, size_opts, (action == 'uncropped'))
+        image_sizing(record, size_opts, (action == "uncropped"))
       else
-        (action == 'original' ? record.real_size : record.size).floor.to_s
+        (action == "original" ? record.real_size : record.size).floor.to_s
       end
     end
 

data/lib/dynamic_image/image_reader.rb

@@ -27,21 +27,36 @@ module DynamicImage
       @file_header ||= StringIO.new(@data, "rb").read(10)
     end
 
-    def magic_bytes
+    def gif_magic_bytes
       [
-        # GIF
         "\x47\x49\x46\x38\x37\x61".force_encoding("binary"),
-        "\x47\x49\x46\x38\x39\x61".force_encoding("binary"),
-        # PNG
-        "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a".force_encoding("binary"),
-        # JPEG
+        "\x47\x49\x46\x38\x39\x61".force_encoding("binary")
+      ]
+    end
+
+    def jpeg_magic_bytes
+      [
         "\xff\xd8\xff\xdb".force_encoding("binary"),
         Regexp.new("\xff\xd8\xff\xe0(.*){2}JFIF".force_encoding("binary")),
         Regexp.new("\xff\xd8\xff\xe1(.*){2}Exif".force_encoding("binary")),
-        "\xff\xd8\xff\xee\x00\x0e".force_encoding("binary"), # Adobe JPEG
-        # TIFF
+        "\xff\xd8\xff\xee\x00\x0e".force_encoding("binary") # Adobe JPEG
+      ]
+    end
+
+    def magic_bytes
+      gif_magic_bytes + png_magic_bytes + jpeg_magic_bytes + tiff_magic_bytes
+    end
+
+    def png_magic_bytes
+      [
+        "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a".force_encoding("binary")
+      ]
+    end
+
+    def tiff_magic_bytes
+      [
         "\x49\x49\x2a\x00".force_encoding("binary"),
-        "\x4d\x4d\x00\x2a".force_encoding("binary"),
+        "\x4d\x4d\x00\x2a".force_encoding("binary")
       ]
     end
   end

data/lib/dynamic_image/metadata.rb

@@ -16,11 +16,11 @@ module DynamicImage
       if valid?
         case metadata[:colorspace]
         when /rgb/i
-          'rgb'
+          "rgb"
         when /cmyk/i
-          'cmyk'
+          "cmyk"
         when /gray/i
-          'gray'
+          "gray"
         end
       end
     end

data/lib/dynamic_image/model.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 
-require 'dynamic_image/model/dimensions'
-require 'dynamic_image/model/validations'
+require "dynamic_image/model/dimensions"
+require "dynamic_image/model/transformations"
+require "dynamic_image/model/validations"
 
 module DynamicImage
   # = DynamicImage Model
@@ -62,6 +63,7 @@ module DynamicImage
     extend ActiveSupport::Concern
     include Dis::Model
     include DynamicImage::Model::Dimensions
+    include DynamicImage::Model::Transformations
     include DynamicImage::Model::Validations
 
     included do
@@ -70,17 +72,17 @@ module DynamicImage
 
     # Returns true if the image is in the CMYK colorspace
     def cmyk?
-      colorspace == 'cmyk'
+      colorspace == "cmyk"
     end
 
     # Returns true if the image is in the grayscale colorspace
     def gray?
-      colorspace == 'gray'
+      colorspace == "gray"
     end
 
     # Returns true if the image is in the RGB colorspace
     def rgb?
-      colorspace == 'rgb'
+      colorspace == "rgb"
     end
 
     # Finds a web safe content type. GIF, JPEG and PNG images are allowed,
@@ -89,14 +91,14 @@ module DynamicImage
       if safe_content_types.include?(content_type)
         content_type
       else
-        'image/jpeg'
+        "image/jpeg"
       end
     end
 
     # Includes a timestamp fingerprint in the URL param, so
     # that rendered images can be cached indefinitely.
     def to_param
-      [id, updated_at.utc.to_s(cache_timestamp_format)].join('-')
+      [id, updated_at.utc.to_s(cache_timestamp_format)].join("-")
     end
 
     private

data/lib/dynamic_image/model/transformations.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+
+module DynamicImage
+  module Model
+    # = DynamicImage Model Transformations
+    #
+    module Transformations
+      # Rotates the image
+      def rotate(degrees = 90)
+        degrees = degrees.to_i % 360
+
+        return self if degrees.zero?
+
+        if (degrees % 90).nonzero?
+          raise DynamicImage::Errors::InvalidTransformation,
+                "angle must be a multiple of 90 degrees"
+        end
+
+        transform_image do |image|
+          image.rotate(degrees)
+          rotate_dimensions(real_size.x, real_size.y, degrees)
+        end
+      end
+
+      private
+
+      def rotate_dimensions(width, height, degrees)
+        (degrees / 90).times do
+          width, height = height, width
+
+          self.real_width = width
+          self.real_height = height
+
+          self.crop_gravity_x, self.crop_gravity_y = rotated_crop_gravity(width)
+
+          next unless cropped?
+
+          self.crop_start_x, self.crop_start_y,
+          self.crop_width, self.crop_height = rotated_crop(width)
+        end
+      end
+
+      def rotated_crop(new_width)
+        return nil unless cropped?
+        [
+          new_width - (crop_start_y + crop_height),
+          crop_start_x,
+          crop_height,
+          crop_width
+        ]
+      end
+
+      def rotated_crop_gravity(new_width)
+        return nil unless crop_gravity?
+        [new_width - crop_gravity_y, crop_gravity_x]
+      end
+
+      def processed_image
+        DynamicImage::ProcessedImage.new(self, uncropped: true)
+      end
+
+      def transform_image
+        read_image_metadata if data_changed?
+        self.data = processed_image.normalized do |image|
+          yield(image) if block_given?
+        end
+        self
+      end
+    end
+  end
+end

data/lib/dynamic_image/model/validations.rb

@@ -80,7 +80,7 @@ module DynamicImage
       def validate_crop_bounds
         required_size = crop_start + crop_size
         if required_size.x > real_size.x || required_size.y > real_size.y
-          errors.add(:crop_size, 'is out of bounds')
+          errors.add(:crop_size, "is out of bounds")
         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 defined?(@format) && @format == 'JPG'
+      @format    = "JPEG" if defined?(@format) && @format == "JPG"
     end
 
     # Returns the content type of the processed image.
@@ -62,7 +62,7 @@ module DynamicImage
       process_data do |image|
         image.combine_options do |combined|
           combined.auto_orient
-          combined.colorspace('sRGB') if needs_colorspace_conversion?
+          combined.colorspace("sRGB") if needs_colorspace_conversion?
           yield(combined) if block_given?
           optimize(combined)
         end
@@ -85,7 +85,7 @@ module DynamicImage
     end
 
     def gif?
-      content_type == 'image/gif'
+      content_type == "image/gif"
     end
 
     def image_sizing
@@ -102,7 +102,7 @@ module DynamicImage
     end
 
     def optimize(image)
-      image.layers 'optimize' if gif?
+      image.layers "optimize" if gif?
       image.strip
     end
 
@@ -118,14 +118,14 @@ module DynamicImage
 
     def record_format
       case record.content_type
-      when 'image/png'
-        'PNG'
-      when 'image/gif'
-        'GIF'
-      when 'image/jpeg', 'image/pjpeg'
-        'JPEG'
-      when 'image/tiff'
-        'TIFF'
+      when "image/png"
+        "PNG"
+      when "image/gif"
+        "GIF"
+      when "image/jpeg", "image/pjpeg"
+        "JPEG"
+      when "image/tiff"
+        "TIFF"
       end
     end
 

data/lib/dynamic_image/railtie.rb

@@ -2,11 +2,11 @@
 
 module DynamicImage
   class Railtie < ::Rails::Railtie
-    initializer 'dynamic_image' do
+    initializer "dynamic_image" do
       ActionDispatch::Routing::Mapper.send :include, DynamicImage::Routing
 
       config.after_initialize do |app|
-        secret = app.key_generator.generate_key('dynamic_image')
+        secret = app.key_generator.generate_key("dynamic_image")
         DynamicImage.digest_verifier = DynamicImage::DigestVerifier.new(secret)
       end
 

data/lib/dynamic_image/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module DynamicImage
-  VERSION = '2.0.2'.freeze
+  VERSION = "2.0.3".freeze
 end

data/lib/rails/generators/dynamic_image/resource/resource_generator.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
-require 'rails/generators'
-require 'rails/generators/rails/resource/resource_generator'
+require "rails/generators"
+require "rails/generators/rails/resource/resource_generator"
 
 module DynamicImage
   module Generators
     class ResourceGenerator < Rails::Generators::ResourceGenerator
-      desc 'Creates a DynamicImage resource'
+      desc "Creates a DynamicImage resource"
 
       def initialize(args, *options)
         super(inject_dynamic_image_attributes(args), *options)
@@ -14,10 +14,9 @@ module DynamicImage
 
       def add_controller_extension
         inject_into_file(
-          File.join(
-            'app/controllers',
-            class_path,
-            "#{file_name.pluralize}_controller.rb"),
+          File.join("app/controllers",
+                    class_path,
+                    "#{file_name.pluralize}_controller.rb"),
           after: "ApplicationController\n"
         ) do
           "  include DynamicImage::Controller\n\n  private\n\n" \
@@ -27,7 +26,7 @@ module DynamicImage
 
       def add_model_extension
         inject_into_file(
-          File.join('app/models', class_path, "#{file_name}.rb"),
+          File.join("app/models", class_path, "#{file_name}.rb"),
           after: "ActiveRecord::Base\n"
         ) do
           "  include DynamicImage::Model\n"
@@ -36,7 +35,7 @@ module DynamicImage
 
       def alter_resource_routes
         gsub_file(
-          File.join('config', 'routes.rb'),
+          File.join("config", "routes.rb"),
           " resources :#{file_name.pluralize}",
           " image_resources :#{file_name.pluralize}"
         )
@@ -54,13 +53,13 @@ module DynamicImage
 
       def dynamic_image_attributes
         %w(
-          content_hash:string    content_type:string
+          content_hash:string content_type:string
           content_length:integer
           filename:string
           colorspace:string
-          real_width:integer     real_height:integer
-          crop_width:integer     crop_height:integer
-          crop_start_x:integer   crop_start_y:integer
+          real_width:integer real_height:integer
+          crop_width:integer crop_height:integer
+          crop_start_x:integer crop_start_y:integer
           crop_gravity_x:integer crop_gravity_y:integer
         )
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,6 +127,7 @@ files:
 - lib/dynamic_image/metadata.rb
 - lib/dynamic_image/model.rb
 - lib/dynamic_image/model/dimensions.rb
+- lib/dynamic_image/model/transformations.rb
 - lib/dynamic_image/model/validations.rb
 - lib/dynamic_image/processed_image.rb
 - lib/dynamic_image/railtie.rb