Make VerticalPastingShootingStrategy aware of DevicePixelRatio

Author: Viacheslav Frolov

README.md

@@ -26,7 +26,7 @@ As a result aShot provides an image of the WebElement
 <dependency>
     <groupId>ru.yandex.qatools.ashot</groupId>
     <artifactId>ashot</artifactId>
-    <version>1.4.12</version>
+    <version>1.5.1</version>
 </dependency>
 ``` 
 
@@ -39,33 +39,6 @@ new AShot()
   .takeScreenshot(webDriver);
 ```
 
-#####Capturing shots when a browser has fixed or variable header height
-When using AShot to capture screen of a device (iOS, Android) or it's simulator, then resulting image is returned with browser's header.
-
-For example to capture page on iOS 7 device we will use fixed header's height of 98px.
-
-```java
-int browserHeaderHeight = 98;
-new AShot()
-  .shootingStrategy(new ViewportPastingStrategy(browserHeaderHeight))
-  .takeScreenshot(webDriver);
-```
-
-In iOS 8 Safari introduces a feature when browser's header might be 65px or 41px (with address bar hidden).
-
-For example to capture pages on iPad 2 we will use a strategy that can detect current height of browser's header.
-
-```java
-int minHeader = 41;
-int maxHeader = 65;
-int minViewPortHeight = 960;
-HeaderDetectionStrategy strategy =
-    new VariableHeaderDetectionStrategy(minHeader, maxHeader, minViewPortHeight);
-new AShot()
-  .shootingStrategy(new ViewportPastingStrategy(strategy))
-  .takeScreenshot(webDriver);
-```
-
 #####Capturing the WebElement
 
 One can take a screenshot of the particular WebElement(s). Just specify the element(s).
@@ -82,7 +55,7 @@ new AShot()
   .takeScreenshot(webDriver, myWebElement);
 ```
 Feel free to implement own CoordsProvider. Pull requests are welcome.
- 
+
 #####Prettifying the screenshot
 
 So, let's take a simple screenshot of the weather snippet at Yandex.com.

doc/img/YandexTouchOniPhone_uber_compiled.png

@@ -10,7 +10,7 @@
 
     <groupId>ru.yandex.qatools.ashot</groupId>
     <artifactId>ashot</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
 
     <organization>
         <name>Yandex</name>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
-            <version>2.39.0</version>
+            <version>2.47.2</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

doc/img/iPadSafariWithHeader.png

@@ -9,8 +9,8 @@
 import ru.yandex.qatools.ashot.coordinates.JqueryCoordsProvider;
 import ru.yandex.qatools.ashot.cropper.DefaultCropper;
 import ru.yandex.qatools.ashot.cropper.ImageCropper;
-import ru.yandex.qatools.ashot.screentaker.ScreenTaker;
-import ru.yandex.qatools.ashot.screentaker.ShootingStrategy;
+import ru.yandex.qatools.ashot.shooting.ShootingStrategy;
+import ru.yandex.qatools.ashot.shooting.SimpleShootingStrategy;
 
 import java.awt.image.BufferedImage;
 import java.io.Serializable;
@@ -25,11 +25,11 @@
 
 public class AShot implements Serializable {
 
-    private ScreenTaker taker = new ScreenTaker();
     private CoordsProvider coordsProvider = new JqueryCoordsProvider();
     private ImageCropper cropper = new DefaultCropper();
     private Set<By> ignoredLocators = new HashSet<>();
     private Set<Coords> ignoredAreas = new HashSet<>();
+    private ShootingStrategy shootingStrategy = new SimpleShootingStrategy();
 
     public AShot coordsProvider(final CoordsProvider coordsProvider) {
         this.coordsProvider = coordsProvider;
@@ -42,20 +42,6 @@ public AShot imageCropper(ImageCropper cropper) {
         return this;
     }
 
-    /**
-     * Sets taker impl.
-     * Usually is not used.
-     *
-     * @param taker ScreenTaker
-     * @return this;
-     * @see ru.yandex.qatools.ashot.screentaker.ScreenTaker
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    public AShot screenTaker(ScreenTaker taker) {
-        this.taker = taker;
-        return this;
-    }
-
     /**
      * Sets the list of locators to ignore during image comparison.
      *
@@ -106,22 +92,10 @@ public synchronized AShot addIgnoredArea(Coords area) {
      *
      * @param strategy shooting strategy
      * @return this
-     * @see ru.yandex.qatools.ashot.screentaker.ShootingStrategy
+     * @see ru.yandex.qatools.ashot.shooting.ShootingStrategy
      */
     public AShot shootingStrategy(ShootingStrategy strategy) {
-        this.taker.withShootingStrategy(strategy);
-        return this;
-    }
-
-    /**
-     * Sets device pixel ratio.
-     * for example, Retina = 2.
-     *
-     * @param dpr device pixel ratio
-     * @return this
-     */
-    public AShot dpr(float dpr) {
-        this.taker.withDpr(dpr);
+        this.shootingStrategy = strategy;
         return this;
     }
 
@@ -136,7 +110,7 @@ public AShot dpr(float dpr) {
      */
     public Screenshot takeScreenshot(WebDriver driver, Collection<WebElement> elements) {
         Set<Coords> elementCoords = coordsProvider.ofElements(driver, elements);
-        BufferedImage shot = taker.take(driver, elementCoords);
+        BufferedImage shot = shootingStrategy.getScreenshot(driver, elementCoords);
         Screenshot screenshot = cropper.crop(shot, elementCoords);
         Set<Coords> ignoredAreas = compileIgnoredAreas(driver, intersectingWith(screenshot));
         screenshot.setIgnoredAreas(ignoredAreas);
@@ -163,7 +137,7 @@ public Screenshot takeScreenshot(WebDriver driver, WebElement element) {
      * @see Screenshot
      */
     public Screenshot takeScreenshot(WebDriver driver) {
-        Screenshot screenshot = new Screenshot(taker.take(driver));
+        Screenshot screenshot = new Screenshot(shootingStrategy.getScreenshot(driver));
         screenshot.setIgnoredAreas(compileIgnoredAreas(driver, CoordsPreparationStrategy.simple()));
         return screenshot;
     }