compaa 0.0.1.3 → 0.0.2

data/.travis.yml

@@ -4,5 +4,4 @@ rvm:
   - 1.9.3
   - 1.8.7
   - jruby-19mode
-  - rbx-19mode
   - rbx-18mode

data/bin/compaa

@@ -3,62 +3,62 @@
 require 'optparse'
 require 'methadone'
 require 'compaa'
-require 'sinatra'
-require 'watir-webdriver'
+require 'rack'
+if ENV['TRAVIS'] == 'true'
+  require 'watir-webdriver-fake'
+else
+  require 'watir-webdriver'
+end
 require 'cgi'
 
 class App
   include Methadone::Main
   include Methadone::CLILogging
 
-  PORT = '7788'
+  PORT = 7788
 
   main do
-    
-    sinatra_pid = fork do
-      user_project_path = Dir.pwd
-
-      Dir.chdir(File.dirname(__FILE__))
-      Dir.chdir("../")
-      puts Dir.pwd
-
-      begin 
-        `ln -s  #{user_project_path} #{Dir.pwd}/public`
-      rescue
-        puts 'Error creating symbolic link'
-      end
+    begin
+      start_server_in_background
 
-      exec "thin start -p #{PORT}"
-    end
+      browser = Watir::Browser.new
+      browser.window.resize_to 1368, 1200
 
-    browser = Watir::Browser.new
-    browser.window.resize_to 1368, 1200
+      Compaa::DifferenceImage.all.each do |difference_image|
+        browser.goto "http://localhost:#{PORT}/?filepath=#{CGI::escape(difference_image.path)}"
+        puts "Comparing: #{difference_image.path}"
+        puts "Would you like to make this the reference image?"
 
-    sleep 3
+        difference_image.create_reference_image if screenshot_approved?
+      end
 
-    Compaa::DifferenceImage.all.each do |difference_image|
-      browser.goto "http://localhost:#{PORT}/?filepath=#{CGI::escape(difference_image.path)}"
-      puts "Comparing: #{difference_image.path}"
-      puts "Would you like to make this the reference image?"
+      Compaa::GeneratedImage.all.each do |generated_image|
+        next if generated_image.has_reference_image?
 
-      difference_image.create_reference_image if screenshot_approved?
+        puts "Approving: #{generated_image.path}"
+        generated_image.create_reference_image if screenshot_approved?
+      end
+    ensure
+      shutdown_server
+      browser.close
     end
+  end
 
-    Compaa::GeneratedImage.all.each do |generated_image|
-      next if generated_image.has_reference_image?
-
-      puts "Approving: #{generated_image.path}"
-      generated_image.create_reference_image if screenshot_approved?
+  def self.start_server_in_background
+    Thread.new do
+      Rack::Handler::WEBrick.run Compaa::RackApp.new.app,
+        :Port      => PORT,
+        :Logger    => Compaa::NullObject.new,
+        :AccessLog => [nil, nil]
     end
+  end
 
-    `kill -9 #{sinatra_pid}`
-
-    browser.close
-
+  def self.shutdown_server
+    Rack::Handler::WEBrick.shutdown
   end
 
   def self.screenshot_approved?
-      STDIN.gets.chomp.downcase.start_with? 'y'
+    STDIN.gets.chomp.downcase.start_with? 'y'
   end
 
   version Compaa::VERSION

data/compaa.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  %w[rake aruba simplecov wrong minitest guard-minitest guard-cucumber].each do |lib|
+  %w[rake aruba simplecov wrong minitest guard-minitest guard-cucumber rack-test].each do |lib|
     gem.add_development_dependency lib
   end
 
@@ -30,8 +30,7 @@ Gem::Specification.new do |gem|
   end
 
   gem.add_dependency 'methadone', '~> 1.2.2'
-  gem.add_dependency 'sinatra'
-  gem.add_dependency 'thin'
   gem.add_dependency 'haml'
   gem.add_dependency 'watir-webdriver'
+  gem.add_dependency 'rack'
 end

data/features/step_definitions/compaa_steps.rb

@@ -29,7 +29,7 @@ Then /^the new reference screenshot should be the same as the sample generated s
   sample_generated_file_path = File.join fixture_image_path, 'sample_generated.png'
   new_reference_file_path = File.join current_dir, *%w[artifacts reference_screenshots dir image.png]
 
