percy-capybara 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45e93cfdc34a6ab2afca7f8f21602f6e722d8c2e
-  data.tar.gz: c88c63e7071b3a653858ee8a9bb381d8120b57ef
+  metadata.gz: 40bc91d41c82651dd6873aa89f1680b7fb85560b
+  data.tar.gz: a324146ad3bafa211c29c412e36f91d41051ff2b
 SHA512:
-  metadata.gz: 307fb95d7ccc3443d47210244fb3046643b10841d4e0e8547302816d53da5ead96726f071b8632f5d66611b194f4028a5bbb8fd21d29c5e727035a03b1ada557
-  data.tar.gz: d61b94fcffdb72c50dfae42044adc69732321a62aa1c11563466c114ea70307cd9fd32f936ce1b149f46ed157a07b63b1e682fc30bfa6f63cba9103686d0cf2f
+  metadata.gz: 26dd09ccac1d8f7770ad95ea97699e9f876570701c67e1779ecfb7ebda990a6856df23f3443f2cad7cedade62853e97d189fe0304a9a55ee9b659e93e37d9a6d
+  data.tar.gz: 7c6c5452139cc6c948447264740158eafd5b1f6a16b44931b4ea8402129d358c174c3f32b2faed1cb9994002bfdbeb679179ebba27769aa4d58d1bcb37adc5e5

data/lib/percy/capybara/loaders/base_loader.rb

@@ -1,3 +1,4 @@
+require 'pathname'
 require 'percy/capybara'
 
 module Percy
@@ -124,9 +125,7 @@ module Percy
         def _resources_from_dir(root_dir, base_url: '/')
           resources = []
 
-          Find.find(root_dir).each do |path|
-            # Skip directories.
-            next unless FileTest.file?(path)
+          _find_files(root_dir).each do |path|
             # Skip certain extensions.
             next if SKIP_RESOURCE_EXTENSIONS.include?(File.extname(path))
             # Skip large files, these are hopefully downloads and not used in page rendering.
@@ -143,6 +142,21 @@ module Percy
           resources
         end
 
+        # A simplified version of Find.find that only returns files and follows symlinks.
+        def _find_files(*paths)
+          paths.flatten!
+          paths.map! { |p| Pathname.new(p) }
+          files = []
+          paths.each do |path|
+            if path.file?
+              files << path.to_s
+            else
+              files = files.concat(_find_files(path.children))
+            end
+          end
+          files
+        end
+
         def _uri_join(*paths)
           # We must swap File::SEPARATOR for '/' here because on Windows File.join
           # will use backslashes and this is a URL.

data/lib/percy/capybara/loaders/sprockets_loader.rb

@@ -64,24 +64,9 @@ module Percy
           # Load resources from the public/ directory, if a Rails app.
           if _rails
             public_path = _rails.public_path.to_s
-            Find.find(public_path).each do |path|
-              # Skip directories.
-              next unless FileTest.file?(path)
-              # Skip certain extensions.
-              next if SKIP_RESOURCE_EXTENSIONS.include?(File.extname(path))
-              # Skip large files, these are hopefully downloads and not used in page rendering.
-              next if File.size(path) > MAX_FILESIZE_BYTES
-
-              # Strip the public_path from the beginning of the resource_url.
-              # This assumes that everything in the Rails public/ directory is served at the root
-              # of the app.
-              resource_url = path.sub(public_path, '')
-
+            resources += _resources_from_dir(public_path).reject do |resource|
               # Skip precompiled files already included via the asset pipeline.
-              next if loaded_resource_urls.include?(resource_url)
-
-              sha = Digest::SHA256.hexdigest(File.read(path))
-              resources << Percy::Client::Resource.new(resource_url, sha: sha, path: path)
+              loaded_resource_urls.include?(resource.resource_url)
             end
           end
 

data/lib/percy/capybara/version.rb

@@ -1,5 +1,5 @@
 module Percy
   module Capybara
-    VERSION = '3.0.0'.freeze
+    VERSION = '3.0.1'.freeze
   end
 end

data/spec/lib/percy/capybara/client/rails_public_test_data/symlink_to_images

@@ -0,0 +1 @@
+spec/lib/percy/capybara/client/rails_public_test_data/../symlink_test_data

data/spec/lib/percy/capybara/loaders/filesystem_loader_spec.rb

@@ -71,7 +71,6 @@ RSpec.describe Percy::Capybara::Loaders::FilesystemLoader do
           '/images/srcset-second.png',
           '/index.html',
           '/js/base.js',
-          '/public/percy-from-public.svg',
           '/test-css.html',
           '/test-font.html',
           '/test-iframe.html',
@@ -104,7 +103,6 @@ RSpec.describe Percy::Capybara::Loaders::FilesystemLoader do
           '/url-prefix/images/srcset-second.png',
           '/url-prefix/index.html',
           '/url-prefix/js/base.js',
-          '/url-prefix/public/percy-from-public.svg',
           '/url-prefix/test-css.html',
           '/url-prefix/test-font.html',
           '/url-prefix/test-iframe.html',

data/spec/lib/percy/capybara/loaders/sprockets_loader_spec.rb

@@ -7,6 +7,12 @@ class SimpleRackApp
 end
 
 RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
+  let(:test_data_path) do
+    File.expand_path('../../client/test_data', __FILE__)
+  end
+  let(:rails_public_test_data_path) do
+    File.expand_path('../../client/rails_public_test_data', __FILE__)
+  end
   let(:loader) do
     described_class.new(
       page: page,
@@ -15,8 +21,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
     )
   end
   let(:environment) do
-    root = File.expand_path('../../client/test_data', __FILE__)
-    environment = Sprockets::Environment.new(root)
+    environment = Sprockets::Environment.new(test_data_path)
     environment.append_path '.'
     environment
   end
@@ -78,7 +83,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
         rails_double = double('Rails')
         # Pretend like the entire test_data directory is the public/ folder.
         expect(rails_double).to receive(:application).and_return(nil)
-        expect(rails_double).to receive(:public_path).and_return(environment.root + '/public')
+        expect(rails_double).to receive(:public_path).and_return(rails_public_test_data_path)
         expect(loader).to receive(:_rails).at_least(:once).and_return(rails_double)
       end
       it 'includes files from the public folder (non-asset-pipeline)' do
@@ -89,6 +94,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
         resource_urls = resources.map(&:resource_url)
         expect(resource_urls).to include('/assets/images/bg-relative.png') # From asset pipeline.
         expect(resource_urls).to include('/percy-from-public.svg') # Public merged into root.
+        expect(resource_urls).to include('/symlink_to_images/test.png') # Symlink in public dir.
         expect(resource_urls).not_to include('/large-file-skipped.png') # Public merged into root.
       end
       context 'digest enabled' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-capybara
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: percy-client
@@ -204,7 +204,11 @@ files:
 - spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/assets/percy-frontend.svg
 - spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/index.html
 - spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/percy-frontend-public.svg
+- spec/lib/percy/capybara/client/rails_public_test_data/large-file-skipped.png
+- spec/lib/percy/capybara/client/rails_public_test_data/percy-from-public.svg
+- spec/lib/percy/capybara/client/rails_public_test_data/symlink_to_images
 - spec/lib/percy/capybara/client/snapshots_spec.rb
+- spec/lib/percy/capybara/client/symlink_test_data/test.png
 - spec/lib/percy/capybara/client/test_data/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css
 - spec/lib/percy/capybara/client/test_data/assets/images/large-file-skipped.png
 - spec/lib/percy/capybara/client/test_data/css/base.css
@@ -228,8 +232,6 @@ files:
 - spec/lib/percy/capybara/client/test_data/images/srcset-second.png
 - spec/lib/percy/capybara/client/test_data/index.html
 - spec/lib/percy/capybara/client/test_data/js/base.js
-- spec/lib/percy/capybara/client/test_data/public/large-file-skipped.png
-- spec/lib/percy/capybara/client/test_data/public/percy-from-public.svg
 - spec/lib/percy/capybara/client/test_data/test-css.html
 - spec/lib/percy/capybara/client/test_data/test-font.html
 - spec/lib/percy/capybara/client/test_data/test-iframe.html
@@ -265,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Percy::Capybara
@@ -277,7 +279,11 @@ test_files:
 - spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/assets/percy-frontend.svg
 - spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/index.html
 - spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/percy-frontend-public.svg
+- spec/lib/percy/capybara/client/rails_public_test_data/large-file-skipped.png
+- spec/lib/percy/capybara/client/rails_public_test_data/percy-from-public.svg
+- spec/lib/percy/capybara/client/rails_public_test_data/symlink_to_images
 - spec/lib/percy/capybara/client/snapshots_spec.rb
+- spec/lib/percy/capybara/client/symlink_test_data/test.png
 - spec/lib/percy/capybara/client/test_data/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css
 - spec/lib/percy/capybara/client/test_data/assets/images/large-file-skipped.png
 - spec/lib/percy/capybara/client/test_data/css/base.css
@@ -301,8 +307,6 @@ test_files:
 - spec/lib/percy/capybara/client/test_data/images/srcset-second.png
 - spec/lib/percy/capybara/client/test_data/index.html
 - spec/lib/percy/capybara/client/test_data/js/base.js
-- spec/lib/percy/capybara/client/test_data/public/large-file-skipped.png
-- spec/lib/percy/capybara/client/test_data/public/percy-from-public.svg
 - spec/lib/percy/capybara/client/test_data/test-css.html
 - spec/lib/percy/capybara/client/test_data/test-font.html
 - spec/lib/percy/capybara/client/test_data/test-iframe.html