sitediff 1.2.4 → 1.2.5a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1ee18040cb7cad571450e2e17f9144bdab9965b0c52f84199a8eecb7d046e71
-  data.tar.gz: 7d3744b782caae37bbb7fc7789e9fd3d0ae600849dbd13c9d77f60201af56792
+  metadata.gz: 5dbab719d51bbf4922bbf90d806fab06801a8c29d1e0697655121a16634f84d7
+  data.tar.gz: cc42c00cd4d36393723bc28cb204851bdf86535cee30519d1cd9367c6f6e06b9
 SHA512:
-  metadata.gz: 7c3fc26f34f94fcacee9a8d87d7cdda3ea0c9a79aa40b8ff82d8a1f19b677fdda2fee147d6b91a3a9df0c4dc80541b9ae516778abc72fb4046399c18eefafb0d
-  data.tar.gz: 7f615aed415a0f313badb5a32873b611200b878587d40c5d5498d06a05088bb91531d4130c7f0f64261c6e9d33a167943b00b3023c2e9ef14c524cc2dc3d9aae
+  metadata.gz: ed9dfaad56b3a52761a6df4fee893d871931632cb32bc526574d0988ac5599ff09b352c785ed35f8a8717844438b65ef432f9c6a4258c756b3518a12c3b3f6da
+  data.tar.gz: 011c5c381479cbd7fc95b8a82de66708f503b649f6b840b32d1cb06b4e50471bb92eb34ee426f5b879863a949fe339a5d3f9e317f9286401b6666fa12de7d6ee

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 Contains noteworthy changes made to SiteDiff.
 ## Version 1.2.5
 - Fix issue with whitespace in URLs.
+- Updates for Drupal preset for Drupal 8, 9, 10.
+- Bump nokogiri from 1.14.2 to 1.14.3
+- Fix basic auth derived from URL syntax
 
 ## Version 1.2.4
 - Fix issue with 'store' command.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sitediff (1.2.4)
+    sitediff (1.2.5a)
       addressable (>= 2.5.2, < 2.9.0)
       diffy (~> 3.4.0)
       minitar (~> 0.9)
@@ -9,7 +9,7 @@ PATH
       pkg-config (~> 1.4)
       rainbow (~> 3.1.1)
       thor (~> 1.2.1)
-      typhoeus (~> 1.4.1)
+      typhoeus (>= 1.1.1)
       webrick (>= 1.7)
 
 GEM
@@ -20,8 +20,8 @@ GEM
     ast (2.4.2)
     diff-lcs (1.5.0)
     diffy (3.4.2)
-    ethon (0.10.0)
-      ffi (>= 1.3.0)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
     ffi (1.15.5)
     fileutils (1.1.0)
     json (2.6.2)
@@ -65,12 +65,13 @@ GEM
     ruby-progressbar (1.11.0)
     thor (1.2.1)
     typhoeus (1.4.1)
-      ethon (= 0.10.0)
+      ethon (= 0.16.0)
     unicode-display_width (2.2.0)
     webrick (1.8.1)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   fileutils (= 1.1.0)

data/lib/sitediff/presets/drupal.yaml

@@ -61,7 +61,27 @@ sanitization:
     selector: script
     pattern: 'js_[-\w]{40,43}\\?\.js'
     substitute: 'js__ID__.js'
+  - pattern: ' data-contextual-token="[^\"]*"'
+    selector: 'div'
+    substitute: ''
+  - pattern: ' data-drupal-selector="[^\"]*"'
+    selector: 'div'
+    substitute: ''
+  - pattern: ' title="[^\"]*"'
+    selector: 'input'
+    substitute: ''
+  - pattern: 'js-view-dom-id-[a-zA-Z0-9]+'
+    selector: 'div'
+    substitute: 'js-view-dom-id-__HASH__'
+  - pattern: 'value="[^\"]*"'
+    selector: 'input'
+    substitute: 'value="HASH"'
+  - pattern: 'itok=[A-Za-z0-9\-_]+'
+    substitute: ''
+  - pattern: 'hash=[^"]+"'
+    selector: 'iframe'
+    substitute: 'hash=HASH'
 dom_transform:
   # Strip Drupal.settings (>8.0)
   - type: remove
-    selector: 'script[data-drupal-selector="drupal-settings-json"]'
+    selector: 'script[data-drupal-selector="drupal-settings-json"]'

data/lib/sitediff/uriwrapper.rb

@@ -117,7 +117,7 @@ class SiteDiff
     def typhoeus_request
       params = @curl_opts.dup
       # Allow basic auth
-      params[:userpwd] = "#{@uri.user}: #{@uri.password}" if @uri.user
+      params[:userpwd] = "#{@uri.user}:#{@uri.password}" if @uri.user
 
       # params['verbose'] = true
       # params['ssl_verifypeer'] = false

data/sitediff.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'sitediff'
-  s.version     = '1.2.4'
+  s.version     = '1.2.5a'
   s.required_ruby_version = '>= 3.1.2'
   s.summary     = 'Compare two versions of a site with ease!'
   s.description = <<DESC
@@ -35,7 +35,7 @@ DESC
 
   s.add_dependency 'minitar', '~> 0.9'
   s.add_dependency 'thor', '~> 1.2.1'
-  s.add_dependency 'typhoeus', '~> 1.4.1'
+  s.add_dependency 'typhoeus', '>= 1.1.1'
 
   # A bug in rubygems can break rainbow 2.2
   # https://github.com/bundler/bundler/issues/5357

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sitediff
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5a
 platform: ruby
 authors:
 - Alex Dergachev
@@ -58,16 +58,16 @@ dependencies:
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -225,11 +225,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.8
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Compare two versions of a site with ease!