green_onion 0.0.4 → 0.0.5

data/Rakefile

@@ -4,21 +4,21 @@ require 'rack'
 
 desc "Running server..."
 task :server do
-	require File.dirname(__FILE__) + '/spec/sample_app/sample_app.rb'
-	Rack::Handler::WEBrick.run SampleApp, :Port => 8070
+  require File.dirname(__FILE__) + '/spec/sample_app/sample_app.rb'
+  Rack::Handler::WEBrick.run SampleApp, :Port => 8070
 end
 
 desc "Running specs..."
 task :specs do
-	system "rspec spec"
+  system "rspec spec"
 end
 
 desc "Running specs on test server"
 task :spec do
-	# have the server run on its own thread so that it doesn't block the spec task
-	server = Thread.new do	
-		task("server").execute
-	end
-	task("specs").execute
-	server.kill
+  # have the server run on its own thread so that it doesn't block the spec task
+  server = Thread.new do  
+    task("server").execute
+  end
+  task("specs").execute
+  server.kill
 end

data/green_onion.gemspec

@@ -10,15 +10,15 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
-  gem.add_development_dependency "fileutils"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "debugger"
   gem.add_development_dependency "sinatra"
   
-  gem.add_dependency "capybara"
-  gem.add_dependency "capybara-webkit"
-  gem.add_dependency "oily_png"
-  gem.add_dependency "rainbow"
+  gem.add_dependency "capybara", "1.1.2"
+  gem.add_dependency "capybara-webkit", "0.12.1"
+  gem.add_dependency "oily_png", "1.0.2"
+  gem.add_dependency "rainbow", "1.1.4"
+  gem.add_dependency "fileutils", "0.7"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/green_onion.rb

@@ -5,77 +5,77 @@ require "green_onion/configuration"
 require "rainbow"
 
 module GreenOnion
-	class << self
+  class << self
 
-		attr_reader :compare, :screenshot
+    attr_reader :compare, :screenshot
 
-		# Pass configure block to set Configuration object
-		def configure
-			yield configuration
-		end
+    # Pass configure block to set Configuration object
+    def configure
+      yield configuration
+    end
 
-		def configuration
-			@configuration ||= GreenOnion::Configuration.new
-		end
+    def configuration
+      @configuration ||= GreenOnion::Configuration.new
+    end
 
-		# Bring the Screenshot and Compare classes together to create a skin
-		def skin(url)
-			@screenshot = Screenshot.new(
-				:dir => @configuration.skins_dir,
-				:dimensions => @configuration.dimensions
-			)
-			@compare = GreenOnion::Compare.new
+    # Bring the Screenshot and Compare classes together to create a skin
+    def skin(url)
+      @screenshot = Screenshot.new(
+        :dir => @configuration.skins_dir,
+        :dimensions => @configuration.dimensions
+      )
+      @compare = GreenOnion::Compare.new
 
-			@screenshot.test_screenshot(url)
-		end
+      @screenshot.test_screenshot(url)
+    end
 
-		# Finds the percentage of change between skins
-		# Threshold can be set in configuration, or as an argument itself, and can be specific to an instance
-		def skin_percentage(url, threshold=@configuration.threshold)
-			skin(url)
-			if(@screenshot.paths_hash.length > 1)
-				puts "\n" + url.color(:cyan)
-				@compare.percentage_diff(@screenshot.paths_hash[:original], @screenshot.paths_hash[:fresh])
-				threshold_alert(@compare.percentage_changed, threshold)
-			else
-				puts "\n#{url}".color(:cyan) + " has been saved to #{@screenshot.paths_hash[:original]}".color(:yellow)
-			end
-		end
+    # Finds the percentage of change between skins
+    # Threshold can be set in configuration, or as an argument itself, and can be specific to an instance
+    def skin_percentage(url, threshold=@configuration.threshold)
+      skin(url)
+      if(@screenshot.paths_hash.length > 1)
+        puts "\n" + url.color(:cyan)
+        @compare.percentage_diff(@screenshot.paths_hash[:original], @screenshot.paths_hash[:fresh])
+        threshold_alert(@compare.percentage_changed, threshold)
+      else
+        puts "\n#{url}".color(:cyan) + " has been saved to #{@screenshot.paths_hash[:original]}".color(:yellow)
+      end
+    end
 
