capybara-screenshot-diff 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c51c0b3910c0d9084516caa214cc4def9f3555e5
-  data.tar.gz: d6a6c7b9c780bba92792dea8d18ad5e6a4309004
+  metadata.gz: 9693ec849ed0228f76f945328e20760061ab55ba
+  data.tar.gz: 4c1d4a1bcb09f53a39534a968422daa4d19c0c31
 SHA512:
-  metadata.gz: ff97131d3381c1db29293d78c70d090ef0f08e31878f2c680305bf2e0205d79257acfee39769b0025d75a56137ed6ef31338333ac682571c2856118cffb3560c
-  data.tar.gz: 55375885f91dff602b8744a46254261597fc19d1066057e350623bcb96152f0c28853be88b4436920c91e54e9d8f084c913454e4c23148bd0f3bb986e5331c61
+  metadata.gz: 4d3780c6cad851a73f05d0f01cd6cbeced829575226192dc0943b84b2ae1df24b00483508389d5d39f3e6974a7b2c2d4bebc5efe8cfb9dabd5bb10cc59f17e66
+  data.tar.gz: 87a8cd3a9875055cbfbc8df8c244e031b61e7ac3c14cd958696375e7b0e63edc955864ab514c77c417c890a366567f200d6531a21b63b237a148ee329ad88f49

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-07-06 16:03:55 +0200 using RuboCop version 0.49.1.
+# on 2017-07-12 20:35:14 +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
@@ -21,7 +21,7 @@ Metrics/AbcSize:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 188
+  Max: 180
 
 # Offense count: 2
 Metrics/CyclomaticComplexity:
@@ -30,7 +30,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 8
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 24
+  Max: 21
 
 # Offense count: 1
 Metrics/PerceivedComplexity:

data/.travis.yml

@@ -1,13 +1,13 @@
 language: ruby
+sudo: false
 rvm:
   - ruby-2.4.1
-  - jruby-9.1.8.0
+  - jruby-9.1.12.0
   - ruby-2.3.4
   - ruby-2.2.7
-  - ruby-head
-  - jruby-head
 
 gemfile:
+  - gemfiles/rails51.gemfile
   - gemfiles/rails50.gemfile
   - gemfiles/rails42.gemfile
 
@@ -16,12 +16,3 @@ env:
 
 jdk:
   - oraclejdk8
-
-matrix:
-  allow_failures:
-    - rvm: jruby-head # FIXME: (uwe) Low coverage: https://github.com/jruby/jruby/issues/4404
-      gemfile: gemfiles/rails50.gemfile
-    - rvm: jruby-head # FIXME: (uwe) Low coverage: https://github.com/jruby/jruby/issues/4404
-      gemfile: gemfiles/rails42.gemfile
-
-before_install: gem query -i -n ^bundler$ >/dev/null || gem install bundler

data/capybara-screenshot-diff.gemspec

@@ -12,14 +12,15 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Track your GUI changes with diff assertions'
   spec.description   = 'Save screen shots and track changes with graphical diff'
   spec.homepage      = 'https://github.com/donv/capybara-screenshot-diff'
-  spec.license       = 'MIT'
+  spec.required_ruby_version = '~> 2.2'
+  spec.license = 'MIT'
   spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'actionpack', '>= 4.1', '<5.1'
+  spec.add_runtime_dependency 'actionpack', '>= 4.2', '<5.2'
   spec.add_runtime_dependency 'capybara', '~> 2.0'
   spec.add_runtime_dependency 'chunky_png', '~> 1.3'
 

data/gemfiles/rails51.gemfile

@@ -0,0 +1,3 @@
+eval File.read("#{__dir__}/common.gemfile")
+
+gem 'actionpack', '~>5.1.2'

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

@@ -65,10 +65,7 @@ module Capybara
 
           old_file, new_file = load_image_files(@old_file_name, @new_file_name)
 
-          if old_file == new_file
-            clean_tmp_files(@annotated_old_file_name, @annotated_new_file_name)
-            return false
-          end
+          return not_different if old_file == new_file
 
           images = load_images(old_file, new_file)
 
@@ -82,20 +79,24 @@ module Capybara
             return true
           end
 
-          if old_img.pixels == new_img.pixels
-            clean_tmp_files(@annotated_new_file_name, @annotated_old_file_name)
-            return false
-          end
+          return not_different if old_img.pixels == new_img.pixels
 
           @left, @top, @right, @bottom = find_diff_rectangle(old_img, new_img)
 
-          return false if @top.nil?
+          return not_different if @top.nil?
+
           annotated_old_img, annotated_new_img = draw_rectangles(images, @bottom, @left, @right, @top)
+
           save_images(@annotated_new_file_name, annotated_new_img,
               @annotated_old_file_name, annotated_old_img)
           true
         end
 
+        private def not_different
+          clean_tmp_files(@annotated_old_file_name, @annotated_new_file_name)
+          false
+        end
+
         def old_file_exists?
           @old_file_name && File.exist?(@old_file_name)
         end

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

@@ -3,7 +3,7 @@
 module Capybara
   module Screenshot
     module Diff
-      VERSION = '0.7.0'.freeze
+      VERSION = '0.7.1'.freeze
     end
   end
 end

data/matrix_test.rb

@@ -14,7 +14,7 @@ def run_script(ruby, env, gemfile)
   puts '*' * 80
   puts "Testing #{ruby} #{gemfile} #{env}"
   puts
-  system "chruby-exec #{ruby} -- bundle exec rake" || exit(1)
+  system("chruby-exec #{ruby} -- bundle exec rake") || exit(1)
   puts '*' * 80
 end
 
@@ -42,8 +42,9 @@ travis['rvm'].each do |ruby|
   bundler_gem_check_cmd = "chruby-exec #{ruby} -- gem query -i -n bundler >/dev/null"
   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 }
+    if travis['matrix'] &&
+        (travis['matrix']['exclude'].to_a + travis['matrix']['allowed_failures'].to_a)
+            .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.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +163,7 @@ files:
 - gemfiles/common.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
+- gemfiles/rails51.gemfile
 - lib/capybara/screenshot/diff.rb
 - lib/capybara/screenshot/diff/capybara_setup.rb
 - lib/capybara/screenshot/diff/image_compare.rb
@@ -179,9 +180,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="