-  eventually :timeout => RUBY_PLATFORM == 'java' ? 20 : 3 do
+  eventually :timeout => RUBY_PLATFORM == 'java' ? 20 : 10 do
     new_reference_file_path.should be_the_same_file_as sample_generated_file_path
   end
 end
@@ -38,7 +38,7 @@ Then /^the new reference screenshot should be the same as the original reference
   original_reference_file_path = File.join fixture_image_path, 'sample_reference.png'
   new_reference_file_path = File.join current_dir, *%w[artifacts reference_screenshots dir image.png]
 
-  eventually :timeout => RUBY_PLATFORM == 'java' ? 20 : 3 do
+  eventually :timeout => RUBY_PLATFORM == 'java' ? 20 : 10 do
     new_reference_file_path.should be_the_same_file_as original_reference_file_path
   end
 end

data/features/support/env.rb

@@ -4,8 +4,6 @@ require 'wrong'
 
 include Wrong
 
-ENV['APP_ENV'] = 'test'
-
 bin_dir     = File.expand_path File.dirname(__FILE__), '../../bin'
 ENV['PATH'] = bin_dir + File::PATH_SEPARATOR + ENV['PATH']
 LIB_DIR     = File.expand_path File.dirname(__FILE__), '../../lib'

data/lib/compaa.rb

@@ -1,3 +1,5 @@
 require 'compaa/version'
 require 'compaa/difference_image'
 require 'compaa/generated_image'
+require 'compaa/null_object'
+require 'compaa/rack_app'

data/lib/compaa/null_object.rb

@@ -0,0 +1,5 @@
+module Compaa
+  class NullObject
+    def method_missing *args, █ self; end
+  end
+end

data/lib/compaa/rack_app.rb

@@ -0,0 +1,32 @@
+require 'rack'
+require 'haml'
+
+module Compaa
+  class RackApp
+    attr_writer :root_directory
+
+    DEFAULT_ROOT = Dir.pwd
+
+    def app
+      template = File.read File.expand_path 'template.haml', File.dirname(__FILE__)
+      root     = @root_directory or DEFAULT_ROOT
+
+      Rack::Builder.new do
+        use Rack::Static, :urls => ['/artifacts'], :root => root
+
+        run lambda { |env|
+          request = Rack::Request.new env
+
+          if request.path == '/' and request.params.has_key? 'filepath'
+            locals = { :filepath => request.params['filepath'] }
+            body   = Haml::Engine.new(template).render Object.new, locals
+
+            [ 200, { 'Content-Type' => 'text/html' }, [body] ]
+          else
+            [ 404, {}, ['Not found'] ]
+          end
+        }
+      end
+    end
+  end
+end

data/lib/compaa/template.haml

@@ -0,0 +1,80 @@
+!!!
+%head
+  %script{src: "https://raw.github.com/Phrogz/context-blender/master/context_blender.js", type: "text/javascript"}
+%body
+  %canvas#offScreenCanvas{style: 'position: absolute; left: -9999999px;'}
+  %canvas#difference
+  %img#animation{src: filepath, style: 'display: none'}
+  %img#oldImage{style: 'display: none'}
+  %img#newImage{style: 'display: none'}
+
+  #buttonBar{style: 'width: 400px; margin: 0px auto'}
+    %button#differenceButton Difference
+    %button#animationButton Animation
+    %button#oldImageButton Old Image
+    %button#newImageButton New Image
+  :javascript
+    var compaa = {
+      differenceGifPath: '#{filepath}',
+      oldImagePath: '#{filepath.gsub('gif', 'png').gsub('_difference.png', '').gsub('differences_in_screenshots_this_run','reference_screenshots')}',
+      newImagePath: '#{filepath.gsub('gif', 'png').gsub('_difference.png', '').gsub('differences_in_screenshots_this_run','screenshots_generated_this_run')}',
+
+      init: function() {
+        var oldImg=document.createElement('img');
+        oldImg.src = compaa.oldImagePath
+        
+        var newImg=document.createElement('img');
+        newImg.src = compaa.newImagePath
+
+        document.getElementById('difference').width = oldImg.width;
+        document.getElementById('difference').height = oldImg.height;
+
+        document.getElementById('offScreenCanvas').width = newImg.width;
+        document.getElementById('offScreenCanvas').height = newImg.height;
+        
+        var over = document.getElementById('offScreenCanvas').getContext('2d'); 
+        over.drawImage(oldImg, 0, 0);
+
+        var under = document.getElementById('difference').getContext('2d');
+        under.drawImage(newImg, 0, 0);
+
+        over.blendOnto(under,'difference');
+
+        document.getElementById('oldImage').src = compaa.oldImagePath;
+        document.getElementById('newImage').src = compaa.newImagePath;
+
+        compaa.show('difference');
+
+        document.getElementById('differenceButton').onclick = function(){compaa.show('difference')};
+        document.getElementById('animationButton').onclick = function(){compaa.show('animation')};
+        document.getElementById('oldImageButton').onclick = function(){compaa.show('oldImage')};
+        document.getElementById('newImageButton').onclick = function(){compaa.show('newImage')};
+      },
+      show: function(mode) {
+        document.getElementById('difference').style.display = 'none';
+        document.getElementById('animation').style.display = 'none';
+        document.getElementById('oldImage').style.display = 'none';
+        document.getElementById('newImage').style.display = 'none';
+        
+        switch(mode){
+          case 'difference':
+            document.getElementById('difference').style.display = 'block';
+            break;
+          case 'animation':
+            document.getElementById('animation').style.display = 'block';
+            break;
+          case 'oldImage':
+            document.getElementById('oldImage').style.display = 'block';
+            break;
+          case 'newImage':
+            document.getElementById('newImage').style.display = 'block';
+            break;
+        }
+      }
+    }
+
+    document.onreadystatechange = function() {
+      if (document.readyState == "complete" || document.readyState == "interactive") {
+        compaa.init();
+      }
+    }