-		# Creates a diffed screenshot between skins
-		def skin_visual(url)
-			skin(url)
-			if(@screenshot.paths_hash.length > 1)
-				puts "\n" + url.color(:cyan)
-				@compare.visual_diff(@screenshot.paths_hash[:original], @screenshot.paths_hash[:fresh])
-			else
-				puts "\n#{url}".color(:cyan) + " has been saved to #{@screenshot.paths_hash[:original]}".color(:yellow)
-			end
-		end
+    # Creates a diffed screenshot between skins
+    def skin_visual(url)
+      skin(url)
+      if(@screenshot.paths_hash.length > 1)
+        puts "\n" + url.color(:cyan)
+        @compare.visual_diff(@screenshot.paths_hash[:original], @screenshot.paths_hash[:fresh])
+      else
+        puts "\n#{url}".color(:cyan) + " has been saved to #{@screenshot.paths_hash[:original]}".color(:yellow)
+      end
+    end
 
-		# Creates a diffed screenshot between skins AND prints percentage changed
-		def skin_visual_and_percentage(url, threshold=@configuration.threshold)
-			skin(url)
-			if(@screenshot.paths_hash.length > 1)
-				puts "\n" + url.color(:cyan)
-				@compare.percentage_diff(@screenshot.paths_hash[:original], @screenshot.paths_hash[:fresh])
-				@compare.visual_diff(@screenshot.paths_hash[:original], @screenshot.paths_hash[:fresh])
-				threshold_alert(@compare.percentage_changed, threshold)
-			else
-				puts "\n#{url}".color(:cyan) + " has been saved to #{@screenshot.paths_hash[:original]}".color(:yellow)
-			end
-		end
+    # Creates a diffed screenshot between skins AND prints percentage changed
+    def skin_visual_and_percentage(url, threshold=@configuration.threshold)
+      skin(url)
+      if(@screenshot.paths_hash.length > 1)
+        puts "\n" + url.color(:cyan)
+        @compare.percentage_diff(@screenshot.paths_hash[:original], @screenshot.paths_hash[:fresh])
+        @compare.visual_diff(@screenshot.paths_hash[:original], @screenshot.paths_hash[:fresh])
+        threshold_alert(@compare.percentage_changed, threshold)
+      else
+        puts "\n#{url}".color(:cyan) + " has been saved to #{@screenshot.paths_hash[:original]}".color(:yellow)
+      end
+    end
 
-		# This is used in skin_percentage to better alert if a set of skins are ok or not
-		def threshold_alert(actual, threshold)
-			if actual > threshold
-				puts "#{actual - threshold}% above threshold set @ #{threshold}%".color(:red)
-				puts "pixels changed (%): 		#{@compare.percentage_changed}%"
-				puts "pixels changed/total:	#{@compare.changed_px}/#{@compare.total_px}"
-			else
-				puts "pixels changed/total:	#{@compare.changed_px}/#{@compare.total_px}"
-			end
-		end
+    # This is used in skin_percentage to better alert if a set of skins are ok or not
+    def threshold_alert(actual, threshold)
+      if actual > threshold
+        puts "#{actual - threshold}% above threshold set @ #{threshold}%".color(:red)
+        puts "pixels changed (%):     #{@compare.percentage_changed}%"
+        puts "pixels changed/total:  #{@compare.changed_px}/#{@compare.total_px}"
+      else
+        puts "pixels changed/total:  #{@compare.changed_px}/#{@compare.total_px}"
+      end
+    end
 
-	end
+  end
 end

data/lib/green_onion/compare.rb

@@ -2,60 +2,67 @@ require "oily_png"
 require "rainbow"
 
 module GreenOnion
