photo-cook 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 134a21bfc6697b25c4b682afee2ec145c0e29f38
-  data.tar.gz: e090d4eb4009cac709d78e50e2e5caa72f1dd5f7
+  metadata.gz: 6005409b8dc3c640b98055fdf5632229ba5f4f1c
+  data.tar.gz: 39172ae4df3922a0e45a95971b2851a0ae58351a
 SHA512:
-  metadata.gz: 378835a2a6cf41cf6160be4c8e7b607fd343cf08b9dbf972f20e19c3242fc842ec83c276e01c82d156c87ff359f4c39e0177c51073e45b5c91b17dcc0279ae2c
-  data.tar.gz: 4c7274814608e4250c4a400cf9b109c44abb7f6b62ab39c14ee3d2dbc00a6dd70935af1f7c2471a994632bac5df06fb9110cc17eddf5db74456085ab6edad493
+  metadata.gz: 751fd68124f6dc8c7006587354a258f5a65c654c863a7eb6fabfaf1f321a63aaabf09ea72ad53a86de292bd11b3b1a058ee3c4765dde103961fe7db47c58a9aa
+  data.tar.gz: 8afd24b253d69b657f4308c85950f1d7f9ce6c4086cbdc0059fb2571a3c46a8f4b68a874c649ec780032c79a604f8a948507f69b9d5588f1a9a445801b449ef0

data/.gitignore

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

data/lib/photo-cook/abstract-optimizer.rb

@@ -0,0 +1,9 @@
+module PhotoCook
+  class AbstractOptimizer
+    include Singleton
+
+    def optimize(path, options = {})
+
+    end
+  end
+end

data/lib/photo-cook/image-optim.rb

@@ -0,0 +1,24 @@
+module PhotoCook
+  class ImageOptim < AbstractOptimizer
+    def optimize(path, options = {})
+      PhotoCook.logger.will_perform_optimization(path)
+
+      image_optim = options.empty? ? default_image_optim : ::ImageOptim.new(options)
+      result = image_optim.optimize_image!(path)
+
+      case result
+        when ::ImageOptim::ImagePath::Optimized
+          PhotoCook.logger.performed_optimization(path, result.original_size, result.size)
+        else
+          PhotoCook.logger.no_optimization_performed(path)
+      end
+
+      result
+    end
+
+  private
+    def default_image_optim
+      @default_image_optim ||= ::ImageOptim.new
+    end
+  end
+end

data/lib/photo-cook/logging.rb

@@ -10,40 +10,65 @@ module PhotoCook
 
     def matched_resize_uri(uri)
       info %{
-        [PhotoCook] Matched resize URI.
-        #{uri}
+[PhotoCook] Matched resize URI.
+  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"}
-        Height:       #{h == 0 ? 'auto': "#{h}px"}
-        Crop:         #{crop ? 'yes' : 'no'}
-        Pixel ratio:  #{px_ratio}
-        Completed in: #{msec.round(1)}ms
+[PhotoCook] Performed resize.
+  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
       }
     end
 
     def will_symlink_cache_dir(cmd)
       info %{
-        [PhotoCook] Will symlink cache directory.
-        Command: #{cmd}
+[PhotoCook] Will symlink cache directory.
+  Command:      #{cmd}
       }
     end
 
     def symlink_cache_dir_success
       info %{
-        [PhotoCook] Successfully symlink cache directory.
+[PhotoCook] Successfully symlink cache directory.
       }
     end
 
     def symlink_cache_dir_failure
       info %{
-        [PhotoCook] Failed to symlink cache directory.
+[PhotoCook] Failed to symlink cache directory.
+      }
+    end
+
+    def will_perform_optimization(path)
+      info %{
+[PhotoCook] Will perform optimization.
+  File path:     #{path}
+      }
+    end
+
+    def performed_optimization(path, original_size, new_size)
+      diff = original_size - new_size
+      info %{
+[PhotoCook] Performed optimization.
+  File path:     #{path}
+  Original size: #{PhotoCook.format_size(original_size)}
+  New size:      #{PhotoCook.format_size(new_size)}
+  Saved:         #{diff} bytes / #{PhotoCook.format_size(diff)} / #{(diff / original_size.to_f * 100.0).round(2)}%
+      }
+    end
+
+    def no_optimization_performed(path)
+      info %{
+[PhotoCook] No optimization performed.
+  File path:     #{path}
       }
     end
   end

data/lib/photo-cook/middleware.rb

@@ -1,6 +1,8 @@
 # To use this middleware you should configure application:
 #   application.config.middleware.insert_before(Rack::Sendfile, PhotoCook::Middleware, Rails.root)
 
+# TODO Extract symlink
+
 module PhotoCook
   class Middleware
 
@@ -44,22 +46,27 @@ module PhotoCook
       #   => /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.decode_crop_option(command[:crop])
-
-      # Finally resize photo
-      # Resized photo will appear in resize directory
-      photo = PhotoCook.perform_resize(
-        source_path, store_path,
-        command[:width], command[:height],
-        pixel_ratio: command[:pixel_ratio], crop: crop
-      )
-
-      if photo
+      if File.exists?(store_path)
         symlink_cache_dir(source_path, store_path)
-        respond_with_file(env)
-      else
         default_actions(env)
+
+      else
+        # Map crop option values: 'yes' => true, 'no' => false
+        crop = PhotoCook.decode_crop_option(command[:crop])
+
+        # Finally resize photo
+        # Resized photo will appear in resize directory
+        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)
+        end
       end
     end
 
@@ -105,7 +112,9 @@ module PhotoCook
       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}"
+        ln_flags = PhotoCook.explicitly_add_relative_flag? ? '-rs' : '-s'
+
+        cmd = "cd #{p1} && rm -rf #{cache_dir} && ln #{ln_flags} #{relative} #{cache_dir}"
 
         PhotoCook.logger.will_symlink_cache_dir(cmd)
 
@@ -119,4 +128,12 @@ module PhotoCook
       end
     end
   end
+
+  def self.explicitly_add_relative_flag?
+    if @relative_flag_illegal.nil?
+      out = Open3.capture2e('ln', '-rs')[0]
+      @relative_flag_illegal = !!(out =~ /\billegal\b/)
+    end
+    @relative_flag_illegal == false
+  end
 end

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

@@ -0,0 +1,20 @@
+module PhotoCook
+  module API
+    module Optimization
+      def optimizer
+        ImageOptim.instance
+      end
+
+      def perform_optimization(path, options = {})
+        if File.exists?(path) && (optimizer = self.optimizer)
+          optimizer.optimize(path, options)
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+
+  extend API::Optimization
+end

data/lib/photo-cook/optimization-job.rb

@@ -0,0 +1,9 @@
+module PhotoCook
+  class OptimizationJob < ActiveJob::Base
+    queue_as :photo_cook
+
+    def perform(path)
+      PhotoCook.perform_optimization(path)
+    end
+  end
+end

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

@@ -79,6 +79,8 @@ module PhotoCook
             [options[:pixel_ratio], options.fetch(:crop, false)]
           when Symbol
             [nil, options == :crop]
+          else
+            [nil, !!options]
         end
       end
 

data/lib/photo-cook/resizer.rb

@@ -1,4 +1,8 @@
 module PhotoCook
+  def self.resizer
+    Resizer.instance
+  end
+
   class Resizer
     include Singleton
 
@@ -43,6 +47,8 @@ module PhotoCook
       cols, rows      = photo[:dimensions]
       mwidth, mheight = multiply_dimensions(width, height, pixel_ratio)
 
+      width, height   = mwidth, mheight
+
       # 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

data/lib/photo-cook/size-formatting.rb

@@ -0,0 +1,13 @@
+module PhotoCook
+  def self.format_size(bytes, precision = 2)
+    if bytes >= 1_000_000_000.0
+      "#{(bytes / 1_000_000_000.0).round(precision)} GB"
+
+    elsif bytes >= 1_000_000.0
+      "#{(bytes / 1_000_000.0).round(precision)} MB"
+
+    else
+      "#{(bytes / 1_000.0).round(precision)} KB"
+    end
+  end
+end

data/lib/photo-cook/version.rb

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

data/lib/photo-cook.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'pathname'
 require 'rake'
 require 'mini_magick'
+require 'open3'
 
 module PhotoCook
   def self.rails_env?
@@ -19,9 +20,14 @@ require 'photo-cook/resizer'
 require 'photo-cook/middleware'
 require 'photo-cook/magick-photo'
 require 'photo-cook/carrierwave'
+require 'photo-cook/abstract-optimizer'
+require 'photo-cook/image-optim'
 require 'photo-cook/resize-api'
+require 'photo-cook/optimization-api'
+require 'photo-cook/size-formatting'
 
 if PhotoCook.rails_env?
   require 'photo-cook/engine'
   require 'photo-cook/pixel-ratio-spy'
-end
+  require 'photo-cook/optimization-job'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-cook
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,19 +52,24 @@ files:
 - app/assets/javascripts/photo-cook.js
 - app/assets/javascripts/photo-cook/photo-cook.js.erb
 - lib/photo-cook.rb
+- lib/photo-cook/abstract-optimizer.rb
 - lib/photo-cook/assemble.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/image-optim.rb
 - lib/photo-cook/logging.rb
 - lib/photo-cook/magick-photo.rb
 - lib/photo-cook/middleware.rb
+- lib/photo-cook/optimization-api.rb
+- lib/photo-cook/optimization-job.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/size-formatting.rb
 - lib/photo-cook/version.rb
 - photo-cook.gemspec
 homepage: http://github.com/yivo/photo-cook