data/lib/compaa/version.rb

@@ -1,3 +1,3 @@
 module Compaa
-  VERSION = "0.0.1.3"
+  VERSION = "0.0.2"
 end

data/lib/watir-webdriver-fake.rb

@@ -0,0 +1,9 @@
+require 'compaa/null_object'
+
+module Watir
+  class Browser
+    def self.new
+      Compaa::NullObject.new
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'simplecov'
 SimpleCov.start
 
+require 'pry'
+
 gem 'minitest'
 require 'minitest/autorun'
 require 'compaa'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compaa
 version: !ruby/object:Gem::Version
-  version: 0.0.1.3
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000Z
+date: 2013-01-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15960640 !ruby/object:Gem::Requirement
+  requirement: &19861380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15960640
+  version_requirements: *19861380
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &15959580 !ruby/object:Gem::Requirement
+  requirement: &19859900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15959580
+  version_requirements: *19859900
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &15958560 !ruby/object:Gem::Requirement
+  requirement: &19829160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15958560
+  version_requirements: *19829160
 - !ruby/object:Gem::Dependency
   name: wrong
-  requirement: &15957880 !ruby/object:Gem::Requirement
+  requirement: &19827180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15957880
+  version_requirements: *19827180
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &15957340 !ruby/object:Gem::Requirement
+  requirement: &19824440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15957340
+  version_requirements: *19824440
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &15956680 !ruby/object:Gem::Requirement
+  requirement: &19796120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15956680
+  version_requirements: *19796120
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &15955940 !ruby/object:Gem::Requirement
+  requirement: &19729380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15955940
+  version_requirements: *19729380
 - !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: &15954640 !ruby/object:Gem::Requirement
+  name: rack-test
+  requirement: &19726820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,32 +98,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15954640
+  version_requirements: *19726820
 - !ruby/object:Gem::Dependency
-  name: methadone
-  requirement: &15953560 !ruby/object:Gem::Requirement
+  name: rb-inotify
+  requirement: &19722980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *15953560
+  version_requirements: *19722980
 - !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &15934960 !ruby/object:Gem::Requirement
+  name: methadone
+  requirement: &19691520 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *15934960
+  version_requirements: *19691520
 - !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &15934200 !ruby/object:Gem::Requirement
+  name: haml
+  requirement: &19689220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15934200
+  version_requirements: *19689220
 - !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &15933200 !ruby/object:Gem::Requirement
+  name: watir-webdriver
+  requirement: &19688160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15933200
+  version_requirements: *19688160
 - !ruby/object:Gem::Dependency
-  name: watir-webdriver
-  requirement: &15932260 !ruby/object:Gem::Requirement
+  name: rack
+  requirement: &19649800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15932260
+  version_requirements: *19649800
 description: 
 email:
 - skyhelpcentre@gmail.com
@@ -169,10 +169,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app.rb
 - bin/compaa
 - compaa.gemspec
-- config.ru
 - features/compaa.feature
 - features/step_definitions/compaa_steps.rb
 - features/support/env.rb
