gatling 1.0.9 → 1.1.0

data/README.rdoc

@@ -49,7 +49,7 @@ GATLING::CONFIGURATION will be depreciated in future versions.
 
 Identify an element to match, for example:
 
-        @element = page.find(:css, #button)
+        @element = page.find(:css, '#button')
 
 Use Gatling's custom matcher (conveniently supplied in the gatling gem) and specify the reference image:
 

data/lib/gatling/capture_element.rb

@@ -1,11 +1,8 @@
 require 'fileutils'
-require_relative 'image_wrangler'
 
 module Gatling
   class CaptureElement
 
-  include ImageWrangler
-
     def initialize element_to_capture, *element_to_exclude
       @reference_image_path = Gatling::Configuration.reference_image_path
       @element_to_capture = element_to_capture
@@ -14,9 +11,13 @@ module Gatling
     end
 
     def capture
+      # Getting the element position before screenshot because of a side effect
+      # of WebDrivers getLocationOnceScrolledIntoView method which scrolls the page
+      # regardless of whether the object is in view or not
+      element_position = get_element_position @element_to_capture
       screenshot = self.take_screenshot
       screenshot = exclude(screenshot, @element_to_exclude) if @element_to_exclude
-      Gatling::ImageWrangler.crop_element(screenshot, @element_to_capture)
+      crop_element(screenshot, @element_to_capture, element_position)
     end
 
     def take_screenshot
@@ -31,6 +32,21 @@ module Gatling
         raise "Could not save screenshot to #{temp_dir}. Please make sure you have permission"
       end
     end
+
+    def get_element_position element
+      element = element.native
+      position = Hash.new{}
+      position[:x] = element.location.x
+      position[:y] = element.location.y
+      position[:width] = element.size.width
+      position[:height] = element.size.height
+      position
+    end
+
+    def crop_element image, element_to_crop, position
+      @cropped_element = image.crop(position[:x], position[:y], position[:width], position[:height])
+    end
+
   end
 end
 

data/lib/gatling/image.rb

@@ -34,7 +34,6 @@ module Gatling
 
     def initialize element, file_name
       super(image, file_name)
-
       @image = Gatling::CaptureElement.new(element).capture
     end
 

data/lib/gatling/version.rb

@@ -1,3 +1,3 @@
 module Gatling
-  VERSION = "1.0.9"
+  VERSION = "1.1.0"
 end

data/spec/capture_spec.rb

@@ -37,6 +37,41 @@ describe Gatling::CaptureElement do
 
       @capture_element.take_screenshot
     end
+
+
+  class Point
+    attr_accessor :x, :y
+  end
+
+  class Size
+    attr_accessor :width, :height
+  end
+
+  it 'should get the position of the css element' do
+
+    #Overiding the stupid public method:y of YAML module
+
+    location = Point.new
+    location.x = 1
+    location.y = 2
+
+    size = Size.new
+    size.width = 100
+    size.height = 200
+
+    mock_element = mock
+    mock_element.stub(:native).and_return(mock_element)
+    mock_element.stub(:location).and_return(location)
+    mock_element.stub(:size).and_return(size)
+
+    position = @capture_element.get_element_position mock_element
+
+    position[:x].should eql(1)
+    position[:y].should eql(2)
+    position[:width].should eql(100)
+    position[:height].should eql(200)
+  end
+
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gatling
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70099690488660 !ruby/object:Gem::Requirement
+  requirement: &70097588530300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.13.1
   type: :runtime
   prerelease: false
-  version_requirements: *70099690488660
+  version_requirements: *70097588530300
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70099690488120 !ruby/object:Gem::Requirement
+  requirement: &70097588529480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099690488120
+  version_requirements: *70097588529480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70099690536780 !ruby/object:Gem::Requirement
+  requirement: &70097588528340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099690536780
+  version_requirements: *70097588528340
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70099690536300 !ruby/object:Gem::Requirement
+  requirement: &70097588527280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70099690536300
+  version_requirements: *70097588527280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70099690535820 !ruby/object:Gem::Requirement
+  requirement: &70097588526600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70099690535820
+  version_requirements: *70097588526600
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
-  requirement: &70099690535340 !ruby/object:Gem::Requirement
+  requirement: &70097588525520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.1.8
   type: :development
   prerelease: false
-  version_requirements: *70099690535340
+  version_requirements: *70097588525520
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70099690534800 !ruby/object:Gem::Requirement
+  requirement: &70097588524820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 0.9.8.2
   type: :development
   prerelease: false
-  version_requirements: *70099690534800
+  version_requirements: *70097588524820
 description: Add visual comparison matchers for rspec
 email:
 - grotbart@gmail.com
@@ -109,7 +109,6 @@ files:
 - lib/gatling/comparison.rb
 - lib/gatling/config.rb
 - lib/gatling/image.rb
-- lib/gatling/image_wrangler.rb
 - lib/gatling/matchers/look_like_matcher.rb
 - lib/gatling/version.rb
 - pkg/gatling-0.0.1.gem
@@ -121,11 +120,11 @@ files:
 - spec/configuration_spec.rb
 - spec/gatling_spec.rb
 - spec/image_spec.rb
-- spec/image_wrangler_spec.rb
 - spec/integration/gatling_integration_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/assets/fruit_app.html
+- temp-1032.rdb
 homepage: http://github.com/GabrielRotbart/gatling
 licenses: []
 post_install_message: 
@@ -158,7 +157,6 @@ test_files:
 - spec/configuration_spec.rb
 - spec/gatling_spec.rb
 - spec/image_spec.rb
-- spec/image_wrangler_spec.rb
 - spec/integration/gatling_integration_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/lib/gatling/image_wrangler.rb

@@ -1,23 +0,0 @@
-module Gatling
-  module ImageWrangler
-
-    def self.get_element_position element
-      element = element.native
-      position = Hash.new{}
-      position[:x] = element.location.x
-      position[:y] = element.location.y
-      position[:width] = element.size.width
-      position[:height] = element.size.height
-      position
-    end
-
-    def self.crop_element image, element_to_crop
-      position = get_element_position(element_to_crop)
-      @cropped_element = image.crop(position[:x], position[:y], position[:width], position[:height])
-    end
-
-
-
-
-  end
-end

data/spec/image_wrangler_spec.rb

@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe Gatling::ImageWrangler do
-
-  class Point
-    attr_accessor :x, :y
-  end
-
-  class Size
-    attr_accessor :width, :height
-  end
-
-  it 'should get the position of the css element' do
-
-    #Overiding the stupid public method:y of YAML module
-
-    location = Point.new
-    location.x = 1
-    location.y = 2
-
-    size = Size.new
-    size.width = 100
-    size.height = 200
-
-    mock_element = mock
-    mock_element.stub(:native).and_return(mock_element)
-    mock_element.stub(:location).and_return(location)
-    mock_element.stub(:size).and_return(size)
-
-    position = Gatling::ImageWrangler.get_element_position(mock_element)
-
-    position[:x].should eql(1)
-    position[:y].should eql(2)
-    position[:width].should eql(100)
-    position[:height].should eql(200)
-  end
-
-
-
-
-end