sitediff 1.2.6 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 233b252b32a914f3d88133ae1d8784edb7057a252ac813685369ac052e46fa91
-  data.tar.gz: c1907fd80f5e3b6e66759592dd88dd2d280420f90fb1bf6f25b411bd31952c6b
+  metadata.gz: d8ada20fc6a7f1adad1a21601dd0ffb9d8391f6a939296339cec3eb1b0104aba
+  data.tar.gz: 899e79721748ec176b0ce6bd602c521cd94689ce0d28806f77d495effa92f57e
 SHA512:
-  metadata.gz: b13c3aa28be320461b256da3f47c80d3f2cc78a00360e6d4da0a997534c72a8b19dc3a5ee0a79ecf77bbd96c0f12e59e75190386013790569d91af72f28ffca5
-  data.tar.gz: fea5b0c03cd7597cea7d3e81951af82c5f47722ef32344e9ead6446db9c4363699ba896d445cd79552c13c51d38876778a2c91956f307a239e04595b768a1093
+  metadata.gz: 70cff17823e4244a3ce2d148b8ebbc707ae7b38d1a9ea7c90ea622520d730d13fd0b4efd2733784e0fd806f39afee835c4536b0c6fc2bf749aa9a3ab77c6afa0
+  data.tar.gz: da2a6294e02c1a1badb93c04af8d5bf7f21f05c976e902463f2d8ffe3bad53ef6aae79e5ee9373ae949f35cce883098b7081b5d482dc78dab1b929665c4968f6

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # SiteDiff Change Log
 
 Contains noteworthy changes made to SiteDiff.
+## Version 1.2.8
+- Dependency updates.
+
+## Version 1.2.7
+- Diff performance improvement.  Preset rules were being repeatedly re-added to the list of rules.
+
 ## Version 1.2.5
 - Fix issue with whitespace in URLs.
 - Updates for Drupal preset for Drupal 8, 9, 10.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sitediff (1.2.6)
+    sitediff (1.2.7)
       addressable (>= 2.5.2, < 2.9.0)
       diffy (~> 3.4.0)
       minitar (~> 0.9)
@@ -26,7 +26,9 @@ GEM
     fileutils (1.1.0)
     json (2.6.2)
     minitar (0.9)
-    nokogiri (1.14.2-arm64-darwin)
+    nokogiri (1.15.2-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.1.2.0)
@@ -64,13 +66,12 @@ GEM
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     thor (1.2.1)
-    typhoeus (1.4.1)
-      ethon (= 0.16.0)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
     unicode-display_width (2.2.0)
     webrick (1.8.1)
 
 PLATFORMS
-  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -81,4 +82,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   2.1.4
+   2.3.26

data/lib/sitediff/config.rb

@@ -255,6 +255,7 @@ class SiteDiff
       @file = file
       @directory = directory
 
+      @preset_applied = { 'before' => false, 'after' => false }
       # Validate configurations.
       validate
     end
@@ -512,10 +513,14 @@ class SiteDiff
         # Merge plugins with array values.
         # TODO: This won't be required after plugin declarations are improved.
         # See https://rm.ewdev.ca/issues/18301
-        Sanitizer::TOOLS[:array].each do |key|
-          if preset_config[key]
-            result[key] = (result[key] || []) + preset_config[key]
+        unless @preset_applied[name]
+          Sanitizer::TOOLS[:array].each do |key|
+            if preset_config[key]
+              result[key] = (result[key] || []) + preset_config[key]
+            end
           end
+
+          @preset_applied[name] = true
         end
       end
 

data/lib/sitediff/presets/drupal.yaml

@@ -20,10 +20,10 @@ sanitization:
     selector: script
     pattern: '(src="[^"]*/files/js/js_)[-\w]{40,43}\.js"'
     substitute: '\1DRUPAL_AGGREGATED_JS.js"'
-  - title: Strip CSS/JS cache IDs
-    selector: style, script
-    pattern: '("[^"]*\.(js|css))\?[a-z0-9]{6}"'
-    substitute: '\1'
+  # - title: Strip CSS/JS cache IDs
+  #   selector: style, script
+  #   pattern: '("[^"]*\.(js|css))\?[a-z0-9]{6}"'
+  #   substitute: '\1'
   - title: Strip Drupal JS version tags
     selector: script
     pattern: '(src="[^"]*/misc/\w+\.js)?v=\d+\.\d+"'

data/package-lock.json

@@ -854,9 +854,9 @@
       }
     },
     "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "dev": true
     },
     "wrappy": {

data/sitediff.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'sitediff'
-  s.version     = '1.2.6'
+  s.version     = '1.2.8'
   s.required_ruby_version = '>= 3.1.2'
   s.summary     = 'Compare two versions of a site with ease!'
   s.description = <<DESC

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sitediff
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.8
 platform: ruby
 authors:
 - Alex Dergachev
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-14 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: Compare two versions of a site with ease!