-	class Compare
-
-		attr_accessor :percentage_changed, :total_px, :changed_px
-		attr_reader :diffed_image
-
-		# Pulled from Jeff Kreeftmeijer's post here: http://jeffkreeftmeijer.com/2011/comparing-images-and-creating-image-diffs/
-		# Thanks Jeff!
-		def diff_images(org, fresh)
-			@images = [
-				ChunkyPNG::Image.from_file(org),
-				ChunkyPNG::Image.from_file(fresh)
-			]
-
-			@diff = []
-
-			@images.first.height.times do |y|
-				@images.first.row(y).each_with_index do |pixel, x|
-					@diff << [x,y] unless pixel == @images.last[x,y]
-				end
-			end
-		end
-
-		def percentage_diff(org, fresh)
-			diff_images(org, fresh)
-			@total_px = @images.first.pixels.length
-			@changed_px = @diff.length
-			@percentage_changed = ( (@diff.length.to_f / @images.first.pixels.length) * 100 ).round(2)
-		end
-
-		def visual_diff(org, fresh)
-			diff_images(org, fresh)
-			diff_iterating(org, fresh)
-		end
-
-		def percentage_and_visual_diff(org, fresh)
-			diff_images(org, fresh)
-			@total_px = @images.first.pixels.length
-			@changed_px = @diff.length
-			@percentage_changed = ( (@diff.length.to_f / @images.first.pixels.length) * 100 ).round(2)
-		end
-
-		def diff_iterating(org, fresh)
-			x, y = @diff.map{ |xy| xy[0] }, @diff.map{ |xy| xy[1] }
-
-			@diffed_image = org.insert(-5, '_diff')
-
-			begin
-				@images.last.rect(x.min, y.min, x.max, y.max, ChunkyPNG::Color.rgb(0,255,0))
-			rescue NoMethodError
-				puts "Both skins are the same.".color(:yellow)
-			end
-			
-			@images.last.save(@diffed_image)
-		end
-
-	end
+  class Compare
+
+    attr_accessor :percentage_changed, :total_px, :changed_px
+    attr_reader :diffed_image
+
+    # Pulled from Jeff Kreeftmeijer's post here: http://jeffkreeftmeijer.com/2011/comparing-images-and-creating-image-diffs/
+    # Thanks Jeff!
+    def diff_images(org, fresh)
+      @images = [
+        ChunkyPNG::Image.from_file(org),
+        ChunkyPNG::Image.from_file(fresh)
+      ]
+
+      @diff_index = []
+
+      @images.first.height.times do |y|
+        @images.first.row(y).each_with_index do |pixel, x|
+          unless pixel == @images.last[x,y]
+            @diff_index << [x,y] 
+            @images.last[x,y] = ChunkyPNG::Color.rgb(
+              ChunkyPNG::Color.r(pixel) + ChunkyPNG::Color.r(@images.last[x,y]) - 2 * [ChunkyPNG::Color.r(pixel), ChunkyPNG::Color.r(@images.last[x,y])].min,
+              ChunkyPNG::Color.g(pixel) + ChunkyPNG::Color.g(@images.last[x,y]) - 2 * [ChunkyPNG::Color.g(pixel), ChunkyPNG::Color.g(@images.last[x,y])].min,
+              ChunkyPNG::Color.b(pixel) + ChunkyPNG::Color.b(@images.last[x,y]) - 2 * [ChunkyPNG::Color.b(pixel), ChunkyPNG::Color.b(@images.last[x,y])].min
+            )
+          end
+        end
+      end
+    end
+
+    def percentage_diff(org, fresh)
+      diff_images(org, fresh)
+      @total_px = @images.first.pixels.length
+      @changed_px = @diff_index.length
+      @percentage_changed = ( (@diff_index.length.to_f / @images.first.pixels.length) * 100 ).round(2)
+    end
+
+    def visual_diff(org, fresh)
+      diff_images(org, fresh)
+      diff_iterating(org, fresh)
+    end
+
+    def percentage_and_visual_diff(org, fresh)
+      diff_images(org, fresh)
+      @total_px = @images.first.pixels.length
+      @changed_px = @diff_index.length
+      @percentage_changed = ( (@diff_index.length.to_f / @images.first.pixels.length) * 100 ).round(2)
+    end
+
+    def diff_iterating(org, fresh)
+      x, y = @diff_index.map{ |xy| xy[0] }, @diff_index.map{ |xy| xy[1] }
+
+      @diffed_image = org.insert(-5, '_diff')
+
+      begin
+        @images.last.rect(x.min, y.min, x.max, y.max, ChunkyPNG::Color.rgb(0,255,0))
+      rescue NoMethodError
+        puts "Both skins are the same.".color(:yellow)
+      end
+      
+      @images.last.save(@diffed_image)
+    end
+
+  end
 end

data/lib/green_onion/configuration.rb

@@ -1,23 +1,23 @@
 module GreenOnion
-	class Configuration
+  class Configuration
 
-		attr_writer :threshold, :skins_dir
+    attr_writer :threshold, :skins_dir
 
-		def dimensions=(options)
-			@dimensions = { :width => options[:width], :height => options[:height] }
-		end
+    def dimensions=(options)
+      @dimensions = { :width => options[:width], :height => options[:height] }
+    end
+    
+    def dimensions
+      @dimensions ||= { :height => 768, :width => 1024 }
+    end
 
-		def dimensions
-			@dimensions ||= { :height => 768, :width => 1024 }
-		end
+    def threshold
+      @threshold ||= 100
+    end
 
-		def threshold
-			@threshold ||= 100
-		end
+    def skins_dir
+      @skins_dir ||= './spec/skins'
+    end
 
-		def skins_dir
-			@skins_dir ||= './spec/skins'
-		end
-
-	end
+  end
 end

data/lib/green_onion/screenshot.rb

@@ -1,61 +1,60 @@
 require 'capybara/dsl'
 require 'capybara-webkit'
 require "fileutils"
-require "debugger"
 
 module GreenOnion
-	class Screenshot
-		include Capybara::DSL
-
-		attr_accessor :dir, :dimensions 
-		attr_reader :paths_hash
-
-		def initialize(params = {})
-			Capybara.default_driver = :webkit
-			@dimensions = params[:dimensions]
-			@dir = params[:dir]
-			@paths_hash = {}
-		end
-
-		def snap_screenshot(url, path)
-			visit url
-			Capybara.page.driver.render(path, @dimensions)
-		end
-
-		def test_screenshot(url)
-			url_to_path(url)
-			snap_screenshot(url, @shot_path)
-		end
-
-		def url_to_path(url)
-			get_path(url)
-			if File.exist?(@paths_hash[:original])
-				@paths_hash[:fresh] = @paths_hash[:original].dup.insert(-5, '_fresh')
-				@shot_path = @paths_hash[:fresh]
-			else
-				@shot_path = @paths_hash[:original]
-			end
-		end	
-
-		def get_path(url)
-			@filename = url.match(/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/)[5]
-			if @filename.empty? || @filename == '/' 
-				@paths_hash[:original] = "#{@dir}/root.png"
-			else
-				@filename = @filename.gsub(/[\/]/, '')
-				@paths_hash[:original] = "#{@dir}/#{@filename}.png"
-			end
-		end
-
-		def destroy(url)
-			get_path(url)
-			if File.exist?( @paths_hash[:original] )
-				FileUtils.rm( @paths_hash[:original] )
-				if File.exist?( @paths_hash[:fresh] )
-					FileUtils.rm( @paths_hash[:fresh] ) 
-				end
-			end
-		end
-
-	end
+  class Screenshot
+    include Capybara::DSL
+
+    attr_accessor :dir, :dimensions 
+    attr_reader :paths_hash
+
+    def initialize(params = {})
+      Capybara.default_driver = :webkit
+      @dimensions = params[:dimensions]
+      @dir = params[:dir]
+      @paths_hash = {}
+    end
+
+    def snap_screenshot(url, path)
+      visit url
+      Capybara.page.driver.render(path, @dimensions)
+    end
+
+    def test_screenshot(url)
+      url_to_path(url)
+      snap_screenshot(url, @shot_path)
+    end
+
+    def url_to_path(url)
+      get_path(url)
+      if File.exist?(@paths_hash[:original])
+        @paths_hash[:fresh] = @paths_hash[:original].dup.insert(-5, '_fresh')
+        @shot_path = @paths_hash[:fresh]
+      else
+        @shot_path = @paths_hash[:original]
+      end
+    end  
+
+    def get_path(url)
+      @filename = url.match(/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/)[5]
+      if @filename.empty? || @filename == '/' 
+        @paths_hash[:original] = "#{@dir}/root.png"
+      else
+        @filename = @filename.gsub(/[\/]/, '')
+        @paths_hash[:original] = "#{@dir}/#{@filename}.png"
+      end
+    end
+
+    def destroy(url)
+      get_path(url)
+      if File.exist?( @paths_hash[:original] )
+        FileUtils.rm( @paths_hash[:original] )
+        if File.exist?( @paths_hash[:fresh] )
+          FileUtils.rm( @paths_hash[:fresh] ) 
+        end
+      end
+    end
+
+  end
 end

data/lib/green_onion/version.rb

@@ -1,3 +1,3 @@
 module GreenOnion
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/sample_app/sample_app.rb

@@ -7,11 +7,15 @@ class SampleApp < Sinatra::Base
   set :logging, false
 
   get '/' do
-	  "<div style='height:200px; width:200px; background-color:rgb(#{rand(266)}, #{rand(266)}, #{rand(266)})'><!-- Big blue box --></div>"
+    "<div style='height:200px; width:200px; background-color:rgb(#{rand(266)}, #{rand(266)}, #{rand(266)})'><!-- Big blue box --></div>"
   end
 
   get "/fake_uri" do
     "<h2>foo</h2>"
   end
 
+  get "/onion_face" do
+    "<img src='onion_face_#{rand(2)}.jpg' />"
+  end
+
 end

data/spec/unit/compare_spec.rb

@@ -2,27 +2,27 @@ require 'spec_helper'
 
 describe GreenOnion::Compare do
 
-	describe 'Comparing Screenshots' do
+  describe 'Comparing Screenshots' do
 
-		before(:each) do
-			@comparison = GreenOnion::Compare.new
-			@spec_shot1 = './spec/skins/spec_shot.png'
-			@spec_shot2 = './spec/skins/spec_shot_fresh.png'
-			@diff_shot = './spec/skins/spec_shot_diff.png'
-		end
+    before(:each) do
+      @comparison = GreenOnion::Compare.new
+      @spec_shot1 = './spec/skins/spec_shot.png'
+      @spec_shot2 = './spec/skins/spec_shot_fresh.png'
+      @diff_shot = './spec/skins/spec_shot_diff.png'
+    end
 
-		after(:all) do
-			FileUtils.rm('./spec/skins/spec_shot_diff.png', :force => true)
-		end
+    after(:all) do
+      FileUtils.rm('./spec/skins/spec_shot_diff.png', :force => true)
+    end
 
-		it 'should get a percentage of difference between two shots' do
-			@comparison.percentage_diff(@spec_shot1, @spec_shot2)
-			@comparison.percentage_changed.should eq(66.0)
-		end
+    it 'should get a percentage of difference between two shots' do
+      @comparison.percentage_diff(@spec_shot1, @spec_shot2)
+      @comparison.percentage_changed.should eq(66.0)
+    end
 
-		it 'should create a new file with a visual diff between two shots' do
-			@comparison.visual_diff(@spec_shot1, @spec_shot2)
-			File.exist?(@diff_shot).should be_true
-		end
-	end
+    it 'should create a new file with a visual diff between two shots' do
+      @comparison.visual_diff(@spec_shot1, @spec_shot2)
+      File.exist?(@diff_shot).should be_true
+    end
+  end
 end

data/spec/unit/green_onion_spec.rb

@@ -2,125 +2,125 @@ require "spec_helper"
 
 describe GreenOnion do
 
-	before(:all) do
-		@tmp_path = './spec/tmp'
-		@url = 'http://localhost:8070'
-		@url_w_uri = @url + '/fake_uri'
-	end
-
-	describe "Skins" do
-	  before(:each) do	
-			FileUtils.mkdir(@tmp_path)
-
-	    GreenOnion.configure do |c|
-	    	c.skins_dir = @tmp_path
-	    end
-	  end
-
-		after(:each) do
-			FileUtils.rm_r(@tmp_path, :force => true)
-		end
-
-		it "should default to 1024x768 browser dimensions" do
-			( (GreenOnion.configuration.dimensions[:height] == 768) && 
-				(GreenOnion.configuration.dimensions[:width] == 1024) ).should be_true
-	  end
-
-	  it "should set/get custom directory" do
-	    GreenOnion.configuration.skins_dir.should eq(@tmp_path)
-	  end
-
-	  it "should get the correct paths_hash" do
-		  2.times do
-			  GreenOnion.skin(@url)
-			end
-		  ( (GreenOnion.screenshot.paths_hash[:original] == "#{@tmp_path}/root.png") && 
-		  	(GreenOnion.screenshot.paths_hash[:fresh] == "#{@tmp_path}/root_fresh.png") ).should be_true
-	  end
-
-		it "should measure the percentage of diff between skins" do	      
-		  2.times do
-			  GreenOnion.skin_percentage(@url)
-			end
-		  GreenOnion.compare.percentage_changed.should be > 0
-		end
-
-		it "should measure the percentage of diff between skins (even if there is no diff)" do	      
-		  2.times do
-			  GreenOnion.skin_percentage(@url_w_uri)
-			end
-		  GreenOnion.compare.percentage_changed.should be == 0
-		end
-
-		it "should print just URL and changed/total when diff percentage threshold has not been surpassed" do
-			$stdout.should_receive(:puts).exactly(3).times
-		  2.times do
-			  GreenOnion.skin_percentage(@url, 6)
-			end
-		end
-
-		it "should create visual diff between skins" do      
-		  2.times do
-			  GreenOnion.skin_visual(@url)
-			end
-			GreenOnion.compare.diffed_image.should eq("#{@tmp_path}/root_diff.png")
-		end
-
-		it "should create visual diff between skins (even when there is no change)" do	      
-		  2.times do
-			  GreenOnion.skin_visual(@url_w_uri)
-			end
-			GreenOnion.compare.diffed_image.should eq("#{@tmp_path}/fake_uri_diff.png")
-		end
-
-		it "should measure the percentage of diff between skins AND create visual diff" do	      
-		  2.times do
-			  GreenOnion.skin_visual_and_percentage(@url)
-			end
-			( (GreenOnion.compare.diffed_image.should eq("#{@tmp_path}/root_diff.png")) &&
-		  	(GreenOnion.compare.percentage_changed.should be > 0) ).should be_true
-		end
-	end
-
-	describe "Skins with custom dimensions" do
-	  before(:each) do	
-			FileUtils.mkdir(@tmp_path)
-
-	    GreenOnion.configure do |c|
-	    	c.skins_dir = @tmp_path
-	    	c.dimensions = { :width => 1440, :height => 900 }
-	    end
-	  end
-
-		after(:each) do
-			FileUtils.rm_r(@tmp_path, :force => true)
-		end
-
-		it "should allow custom browser dimensions" do
-			( (GreenOnion.configuration.dimensions[:height] == 900) && 
-				(GreenOnion.configuration.dimensions[:width] == 1440) ).should be_true
-	  end
-	end
-
-	describe "Skins with custom threshold" do
-	  before(:each) do	
-			FileUtils.mkdir(@tmp_path)
-
-	    GreenOnion.configure do |c|
-	    	c.skins_dir = @tmp_path
-	    	c.threshold = 1
-	    end
-	  end
-
-		after(:each) do
-			FileUtils.rm_r(@tmp_path, :force => true)
-		end
-
-		it "should alert when diff percentage threshold is surpassed" do
-			$stdout.should_receive(:puts).exactly(5).times
-		  2.times do
-			  GreenOnion.skin_percentage(@url)
-			end
-		end
-	end
+  before(:all) do
+    @tmp_path = './spec/tmp'
+    @url = 'http://localhost:8070'
+    @url_w_uri = @url + '/fake_uri'
+  end
+
+  describe "Skins" do
+    before(:each) do  
+      FileUtils.mkdir(@tmp_path)
+
+      GreenOnion.configure do |c|
+        c.skins_dir = @tmp_path
+      end
+    end
+
+    after(:each) do
+      FileUtils.rm_r(@tmp_path, :force => true)
+    end
+
+    it "should default to 1024x768 browser dimensions" do
+      ( (GreenOnion.configuration.dimensions[:height] == 768) && 
+        (GreenOnion.configuration.dimensions[:width] == 1024) ).should be_true
+    end
+
+    it "should set/get custom directory" do
+      GreenOnion.configuration.skins_dir.should eq(@tmp_path)
+    end
+
+    it "should get the correct paths_hash" do
+      2.times do
+        GreenOnion.skin(@url)
+      end
+      ( (GreenOnion.screenshot.paths_hash[:original] == "#{@tmp_path}/root.png") && 
+        (GreenOnion.screenshot.paths_hash[:fresh] == "#{@tmp_path}/root_fresh.png") ).should be_true
+    end
+
+    it "should measure the percentage of diff between skins" do        
+      2.times do
+        GreenOnion.skin_percentage(@url)
+      end
+      GreenOnion.compare.percentage_changed.should be > 0
+    end
+
+    it "should measure the percentage of diff between skins (even if there is no diff)" do        
+      2.times do
+        GreenOnion.skin_percentage(@url_w_uri)
+      end
+      GreenOnion.compare.percentage_changed.should be == 0
+    end
+
+    it "should print just URL and changed/total when diff percentage threshold has not been surpassed" do
+      $stdout.should_receive(:puts).exactly(3).times
+      2.times do
+        GreenOnion.skin_percentage(@url, 6)
+      end
+    end
+
+    it "should create visual diff between skins" do      
+      2.times do
+        GreenOnion.skin_visual(@url)
+      end
+      GreenOnion.compare.diffed_image.should eq("#{@tmp_path}/root_diff.png")
+    end
+
+    it "should create visual diff between skins (even when there is no change)" do        
+      2.times do
+        GreenOnion.skin_visual(@url_w_uri)
+      end
+      GreenOnion.compare.diffed_image.should eq("#{@tmp_path}/fake_uri_diff.png")
+    end
+
+    it "should measure the percentage of diff between skins AND create visual diff" do        
+      2.times do
+        GreenOnion.skin_visual_and_percentage(@url)
+      end
+      ( (GreenOnion.compare.diffed_image.should eq("#{@tmp_path}/root_diff.png")) &&
+        (GreenOnion.compare.percentage_changed.should be > 0) ).should be_true
+    end
+  end
+
+  describe "Skins with custom dimensions" do
+    before(:each) do  
+      FileUtils.mkdir(@tmp_path)
+
+      GreenOnion.configure do |c|
+        c.skins_dir = @tmp_path
+        c.dimensions = { :width => 1440, :height => 900 }
+      end
+    end
+
+    after(:each) do
+      FileUtils.rm_r(@tmp_path, :force => true)
+    end
+
+    it "should allow custom browser dimensions" do
+      ( (GreenOnion.configuration.dimensions[:height] == 900) && 
+        (GreenOnion.configuration.dimensions[:width] == 1440) ).should be_true
+    end
+  end
+
+  describe "Skins with custom threshold" do
+    before(:each) do  
+      FileUtils.mkdir(@tmp_path)
+
+      GreenOnion.configure do |c|
+        c.skins_dir = @tmp_path
+        c.threshold = 1
+      end
+    end
+
+    after(:each) do
+      FileUtils.rm_r(@tmp_path, :force => true)
+    end
+
+    it "should alert when diff percentage threshold is surpassed" do
+      $stdout.should_receive(:puts).exactly(5).times
+      2.times do
+        GreenOnion.skin_percentage(@url)
+      end
+    end
+  end
 end

