monet 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd82504151954e9dec64d70da527bf9d6973b2aa
-  data.tar.gz: 67a18681fd090836de4c7d4285afbd8e59c1b67e
+  metadata.gz: 2a11fc10105edf8cce2166fb0bf751e84115374f
+  data.tar.gz: e895a699a3246d30ce4d46231a54eaaa0e4f58a7
 SHA512:
-  metadata.gz: 9ec8e7217fedd9b53d186da3ec9b06e2b6d0be26db4b7cabe5365a8d5779e5c03ae517e571cee12f8e951a6e4d63fb92fdadcf63e5d8374c1202b8a798082b5a
-  data.tar.gz: 7baca87ebf4ec4e08e5575cdfcd0cebe26eaca652adbfdf9b6ad81a476ffe94857d2286283f1ddb0d9a8ad7a93da9d41b1d2a4bdcac76623294a5a17c4ad60fd
+  metadata.gz: 693e7e62a8ccbe89d7a17370961576848c48e7c172a8184db9c5447f533062251e6ba46ff8e9e29fc1b118cad1853e70b22dfe877eba8901395733119b83fee1
+  data.tar.gz: be761e3bf2fe43a9764a1b8b326bf779672113941ab1ee356b41c53436675ae7ce44c2b8b4dfa0da71c9a47553046ae4d6b5059f57bcf737b69cad7bf9c9911c

data/lib/monet/capture.rb

@@ -1,8 +1,11 @@
+require 'fileutils'
+
 require "capybara"
 require 'capybara/poltergeist'
 require "capybara/dsl"
 
 require 'monet/config'
+require 'monet/path_router'
 
 module Monet
   class Capture
@@ -27,9 +30,29 @@ module Monet
       visit @router.build_url(path)
 
       @config.dimensions.each do |width|
+        file_path = @router.route_url_path(path, width)
+
         page.driver.resize(width, MAX_HEIGHT)
-        page.driver.render(@router.route_url_path(path, width), full: true)
+        page.driver.render(file_path, full: true)
+
+        thumbnail(file_path) if @config.thumbnail?
       end
     end
+
+    def thumbnail(path)
+      img = ChunkyPNG::Image.from_file(path)
+      short_edge = [img.width, img.height].min
+      save_path = @router.to_thumbnail_path(path)
+      save_dir = File.dirname save_path
+
+      puts save_path
+
+      cropped = img.crop(0, 0, short_edge, short_edge)
+      resized = cropped.resize(200, 200)
+
+      FileUtils.mkdir_p save_dir unless Dir.exists? save_dir
+
+      resized.save save_path
+    end
   end
 end

data/lib/monet/config.rb

@@ -14,7 +14,9 @@ module Monet
       map: nil,
       compare_type: "ColorBlend",
       capture_dir: "./captures",
-      baseline_dir: "./baselines"
+      baseline_dir: "./baselines",
+      thumbnail_dir: "./thumbnails",
+      thumbnail: false
     }
 
     attr_accessor *DEFAULT_OPTIONS.keys
@@ -49,6 +51,10 @@ module Monet
       @base_url
     end
 
+    def thumbnail?
+      !!thumbnail
+    end
+
     def capture_dir=(path)
       @capture_dir = expand_path(path)
     end
@@ -57,6 +63,10 @@ module Monet
       @baseline_dir = expand_path(path)
     end
 
+    def thumbnail_dir=(path)
+      @thumbnail_dir = expand_path(path)
+    end
+
     def map=(paths)
       map.paths = paths unless paths.nil?
     end

data/lib/monet/path_router.rb

@@ -8,6 +8,7 @@ module Monet
       @base_url = parse_uri(config.base_url)
       @capture_path = config.capture_dir
       @baseline_path = config.baseline_dir
+      @thumbnail_path = config.thumbnail_dir
     end
 
     def build_url(path)
@@ -38,6 +39,11 @@ module Monet
       path.gsub(@capture_path, @baseline_path)
     end
 
+    def to_thumbnail_path(path)
+      image_path = path.split(File::SEPARATOR)[-2..-1].join(File::SEPARATOR)
+      File.join @thumbnail_path, image_path
+    end
+
     # takes a path, returns the URL used to generate the image
     def route_path(path)
       url = path.split("/").last

data/lib/monet/tasks.rb

@@ -1,23 +1,49 @@
 require 'monet'
 
+def load_config(args)
+  args.with_defaults(path: './config.yaml')
+  Monet::Config.load args[:path]
+end
+
+def images_from_dir(dir)
+  Dir.glob File.join(dir, "**", "*.png")
+end
+
 namespace :monet do
   desc "clean out the baseline directory"
   task :clean, :path do |t, args|
-    args.with_defaults(path: './config.yaml')
-
-    config = Monet::Config.load args[:path]
-    Monet.clean config
+    Monet.clean load_config(args)
   end
 
   desc "Runs the site and grabs baselines"
   task :baseline => [:clean, :run] do
   end
 
