percy-capybara 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0373826717cf4a83f083c9d8d71d92dfea1b595c
-  data.tar.gz: e32236928c98afe4613579a5a9db5869ea506f90
+  metadata.gz: b08eef19753c6cf3c0933fe6b5cfc83bdd0f158a
+  data.tar.gz: 27a4c1eec39774d8d2319aa25917acc958c56b39
 SHA512:
-  metadata.gz: bbc8b68ae8f7df03bc575f64cd6efa4c9bcb7bfbde16e478735e57d43b1e5d3bb64bd7e380db3025f81bc8c3bfdd7d8f0283b21da075258f98357ac94c9a15d9
-  data.tar.gz: 053c1512eba240ff18904cb7790f5aa8093cc8356cfe086665be2b241ec9291679d2fb2d69a09ed790e055ee8f075ba652be3a26bed671ad23ffb2ec90eac5b6
+  metadata.gz: 2acc70ed15ac3efc0de81b79f02b11a123c38d1a8f6ed64fb0c434057ac93a99e2994196351c421da72ccf97af63345753fcb9943b9c024131ec95b919897584
+  data.tar.gz: d7f3b7eb44c7f88cc45cb8e6dc151bbd4807188e26c4d4ef8942918a9848bbb29c6241cec25955c9d7f055ba2141cf2cd417b3547a8140515b29124b28c659f3

data/lib/percy/capybara/client/builds.rb

@@ -16,14 +16,14 @@ module Percy
             current_build['data']['relationships']['missing-resources']['data']
           return 0 if !new_build_resources
 
-          if !new_build_resources.empty?
-            puts "[percy] Uploading #{new_build_resources.length} new resources..."
-          end
-          new_build_resources.each do |missing_resource|
+          new_build_resources.each_with_index do |missing_resource, i|
             sha = missing_resource['id']
             resource = build_resources.find { |r| r.sha == sha }
             content = resource.content || File.read(resource.path)
             client.upload_resource(current_build['data']['id'], content)
+            if i % 50 == 0
+              puts "[percy] Uploading #{i+1} of #{new_build_resources.length} new resources..."
+            end
           end
           new_build_resources.length
         end

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

@@ -24,6 +24,28 @@ module Percy
         end
 
         def build_resources
+          resources = []
+          _asset_logical_paths.each do |logical_path|
+            asset = sprockets_environment.find_asset(logical_path)
+            content = asset.to_s
+            sha = Digest::SHA256.hexdigest(content)
+
+            if defined?(ActionController)
+              # Ask Rails where this asset is (this handles asset_hosts, digest paths, etc.).
+              resource_url = ActionController::Base.helpers.asset_path(logical_path)
+            else
+              # TODO: more robust support for Sprockets usage outside Rails, ie Sinatra.
+              # How do we find the correct path in that case?
+              path = sprockets_options.digest ? asset.digest_path : logical_path
+              resource_url = URI.escape("/assets/#{path}")
+            end
+
+            resources << Percy::Client::Resource.new(resource_url, sha: sha, content: content)
+          end
+          resources
+        end
+
+        def _asset_logical_paths
           # Re-implement the same technique that "rake assets:precompile" uses to generate the
           # list of asset paths to include in compiled assets. https://goo.gl/sy2R4z
           # We can't just use environment.each_logical_path without any filters, because then
@@ -33,16 +55,6 @@ module Percy
           logical_paths += precompile_list.flatten.select do |filename|
             Pathname.new(filename).absolute? if filename.is_a?(String)
           end
-
-          resources = []
-          logical_paths.each do |logical_path|
-            content = sprockets_environment.find_asset(logical_path).to_s
-            sha = Digest::SHA256.hexdigest(content)
-            resource_url = URI.escape("/assets/#{logical_path}")
-            resources << Percy::Client::Resource.new(
-              resource_url, sha: sha, content: content)
-          end
-          resources
         end
       end
     end

data/lib/percy/capybara/version.rb

@@ -1,5 +1,5 @@
 module Percy
   module Capybara
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

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

@@ -23,6 +23,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
   let(:sprockets_options) do
     options = double('options')
     allow(options).to receive(:precompile).and_return([/(?:\/|\\|\A)base\.(css|js)$/])
+    allow(options).to receive(:digest).and_return(false)
     options
   end
 

data/spec/support/test_helpers.rb

@@ -41,6 +41,7 @@ module TestHelpers
 
     sprockets_options = double('sprockets_options')
     allow(sprockets_options).to receive(:precompile).and_return([/(?:\/|\\|\A)base\.(css|js)$/])
+    allow(sprockets_options).to receive(:digest).and_return(false)
 
     capybara_client.sprockets_environment = environment
     capybara_client.sprockets_options = sprockets_options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: percy-capybara
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Perceptual Inc.