curation 1.6 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f059bacdf3a2deedf5363721c8186af8a62d5b69709022b3d076f725433be26f
-  data.tar.gz: ac36789448e1b3a58161f98362dbed1d889537612939f86d4a2db31b935811c3
+  metadata.gz: e3e4d559a2583393e2d58cba1bfe30ef8870733ce013c00780b29706b9bfce68
+  data.tar.gz: 5802c61d564cfc2568f9173f6b270e3e288f4dbdfcfec624b02205bd01a81aaf
 SHA512:
-  metadata.gz: 311113b9b172cfb54f917b694ca5a8f2bb17184c38fc99c8930592f73de9219c9ecda9217562180ef0e17def15682f56255b5f7e671555071d32b9149479cc2b
-  data.tar.gz: bbbe41e2fce674677dac3f3d7c5b724c6bbde6e8941f8be79f8d695ce722578046cb061d7c25fcac771ecb1bb57223d4c88748f36c85c0d6d08cac354ecb6a40
+  metadata.gz: 7cd290b2f9b5d9188c9db0bd07a9f88ce564faac927c3590af5c88cf11be0a848dd209fd7c0dd48e5af103bc8f05822911e7ffbe94c9a35dab0732e9e7d70a21
+  data.tar.gz: 0bcd9304b78f9ddb362ef7809831fe5065454adc64aa117df302d8a0ec384d92d7aac64e2dc1e8ebc3caf12267d78dbf7150f9fe12254a2b1d31509644e1e62e

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.byebug_history

data/Gemfile

@@ -3,4 +3,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in curation.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem 'rake', '~> 12.0'
+gem 'minitest'
+gem 'minitest-reporters'
+gem 'byebug'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    curation (1.6)
+    curation (1.7)
       metainspector
       nokogiri
 
@@ -10,6 +10,9 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ansi (1.5.0)
+    builder (3.2.4)
+    byebug (11.1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     faraday (1.0.1)
@@ -37,12 +40,19 @@ GEM
       nesty (~> 1.0.2)
       nokogiri (~> 1.10.9)
     mini_portile2 (2.4.0)
+    minitest (5.14.1)
+    minitest-reporters (1.4.2)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
     multipart-post (2.1.1)
     nesty (1.0.2)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     public_suffix (4.0.5)
     rake (12.3.3)
+    ruby-progressbar (1.10.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
@@ -51,7 +61,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  byebug
   curation!
+  minitest
+  minitest-reporters
   rake (~> 12.0)
 
 BUNDLED WITH

data/Rakefile

@@ -1,2 +1,10 @@
 require "bundler/gem_tasks"
-task :default => :spec
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/**/*_spec.rb"]
+  t.warning = false
+end
+
+task default: :test

data/lib/curation.rb

@@ -6,7 +6,7 @@ module Curation
   class Error < StandardError; end
 
   class Page
-    attr_reader :url, :title, :text, :image
+    attr_reader :url
 
     BLACKLIST = [
       'head', 'script', 'style', 'iframe', 'nav', 'noscript', 'header', 'footer', 'aside',
@@ -25,40 +25,29 @@ module Curation
     end
 
     def title
-      @title = find_title
+      @title ||= find_title
     end
 
     def image
-      @image = find_image
-      @image = @image.to_s.gsub('http://', 'https://')
+      unless @image
+        @image = find_image
+        @image = @image.to_s.gsub('http://', 'https://')
+      end
       @image
     end
 
     def text
-      if json_ld.any?
-        json_ld.each do |ld|
-          next unless ld['@type'] == 'NewsArticle'
-          return ld['text'] if ld.has_key? 'text'
-          return ld['articleBody'] if ld.has_key? 'articleBody'
-        end
-      end
-      h = nokogiri.dup
-      BLACKLIST.each do |tag|
-        h.css(tag).remove
-      end
-      nodes = h.css('p')
-      nodes.xpath('//style').remove
-      text = nodes.to_html
-      text.gsub!('<br><br>', '<br>')
-      text
+      @text ||= find_text
+    end
+
+    def date
+      @date ||= find_date
     end
 
     protected
 
     def find_title
       if json_ld.any?
-        # Some sites have tables in tables
-        json_ld.flatten!
         json_ld.each do |ld|
           return ld['headline'] if ld.has_key? 'headline'
         end
@@ -70,7 +59,7 @@ module Curation
           nokogiri.css('[itemprop="headline"]')&.first&.inner_text,
           nokogiri.css('title')&.first&.inner_text
         ].each do |possibility|
-          return possibility unless possibility.blank?
+          return possibility unless possibility.to_s.empty?
         end
       rescue
         puts 'Curation::Page find_title error'
@@ -98,7 +87,7 @@ module Curation
           metainspector.images.best,
           nokogiri.css('[property="og:image"]').first&.attributes['content'].value
         ].each do |possibility|
-            return possibility unless possibility.blank?
+          return possibility unless possibility.to_s.empty?
         end
       rescue
         puts 'Curation::Page find_image error'
@@ -106,8 +95,63 @@ module Curation
       return ''
     end
 
+    def find_text
+      if json_ld.any?
+        json_ld.each do |ld|
+          next unless ['NewsArticle', 'ReportageNewsArticle'].include? ld['@type']
+          return ld['text'] if ld.has_key? 'text'
+          return ld['articleBody'] if ld.has_key? 'articleBody'
+        end
+      end
+      h = nokogiri.dup
+      BLACKLIST.each do |tag|
+        h.css(tag).remove
+      end
+      nodes = h.css('p')
+      nodes.xpath('//style').remove
+      text = nodes.to_html
+      text.gsub!('<br><br>', '<br>')
+      text
+    end
+
+    def find_date
+      if json_ld.any?
+        json_ld.each do |ld|
+          next unless ['NewsArticle', 'ReportageNewsArticle'].include? ld['@type']
+          return Date.parse ld['datePublished'] if ld.has_key? 'datePublished'
+        end
+      end
+      return Date.parse metatags['date'] rescue nil
+      return Date.parse metatags['pubdate'] rescue nil
+      return Date.parse nokogiri.css('meta[property="article:published"]').first['content'] rescue nil
+      return Date.parse nokogiri.css('meta[property="article:published_time"]').first['content'] rescue nil
+      chunks = html.split('DisplayDate')
+      if chunks.count > 1
+        value = chunks[1]
+        value = value.split(',').first
+        value = value.gsub('"', '')
+        value = value[1..-1] if value[0] == ':'
+        return Date.parse value rescue nil
+      end
+      begin
+        value = nokogiri.css('.postDate').first
+        value = value.inner_text
+        value = value.gsub(' — ', '')
+        return Date.parse value
+      rescue
+      end
+      begin
+        value = nokogiri.css('.gta_post_date').first
+        value = value.inner_text
+        return Date.parse value
+      rescue
+      end
+    end
+
+    private
+
     def json_ld
-      unless @json_ld
+      unless defined?(@json_ld)
         @json_ld = []
         begin
           options = nokogiri.css('[type="application/ld+json"]')
@@ -116,6 +160,8 @@ module Curation
             hash = JSON.parse(string)
             @json_ld << hash
           end
+          # Some sites have tables in tables
+          @json_ld.flatten!
         rescue
           puts 'Curation::Page json_ld error'
         end
@@ -123,22 +169,48 @@ module Curation
       @json_ld
     end
 
+    def file
+      @file ||= URI.open url, 'User-Agent' => "Mozilla/5.0"
+    rescue
+      puts "Curation::Page file error with url #{url}"
+    end
+
     def html
-      @html ||= URI.open url
+      unless @html
+        file.rewind
+        @html = file.read
+        file.rewind
+      end
+      @html
     rescue
-      puts "Impossible to open #{url}"
+      puts "Curation::Page html error"
     end
 
     def nokogiri
-      @nokogiri ||= Nokogiri::HTML html
+      unless @nokogiri
+        file.rewind
+        @nokogiri = Nokogiri::HTML file
+        file.rewind
+      end
+      @nokogiri
     rescue
       puts 'Curation::Page nokogiri error'
     end
 
     def metainspector
-      @metainspector ||= MetaInspector.new url, document: html
+      unless @metainspector
+        @metainspector = html.nil?  ? MetaInspector.new(url)
+                                    : MetaInspector.new(url, document: html)
+      end
+      @metainspector
     rescue
       puts 'Curation::Page metainspector error'
     end
+
+    def metatags
+      @metatags ||= metainspector.meta_tag['name']
+    rescue
+      puts 'Curation::Page metatags error'
+    end
   end
 end

data/lib/curation/version.rb

@@ -1,3 +1,3 @@
 module Curation
-  VERSION = "1.6"
+  VERSION = "1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curation
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.7'
 platform: ruby
 authors:
 - Arnaud Levy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metainspector