data/spec/unit/screenshot_spec.rb

@@ -2,85 +2,85 @@ require 'spec_helper'
 
 describe GreenOnion::Screenshot do
 
-	before(:all) do
-		@url = 'http://localhost:8070'
-		@url_w_uri = @url + '/fake_uri'
-		@tmp_path = './spec/tmp'
-		@dimensions = { :width => 1024, :height => 768 }
-	end
+  before(:all) do
+    @url = 'http://localhost:8070'
+    @url_w_uri = @url + '/fake_uri'
+    @tmp_path = './spec/tmp'
+    @dimensions = { :width => 1024, :height => 768 }
+  end
 
   describe 'Snap single screenshot' do
 
-		before(:each) do
-			FileUtils.mkdir(@tmp_path)
-
-  		@screenshot = GreenOnion::Screenshot.new(
-				:dir => @tmp_path,
-				:dimensions => @dimensions
-  		)
-			@file = "#{@tmp_path}/fake_uri.png"
-  	end
-
-		after(:each) do
-			FileUtils.rm_r(@tmp_path, :force => true)
-		end
-
-	  it 'should build the path from the URI' do
-  		@screenshot.url_to_path(@url_w_uri).should eq(@file)
-	  end
-
-	  it 'should build the path from root' do
-  		@screenshot.url_to_path('http://localhost:8070').should eq("#{@tmp_path}/root.png")
-	  end
-
-	  it 'should build the path from root (even with trailing slash)' do
-  		@screenshot.url_to_path('http://localhost:8070/').should eq("#{@tmp_path}/root.png")
-	  end
-
-	  it 'should snap and save screenshot' do
-  		@screenshot.snap_screenshot(@url_w_uri, @file)
-  		File.exist?(@file).should be_true
-	  end
-
-		it "should destroy a singular screenshot" do
-		  @screenshot.destroy(@url_w_uri)
-  		File.exist?(@file).should be_false
-		end
-	end
-
-	describe 'Snap two screenshots' do
-
-		before(:each) do
-			FileUtils.mkdir(@tmp_path)
-
-			@screenshot = GreenOnion::Screenshot.new(
-				:dir => @tmp_path,
-				:dimensions => @dimensions
-			)
-			@file1 = "#{@tmp_path}/fake_uri.png"
-			@file2 = "#{@tmp_path}/fake_uri_fresh.png"
-			2.times do
-				@screenshot.test_screenshot(@url_w_uri)
-			end
-		end
-
-		after(:each) do
-			FileUtils.rm_r(@tmp_path, :force => true)
-		end
-
-		it "should create the paths_hash correctly" do
-		  ( (@screenshot.paths_hash[:original].should eq(@file1)) && (@screenshot.paths_hash[:fresh].should eq(@file2)) ).should be_true
-		end
-
-		it "should snap and save another screenshot if a screenshot already exists" do
-			if File.exist?(@file1)
-				File.exist?(@file2).should be_true
-			end
-		end
-
-		it "should destroy a set of screenshots" do
-		  @screenshot.destroy(@url_w_uri)
-		  ( File.exist?(@file1) && File.exist?(@file2) ).should be_false
-		end
-	end
+    before(:each) do
+      FileUtils.mkdir(@tmp_path)
+
+      @screenshot = GreenOnion::Screenshot.new(
+        :dir => @tmp_path,
+        :dimensions => @dimensions
+      )
+      @file = "#{@tmp_path}/fake_uri.png"
+    end
+
+    after(:each) do
+      FileUtils.rm_r(@tmp_path, :force => true)
+    end
+
+    it 'should build the path from the URI' do
+      @screenshot.url_to_path(@url_w_uri).should eq(@file)
+    end
+
+    it 'should build the path from root' do
+      @screenshot.url_to_path('http://localhost:8070').should eq("#{@tmp_path}/root.png")
+    end
+
+    it 'should build the path from root (even with trailing slash)' do
+      @screenshot.url_to_path('http://localhost:8070/').should eq("#{@tmp_path}/root.png")
+    end
+
+    it 'should snap and save screenshot' do
+      @screenshot.snap_screenshot(@url_w_uri, @file)
+      File.exist?(@file).should be_true
+    end
+
+    it "should destroy a singular screenshot" do
+      @screenshot.destroy(@url_w_uri)
+      File.exist?(@file).should be_false
+    end
+  end
+
+  describe 'Snap two screenshots' do
+
+    before(:each) do
+      FileUtils.mkdir(@tmp_path)
+
+      @screenshot = GreenOnion::Screenshot.new(
+        :dir => @tmp_path,
+        :dimensions => @dimensions
+      )
+      @file1 = "#{@tmp_path}/fake_uri.png"
+      @file2 = "#{@tmp_path}/fake_uri_fresh.png"
+      2.times do
+        @screenshot.test_screenshot(@url_w_uri)
+      end
+    end
+
+    after(:each) do
+      FileUtils.rm_r(@tmp_path, :force => true)
+    end
+
+    it "should create the paths_hash correctly" do
+      ( (@screenshot.paths_hash[:original].should eq(@file1)) && (@screenshot.paths_hash[:fresh].should eq(@file2)) ).should be_true
+    end
+
+    it "should snap and save another screenshot if a screenshot already exists" do
+      if File.exist?(@file1)
+        File.exist?(@file2).should be_true
+      end
+    end
+
+    it "should destroy a set of screenshots" do
+      @screenshot.destroy(@url_w_uri)
+      ( File.exist?(@file1) && File.exist?(@file2) ).should be_false
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: green_onion
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ted O'Meara
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-30 00:00:00 Z
+date: 2012-07-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -35,7 +35,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: fileutils
+  name: pry
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -46,7 +46,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: pry
+  name: debugger
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -57,7 +57,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: debugger
+  name: sinatra
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -68,58 +68,58 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: capybara
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
+        version: 1.1.2
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: capybara-webkit
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.12.1
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: capybara-webkit
+  name: oily_png
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.0.2
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: oily_png
+  name: rainbow
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.1.4
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rainbow
+  name: fileutils
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "0.7"
   type: :runtime
   version_requirements: *id010
 description: UI testing/screenshot diffing tool
@@ -188,3 +188,4 @@ test_files:
 - spec/unit/compare_spec.rb
 - spec/unit/green_onion_spec.rb
 - spec/unit/screenshot_spec.rb
+has_rdoc: