capybara-screenshot-diff 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b8e8db9866c1792d98837c0795f1cd079299082
-  data.tar.gz: 70d03887cf122c6981883dd73b843ccb01affb85
+  metadata.gz: d2c578a6c17c416b415a2b9962acd2143475c1f6
+  data.tar.gz: cdf95fc4a8478c7034b6c42da6b2c0243c449b12
 SHA512:
-  metadata.gz: 49185bf7799461dad6d4a10e1588846947bafa4352efa7f0475d1bcacc9c92a755c677c64ac3f413188fd496ec0c880922d2c11c90302a47d047207a0e257ade
-  data.tar.gz: 75dad95ba44ec14b7ebb89afa78e0d25751b5e82fb806d17f7eb191e5072338fd4231769c93321dc394af7893c880ba3ece1fde0c7f3652cbfe0a1484d96318e
+  metadata.gz: 93d2c8284049415f00e368b50089e6a406047aa178f7ba9c979962d15cb8a6b3d005170cd2ba162ec8c572eee56521e4f33710f4d2c2a1bf6231a3579f174cbe
+  data.tar.gz: 0c5a82e828f86294d1d77cbcbf41710b922fd10918e6dd2d37fde681ead14e07cf28ffc392c9adfcd048ed04572462227016273520d161e8a671cd2a81045b6d

data/.rubocop.yml

@@ -4,6 +4,16 @@ AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
 
+Layout/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+  IndentationWidth: 4
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
 Lint/Debugger:
   Enabled: false
 
@@ -16,16 +26,8 @@ Metrics/LineLength:
 Style/Documentation:
   Enabled: false
 
-Style/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-  IndentationWidth: 4
-
 Style/NumericPredicate:
   Enabled: false
 
 Style/SignalException:
   EnforcedStyle: semantic
-
-Style/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-  IndentationWidth: 4

data/.rubocop_todo.yml

@@ -1,23 +1,38 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-12-23 14:12:31 +0100 using RuboCop version 0.46.0.
+# on 2017-06-08 11:42:01 +0200 using RuboCop version 0.49.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
-Metrics/AbcSize:
-  Max: 45
+# Offense count: 2
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'capybara-screenshot-diff.gemspec'
+    - 'lib/capybara/screenshot/diff/version.rb'
 
 # Offense count: 1
-Metrics/CyclomaticComplexity:
-  Max: 12
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
+Layout/IndentHeredoc:
+  Exclude:
+    - 'lib/capybara/screenshot/diff/capybara_setup.rb'
 
 # Offense count: 4
+Metrics/AbcSize:
+  Max: 31
+
+# Offense count: 2
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 7
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 36
+  Max: 25
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.
@@ -26,9 +41,21 @@ Metrics/ParameterLists:
 
 # Offense count: 1
 Metrics/PerceivedComplexity:
-  Max: 14
+  Max: 8
+
+# Offense count: 1
+Performance/Caller:
+  Exclude:
+    - 'lib/capybara/screenshot/diff/capybara_setup.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Security/YAMLLoad:
+  Exclude:
+    - 'matrix_test.rb'
 
 # Offense count: 1
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - ruby-2.3.3
-  - jruby-9.1.6.0
-  - ruby-2.2.6
+  - ruby-2.4.1
+  - jruby-9.1.8.0
+  - ruby-2.3.4
+  - ruby-2.2.7
   - ruby-2.1.9
   - ruby-head
   - jruby-head
@@ -19,8 +20,6 @@ jdk:
 
 matrix:
   exclude:
-    - rvm: ruby-head # Cannot build json 1.x
-      gemfile: gemfiles/rails42.gemfile
     - rvm: ruby-2.1.9 # Not supported by Rails 5
       gemfile: gemfiles/rails50.gemfile
   allow_failures:

data/Rakefile

@@ -8,3 +8,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+task test: %i[rubocop:auto_correct]

data/lib/capybara/screenshot/diff/capybara_setup.rb

@@ -25,6 +25,10 @@ module ActionDispatch
       end
     end
 
+    def self.macos?
+      os_name == 'macos'
+    end
+
     def self.screenshot_root
       Capybara::Screenshot.screenshot_root ||
         (defined?(Rails.root) && Rails.root) || File.expand_path('.')
@@ -65,11 +69,24 @@ module ActionDispatch
       File.join [self.class.screenshot_area] + group_parts
     end
 
+    private def current_capybara_driver_class
+      Capybara.drivers[Capybara.current_driver].call({}).class
+    end
+
+    private def selenium?
+      current_capybara_driver_class <= Capybara::Selenium::Driver
+    end
+
+    private def poltergeist?
+      return false unless defined?(Capybara::Poltergeist::Driver)
+      current_capybara_driver_class <= Capybara::Poltergeist::Driver
+    end
+
     setup do
       if Capybara::Screenshot.window_size
-        if Capybara.default_driver == :selenium
+        if selenium?
           page.driver.browser.manage.window.resize_to(*Capybara::Screenshot.window_size)
-        elsif Capybara.default_driver == :poltergeist
+        elsif poltergeist?
           page.driver.resize(*Capybara::Screenshot.window_size)
         end
       end
@@ -95,9 +112,9 @@ module ActionDispatch
 
     def screenshot(name)
       return unless Capybara::Screenshot.active?
-      if Capybara.default_driver == :selenium && Capybara::Screenshot.window_size
-        return unless page.driver.browser.manage.window
-              .size == Selenium::WebDriver::Dimension.new(*Capybara::Screenshot.window_size)
+      if selenium? && Capybara::Screenshot.window_size
+        return unless page.driver.browser.manage.window.size ==
+            Selenium::WebDriver::Dimension.new(*Capybara::Screenshot.window_size)
       end
       if @screenshot_counter
         name = "#{'%02i' % @screenshot_counter}_#{name}"
@@ -168,6 +185,20 @@ EOF
       old_file_size = nil
       loop do
         save_screenshot(file_name)
+
+        # FIXME(uwe): Remove when chromedriver take right size screenshots
+        # Reduce Retina image size
+        if self.class.macos? && selenium? && Capybara::Screenshot.window_size
+          saved_image = ChunkyPNG::Image.from_file(file_name)
+          width = Capybara::Screenshot.window_size[0]
+          if saved_image.width >= width * 2
+            height = (width * saved_image.height) / saved_image.width
+            resized_image = saved_image.resample_bilinear(width, height)
+            resized_image.save(file_name)
+          end
+        end
+        # EMXIF
+
         break unless Capybara::Screenshot.stability_time_limit
         new_file_size = File.size(file_name)
         break if new_file_size == old_file_size

data/lib/capybara/screenshot/diff/version.rb

@@ -2,7 +2,7 @@
 module Capybara
   module Screenshot
     module Diff
-      VERSION = '0.4.0'.freeze
+      VERSION = '0.5.0'.freeze
     end
   end
 end

data/matrix_test.rb

@@ -43,7 +43,7 @@ travis['rvm'].each do |ruby|
   system "#{bundler_gem_check_cmd} || chruby-exec #{ruby} -- gem install bundler" || exit(1)
   travis['gemfile'].each do |gemfile|
     if (travis['matrix']['exclude'].to_a + travis['matrix']['allowed_failures'].to_a)
-          .any? { |f| f['rvm'] == ruby && f['gemfile'] == gemfile }
+        .any? { |f| f['rvm'] == ruby && f['gemfile'] == gemfile }
       puts 'Skipping known failure.'
       next
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot-diff
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack