green_onion 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.2
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+script: rspec spec

data/README.md

@@ -1,3 +1,6 @@
+
+[<img src="https://secure.travis-ci.org/tomeara/green_onion.png" />](http://travis-ci.org/#!/tomeara/green_onion)
+
 # GreenOnion
 
 Regression issues make you cry.

data/green_onion.gemspec

@@ -12,9 +12,10 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "fileutils"
   gem.add_development_dependency "pry"
+  gem.add_development_dependency "debugger"
   
   gem.add_dependency "capybara"
-  gem.add_dependency "chunky_png"
+  gem.add_dependency "oily_png"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/green_onion.rb

@@ -1,9 +1,42 @@
 require "green_onion/version"
 require "green_onion/screenshot"
 require "green_onion/compare"
-
+require "green_onion/configuration"
 module GreenOnion
 	class << self
 
+		attr_reader :compare, :screenshot
+
+		def configure
+			yield configuration
+		end
+
+		def configuration
+			@configuration ||= GreenOnion::Configuration.new
+		end
+
+		def skin(url)
+			@screenshot = Screenshot.new(
+				:dir => self.configuration.skins_dir
+			)
+			@compare = GreenOnion::Compare.new
+
+			@screenshot.test_screenshot(url)
+		end
+
+		def skin_percentage(url)
+			self.skin(url)
+			if(@screenshot.paths_hash.length > 1)
+				self.compare.percentage_diff(@screenshot.paths_hash[:original], @screenshot.paths_hash[:fresh])
+			end
+		end
+
+		def skin_visual(url)
+			self.skin(url)
+			if(@screenshot.paths_hash.length > 1)
+				self.compare.visual_diff(@screenshot.paths_hash[:original], @screenshot.paths_hash[:fresh])
+			end
+		end
+
 	end
 end

data/lib/green_onion/compare.rb

@@ -1,9 +1,10 @@
-require "chunky_png"
+require "oily_png"
 
 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!
@@ -35,10 +36,17 @@ module GreenOnion
 
 		def visual_diff(org, fresh)
 			diff_images(org, fresh)
-			x, y = diff.map{ |xy| xy[0] }, diff.map{ |xy| xy[1] }
+			x, y = @diff.map{ |xy| xy[0] }, @diff.map{ |xy| xy[1] }
 
-			images.last.rect(x.min, y.min, x.max, y.max, ChunkyPNG::Color.rgb(0,255,0))
-			images.last.save('diff.png')
+			@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 "#{org} and #{fresh} skins are the same."
+			end
+			
+			@images.last.save(@diffed_image)
 		end
 
 	end

data/lib/green_onion/configuration.rb

@@ -0,0 +1,11 @@
+module GreenOnion
+	class Configuration
+		
+		attr_accessor :skins_dir
+
+		def skins_dir=(directory)
+			@skins_dir ||= directory
+		end
+
+	end
+end

data/lib/green_onion/screenshot.rb

@@ -5,11 +5,13 @@ module GreenOnion
 	class Screenshot
 		include Capybara::DSL
 
-		attr_accessor :dir
+		attr_accessor :dir 
+		attr_reader :paths_hash
 
 		def initialize(params = {})
 			Capybara.default_driver = :selenium
 			@dir = params[:dir]
+			@paths_hash = {}
 		end
 
 		def snap_screenshot(url, path)
@@ -19,38 +21,37 @@ module GreenOnion
 
 		def test_screenshot(url)
 			url_to_path(url)
-			snap_screenshot(url, @path)
+			snap_screenshot(url, @shot_path)
 		end
 
 		def url_to_path(url)
-			@filename = url.match(/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/)[5]
-			if @filename.empty?
-				@path = "#{@dir}/root.png"
+			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
-				@filename = @filename.gsub(/[\/]/, '')
-				@path = "#{@dir}/#{@filename}.png"
+				@shot_path = @paths_hash[:original]
 			end
-			accepted?(@path)
-			return @path
-		end
+			return @shot_path
+		end	
 
-		def accepted?(path)
-			if File.exist?(path)
-				return path.insert(-5, '_fresh')
+		def get_path(url)
+			@filename = url.match(/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/)[5]
+			if @filename.empty? || @filename == '/' 
+				@paths_hash[:original] = "#{@dir}/root.png"
 			else
-				return path
+				@filename = @filename.gsub(/[\/]/, '')
+				@paths_hash[:original] = "#{@dir}/#{@filename}.png"
 			end
 		end
 
 		def destroy(url)
-			url_to_path(url)
-			fresh_path = @path.insert(-5, '_fresh') 
-
-			if File.exist?(fresh_path)
-				FileUtils.rm(fresh_path) 
-			end
-			if File.exist?(@path)
-				FileUtils.rm(@path)
+			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
 

data/lib/green_onion/version.rb

@@ -1,3 +1,3 @@
 module GreenOnion
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'fileutils'
-
 require 'green_onion'
 
 RSpec.configure do |config|

data/spec/unit/compare_spec.rb

@@ -8,6 +8,11 @@ describe GreenOnion::Compare 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
 
 		it 'should get a percentage of difference between two shots' do
@@ -17,6 +22,7 @@ describe GreenOnion::Compare do
 
 		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

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe GreenOnion do
+
+	describe "Skins" do
+	  
+	  before(:each) do	
+			@tmp_path = './spec/tmp'
+			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 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('http://www.google.com')
+			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('http://www.google.com')
+			end
+		  GreenOnion.compare.percentage_changed.should be <(1)
+		end
+
+		it "should create visual diff between skins"
+
+		it "should create visual diff between skins (even when there is no change)" do	      
+		  2.times do
+			  GreenOnion.skin_visual('http://www.google.com')
+			end
+			GreenOnion.compare.diffed_image.should eq('./spec/tmp/root_diff.png')
+		end
+
+	end
+end

data/spec/unit/screenshot_spec.rb

@@ -27,6 +27,10 @@ describe GreenOnion::Screenshot do
   		@screenshot.url_to_path('http://www.google.com').should eq("#{@tmp_path}/root.png")
 	  end
 
+	  it 'should build the path from root (even with trailing slash)' do
+  		@screenshot.url_to_path('http://www.google.com/').should eq("#{@tmp_path}/root.png")
+	  end
+
 	  it 'should snap and save screenshot' do
   		@screenshot.snap_screenshot(@url, @file)
   		File.exist?(@file).should be_true
@@ -59,6 +63,10 @@ describe GreenOnion::Screenshot 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
@@ -67,7 +75,7 @@ describe GreenOnion::Screenshot do
 
 		it "should destroy a set of screenshots" do
 		  @screenshot.destroy(@url)
-		  File.exist?(@file1).should be_false
+		  ( 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.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ted O'Meara
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-18 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -57,7 +57,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: debugger
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -65,10 +65,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: chunky_png
+  name: capybara
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -78,6 +78,17 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: oily_png
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 description: UI testing/screenshot diffing tool
 email: 
 - ted@intridea.com
@@ -91,6 +102,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -98,12 +110,14 @@ files:
 - green_onion.gemspec
 - lib/green_onion.rb
 - lib/green_onion/compare.rb
+- lib/green_onion/configuration.rb
 - lib/green_onion/screenshot.rb
 - lib/green_onion/version.rb
 - spec/skins/spec_shot.png
 - spec/skins/spec_shot_fresh.png
 - spec/spec_helper.rb
 - spec/unit/compare_spec.rb
+- spec/unit/green_onion_spec.rb
 - spec/unit/screenshot_spec.rb
 homepage: ""
 licenses: []
@@ -137,4 +151,5 @@ test_files:
 - spec/skins/spec_shot_fresh.png
 - spec/spec_helper.rb
 - spec/unit/compare_spec.rb
+- spec/unit/green_onion_spec.rb
 - spec/unit/screenshot_spec.rb