@@ -184,12 +182,15 @@ files:
 - lib/compaa.rb
 - lib/compaa/difference_image.rb
 - lib/compaa/generated_image.rb
+- lib/compaa/null_object.rb
+- lib/compaa/rack_app.rb
+- lib/compaa/template.haml
 - lib/compaa/version.rb
+- lib/watir-webdriver-fake.rb
 - log/newrelic_agent.log
 - spec/difference_image_spec.rb
 - spec/generated_image_spec.rb
 - spec/spec_helper.rb
-- views/index.haml
 homepage: https://github.com/bskyb-commerce-helpcentre/compaa
 licenses: []
 post_install_message: 
@@ -202,18 +203,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1838838566745531366
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1838838566745531366
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/app.rb

@@ -1,9 +0,0 @@
-require 'sinatra'
-
-module Compaa
-  class Screenshots < Sinatra::Base
-    get '/' do
-      haml :index
-    end
-  end
-end

data/config.ru

@@ -1,6 +0,0 @@
-require 'bundler'
-Bundler.require
-
-require './app'
-
-run Compaa::Screenshots

data/views/index.haml

@@ -1,86 +0,0 @@
-!!!
-%head
-%script{src: "https://raw.github.com/Phrogz/context-blender/master/context_blender.js", type: "text/javascript"}
-%body
-%canvas#offScreenCanvas{style: 'position: absolute; left: -9999999px;'}
-%canvas#difference
-%img#animation{src: params[:filepath], style: 'display: none'}
-%img#oldImage{style: 'display: none'}
-%img#newImage{style: 'display: none'}
-#buttonBar{style: 'width: 400px; margin: 0px auto'}
-  %button#differenceButton
-    Difference
-  %button#animationButton
-    Animation
-  %button#oldImageButton
-    Old Image
-  %button#newImageButton
-    New Image
-:javascript
-  var compaa = {
-    differenceGifPath: '#{params[:filepath]}',
-    oldImagePath: '#{params[:filepath].gsub('gif','png').gsub('_difference.png','').gsub('differences_in_screenshots_this_run','reference_screenshots')}',
-    newImagePath: '#{params[:filepath].gsub('gif','png').gsub('_difference.png','').gsub('differences_in_screenshots_this_run','screenshots_generated_this_run')}',
-
-
-    init: function() {
-        var oldImg=document.createElement('img');
-        oldImg.src = compaa.oldImagePath
-        
-        var newImg=document.createElement('img');
-        newImg.src = compaa.newImagePath
-
-        document.getElementById('difference').width = oldImg.width;
-        document.getElementById('difference').height = oldImg.height;
-
-        document.getElementById('offScreenCanvas').width = newImg.width;
-        document.getElementById('offScreenCanvas').height = newImg.height;
-        
-        var over = document.getElementById('offScreenCanvas').getContext('2d'); 
-        over.drawImage(oldImg, 0, 0);
-
-        var under = document.getElementById('difference').getContext('2d');
-        under.drawImage(newImg, 0, 0);
-
-        over.blendOnto(under,'difference');
-
-        document.getElementById('oldImage').src = compaa.oldImagePath;
-        document.getElementById('newImage').src = compaa.newImagePath;
-
-        compaa.show('difference');
-
-        document.getElementById('differenceButton').onclick = function(){compaa.show('difference')};
-        document.getElementById('animationButton').onclick = function(){compaa.show('animation')};
-        document.getElementById('oldImageButton').onclick = function(){compaa.show('oldImage')};
-        document.getElementById('newImageButton').onclick = function(){compaa.show('newImage')};
-    },
-    show: function(mode) {
-
-      document.getElementById('difference').style.display = 'none';
-      document.getElementById('animation').style.display = 'none';
-      document.getElementById('oldImage').style.display = 'none';
-      document.getElementById('newImage').style.display = 'none';
-      
-      switch(mode){
-        case 'difference':
-          document.getElementById('difference').style.display = 'block';
-          break;
-        case 'animation':
-          document.getElementById('animation').style.display = 'block';
-          break;
-        case 'oldImage':
-          document.getElementById('oldImage').style.display = 'block';
-          break;
-        case 'newImage':
-          document.getElementById('newImage').style.display = 'block';
-          break;
-      }
-    }
-  }
-
-  document.onreadystatechange = function () {
-        if (document.readyState == "complete" || document.readyState == "interactive"){
-          compaa.init();
-       }
-  }
-