photo-cook 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30713968f97de16d9fa2a2d0c3b88bcb5435ac43
-  data.tar.gz: 6deed34ded832a9041bb6adf6bd5595acb2ae170
+  metadata.gz: 134a21bfc6697b25c4b682afee2ec145c0e29f38
+  data.tar.gz: e090d4eb4009cac709d78e50e2e5caa72f1dd5f7
 SHA512:
-  metadata.gz: 5c76ef21599b1cb9d4c5e870b77afc2748aa7ba65613b7b46246a6850c9e3aee716182c45c4fdc100951746af0feb2a9ed910df90fd12cc68d3ad47e33cfd081
-  data.tar.gz: a87c0fdaf2d015ac0b9aafd5b551d64c18c864f21f23d514c6ddd9989759df01cc108cbeb9a6f447435f5fdb001889479cf329c29d07e46c84502716abd89ed2
+  metadata.gz: 378835a2a6cf41cf6160be4c8e7b607fd343cf08b9dbf972f20e19c3242fc842ec83c276e01c82d156c87ff359f4c39e0177c51073e45b5c91b17dcc0279ae2c
+  data.tar.gz: 4c7274814608e4250c4a400cf9b109c44abb7f6b62ab39c14ee3d2dbc00a6dd70935af1f7c2471a994632bac5df06fb9110cc17eddf5db74456085ab6edad493

data/.gitignore

@@ -1,4 +1,5 @@
 .bundle/
 log/*.log
 pkg/
-.idea
+.idea
+.Gemfile.lock

data/README.md

@@ -0,0 +1,15 @@
+```ruby
+# application
+#   public
+#     uploads
+#       photos
+#         1
+#           car.png
+#           resize-cache -> ../../../resize-cache/uploads/photos/1
+#     resize-cache
+#       uploads
+#         photos
+#           1
+#             width=auto&height=640&pixel_ratio=1&crop=yes
+#               car.png
+```

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

@@ -1,13 +1,15 @@
 (function(root) {
   var PhotoCook = {
-    resizeDir: <%= PhotoCook.cache_dir.to_json %>,
+    cacheDir: <%= PhotoCook.cache_dir.to_json %>,
 
-    commandRegex: /\-(?:(?:\d+x\d+)|(?:\d+x)|(?:x\d+))(?:crop)?$/,
+    commandRegex: /^$width=auto|\d{1,5}&height=auto|\d{1,5}&pixel_ratio=[1234]&crop=yes|no$/,
 
     initialize: function() {
       PhotoCook.persistPixelRatio();
     },
 
+    // Returns device pixel ratio (float)
+    // If no ratio could be determined will return normal ratio (1.0)
     pixelRatio: (function () {
       // https://gist.github.com/marcedwards/3446599
       var mediaQuery = [
@@ -22,11 +24,11 @@
       // and if so return 2x ratio
       if (ratio == null && typeof window.matchMedia === 'function') {
         if (window.matchMedia(mediaQuery).matches) {
-          ratio = 2;
+          ratio = 2.0;
         }
       }
 
-      return parseFloat(ratio == null ? 1 : ratio);
+      return parseFloat(ratio) || 1.0;
     })(),
 
     persistPixelRatio: function() {
@@ -35,66 +37,35 @@
         // Expires in 1 year
         date.setTime(date.getTime() + 365 * 24 * 60 * 60 * 1000);
         var expires = 'expires=' + date.toUTCString();
-        document.cookie = "PhotoCookPixelRatio=" + PhotoCook.pixelRatio + '; ' + expires;
+        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;
+      var crop    = typeof options === 'boolean' ? !!options : !!(options && options.crop);
+      var ratio   = Math.ceil(Math.max(0, options && options.pixelRatio) || PhotoCook.pixelRatio);
+      var command = 'width='       + (+width  || 'auto') +
+                   '&height='      + (+height || 'auto') +
+                   '&pixel_ratio=' + (+ratio  || 1) +
+                   '&crop='        + (crop ? 'yes' : 'no');
+      var els     = path.split('/');
+      els.splice(-1, 0, PhotoCook.cacheDir, command);
+      return els.join('/');
     },
 
-    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
-      );
+    strip: function (uri) {
+      var sections = uri.split('/');
+      var length   = sections.length;
+      if (length < 3) { return uri; }
 
-      var oldLength = basename.length;
+      var cacheDir = sections[length - 3];
+      var command  = sections[length - 2];
 
-      basename = basename.replace(PhotoCook.commandRegex, '');
-
-      if (oldLength === basename.length) {
-        return path;
+      if (PhotoCook.cacheDir !== cacheDir || PhotoCook.commandRegex.test(command) == false) {
+        return uri;
       }
 
-      var leftPart = path.slice(0, leftIndex);
-      var rightPart = rightIndex >= 0 ? path.slice(rightIndex) : '';
-
-      return leftPart + basename + rightPart;
+      sections.splice(length - 3, 2)
+      return sections.join('/');
     },
 
     uriRegex: /^[-a-z]+:\/\/|^(?:cid|data):|^\/\//i,

data/lib/photo-cook/assemble.rb

@@ -1,26 +1,96 @@
 module PhotoCook
   module Assemble
 
-    # Edit URI so it will point to PhotoCook::Middleware
+    # Returns URI which points to PhotoCook::Middleware
+    #
+    # Arguments:
+    #   source_uri  => /uploads/photos/1/car.png
+    #   width       => :auto
+    #   height      => 640
+    #   pixel_ratio => 1
+    #   crop        => true
+    #
+    # Returns /uploads/photos/1/resized/width=auto&height=640&pixel_ratio=1&crop=yes/car.png
+    #
     # 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
+    def assemble_resize_uri(source_uri, width, height, pixel_ratio, crop)
+      source_uri.split('/').insert(-2, cache_dir, assemble_command(width, height, pixel_ratio, crop)).join('/')
     end
 
-    # Edit path so it will point to place where resized photo stored
+    # Strips resize command from URI. Inverse of +assemble_resize_uri+
+    #
+    # Arguments:
+    #   resize_uri => /uploads/photos/1/resized/width=auto&height=640&pixel_ratio=1&crop=yes/car.png
+    #
+    # Returns /uploads/photos/1/car.png
+    #
     # 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)
+    def disassemble_resize_uri(resize_uri)
+      # Take URI:
+      # /uploads/photos/1/resized/width=auto&height=640&pixel_ratio=1&crop=yes/car.png
+      #
+      # Split by separator:
+      # ["", "uploads", "photos", "1", "resized", "width=auto&height=640&pixel_ratio=1&crop=yes", "car.png"]
+      #
+      sections = resize_uri.split('/')
+
+      # Delete PhotoCook directory:
+      # ["", "uploads", "photos", "1", "width=auto&height=640&pixel_ratio=1&crop=yes", "car.png"]
+      sections.delete_at(-3)
+
+      # Delete command string:
+      # ["", "uploads", "photos", "1", "car.png"]
+      sections.delete_at(-2)
+
+      sections.join('/')
+    end
+
+    # Path where source photo is stored
+    #
+    # Arguments:
+    #   root       => /application
+    #   resize_uri => /uploads/photos/1/resized/width=auto&height=640&pixel_ratio=1&crop=yes/car.png
+    #
+    # Returns /application/public/uploads/photos/1/car.png
+    #
+    # NOTE: This method performs no validation
+    def assemble_source_path(root, resize_uri)
+      uri = disassemble_resize_uri(resize_uri)
+      uri.gsub!('/', '\\') if File::SEPARATOR != '/'
+      File.join(assemble_public_path(root), uri)
+    end
+
+    # Path where resized photo is stored
+    #
+    # Arguments:
+    #   root              => /application
+    #   source_path       => /application/public/uploads/photos/1/car.png
+    #   assembled_command => width=auto&height=640&pixel_ratio=1&crop=yes
+    #
+    # Returns /application/public/resized/uploads/photos/1/width=auto&height=640&pixel_ratio=1&crop=yes/car.png
+    #
+    # NOTE: This method performs no validation
+    def assemble_store_path(root, source_path, assembled_command)
+      public         = assemble_public_path(root)
+      photo_location = dirname_or_blank(source_path.split(public).last)
+      File.join public, cache_dir, photo_location, assembled_command, File.basename(source_path)
+    end
+
+    # Path to public directory
+    #
+    # Arguments:
+    #   root => /application
+    #
+    # Returns /application/public
+    #
+    # NOTE: This method performs no validation
+    def assemble_public_path(root)
+      File.join(root, public_dir)
     end
 
   private
     def dirname_or_blank(path)
-      (dirname = File.dirname(path)) == '.' ? '' : dirname
+      File.dirname(path).sub(/\A\.\z/, '')
     end
   end
   extend Assemble

data/lib/photo-cook/command.rb

@@ -8,28 +8,42 @@ module PhotoCook
     # http://www.canbike.org/CSSpixels/
     def command_regex
       @command_regex ||= %r{
+        \A
           width=       (?<width>      auto|\d{1,4}) &
           height=      (?<height>     auto|\d{1,4}) &
           pixel_ratio= (?<pixel_ratio>[1234]) &
           crop=        (?<crop>       yes|no)
+        \z
         }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)}&"
+       'width='       + encode_dimension(width) +
+      '&height='      + encode_dimension(height) +
+      '&pixel_ratio=' + encode_pixel_ratio(pixel_ratio) +
+      '&crop='        + encode_crop_option(crop)
     end
 
-    def crop_to_bool(crop)
+    def extract_command(resize_uri)
+      resize_uri.split('/')[-2].match(command_regex)
+    end
+
+    def decode_crop_option(crop)
       crop == 'yes'
     end
 
-    def bool_to_crop(crop)
+    def encode_crop_option(crop)
       crop ? 'yes' : 'no'
     end
+
+    def encode_dimension(val)
+      val == 0 ? 'auto' : val.to_s
+    end
+
+    def encode_pixel_ratio(ratio)
+      ratio.ceil.to_s
+    end
   end
   extend Command
 end

data/lib/photo-cook/dimensions.rb

@@ -9,27 +9,27 @@ module PhotoCook
     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
+      raise WidthOutOfBounds     if width  < 0 || width  > 9999
+      raise HeightOutOfBounds    if height < 0 || height > 9999
+      raise NoConcreteDimensions if width + height == 0
     end
   end
 
-  class WidthOutOfBoundsError < ArgumentError
+  class WidthOutOfBounds < ArgumentError
     def initialize
       super 'Width must be positive integer number (0...9999)'
     end
   end
 
-  class HeightOutOfBoundsError < ArgumentError
+  class HeightOutOfBounds < ArgumentError
     def initialize
       super 'Height must be positive integer number (0...9999)'
     end
   end
 
-  class NoConcreteDimensionsError < ArgumentError
+  class NoConcreteDimensions < ArgumentError
     def initialize
-      super "Both width and height specified as 'auto'"
+      super 'Both width and height specified as :auto'
     end
   end
   extend Dimensions

data/lib/photo-cook/dirs.rb

@@ -0,0 +1,8 @@
+module PhotoCook
+  class << self
+    attr_accessor :public_dir, :cache_dir
+  end
+
+  self.public_dir = 'public'
+  self.cache_dir  = 'resize-cache'
+end

data/lib/photo-cook/engine.rb

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

data/lib/photo-cook/logging.rb

@@ -1,8 +1,23 @@
 module PhotoCook
-  module Logging
-    def log_resize(photo, w, h, px_ratio, crop, msec)
-      msg = %{
-        [PhotoCook] Resized photo.
+  class Logger
+    def initialize(logger)
+      @logger = logger
+    end
+
+    def info(msg)
+      @logger.info(msg)
+    end
+
+    def matched_resize_uri(uri)
+      info %{
+        [PhotoCook] Matched resize URI.
+        #{uri}
+      }
+    end
+
+    def performed_resize(photo, w, h, px_ratio, crop, msec)
+      info %{
+        [PhotoCook] Performed resize.
         Source file:  #{photo.source_path}
         Resized file: #{photo.resized_path}
         Width:        #{w == 0 ? 'auto': "#{w}px"}
@@ -11,8 +26,35 @@ module PhotoCook
         Pixel ratio:  #{px_ratio}
         Completed in: #{msec.round(1)}ms
       }
-      rails_env? ? Rails.logger.info(msg) : print(msg)
     end
+
+    def will_symlink_cache_dir(cmd)
+      info %{
+        [PhotoCook] Will symlink cache directory.
+        Command: #{cmd}
+      }
+    end
+
+    def symlink_cache_dir_success
+      info %{
+        [PhotoCook] Successfully symlink cache directory.
+      }
+    end
+
+    def symlink_cache_dir_failure
+      info %{
+        [PhotoCook] Failed to symlink cache directory.
+      }
+    end
+  end
+
+  class STDOut
+    def info(msg)
+      print(msg)
+    end
+  end
+
+  def self.logger
+    @logger ||= Logger.new(rails_env? ? Rails.logger : STDOut.new)
   end
-  extend Logging
 end

data/lib/photo-cook/middleware.rb

@@ -8,49 +8,55 @@ module PhotoCook
       @app, @root = app, root
     end
 
-    # Consider we have car.png in /uploads/photos/1
+    # Consider we have car.png in /uploads/photos/1/car.png
     # We want to resize it with the following params:
-    #   Width:  choose automatically
-    #   Height: exactly 640px
-    #   Crop:   yes
-    #   Pixel   ratio: 1
+    #   Width:       choose automatically
+    #   Height:      exactly 640px
+    #   Pixel ratio: 1
+    #   Crop:        yes
     #
     # Middleware will handle this URI:
-    #   /resized/uploads/photos/1/width:auto&height:640&crop:true&pixel_ratio:1/car.png
+    #   /uploads/photos/1/resized/width=auto&height=640&pixel_ratio=1&crop=yes/car.png
     #
     def call(env)
       uri = extract_uri(env)
 
       return default_actions(env) if
 
-        # Check if uri starts with '/resized'
-        false == uri.start_with?(PhotoCook.resize_uri_indicator) ||
-
-        # 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) ||
+        # Check if URI contains PhotoCook resize indicators
+        PhotoCook.resize_uri?(uri) == false ||
 
         # If for some reasons file exists but request went to Ruby app
-        true  == requested_file_exists?(uri)
+        requested_file_exists?(uri)
 
       # At this point we are sure that this request is targeting to resize photo
 
+      PhotoCook.logger.matched_resize_uri(uri)
+
+      # Matched data: width=auto&height=640&pixel_ratio=1&crop=yes
+      command = PhotoCook.extract_command(uri)
+
       # Assemble path of the source photo:
-      #   => /uploads/photos/1/car.png
-      source_path = assemble_source_path(uri)
+      #   => /application/public/uploads/photos/1/car.png
+      source_path = PhotoCook.assemble_source_path(@root, uri)
 
-      # Matched data: width:auto&height:640&crop:true&pixel_ratio:1
-      command = Regexp.last_match
+      # Assemble path of the resized photo:
+      #   => /application/public/resized/uploads/photos/1/COMMAND/car.png
+      store_path  = PhotoCook.assemble_store_path(@root, source_path, command.to_s)
 
       # Map crop option values: 'yes' => true, 'no' => false
-      crop  = PhotoCook.crop_to_bool(command[:crop])
+      crop        = PhotoCook.decode_crop_option(command[:crop])
 
       # 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)
+      photo = PhotoCook.perform_resize(
+        source_path, store_path,
+        command[:width], command[:height],
+        pixel_ratio: command[:pixel_ratio], crop: crop
+      )
 
       if photo
+        symlink_cache_dir(source_path, store_path)
         respond_with_file(env)
       else
         default_actions(env)
@@ -58,31 +64,14 @@ module PhotoCook
     end
 
   private
-
-    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)
+    def public
+      @public ||= PhotoCook.assemble_public_path(@root)
     end
 
     def requested_file_exists?(uri)
       # 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)
+      #   /application/public/uploads/photos/1/resized/width=auto&height=640&pixel_ratio=1&crop=yes/car.png
+      File.exists? File.join(public, uri)
     end
 
     def extract_uri(env)
@@ -97,9 +86,37 @@ module PhotoCook
     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)
+      status, headers, body = Rack::File.new(public).call(env)
       response = Rack::Response.new(body, status, headers)
       response.finish
     end
+
+    def symlink_cache_dir(source_path, store_path)
+      # /application/public/uploads/photos/1
+      p1 = Pathname.new(File.dirname(source_path))
+
+      # /application/public/resized/uploads/photos/1
+      p2 = Pathname.new(File.dirname(File.dirname(store_path)))
+
+      # ../../../resized/uploads/photos/1
+      relative = p2.relative_path_from(p1)
+
+      # Guess cache directory (must be same as PhotoCook.cache_dir)
+      cache_dir = relative.to_s.split(File::SEPARATOR).find { |el| !(el =~ /\A\.\.?\z/) }
+
+      unless Dir.exists?(p1.join(cache_dir))
+        cmd = "cd #{p1} && rm -rf #{cache_dir} && ln -rs #{relative} #{cache_dir}"
+
+        PhotoCook.logger.will_symlink_cache_dir(cmd)
+
+        %x{ #{cmd} }
+
+        if $?.success?
+          PhotoCook.logger.symlink_cache_dir_success
+        else
+          PhotoCook.logger.symlink_cache_dir_failure
+        end
+      end
+    end
   end
 end

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

@@ -3,8 +3,8 @@ module PhotoCook
     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
+      raise PixelRatioInvalidOrInfinite if pixel_ratio.nan? || pixel_ratio.infinite?
+      raise PixelRatioOutOfBounds       if pixel_ratio < 1 || pixel_ratio > 4
 
       pixel_ratio
     end
@@ -12,15 +12,22 @@ module PhotoCook
     def valid_pixel_ratio?(ratio)
       !ratio.nan? && !ratio.infinite? && ratio >= 1 && ratio <= 4
     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
 
-  class PixelRatioInvalidOrInfiniteError < ArgumentError
+  class PixelRatioInvalidOrInfinite < ArgumentError
     def initialize
       super 'Given pixel ratio is invalid number or infinite'
     end
   end
 
-  class PixelRatioOutOfBoundsError < ArgumentError
+  class PixelRatioOutOfBounds < ArgumentError
     def initialize
       super 'Pixel ratio must be positive number: 1 <= pixel_ratio <= 4'
     end

data/lib/photo-cook/resize-api.rb

@@ -0,0 +1,92 @@
+module PhotoCook
+  module API
+    module Magick
+      # Performs photo resizing with ImageMagick:
+      #   perform_resize('/application/public/uploads/car.png', '/application/public/resized_car.png', 280, 280)
+      #
+      # Source file: /application/public/uploads/car.png
+      # Result file: /application/public/resized_car.png
+      #
+      # NOTE: This method will perform validation
+      def perform_resize(source_path, store_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(source_path, store_path, width, height, pixel_ratio, !!crop)
+
+        finished          = Time.now
+        logger.performed_resize(photo, width, height, pixel_ratio, !!crop, (finished - started) * 1000.0)
+        photo
+      end
+    end
+
+    module URI
+      # Builds URI which points to PhotoCook::Middleware:
+      #   resize('/uploads/car.png', 280, 280, pixel_ratio: 2.5)
+      #     => /uploads/resized/width=280&height=280&pixel_ratio=3&crop=no/car.png
+      #
+      # NOTE: This method will perform validation
+      def resize(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_resize_uri(uri, width, height, unify_pixel_ratio(pixel_ratio), !!crop)
+      end
+
+      # Inverse of PhotoCook#resize (see ^):
+      #   strip('/uploads/resized/width=280&height=280&pixel_ratio=3&crop=no/car.png')
+      #     => /uploads/car.png
+      #
+      # NOTE: This method will perform validation
+      def strip(uri, check = false)
+        # TODO Implement check
+        disassemble_resize_uri(uri)
+      end
+
+      # Shorthand: hresize('/uploads/car.png', 280) <=> resize('/uploads/car.png', 280, nil)
+      #
+      # NOTE: This method will perform validation
+      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
+
+      def resize_uri?(uri)
+        sections = uri.split('/')
+
+        # Check if PhotoCook cache directory exists:
+        #   sections[-3] => resized
+        sections[-3] == cache_dir &&
+
+        # Check if valid resize command exists:
+        #   sections[-2] => width=auto&height=640&pixel_ratio=1&crop=yes
+        (sections[-2] =~ command_regex) == 0
+      end
+    end
+
+    module Tools
+      def open_options(options)
+        case options
+          when Hash
+            [options[:pixel_ratio], options.fetch(:crop, false)]
+          when Symbol
+            [nil, options == :crop]
+        end
+      end
+
+      private :open_options
+    end
+  end
+
+  extend API::Magick
+  extend API::URI
+  extend API::Tools
+end

data/lib/photo-cook/resizer.rb

@@ -5,11 +5,11 @@ module PhotoCook
     CENTER_GRAVITY          = 'Center'.freeze
     TRANSPARENT_BACKGROUND  = 'rgba(255,255,255,0.0)'.freeze
 
-    def resize(photo_path, width, height, pixel_ratio = 1.0, crop = false)
+    def resize(src_path, store_path, w, h, px_ratio = 1, crop = false)
       if crop
-        resize_to_fill(photo_path, width, height, pixel_ratio)
+        resize_to_fill(src_path, store_path, w, h, px_ratio)
       else
-        resize_to_fit(photo_path, width, height, pixel_ratio)
+        resize_to_fit(src_path, store_path, w, h, px_ratio)
       end
     end
 
@@ -18,12 +18,11 @@ 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, pixel_ratio)
+    def resize_to_fit(source_path, store_path, width, height, pixel_ratio)
 
       # Do nothing if photo is not valid so exceptions will be not thrown
-      return unless (photo = open(photo_path)) && photo.valid?
+      return unless (photo = open(source_path)) && photo.valid?
 
-      store_path    = assemble_store_path(photo_path, width, height, pixel_ratio, false)
       width, height = multiply_dimensions(width, height, pixel_ratio)
 
       photo.combine_options { |cmd| cmd.resize "#{literal_dimensions(width, height)}>" }
@@ -36,12 +35,11 @@ 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, pixel_ratio)
+    def resize_to_fill(source_path, store_path, width, height, pixel_ratio)
 
       # Do nothing if photo is not valid so exceptions will be not thrown
-      return unless (photo = open(photo_path)) && photo.valid?
+      return unless (photo = open(source_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)
 
@@ -78,32 +76,26 @@ module PhotoCook
 
   protected
 
-    def open(photo_path)
+    def open(source_path)
       begin
         # MiniMagick::Image.open creates a temporary file for us and protects original
-        photo = MagickPhoto.open(photo_path)
-        photo.source_path = photo_path
+        photo = MagickPhoto.open(source_path)
+        photo.source_path = source_path
         photo
       rescue
         nil
       end
     end
 
-    def store(resized_photo, 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
+    def store(resized_photo, store_path)
+      FileUtils.mkdir_p(File.dirname(store_path))
+      resized_photo.write(store_path)
+      resized_photo.resized_path = store_path
       resized_photo
     end
 
     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)
+      "#{width if width != 0}x#{height if height != 0}"
     end
 
     def multiply_dimensions(width, height, ratio)

data/lib/photo-cook/version.rb

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

data/lib/photo-cook.rb

@@ -1,25 +1,25 @@
 require 'fileutils'
+require 'pathname'
 require 'rake'
 require 'mini_magick'
 
 module PhotoCook
   def self.rails_env?
-    defined?(Rails)
+    @rails.nil? ? @rails = !!defined?(Rails) : @rails
   end
 end
 
 require 'photo-cook/dimensions'
 require 'photo-cook/pixel-ratio'
-require 'photo-cook/paths'
+require 'photo-cook/dirs'
 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/magick-photo'
 require 'photo-cook/carrierwave'
-require 'photo-cook/resizing'
+require 'photo-cook/resize-api'
 
 if PhotoCook.rails_env?
   require 'photo-cook/engine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-cook
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -47,25 +47,24 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
+- README.md
 - 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/dirs.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/resize-api.rb
 - lib/photo-cook/resizer.rb
-- lib/photo-cook/resizing.rb
 - lib/photo-cook/version.rb
 - photo-cook.gemspec
 homepage: http://github.com/yivo/photo-cook

data/Gemfile.lock

@@ -1,19 +0,0 @@
-PATH
-  remote: .
-  specs:
-    photo-cook (1.0.2)
-      mini_magick (~> 4.0)
-      rack (~> 1.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    mini_magick (4.1.0)
-    rack (1.6.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  mini_magick
-  photo-cook!

data/lib/photo-cook/callbacks.rb

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

data/lib/photo-cook/paths.rb

@@ -1,12 +0,0 @@
-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/resizing.rb

@@ -1,68 +0,0 @@
-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