lighthouse-matchers 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa3cc9c2c57e0dae4e2ebb61d281a094354514473b4ff20ed8e6abf67e9991e9
-  data.tar.gz: 42c1681ad2022e0dc875f715128e14acf3e1fbeffd4755165979796a69da1840
+  metadata.gz: 39bae0e8641dae16dd253b900d90ccf0e96008353bebff86bacfc7007d4131ca
+  data.tar.gz: 5ec2143cae768123fe66d882800513e1cf4d2e6194d74bb9297fde83bab999f7
 SHA512:
-  metadata.gz: be9ce6e8dae7d79907120bc5b0a9f52aec74efb33c10cade08320996f82817ec9e51b118b4335e5d8cb3a1e307df83dfbc236980cb7d59a4bf8fd718310d8ad9
-  data.tar.gz: af2742c37727f20e3813e72d178c3d19acb0e660063476060b3b290243c71c38d6b7ccf9b579bc3344bc8a0e6b3ed4b4d7dd5eddcd9dd5a6fd009424138fe22b
+  metadata.gz: e537f89cf5cb908ec7f4afe6ddfce0cdca25ac710ac7e8ee7365a53630e8b854ba9155f33c1e9c37ed59eae19d62e6194198715ad466f7268b5dd3e45ec66d36
+  data.tar.gz: d9ce149527bf757d862d93baf1a1fdc3a5b60064c73d50d5304f5c5ffa36edde525b00a38ce6dc3c96c7516240e8e6b7a7c55a1ec4381a05275dde330da7b346

data/CHANGELOG.md

@@ -12,4 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.0.1] - 2019-05-24
 ### Changed
-- Apply bug fixes based on integration with a Ruby on Rails project
+- Apply bug fixes based on integration with a Ruby on Rails project
+
+## [1.0.2] - 2019-08-16
+### Changed
+- Refactored auditing into a service object (@CaraHill)
+-
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lighthouse-matchers (1.0.1)
+    lighthouse-matchers (1.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -48,4 +48,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/lib/lighthouse/audit_service.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'json'
+
+# Compares a url's actual score to the expected score.
+class AuditService
+  def initialize(url, audit, score)
+    @url = url
+    @audit = audit
+    @score = score
+    @port = Lighthouse::Matchers.remote_debugging_port
+    @runner = Lighthouse::Matchers.runner
+    @cmd = Lighthouse::Matchers.lighthouse_cli
+  end
+
+  def passing_score?
+    measured_score >= @score
+  end
+
+  private
+
+  def opts
+    "'#{@url}' --quiet --output=json #{"--port=#{@port}" if @port}".strip
+  end
+
+  def output
+    @runner.call("#{@cmd} #{opts}")
+  end
+
+  def results
+    JSON.parse(output)
+  end
+
+  def measured_score
+    results.dig('categories', @audit.to_s, 'score') * 100
+  end
+end

data/lib/lighthouse/matchers/rspec.rb

@@ -2,28 +2,26 @@
 
 require 'rspec/expectations'
 require 'lighthouse/matchers'
+require 'lighthouse/audit_service'
 require 'json'
 
 RSpec::Matchers.define :pass_lighthouse_audit do |audit, score: nil|
-  match do |target|
-    score ||= Lighthouse::Matchers.minimum_score
-    port = Lighthouse::Matchers.remote_debugging_port
-    runner = Lighthouse::Matchers.runner
+  score ||= Lighthouse::Matchers.minimum_score
 
-    url = target.respond_to?(:current_url) ? target.current_url : target
-    opts = "'#{url}' --quiet --output=json #{"--port=#{port}" if port}".strip
-    cmd = Lighthouse::Matchers.lighthouse_cli
-    output = runner.call("#{cmd} #{opts}")
-    results = JSON.parse(output)
-    actual_score = results.dig('categories', audit.to_s, 'score') * 100
-    actual_score >= score
+  match do |target|
+    AuditService.new(url(target), audit, score).passing_score?
   end
 
   failure_message do |target|
-    url = target.respond_to?(:current_url) ? target.current_url : target
     <<~FAIL
-      expected #{url} to pass Lighthouse #{audit} audit
+      expected #{url(target)} to pass Lighthouse #{audit} audit
       with a minimum score of #{score}
     FAIL
   end
+
+  private
+
+  def url(target)
+    target.respond_to?(:current_url) ? target.current_url : target
+  end
 end

data/lib/lighthouse/matchers/version.rb

@@ -2,6 +2,6 @@
 
 module Lighthouse
   module Matchers
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lighthouse-matchers
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Josh McArthur on behalf of Ackama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - bin/ci-run
 - bin/console
 - bin/setup
+- lib/lighthouse/audit_service.rb
 - lib/lighthouse/matchers.rb
 - lib/lighthouse/matchers/rspec.rb
 - lib/lighthouse/matchers/version.rb