sitediff 1.0.0 → 1.1.1

data/lib/sitediff/report.rb

@@ -69,6 +69,8 @@ class SiteDiff
     )
       report_before ||= @config.before_url
       report_after ||= @config.after_url
+      @config.before_time = get_timestamp(:before)
+      @config.after_time = get_timestamp(:after)
 
       dir = SiteDiff.ensure_dir dir
 
@@ -81,7 +83,7 @@ class SiteDiff
         report_before,
         report_after,
         @cache,
-        @config.export
+        @config
       )
 
       # Write report.
@@ -234,5 +236,19 @@ class SiteDiff
       output += File.read(File.join(SiteDiff::FILES_DIR, 'sitediff.js'))
       output
     end
+
+    private
+
+    # Get crawl timestamps
+    def get_timestamp(tag)
+      timestamp_file = File.join(@config.directory, 'snapshot', tag.to_s, SiteDiff::Cache::TIMESTAMP_FILE)
+      if File.exist? timestamp_file
+        file = File::Stat.new(timestamp_file)
+        time = file.mtime
+        time.class == Time ? time.strftime('%Y-%m-%d %H:%M') : ''
+      else
+        'unknown'
+      end
+    end
   end
 end

data/lib/sitediff/result.rb

@@ -68,6 +68,8 @@ class SiteDiff
 
     # Printable URL
     def url(tag, prefix, cache)
+      return unless prefix
+
       base = cache.read_tags.include?(tag) ? "/cache/#{tag}" : prefix
       base.to_s + path
     end

data/lib/sitediff/sanitize.rb

@@ -35,7 +35,7 @@ class SiteDiff
       @html = nil
 
       remove_spacing
-      selector
+      regions || selector
       dom_transforms
       regexps
 
@@ -84,6 +84,13 @@ class SiteDiff
       Sanitizer.remove_node_spacing(@node) if rule['value']
     end
 
+    # Perform 'regions' action, don't perform 'selector' if regions exist.
+    def regions
+      return unless validate_regions
+
+      @node = select_regions(@node, @config['regions'], @opts[:output])
+    end
+
     # Perform 'selector' action, to choose a new root
     def selector
       (rule = canonicalize_rule('selector')) || return
@@ -135,6 +142,20 @@ class SiteDiff
       end
     end
 
+    # Restructure the node into regions.
+    def select_regions(node, regions, output)
+      regions = output.map do |name|
+        selector = get_named_region(regions, name)['selector']
+        region = Nokogiri::XML.fragment('<region id="' + name + '"></region>').at_css('region')
+        matching = node.css(selector)
+        matching.each { |m| region.add_child m }
+        region
+      end
+      node = Nokogiri::HTML.fragment('')
+      regions.each { |r| node.add_child r }
+      node
+    end
+
     # Get a fragment consisting of the elements matching the selector(s)
     def self.select_fragments(node, sel)
       # When we choose a new root, we always become a DocumentFragment,
@@ -208,5 +229,32 @@ class SiteDiff
         to_document(domify(obj, false))
       end
     end
+
+    private
+
+    # Validate `regions` and `output` from config.
+    def validate_regions
+      return false unless @config['regions'].is_a?(Array)
+
+      return false unless @opts[:output].is_a?(Array)
+
+      regions = @config['regions']
+      output = @opts[:output]
+      regions.each do |region|
+        return false unless region.key?('name') && region.key?('selector')
+      end
+
+      # Check that each named output has an associated region.
+      output.each do |name|
+        return false unless get_named_region(regions, name)
+      end
+
+      true
+    end
+
+    # Return the selector from a named region.
+    def get_named_region(regions, name)
+      regions.find { |region| region['name'] == name }
+    end
   end
 end

data/lib/sitediff/uriwrapper.rb

@@ -17,7 +17,10 @@ class SiteDiff
       followlocation: true,
       headers: {
         'User-Agent' => 'Sitediff - https://github.com/evolvingweb/sitediff'
-      }
+      },
+      # always accept SSL certs
+      ssl_verifypeer: false,
+      ssl_verifyhost: 0
     }.freeze
 
     # This lets us treat errors or content as one object

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sitediff
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alex Dergachev
 - Amir Kadivar
 - Dave Vasilevsky
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -139,6 +139,7 @@ extra_rdoc_files: []
 files:
 - bin/sitediff
 - lib/sitediff.rb
+- lib/sitediff/api.rb
 - lib/sitediff/cache.rb
 - lib/sitediff/cli.rb
 - lib/sitediff/config.rb
@@ -169,7 +170,7 @@ licenses:
 - GPL-2.0
 metadata:
   source_code_uri: https://github.com/evolvingweb/sitediff
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Compare two versions of a site with ease!
 test_files: []