+
+  namespace :thumbnail do
+    desc "Thumbnail all baseline images"
+    task :baseline do
+      config = load_config(args)
+      capture = Monet::Capture.new config
+
+      images_from_dir(config.baseline_dir).each do |image|
+        capture.thumbnail image
+      end
+    end
+
+    desc "Thumnail all captured images"
+    task :captures do
+      capture = Monet::Capture.new config
+
+      images_from_dir(config.capture_dir).each do |image|
+        capture.thumbnail image
+      end
+    end
+  end
+
   desc "Run the baseline comparison"
   task :run, :path do |t, args|
-    args.with_defaults(path: './config.yaml')
-
-    config = Monet::Config.load args[:path]
+    config = load_config(args)
     Monet.capture config
     Monet.compare config
   end

data/lib/monet/version.rb

@@ -1,3 +1,3 @@
 module Monet
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/baseline_control_spec.rb

@@ -3,7 +3,7 @@ require 'monet/baseline_control'
 
 describe Monet::BaselineControl do
   Given(:control) do
-    config = flexmock("Config", compare_type: "ColorBlend", capture_dir: "./spec/fixtures", baseline_dir: "./baseline", base_url: "http://google.com")
+    config = flexmock("Config", compare_type: "ColorBlend", capture_dir: "./spec/fixtures", baseline_dir: "./baseline", thumbnail_dir: "./thumb", base_url: "http://google.com")
     flexmock Monet::BaselineControl.new(config)
   end
 

data/spec/capture_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+
+require 'chunky_png'
 require 'monet/capture'
 
 describe Monet::Capture do
@@ -6,7 +8,7 @@ describe Monet::Capture do
   Given(:url) { "http://google.com" }
   Given(:capture_agent) { Monet::Capture.new(capture_dir: path, base_url: url) }
 
-  after do
+  after(:all) do
     Dir.glob("#{path}/**/*.png").each do |file|
       File.delete(file)
     end
@@ -42,10 +44,30 @@ describe Monet::Capture do
     Then { File.exist?("#{path}/google.com/google.com|-1400.png").should be_true }
   end
 
-  context "prepends default protocol if missing" do
+  context "captures defualt size as 1024" do
     Given(:capture_agent) { Monet::Capture.new(capture_dir: path, base_url: "http://www.facebook.com") }
     When { capture_agent.capture('/') }
     Then { File.exist?("#{path}/www.facebook.com/www.facebook.com|-1024.png").should be_true }
   end
 
+  context "captured" do
+    Given(:thumb_path) { "#{path}/thumbnails/www.spider.io/www.spider.io|-1024.png" }
+    Given(:capture_agent) { Monet::Capture.new(capture_dir: path,
+      thumbnail_dir: File.join(path, "thumbnails"),
+      base_url: "http://www.spider.io",
+      thumbnail: true)
+    }
+    When { capture_agent.capture('/') }
+
+    context "can thumbnail an image" do
+      Then { File.exist?("#{path}/www.spider.io/www.spider.io|-1024.png").should be_true }
+      And { File.exist?(thumb_path).should be_true }
+    end
+
+    context "thumb is 200x200" do
+      When(:thumb) { ChunkyPNG::Image.from_file(thumb_path) }
+      Then { thumb.width.should == 200 }
+      And { thumb.height.should == 200 }
+    end
+  end
 end

data/spec/path_router_spec.rb

@@ -5,7 +5,8 @@ require 'monet/config'
 describe Monet::PathRouter do
   Given(:capture) { File.expand_path "./capture" }
   Given(:baseline) { File.expand_path "./baseline" }
-  Given(:config) { Monet::Config.new(base_url: "http://google.com", capture_dir: "./capture", baseline_dir: "./baseline") }
+  Given(:thumbnail) { File.expand_path "./thumbnail" }
+  Given(:config) { Monet::Config.new(base_url: "http://google.com", capture_dir: "./capture", baseline_dir: "./baseline", thumbnail_dir: "./thumbnail") }
   Given(:router) { Monet::PathRouter.new(config) }
 
   context "knows base dir" do
@@ -47,4 +48,12 @@ describe Monet::PathRouter do
     When(:path) { router.capture_to_baseline("#{capture}/google.com/google.com|space|manager-900.png") }
     Then { path.should == "#{baseline}/google.com/google.com|space|manager-900.png" }
   end
+
+  context "can create thumbnail path" do
+    When(:path) { router.to_thumbnail_path("#{capture}/google.com/google.com|space|manager-900.png") }
+    Then { path.should == "#{thumbnail}/google.com/google.com|space|manager-900.png" }
+
+    When(:path) { router.to_thumbnail_path("#{baseline}/google.com/google.com|space|manager-900.png") }
+    Then { path.should == "#{thumbnail}/google.com/google.com|space|manager-900.png" }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monet
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Luke van der Hoeven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake