photo-cook 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e15cd4a81a3e2b2873faca2e0c1bc33788b230d
-  data.tar.gz: 96578e33f51efdf6b2300f3db3d5d815713883c9
+  metadata.gz: 30713968f97de16d9fa2a2d0c3b88bcb5435ac43
+  data.tar.gz: 6deed34ded832a9041bb6adf6bd5595acb2ae170
 SHA512:
-  metadata.gz: 6b14c7e899302a98bb69d667be131b960587f323bb6c60bd4dfbb1ba40c90287c5883465b2f751e32bf383d46373678a7c86c38803e4bf80d2ad752385296075
-  data.tar.gz: c26e25973b242036bca129b90b425321f223f714aa11688ec873940844b5aa703ba4adbfc0d446c33625f2d4876bbfbbaec13e8f3f0c0455f3b8cdf9e82683f2
+  metadata.gz: 5c76ef21599b1cb9d4c5e870b77afc2748aa7ba65613b7b46246a6850c9e3aee716182c45c4fdc100951746af0feb2a9ed910df90fd12cc68d3ad47e33cfd081
+  data.tar.gz: a87c0fdaf2d015ac0b9aafd5b551d64c18c864f21f23d514c6ddd9989759df01cc108cbeb9a6f447435f5fdb001889479cf329c29d07e46c84502716abd89ed2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    photo-cook (1.0.1)
+    photo-cook (1.0.2)
       mini_magick (~> 4.0)
       rack (~> 1.5)
 

data/app/assets/javascripts/photo-cook/photo-cook.js.erb

@@ -0,0 +1,114 @@
+(function(root) {
+  var PhotoCook = {
+    resizeDir: <%= PhotoCook.cache_dir.to_json %>,
+
+    commandRegex: /\-(?:(?:\d+x\d+)|(?:\d+x)|(?:x\d+))(?:crop)?$/,
+
+    initialize: function() {
+      PhotoCook.persistPixelRatio();
+    },
+
+    pixelRatio: (function () {
+      // https://gist.github.com/marcedwards/3446599
+      var mediaQuery = [
+          '(-webkit-min-device-pixel-ratio: 1.3)',
+          '(-o-min-device-pixel-ratio: 13/10)',
+          'min-resolution: 120dpi'
+      ].join(', ');
+
+      var ratio = window.devicePixelRatio;
+
+      // If no ratio found check if screen is retina
+      // and if so return 2x ratio
+      if (ratio == null && typeof window.matchMedia === 'function') {
+        if (window.matchMedia(mediaQuery).matches) {
+          ratio = 2;
+        }
+      }
+
+      return parseFloat(ratio == null ? 1 : ratio);
+    })(),
+
+    persistPixelRatio: function() {
+        var date = new Date();
+
+        // Expires in 1 year
+        date.setTime(date.getTime() + 365 * 24 * 60 * 60 * 1000);
+        var expires = 'expires=' + date.toUTCString();
+        document.cookie = "PhotoCookPixelRatio=" + PhotoCook.pixelRatio + '; ' + expires;
+    },
+
+    resize: function (path, width, height, options) {
+      var crop  = typeof options === 'boolean' ? !!options : !!(options && options.crop);
+      var ratio = Math.max(0, options && options.pixelRatio) || PhotoCook.pixelRatio;
+
+      var command = '-' + (width && width !== 'auto' ? Math.round(width * ratio) : '')
+                        + 'x'
+                        + (height && height !== 'auto' ? Math.round(height * ratio) : '')
+                        + (crop ? 'crop' : '');
+
+      var index;       index = path.lastIndexOf('.');
+      if (index < 0) { index = path.lastIndexOf('?'); }
+      if (index < 0) { index = path.lastIndexOf('#'); }
+
+      var leftPart = path.slice(0, Math.max(path.lastIndexOf('/'), 0));
+      var rightPart = index >= 0 ? path.slice(index) : '';
+
+      var basename = path.slice(
+          leftPart ? leftPart.length + 1 : 0,
+          rightPart ? 0 - rightPart.length : path.length
+      );
+
+      return (leftPart ? leftPart + '/' : leftPart)
+              + PhotoCook.resizeDir
+              + '/'
+              + basename
+              + command
+              + rightPart;
+    },
+
+    strip: function (path) {
+      var token = PhotoCook.resizeDir + '/';
+      var leftIndex = path.lastIndexOf(token);
+      if (leftIndex < 0 || (leftIndex > 0 && path[leftIndex - 1] !== '/')) {
+        return path;
+      }
+
+      var rightIndex;       rightIndex = path.lastIndexOf('.');
+      if (rightIndex < 0) { rightIndex = path.lastIndexOf('?'); }
+      if (rightIndex < 0) { rightIndex = path.lastIndexOf('#'); }
+
+      var basename = path.slice(
+          leftIndex + token.length,
+          rightIndex >= 0 ? 0 - path.length + rightIndex : path.length
+      );
+
+      var oldLength = basename.length;
+
+      basename = basename.replace(PhotoCook.commandRegex, '');
+
+      if (oldLength === basename.length) {
+        return path;
+      }
+
+      var leftPart = path.slice(0, leftIndex);
+      var rightPart = rightIndex >= 0 ? path.slice(rightIndex) : '';
+
+      return leftPart + basename + rightPart;
+    },
+
+    uriRegex: /^[-a-z]+:\/\/|^(?:cid|data):|^\/\//i,
+
+    // Returns true if given URL can produce request to PhotoCook middleware on server
+    isServableURL: function(url) {
+      // By default check that URL is relative
+      return !PhotoCook.uriRegex.test(url);
+    }
+  };
+
+  root.PhotoCook = PhotoCook;
+})(this);
+
+PhotoCook.initialize();
+
+// navigator.cookieEnabled

data/app/assets/javascripts/photo-cook.js

@@ -0,0 +1 @@
+//= require ./photo-cook/photo-cook

data/lib/photo-cook/assemble.rb

@@ -0,0 +1,27 @@
+module PhotoCook
+  module Assemble
+
+    # Edit URI so it will point to PhotoCook::Middleware
+    # NOTE: This method performs no validation
+    def assemble_uri(uri, width, height, pixel_ratio, crop)
+        result = File.join cache_dir, dirname_or_blank(uri),
+                           assemble_command(width, height, pixel_ratio, crop), File.basename(uri)
+        uri.start_with?('/') ? '/' + result : result
+    end
+
+    # Edit path so it will point to place where resized photo stored
+    # NOTE: This method performs no validation
+    def assemble_store_path(path, width, height, pixel_ratio, crop)
+      rootless = path.split(File.join(root, public_dir)).second
+      File.join root, public_dir,
+                cache_dir, dirname_or_blank(rootless),
+                assemble_command(width, height, pixel_ratio, crop), File.basename(path)
+    end
+
+  private
+    def dirname_or_blank(path)
+      (dirname = File.dirname(path)) == '.' ? '' : dirname
+    end
+  end
+  extend Assemble
+end

data/lib/photo-cook/callbacks.rb

@@ -0,0 +1,8 @@
+module PhotoCook
+  module Callbacks
+    def on_resize(photo, command)
+      log_resize(photo, command) if rails?
+    end
+  end
+  extend Callbacks
+end

data/lib/photo-cook/carrierwave.rb

@@ -1,9 +1,15 @@
 module PhotoCook
   module CarrierWave
-
     def resize(*args)
       PhotoCook.resize(url, *args)
     end
 
+    def hresize(*args)
+      PhotoCook.hresize(url, *args)
+    end
+
+    def vresize(*args)
+      PhotoCook.vresize(url, *args)
+    end
   end
 end

data/lib/photo-cook/command.rb

@@ -0,0 +1,35 @@
+module PhotoCook
+  module Command
+    # Proportional support
+    # http://stackoverflow.com/questions/7200909/imagemagick-convert-to-fixed-width-proportional-height
+    #
+    # Device pixel ratio collection
+    # http://dpi.lv/
+    # http://www.canbike.org/CSSpixels/
+    def command_regex
+      @command_regex ||= %r{
+          width=       (?<width>      auto|\d{1,4}) &
+          height=      (?<height>     auto|\d{1,4}) &
+          pixel_ratio= (?<pixel_ratio>[1234]) &
+          crop=        (?<crop>       yes|no)
+        }x
+    end
+
+    # NOTE: This method performs no validation
+    def assemble_command(width, height, pixel_ratio, crop)
+      "width=#{  width  == 0 ? 'auto' : width}&" +
+      "height=#{ height == 0 ? 'auto' : height}&" +
+      "pixel_ratio=#{pixel_ratio.ceil}&" +
+      "crop=#{   bool_to_crop(crop)}&"
+    end
+
+    def crop_to_bool(crop)
+      crop == 'yes'
+    end
+
+    def bool_to_crop(crop)
+      crop ? 'yes' : 'no'
+    end
+  end
+  extend Command
+end

data/lib/photo-cook/dimensions.rb

@@ -0,0 +1,36 @@
+module PhotoCook
+  module Dimensions
+    def parse_and_check_dimensions(unsafe_width, unsafe_height)
+      width  = unsafe_width  == :auto ? 0 : unsafe_width.to_i
+      height = unsafe_height == :auto ? 0 : unsafe_height.to_i
+
+      check_dimensions!(width, height)
+      [width, height]
+    end
+
+    def check_dimensions!(width, height)
+      raise WidthOutOfBoundsError     if width  < 0 || width  > 9999
+      raise HeightOutOfBoundsError    if height < 0 || height > 9999
+      raise NoConcreteDimensionsError if width + height == 0
+    end
+  end
+
+  class WidthOutOfBoundsError < ArgumentError
+    def initialize
+      super 'Width must be positive integer number (0...9999)'
+    end
+  end
+
+  class HeightOutOfBoundsError < ArgumentError
+    def initialize
+      super 'Height must be positive integer number (0...9999)'
+    end
+  end
+
+  class NoConcreteDimensionsError < ArgumentError
+    def initialize
+      super "Both width and height specified as 'auto'"
+    end
+  end
+  extend Dimensions
+end

data/lib/photo-cook/engine.rb

@@ -1,9 +1,11 @@
 module PhotoCook
   class Engine < ::Rails::Engine
+    config.before_initialize do
+      PhotoCook.root = Rails.root
+    end
 
-    initializer :javascripts do |app|
+    initializer :photo_cook_javascripts do |app|
       app.config.assets.paths << File.join(PhotoCook::Engine.root, 'app/assets/javascripts')
     end
-
   end
 end

data/lib/photo-cook/logging.rb

@@ -0,0 +1,18 @@
+module PhotoCook
+  module Logging
+    def log_resize(photo, w, h, px_ratio, crop, msec)
+      msg = %{
+        [PhotoCook] Resized photo.
+        Source file:  #{photo.source_path}
+        Resized file: #{photo.resized_path}
+        Width:        #{w == 0 ? 'auto': "#{w}px"}
+        Height:       #{h == 0 ? 'auto': "#{h}px"}
+        Crop:         #{crop ? 'yes' : 'no'}
+        Pixel ratio:  #{px_ratio}
+        Completed in: #{msec.round(1)}ms
+      }
+      rails_env? ? Rails.logger.info(msg) : print(msg)
+    end
+  end
+  extend Logging
+end

data/lib/photo-cook/middleware.rb

@@ -1,6 +1,5 @@
 # To use this middleware you should configure application:
-# application.config.middleware.insert_before(Rack::Sendfile, PhotoCook::Middleware, Rails.root)
-require 'rack'
+#   application.config.middleware.insert_before(Rack::Sendfile, PhotoCook::Middleware, Rails.root)
 
 module PhotoCook
   class Middleware
@@ -9,99 +8,98 @@ module PhotoCook
       @app, @root = app, root
     end
 
-    # The example will be concentrated around uri:
-    # /uploads/photos/resized/car-640x320crop.png
+    # Consider we have car.png in /uploads/photos/1
+    # We want to resize it with the following params:
+    #   Width:  choose automatically
+    #   Height: exactly 640px
+    #   Crop:   yes
+    #   Pixel   ratio: 1
+    #
+    # Middleware will handle this URI:
+    #   /resized/uploads/photos/1/width:auto&height:640&crop:true&pixel_ratio:1/car.png
+    #
     def call(env)
       uri = extract_uri(env)
 
-      return default_actions(env) unless
+      return default_actions(env) if
 
-        # Lets ensure that directory matches PhotoCook.resize_dir
-        # dir = /uploads/photos/resized
-        # File::SEPARATOR + PhotoCook.resize_dir = /resized
-        # dir.chomp! = /uploads/photos
-        (dir = File.dirname(uri)).chomp!(File::SEPARATOR + PhotoCook.resize_dir) &&
+        # Check if uri starts with '/resized'
+        false == uri.start_with?(PhotoCook.resize_uri_indicator) ||
 
-        # Lets ensure that photo_basename ends with resize command
-        # photo_name = car-640x320crop.png
-        # photo_basename = car-640x320crop
-        # photo_basename.sub! = car.png
-        (photo_name = File.basename(uri)) &&
-        (photo_basename = File.basename(photo_name, '.*')).sub!(command_regex, '')
+        # Check if uri has valid resize command.
+        #   uri.split('/')[-2] => width:auto&height:640&crop:true&pixel_ratio:1
+        nil   == (uri.split('/')[-2] =~ PhotoCook.command_regex) ||
 
-      return default_actions(env) if requested_file_exists?(uri)
-
-      # Regex match: _640x320crop
-      command = Regexp.last_match
+        # If for some reasons file exists but request went to Ruby app
+        true  == requested_file_exists?(uri)
 
       # At this point we are sure that this request is targeting to resize photo
 
-      # Lets assemble path of the source photo
-      source_path = assemble_source_path(dir, photo_basename + File.extname(photo_name))
+      # Assemble path of the source photo:
+      #   => /uploads/photos/1/car.png
+      source_path = assemble_source_path(uri)
 
-      # Finally resize photo
-      resizer = PhotoCook::Resizer.instance
+      # Matched data: width:auto&height:640&crop:true&pixel_ratio:1
+      command = Regexp.last_match
 
-      # Resizer will store photo in resize directory
-      photo = resizer.resize source_path, command[:width].to_i, command[:height].to_i, !!command[:crop]
+      # Map crop option values: 'yes' => true, 'no' => false
+      crop  = PhotoCook.crop_to_bool(command[:crop])
 
-      if photo
-        log(photo, source_path, uri, command) if defined?(Rails)
+      # Finally resize photo
+      # Resized photo will appear in resize directory
+      photo = PhotoCook.resize_photo(source_path,
+        command[:width], command[:height], pixel_ratio: command[:pixel_ratio], crop: crop)
 
-        # http://rubylogs.com/writing-rails-middleware/
-        # https://viget.com/extend/refactoring-patterns-the-rails-middleware-response-handler
-        status, headers, body = Rack::File.new(File.join(@root, PhotoCook.public_dir)).call(env)
-        response = Rack::Response.new(body, status, headers)
-        response.finish
+      if photo
+        respond_with_file(env)
       else
         default_actions(env)
       end
     end
 
-    private
+  private
 
-    def assemble_source_path(dir, photo_name)
-      URI.decode File.join(@root, PhotoCook.public_dir, dir, photo_name)
+    def assemble_source_path(resize_uri)
+      # Take URI:
+      # /resized/uploads/photos/1/width:auto&height:640&crop:true&pixel_ratio:1/car.png
+      #
+      # Split by file separator:
+      # ["", "resized", "uploads", "photos", "1", "width:auto&height:640&crop:true&pixel_ratio:1", "car.png"]
+      #
+      els = resize_uri.split('/')
+
+      # Delete PhotoCook directory:
+      # ["", "uploads", "photos", "1", "width:auto&height:640&crop:true&pixel_ratio:1", "car.png"]
+      els.delete_at(1)
+
+      # Delete command string:
+      # ["", "uploads", "photos", "1", "car.png"]
+      els.delete_at(-2)
+
+      URI.decode File.join(@root, PhotoCook.public_dir, els)
     end
 
     def requested_file_exists?(uri)
-      # /my_awesome_project_root/public/uploads/photos/resized/car-640x320crop.png
+      # Check if file exists:
+      #   /application/public/resized/uploads/photos/1/width:auto&height:640&crop:true&pixel_ratio:1/car.png
       File.exists? File.join(@root, PhotoCook.public_dir, uri)
     end
 
     def extract_uri(env)
-      Rack::Utils.unescape(env['PATH_INFO'])
+      # Remove query string and fragment
+      Rack::Utils.unescape(env['PATH_INFO'].gsub(/[\?#].*\z/, ''))
     end
 
     def default_actions(env)
       @app.call(env)
     end
 
-    # Proportional support
-    # http://stackoverflow.com/questions/7200909/imagemagick-convert-to-fixed-width-proportional-height
-    def command_regex
-      unless @r_command
-        w = /(?<width>\d+)/
-        h = /(?<height>\d+)/
-        @r_command = %r{
-          \- (?:(?:#{w}x#{h}) | (?:#{w}x) | (?:x#{h})) (?<crop>crop)? \z
-        }x
-      end
-      @r_command
-    end
-
-    def log(photo, source_path, resized_path, command)
-      w     = command[:width].to_i
-      h     = command[:height].to_i
-      crop  = !!command[:crop]
-      Rails.logger.info %{
-        [PhotoCook] Resized photo.
-        Source file: "#{source_path}".
-        Resized file: "#{resized_path}".
-        Width: #{w == 0 ? 'auto': "#{w}px"}.
-        Height: #{h == 0 ? 'auto': "#{h}px"}.
-        Crop: #{crop ? 'yes' : 'no'}.
-      }
+    def respond_with_file(env)
+      # http://rubylogs.com/writing-rails-middleware/
+      # https://viget.com/extend/refactoring-patterns-the-rails-middleware-response-handler
+      status, headers, body = Rack::File.new(File.join(@root, PhotoCook.public_dir)).call(env)
+      response = Rack::Response.new(body, status, headers)
+      response.finish
     end
   end
 end

data/lib/photo-cook/paths.rb

@@ -0,0 +1,12 @@
+module PhotoCook
+  class << self
+    attr_accessor :public_dir, :cache_dir, :root
+
+    def resize_uri_indicator
+      '/' + cache_dir
+    end
+  end
+
+  self.public_dir = 'public'
+  self.cache_dir  = 'resized'
+end

data/lib/photo-cook/pixel-ratio-spy.rb

@@ -0,0 +1,19 @@
+module PhotoCook
+  module PixelRatioSpy
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :pass_pixel_ratio
+    end
+
+    def pass_pixel_ratio
+      ratio = cookies[:PhotoCookPixelRatio].to_f
+      # Dont set pixel ratio if for some reasons it is invalid
+      PhotoCook.client_pixel_ratio = PhotoCook.valid_pixel_ratio?(ratio) ? ratio : nil
+    end
+  end
+
+  class << self
+    attr_accessor :client_pixel_ratio
+  end
+end

data/lib/photo-cook/pixel-ratio.rb

@@ -0,0 +1,29 @@
+module PhotoCook
+  module PixelRatio
+    def parse_and_check_pixel_ratio(unsafe_ratio)
+      pixel_ratio = unsafe_ratio.to_f
+
+      raise PixelRatioInvalidOrInfiniteError if pixel_ratio.nan? || pixel_ratio.infinite?
+      raise PixelRatioOutOfBoundsError       if pixel_ratio < 1 || pixel_ratio > 4
+
+      pixel_ratio
+    end
+
+    def valid_pixel_ratio?(ratio)
+      !ratio.nan? && !ratio.infinite? && ratio >= 1 && ratio <= 4
+    end
+  end
+
+  class PixelRatioInvalidOrInfiniteError < ArgumentError
+    def initialize
+      super 'Given pixel ratio is invalid number or infinite'
+    end
+  end
+
+  class PixelRatioOutOfBoundsError < ArgumentError
+    def initialize
+      super 'Pixel ratio must be positive number: 1 <= pixel_ratio <= 4'
+    end
+  end
+  extend PixelRatio
+end

data/lib/photo-cook/resizer.rb

@@ -1,5 +1,3 @@
-require 'mini_magick'
-
 module PhotoCook
   class Resizer
     include Singleton
@@ -7,11 +5,11 @@ module PhotoCook
     CENTER_GRAVITY          = 'Center'.freeze
     TRANSPARENT_BACKGROUND  = 'rgba(255,255,255,0.0)'.freeze
 
-    def resize(photo_path, width, height, crop = false)
+    def resize(photo_path, width, height, pixel_ratio = 1.0, crop = false)
       if crop
-        resize_to_fill photo_path, width, height
+        resize_to_fill(photo_path, width, height, pixel_ratio)
       else
-        resize_to_fit photo_path, width, height
+        resize_to_fit(photo_path, width, height, pixel_ratio)
       end
     end
 
@@ -20,19 +18,15 @@ module PhotoCook
     # - new dimensions will be not larger then the specified
     #
     # https://github.com/carrierwaveuploader/carrierwave/blob/71cb18bba4a2078524d1ea683f267d3a97aa9bc8/lib/carrierwave/processing/mini_magick.rb#L131
-    def resize_to_fit(photo_path, width, height)
+    def resize_to_fit(photo_path, width, height, pixel_ratio)
 
       # Do nothing if photo is not valid so exceptions will be not thrown
-      return unless (photo = open(photo_path)).try(:valid?)
+      return unless (photo = open(photo_path)) && photo.valid?
 
-      width, height = parse_dimensions(width, height)
-      store_path    = PhotoCook.assemble_path(photo_path, width, height, false)
+      store_path    = assemble_store_path(photo_path, width, height, pixel_ratio, false)
+      width, height = multiply_dimensions(width, height, pixel_ratio)
 
-      if width > 0 || height > 0
-        photo.combine_options do |cmd|
-          cmd.resize "#{width == 0 ? nil : width}x#{height == 0 ? nil : height}>"
-        end
-      end
+      photo.combine_options { |cmd| cmd.resize "#{literal_dimensions(width, height)}>" }
 
       store(photo, store_path)
     end
@@ -42,36 +36,41 @@ module PhotoCook
     # - the photo will be cropped if necessary
     #
     # https://github.com/carrierwaveuploader/carrierwave/blob/71cb18bba4a2078524d1ea683f267d3a97aa9bc8/lib/carrierwave/processing/mini_magick.rb#L176
-    def resize_to_fill(photo_path, width, height)
+    def resize_to_fill(photo_path, width, height, pixel_ratio)
 
       # Do nothing if photo is not valid so exceptions will be not thrown
-      return unless (photo = open(photo_path)).try(:valid?)
-
-      width, height = parse_dimensions(width, height)
-      cols,  rows   = photo[:dimensions]
-      store_path    = PhotoCook.assemble_path(photo_path, width, height, true)
-
-      if width > 0 || height > 0
-        photo.combine_options do |cmd|
-          if width != cols || height != rows
-            scale_x = width / cols.to_f
-            scale_y = height / rows.to_f
-            if scale_x >= scale_y
-              cols = (scale_x * (cols + 0.5)).round
-              rows = (scale_x * (rows + 0.5)).round
-              cmd.resize "#{cols}>"
-            else
-              cols = (scale_y * (cols + 0.5)).round
-              rows = (scale_y * (rows + 0.5)).round
-              cmd.resize "x#{rows}>"
-            end
-          end
-          cmd.gravity CENTER_GRAVITY
-          cmd.background TRANSPARENT_BACKGROUND
-          if cols != width || rows != height
-            cmd.extent "#{width == 0 ? nil : width}x#{height == 0 ? nil : height}>"
+      return unless (photo = open(photo_path)) && photo.valid?
+
+      store_path      = assemble_store_path(photo_path, width, height, pixel_ratio, true)
+      cols, rows      = photo[:dimensions]
+      mwidth, mheight = multiply_dimensions(width, height, pixel_ratio)
+
+      # TODO
+      # Original dimensions are 1000x800. You want 640x640@1x. You will get 640x640
+      # Original dimensions are 1000x800. You want 640x640@2x. You will get 800x800
+      # Original dimensions are 1000x800. You want 640x640@3x. You will get 800x800
+      # Original dimensions are 1000x800. You want 1280x1280@1x. You will get ?
+      # Original dimensions are 1000x800. You want 1000x1280@1x. You will get ?
+
+      photo.combine_options do |cmd|
+        if width != cols || height != rows
+          scale_x = width / cols.to_f
+          scale_y = height / rows.to_f
+          if scale_x >= scale_y
+            cols = (scale_x * (cols + 0.5)).round
+            rows = (scale_x * (rows + 0.5)).round
+            cmd.resize "#{cols}>"
+          else
+            cols = (scale_y * (cols + 0.5)).round
+            rows = (scale_y * (rows + 0.5)).round
+            cmd.resize "x#{rows}>"
           end
         end
+        cmd.gravity CENTER_GRAVITY
+        cmd.background TRANSPARENT_BACKGROUND
+        if cols != width || rows != height
+          cmd.extent "#{literal_dimensions(width, height)}>"
+        end
       end
 
       store(photo, store_path)
@@ -91,22 +90,24 @@ module PhotoCook
     end
 
     def store(resized_photo, path_to_store_at)
-      dir = File.dirname path_to_store_at
-      Dir.mkdir dir unless File.exists?(dir)
-      resized_photo.write path_to_store_at
+      dir = File.dirname(path_to_store_at)
+      FileUtils.mkdir_p(dir) unless File.exists?(dir)
+
+      resized_photo.write(path_to_store_at)
       resized_photo.resized_path = path_to_store_at
       resized_photo
     end
 
-    def parse_dimensions(width, height)
-      width   = width == :auto ? 0 : width.to_i
-      height  = height == :auto ? 0 : height.to_i
-      check_dimensions!(width, height)
-      [width, height]
+    def literal_dimensions(width, height)
+      "#{width == 0 ? nil : width}x#{height == 0 ? nil : height}"
+    end
+
+    def assemble_store_path(path, width, height, pixel_ratio, crop)
+      PhotoCook.assemble_store_path(path, width, height, pixel_ratio, crop)
     end
 
-    def check_dimensions!(width, height)
-      raise ArgumentError, 'Expected positive numbers ' if width < 0 || height < 0
+    def multiply_dimensions(width, height, ratio)
+      [(width * ratio).round, (height * ratio).round]
     end
   end
 end

data/lib/photo-cook/resizing.rb

@@ -0,0 +1,68 @@
+module PhotoCook
+  module Resizing
+
+    # Performs photo resizing:
+    #   resize_photo('/application/public/uploads/car.png', 280, 280)
+    #
+    # NOTE: This method will perform validation
+    def resize_photo(path, width, height, options = {})
+      started           = Time.now
+
+      width, height     = parse_and_check_dimensions(width, height)
+      pixel_ratio, crop = open_options(options)
+                                                      # Explicit     # Default
+      pixel_ratio       = unify_pixel_ratio(parse_and_check_pixel_ratio(pixel_ratio || 1))
+      photo             = Resizer.instance.resize(path, width, height, pixel_ratio, !!crop)
+
+      finished          = Time.now
+      log_resize(photo, width, height, pixel_ratio, !!crop, (finished - started) * 1000.0)
+      photo
+    end
+
+    # Builds URI for resizing:
+    #   resize('/uploads/car.png', 280, 280, pixel_ratio: 2.5)
+    #     => /resized/uploads/width:280&height:280&crop:0&pixel_ratio:3
+    #
+    # NOTE: This method will perform validation
+    def build_resize_uri(uri, width, height, options = {})
+      width, height     = parse_and_check_dimensions(width, height)
+      pixel_ratio, crop = open_options(options)
+                                                      # Explicit     # From cookies                  # Default
+      pixel_ratio       = parse_and_check_pixel_ratio(pixel_ratio || PhotoCook.client_pixel_ratio || 1)
+      assemble_uri(uri, width, height, unify_pixel_ratio(pixel_ratio), !!crop)
+    end
+
+    alias resize build_resize_uri
+
+    # Shorthand: hresize('/uploads/car.png', 280) <=> resize('/uploads/car.png', 280, nil)
+    def hresize(uri, width, options = {})
+      resize(uri, width, :auto, options)
+    end
+
+    # Shorthand: vresize('/uploads/car.png', 280) <=> resize('/uploads/car.png', nil, 280)
+    def vresize(uri, height, options = {})
+      resize(uri, :auto, height, options)
+    end
+
+  private
+    def open_options(options)
+      case options
+        when Hash
+          [options[:pixel_ratio], options.fetch(:crop, false)]
+        when Symbol
+          [nil, options == :crop]
+        else
+          [nil, nil]
+      end
+    end
+
+    # Do not produce various number of pixel ratios:
+    #   2.5 => 3
+    #   2.1 => 3
+    def unify_pixel_ratio(px_ratio)
+      px_ratio.ceil
+    end
+  end
+
+  extend Resizing
+end

data/lib/photo-cook/version.rb

@@ -1,3 +1,3 @@
 module PhotoCook
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/lib/photo-cook.rb

@@ -1,41 +1,27 @@
-module PhotoCook
-
-  mattr_writer :public_dir
-  mattr_writer :resize_dir
-
-  def self.public_dir
-    @public_dir || 'public'
-  end
-
-  def self.resize_dir
-    @resize_dir || 'resized'
-  end
-
-  def self.resize(*args)
-    assemble_path(*args)
-  end
-
-  def self.assemble_path(path, width, height, crop = false)
-    File.join(assemble_dir(path), assemble_name(path, width, height, crop))
-  end
-
-  def self.assemble_dir(path)
-    File.join(File.dirname(path), resize_dir)
-  end
-
-  def self.assemble_name(path, width, height, crop = false)
-    File.basename(path, '.*') + assemble_command(width, height, crop) + File.extname(path)
-  end
+require 'fileutils'
+require 'rake'
+require 'mini_magick'
 
-  def self.assemble_command(width, height, crop = false)
-    width, height = width.to_i, height.to_i
-    prefix = "-#{width == 0 ? nil : width}x#{height == 0 ? nil : height}"
-    prefix + (crop ? 'crop' : '')
+module PhotoCook
+  def self.rails_env?
+    defined?(Rails)
   end
 end
 
-require 'photo-cook/engine' if defined?(Rails)
+require 'photo-cook/dimensions'
+require 'photo-cook/pixel-ratio'
+require 'photo-cook/paths'
+require 'photo-cook/command'
+require 'photo-cook/assemble'
+require 'photo-cook/callbacks'
+require 'photo-cook/logging'
 require 'photo-cook/resizer'
 require 'photo-cook/middleware'
-require 'photo-cook/carrierwave'
 require 'photo-cook/magick-photo'
+require 'photo-cook/carrierwave'
+require 'photo-cook/resizing'
+
+if PhotoCook.rails_env?
+  require 'photo-cook/engine'
+  require 'photo-cook/pixel-ratio-spy'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-cook
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -49,15 +49,25 @@ files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
+- app/assets/javascripts/photo-cook.js
+- app/assets/javascripts/photo-cook/photo-cook.js.erb
 - lib/photo-cook.rb
+- lib/photo-cook/assemble.rb
+- lib/photo-cook/callbacks.rb
 - lib/photo-cook/carrierwave.rb
+- lib/photo-cook/command.rb
+- lib/photo-cook/dimensions.rb
 - lib/photo-cook/engine.rb
+- lib/photo-cook/logging.rb
 - lib/photo-cook/magick-photo.rb
 - lib/photo-cook/middleware.rb
+- lib/photo-cook/paths.rb
+- lib/photo-cook/pixel-ratio-spy.rb
+- lib/photo-cook/pixel-ratio.rb
 - lib/photo-cook/resizer.rb
+- lib/photo-cook/resizing.rb
 - lib/photo-cook/version.rb
 - photo-cook.gemspec
-- vendor/assets/javascripts/photo-cook/photo-cook.js.erb
 homepage: http://github.com/yivo/photo-cook
 licenses:
 - MIT

data/vendor/assets/javascripts/photo-cook/photo-cook.js.erb

@@ -1,49 +0,0 @@
-window.PhotoCook = {
-    resizeDir: function() {
-        return <%= PhotoCook.resize_dir.to_json %>;
-    },
-
-    pixelRatio: (function() {
-        var mediaQuery = '(-webkit-min-device-pixel-ratio: 1.5), (min--moz-device-pixel-ratio: 1.5), (-o-min-device-pixel-ratio: 3/2), (min-resolution: 1.5dppx)';
-        return function() {
-            var ratio = window.devicePixelRatio;
-
-            // If no ratio found check if screen is retina
-            // and if so return 2x ratio
-            if (ratio == null && typeof window.matchMedia === 'function') {
-                if (window.matchMedia(mediaQuery).matches) {
-                    ratio = 2;
-                }
-            }
-
-            return ratio != null ? ratio : 1;
-        };
-    })()
-};
-
-window.PhotoCook.resize = function(path, width, height, crop) {
-    if (path == null) { return path; }
-
-    var ratio = PhotoCook.pixelRatio();
-    var command = '-' + (width ? Math.round(width * ratio) : '')
-        + 'x'
-        + (height ? Math.round(height * ratio) : '')
-        + (crop ? 'crop' : '');
-
-    var directory = path.slice(0, Math.max(path.lastIndexOf('/'), 0));
-
-    var index = path.lastIndexOf('.');
-    var extension = index >= 0 ? path.slice(index) : '';
-
-    var basename = path.slice(
-        directory ? directory.length + 1 : 0,
-        extension ? 0 - extension.length : path.length
-    );
-
-    return (directory ? directory + '/' : directory)
-            + PhotoCook.resizeDir()
-            + '/'
-            + basename
-            + command
-            + extension;
-};