kontrast 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b7368728b076365bef87db885d73b90465a23a4
-  data.tar.gz: 5bbe03b0ee50223db849389300ba6c16330062bb
+  metadata.gz: 2e5150f17ebb77d6b2e4ccabf768e77a34f5ff85
+  data.tar.gz: 926687107b868968c53f545432fc52910b964943
 SHA512:
-  metadata.gz: b1fb7fde8c74de2c749941f7c9f94c51cfde6a52b28ef69aa7732abe0af98bc19a6d309d96c66d8ec0ebb96f47277881fb88fa68c3f41e931cd2f36baa7b903f
-  data.tar.gz: 22755e98af73c4e25cb4f1f7fb2f587a29e41e5f155ede81904e76f0af8e6d90fa794f530717cb55644673fbb9109b217c2ee457a75ee58cc97d4937fc6613f7
+  metadata.gz: 6517d32d57c3b2341a15b366b2c5de2c737d1cb2ed53db70b2ba5bcb26acdf88f599f7e1460b610e3da856177bdec7fde02fd6ea9af6e22595ce104edfcbf966
+  data.tar.gz: a3cb71cdac6916115ad88d06b8c75b80bbd9a07c542af6de639e34115da1e897318fd083a5275c4fec9074827000e666963198a2813e398a4eab17b9cb953afe

data/lib/kontrast/api_endpoint_runner.rb

@@ -1,7 +1,6 @@
 module Kontrast
     class ApiEndpointRunner
         include ImageUploader
-        include ThumbnailCreator
 
         attr_accessor :diffs
 
@@ -68,7 +67,7 @@ module Kontrast
                         ['.', '..'].include?(file_name) || file_name.include?('.json')
                     }
 
-                    create_thumbnails(test, images)
+                    ThumbnailCreator.create_thumbnails(test, images)
 
                     # Upload to S3
                     if Kontrast.configuration.run_parallel

data/lib/kontrast/page_runner.rb

@@ -1,7 +1,6 @@
 module Kontrast
     class PageRunner
         include ImageUploader
-        include ThumbnailCreator
 
         attr_reader :diffs
 
@@ -60,7 +59,7 @@ module Kontrast
 
                     # Create thumbnails for gallery
                     print "Creating thumbnails... "
-                    create_thumbnails(test, ['test.png', 'production.png', 'diff.png'])
+                    ThumbnailCreator.create_thumbnails(test, ['test.png', 'production.png', 'diff.png'])
 
                     # Upload to S3
                     if Kontrast.configuration.run_parallel

data/lib/kontrast/thumbnail_creator.rb

@@ -1,18 +1,24 @@
 module Kontrast
-    module ThumbnailCreator
+  module ThumbnailCreator
 
-        def create_thumbnails(test, image_names)
-            # Load images
-            images = image_names.map do |image|
-                Magick::Image.read(File.join(Kontrast.path, test.to_s, image)).first
-            end
+    module_function
 
-            # Crop images
-            Workers.map(images) do |image|
-                filename = image.filename.split('/').last.split('.').first + "_thumb"
-                full_path = "#{Kontrast.path}/#{test}/#{filename}.png"
-                image.resize_to_fill(200, 200, Magick::NorthGravity).write(full_path)
-            end
-        end
+    def create_thumbnails(test, image_names)
+      # Crop images
+      Workers.map(image_names) do |image_name|
+        src_path = File.join(Kontrast.path, test.to_s, image_name)
+
+        # Resize to at least 200 width, the crop the top part of the image at 200x200
+        # '+repage' means "don't keep the part of the image not shown in the crop"
+        # http://www.imagemagick.org/discourse-server/viewtopic.php?t=18545
+        options = '-resize "200x200^" -gravity North -crop 200x200+0+0 +repage'
+        `convert "#{src_path}" #{options} "#{thumb_path(test, image_name)}"`
+      end
+    end
+
+    def thumb_path(test, image_name)
+        filename = "#{File.basename(image_name, ".*")}_thumb.png"
+        File.join(Kontrast.path, test.to_s, filename)
     end
+  end
 end

data/lib/kontrast/version.rb

@@ -1,3 +1,3 @@
 module Kontrast
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
 end

data/spec/thumbnail_creator_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+require 'kontrast'
+
+describe Kontrast::ThumbnailCreator do
+  let(:kontrast_path) { "/path/to/kontrast" }
+  let(:test) { "home_1280" }
+  let(:image_names) do
+    [
+      "diff_0.jpg",
+      "test_0.jpg",
+      "prod_0.jpg",
+    ]
+  end
+
+  before do
+    allow(Kontrast).to receive(:path).and_return(kontrast_path)
+  end
+
+  describe 'thumb_path' do
+    it 'should return a png' do
+      image_name = "diff_0.jpg"
+
+      thumb_path = Kontrast::ThumbnailCreator.thumb_path(test, image_name)
+
+      expect(thumb_path).to eql "#{kontrast_path}/#{test}/diff_0_thumb.png"
+    end
+  end
+
+  describe 'create_thumbnails' do
+    it 'creates thumbnails' do
+      allow(Kontrast::ThumbnailCreator).to receive(:`)
+
+      Kontrast::ThumbnailCreator.create_thumbnails(test, image_names)
+
+
+      expect(Kontrast::ThumbnailCreator).to have_received(:`).with(/^convert.*/).exactly(3).times
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontrast
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ilya Rubnich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -219,6 +219,7 @@ files:
 - spec/test_builder_spec.rb
 - spec/test_spec.rb
 - spec/test_suite_spec.rb
+- spec/thumbnail_creator_spec.rb
 homepage: https://github.com/harrystech/kontrast
 licenses:
 - MIT
@@ -261,3 +262,4 @@ test_files:
 - spec/test_builder_spec.rb
 - spec/test_spec.rb
 - spec/test_suite_spec.rb
+- spec/thumbnail_creator_spec.rb