photo-cook 1.1.2 → 1.2.1

data/lib/photo-cook/utils.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+module PhotoCook
+  module Utils
+    class << self
+      def 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
+
+      def call_block_with_floating_arguments(callable, args)
+        arity         = callable.arity
+        resized_args  = arity < 0 ? args : args[0...arity]
+        callable.call(*resized_args)
+      end
+
+      def make_relative_symlink(source, destination)
+        unless File.readable?(destination)
+          # /application/public/resize-cache/uploads/photos/1
+          p1 = source.kind_of?(String)      ? Pathname.new(source) : source
+
+          # /application/public/uploads/photos/1/resize-cache
+          p2 = destination.kind_of?(String) ? Pathname.new(destination) : destination
+
+          # ../../../resize-cache/uploads/photos/1
+          relative = p1.relative_path_from(p2.dirname).to_s
+
+          # resize-cache
+          basename = p2.basename.to_s
+
+          flags    = symlink_utility_needs_relative_flag? ? '-rs' : '-s'
+          cmd      = "cd #{p2.dirname.to_s} && rm -f #{basename} && ln #{flags} #{relative} #{basename}"
+
+          %x{ #{cmd} }
+
+          PhotoCook.log do
+            log "Symlink"
+            log "Source:      #{p1.to_s}"
+            log "Destination: #{p2.to_s}"
+            log "Command:     #{cmd}"
+            log "Status:      #{$?.success? ? 'OK' : 'FAIL'}"
+          end
+
+          return $?.success?
+        end
+        true
+      end
+
+      def symlink_utility_needs_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
+
+      def measure
+        started  = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
+        returned = yield
+        finished = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
+        [returned, finished - started]
+      end
+    end
+  end
+end

data/lib/photo-cook/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module PhotoCook
-  VERSION = '1.1.2'
-end
+  VERSION = '1.2.1'
+end

data/lib/photo-cook.rb

@@ -1,33 +1,42 @@
+# frozen_string_literal: true
 require 'fileutils'
 require 'pathname'
+require 'open3'
+require 'base64'
+require 'pathname'
+require 'logger'
 require 'rake'
 require 'mini_magick'
-require 'open3'
+require 'os'
 
 module PhotoCook
-  def self.rails_env?
-    @rails.nil? ? @rails = !!defined?(Rails) : @rails
+  class << self
+    attr_accessor :root_path, :public_dir
   end
+  self.public_dir = 'public'
 end
 
-require 'photo-cook/dimensions'
-require 'photo-cook/pixel-ratio'
-require 'photo-cook/dirs'
-require 'photo-cook/command'
-require 'photo-cook/assemble'
-require 'photo-cook/logging'
-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'
+require 'photo-cook/utils'
+require 'photo-cook/logger'
+require 'photo-cook/events'
+require 'photo-cook/pixels'
+require 'photo-cook/device-pixel-ratio'
+require 'photo-cook/device-pixel-ratio-spy'   if defined?(Rails)
 
-if PhotoCook.rails_env?
-  require 'photo-cook/engine'
-  require 'photo-cook/pixel-ratio-spy'
-  require 'photo-cook/optimization-job'
-end
+require 'photo-cook/resize/__api__'
+require 'photo-cook/resize/assemble'
+require 'photo-cook/resize/calculations'
+require 'photo-cook/resize/carrierwave'
+require 'photo-cook/resize/command'
+require 'photo-cook/resize/magick-photo'
+require 'photo-cook/resize/middleware'
+require 'photo-cook/resize/mode'
+require 'photo-cook/resize/resizer'
+require 'photo-cook/resize/logging'
+
+require 'photo-cook/optimization/__api__'
+require 'photo-cook/optimization/job'         if defined?(ActiveJob)
+require 'photo-cook/optimization/carrierwave'
+require 'photo-cook/optimization/logging'
+
+require 'photo-cook/engine'                   if defined?(Rails)

data/photo-cook.gemspec

@@ -1,21 +1,27 @@
-# encoding: utf-8
+# frozen_string_literal: true
 require File.expand_path('../lib/photo-cook/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name            = 'photo-cook'
   s.version         = PhotoCook::VERSION
   s.authors         = ['Yaroslav Konoplov']
-  s.email           = ['yaroslav@inbox.com']
+  s.email           = ['eahome00@gmail.com']
   s.homepage        = 'http://github.com/yivo/photo-cook'
-  s.summary         = 'Simple solution for photo resizing'
-  s.description     = 'This is a simple solution for photo resizing.'
+
+  # TODO Write better summary and description
+  s.summary         = 'Tool for resizing and optimizing photos in Ruby'
+  s.description     = 'This gem provides complete tool for resizing and optimizing photos in Ruby'
   s.license         = 'MIT'
 
-  s.executables     = `git ls-files -z -- bin/*`.split("\x0").map{ |f| File.basename(f) }
+  s.executables     = `git ls-files -z -- bin/*`.split("\x0").map { |f| File.basename(f) }
   s.files           = `git ls-files -z`.split("\x0")
   s.test_files      = `git ls-files -z -- {test,spec,features}/*`.split("\x0")
-  s.require_paths   = ['lib']
+  s.require_paths   = %w( app lib )
 
-  s.add_dependency 'rack', '~> 1.5'
+  s.add_dependency 'rack',        '~> 1.5'
   s.add_dependency 'mini_magick', '~> 4.0'
-end
+  s.add_dependency 'os',          '~> 0.9'
+
+  s.add_development_dependency 'bundler', '~> 1.7'
+  s.add_development_dependency 'rake',    '~> 10.0'
+end

data/srcset.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+# def test_something
+#   def lol(maxw, maxh, w, h)
+#     ary = []
+#
+#     w = w.floor
+#     maxw = maxw.floor
+#     # maxx = [maxw % 160 == 0 ? maxw : 160 * (1 + maxw / 160), (w*3) % 160 == 0 ? (w*3) : 160 * (1 + (w*3) / 160)].min
+#     maxx = [maxw, w * 3].min
+#
+#     x = 320
+#     ary << [w, h] if w < x
+#
+#     while x <= maxx
+#       inc = x / w.to_f
+#       ary << [(w * inc).floor, (h * inc).floor]
+#
+#       if w > x && w < (x + 160)
+#         ary << [w, h]
+#       end
+#
+#       x += 160
+#     end
+#
+#     ary
+#   end
+#
+#   puts
+#   puts lol(1000, 800, 350, 350)
+#
+#
+#
+#
+# end

data/test/helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module TestHelper
+  class << self
+    def fixtures_dirpath
+      File.expand_path('../fixtures', __FILE__)
+    end
+
+    def tmp_dirpath
+      File.expand_path('../../tmp', __FILE__)
+    end
+  end
+end

data/test/test-photo-cook-assemble.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+require 'test/unit'
+require 'shoulda-context'
+require 'photo-cook'
+require 'helper'
+
+class PhotoCookAssembleTest < Test::Unit::TestCase
+  def test_assemble
+    assert_equal('/uploads/resize-cache/fit-300x300/dog.png', PhotoCook::Resize.uri('/uploads/dog.png', 300, 300, :fit))
+    assert_equal('/uploads/resize-cache/fill-300x300/dog.png', PhotoCook::Resize.uri('/uploads/dog.png', 300, 300, :fill))
+    assert_equal('/uploads/photos/1/md5/resize-cache/fill-300x300/dog.png', PhotoCook::Resize.uri('/uploads/photos/1/md5/dog.png', 300, 300, :fill))
+  end
+
+  def test_strip
+    assert_equal('/uploads/dog.png', PhotoCook::Resize.strip('/uploads/resize-cache/fit-300x300/dog.png'))
+    assert_equal('/uploads/dog.png', PhotoCook::Resize.strip('/uploads/resize-cache/fill-300x300/dog.png'))
+    assert_equal('/uploads/photos/1/md5/dog.png', PhotoCook::Resize.strip('/uploads/photos/1/md5/resize-cache/fill-300x300/dog.png'))
+  end
+
+  def test_is_resize_uri
+    assert_true(PhotoCook::Resize::Assemble.resize_uri?('/uploads/photos/1/resize-cache/fill-300x300/dog.png'))
+  end
+end

data/test/test-photo-cook-calculations.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+require 'test/unit'
+require 'shoulda-context'
+require 'photo-cook'
+
+class PhotoCookCalculationsTest < Test::Unit::TestCase
+  def test_size_to_fill_calculations
+    test_size_to_fill(1000, 800, 640,  640,  [640, 640])
+    test_size_to_fill(1000, 800, 1280, 1280, [800, 800])
+    test_size_to_fill(1000, 800, 3840, 3840, [800, 800])
+    test_size_to_fill(1000, 800, 1000, 1280, [625, 800])
+    test_size_to_fill(1000, 800, 2000, 2560, [625, 800])
+    test_size_to_fill(264,  175, 400,  300,  [233, 175])
+    test_size_to_fill(331,  277, 680,  360,  [331, 175])
+    test_size_to_fill(259,  179, 260,  180,  [258, 179])
+    test_size_to_fill(259,  179, 520,  360,  [258, 179])
+    test_size_to_fill(455,  683, 800,  700,  [455, 398])
+    test_size_to_fill(683,  455, 800,  700,  [520, 455])
+    test_size_to_fill(444,  455, 1200, 1255, [435, 455])
+  end
+
+  def test_size_to_fit_calculations
+    test_size_to_fit(400,  300,  200,  700,  [200,  150])
+    test_size_to_fit(1920, 1200, 2560, 2560, [1920, 1200])
+    test_size_to_fit(2613, 3070, 1280, 1280, [1089, 1280])
+    test_size_to_fit(400,  800,  100, 340,   [100, 200])
+    test_size_to_fit(600,  340,  2000, 2000, [600, 340])
+    test_size_to_fit(600,  340,  400, 100,   [176, 100])
+    test_size_to_fit(600,  340,  400, 400,   [400, 226])
+  end
+
+protected
+  def assert_same_dimensions(d1, d2)
+    assert_same(d2[0], d1[0])
+    assert_same(d2[1], d1[1])
+  end
+
+  def test_size_to_fill(*calculation_args, expected_result)
+    assert_same_dimensions(PhotoCook::Resize::Calculations.size_to_fill(*calculation_args), expected_result)
+  end
+
+  def test_size_to_fit(*calculation_args, expected_result)
+    assert_same_dimensions(PhotoCook::Resize::Calculations.size_to_fit(*calculation_args), expected_result)
+  end
+end

data/test/test-photo-cook-resize.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+require 'test/unit'
+require 'shoulda-context'
+require 'photo-cook'
+require 'helper'
+require 'fileutils'
+
+Test::Unit.at_start { PhotoCook.disable_logging! }
+Test::Unit.at_exit  { FileUtils.rmtree(TestHelper.tmp_dirpath) }
+
+class PhotoCookResizeTest < Test::Unit::TestCase
+  def test_resize_fit
+    source = File.join(TestHelper.fixtures_dirpath, 'dog.png')
+    store  = File.join(TestHelper.tmp_dirpath, 'dog-200x200-fit.png')
+    PhotoCook::Resize.perform(source, store, 200, 200, :fit)
+
+    photo = MiniMagick::Image.open(store)
+    assert_nothing_raised { photo.validate! }
+    assert_equal(photo[:dimensions][0], 200)
+    assert_equal(photo[:dimensions][1], 186)
+  end
+
+  def test_resize_fit_high_resolution
+    source = File.join(TestHelper.fixtures_dirpath, 'dog.png')
+    store  = File.join(TestHelper.tmp_dirpath, 'dog-1000x1000-fit.png')
+    PhotoCook::Resize.perform(source, store, 1000, 1000, :fit)
+
+    photo = MiniMagick::Image.open(store)
+    assert_nothing_raised { photo.validate! }
+    assert_equal(photo[:dimensions][0], 800)
+    assert_equal(photo[:dimensions][1], 745)
+  end
+
+  def test_resize_fill
+    source = File.join(TestHelper.fixtures_dirpath, 'dog.png')
+    store  = File.join(TestHelper.tmp_dirpath, 'dog-200x200-fill.png')
+    PhotoCook::Resize.perform(source, store, 200, 200, :fill)
+
+    photo = MiniMagick::Image.open(store)
+    assert_nothing_raised { photo.validate! }
+    assert_equal(photo[:dimensions][0], 200)
+    assert_equal(photo[:dimensions][1], 200)
+  end
+
+  def test_resize_fill_high_resolution
+    source = File.join(TestHelper.fixtures_dirpath, 'dog.png')
+    store  = File.join(TestHelper.tmp_dirpath, 'dog-1000x1000-fill.png')
+    PhotoCook::Resize.perform(source, store, 1000, 1000, :fill)
+
+    photo = MiniMagick::Image.open(store)
+    assert_nothing_raised { photo.validate! }
+    assert_equal(photo[:dimensions][0], 745)
+    assert_equal(photo[:dimensions][1], 745)
+  end
+
+  def test_resize_base64
+    source = File.join(TestHelper.fixtures_dirpath, 'dog.png')
+    store  = File.join(TestHelper.tmp_dirpath, 'dog-10x10-fit.png')
+    base64 = PhotoCook::Resize::base64_uri_from_source_path(source, store, 10, 10, :fit)
+    assert_match(/data:image\/png;base64,/, base64)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-cook
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,40 +38,95 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-description: This is a simple solution for photo resizing.
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+description: This gem provides complete tool for resizing and optimizing photos in
+  Ruby
 email:
-- yaroslav@inbox.com
+- eahome00@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - app/assets/javascripts/photo-cook.js
-- app/assets/javascripts/photo-cook/photo-cook.js.erb
+- app/assets/javascripts/photo-cook/photo-cook.coffee
+- app/helpers/photo_cook_helper.rb
 - 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/device-pixel-ratio-spy.rb
+- lib/photo-cook/device-pixel-ratio.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/events.rb
+- lib/photo-cook/logger.rb
+- lib/photo-cook/optimization/__api__.rb
+- lib/photo-cook/optimization/carrierwave.rb
+- lib/photo-cook/optimization/image-optim.rb
+- lib/photo-cook/optimization/job.rb
+- lib/photo-cook/optimization/logging.rb
+- lib/photo-cook/pixels.rb
+- lib/photo-cook/resize/__api__.rb
+- lib/photo-cook/resize/assemble.rb
+- lib/photo-cook/resize/calculations.rb
+- lib/photo-cook/resize/carrierwave.rb
+- lib/photo-cook/resize/command.rb
+- lib/photo-cook/resize/logging.rb
+- lib/photo-cook/resize/magick-photo.rb
+- lib/photo-cook/resize/middleware.rb
+- lib/photo-cook/resize/mode.rb
+- lib/photo-cook/resize/resizer.rb
+- lib/photo-cook/utils.rb
 - lib/photo-cook/version.rb
 - photo-cook.gemspec
+- srcset.rb
+- test/fixtures/dog.png
+- test/helper.rb
+- test/test-photo-cook-assemble.rb
+- test/test-photo-cook-calculations.rb
+- test/test-photo-cook-resize.rb
 homepage: http://github.com/yivo/photo-cook
 licenses:
 - MIT
@@ -79,6 +134,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
+- app
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
@@ -92,8 +148,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Simple solution for photo resizing
-test_files: []
+summary: Tool for resizing and optimizing photos in Ruby
+test_files:
+- test/fixtures/dog.png
+- test/helper.rb
+- test/test-photo-cook-assemble.rb
+- test/test-photo-cook-calculations.rb
+- test/test-photo-cook-resize.rb

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

@@ -1,85 +0,0 @@
-(function(root) {
-  var PhotoCook = {
-    cacheDir: <%= PhotoCook.cache_dir.to_json %>,
-
-    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 = [
-          '(-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.0;
-        }
-      }
-
-      return parseFloat(ratio) || 1.0;
-    })(),
-
-    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.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 (uri) {
-      var sections = uri.split('/');
-      var length   = sections.length;
-      if (length < 3) { return uri; }
-
-      var cacheDir = sections[length - 3];
-      var command  = sections[length - 2];
-
-      if (PhotoCook.cacheDir !== cacheDir || PhotoCook.commandRegex.test(command) == false) {
-        return uri;
-      }
-
-      sections.splice(length - 3, 2)
-      return sections.join('/');
-    },
-
-    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/lib/photo-cook/abstract-optimizer.rb

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