relaton-render 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff9e0dafe6ba6d6df3cd7f3e98057a96400abe99c90e8f8a14525b18d019d673
-  data.tar.gz: 450df19a0aec2275174c164559838023a977ffdfb435f0e07730081c46f4bcfb
+  metadata.gz: 4a59266f60d60c8d152141f675eac858ef9f9b81e4c8d9ac2bfe9dd158db148d
+  data.tar.gz: 40d269013ae823a85f21c335b7157e13c6062572e6e06190e6a06688b5508061
 SHA512:
-  metadata.gz: 1f408ad815ea069f7bf8eca30461eaa1965f6303e57a37698d66135159d70e93bcc90ffaf5f49bb3dc173a4e689e7d5090baa60b510aca95b5fe2d50cf0bb196
-  data.tar.gz: 070304e5689852b644ff5d072e18d7354e5d274196afa4b1f85f89e3edfb865c93642bcce1bd18a9d195217e9ec1cbe1a63782549382308ee67632a1d9dcc108
+  metadata.gz: a084f59643670d47b6e237c00df3b831f7b50781aa39bbf153bf1fc6912dd6358c77d8d04f5ce6a8742d6c3586bd5d025c2a6ceddb70f5db8f0b0d4f2200f07e
+  data.tar.gz: 1ae9f86ae3ee701eeece1ac44c6cfcfd41ce34320ea263c413c3417609c0b919c2924bdafda02b0db828e9f16ce7de0aaec1f25bee3ec53a33a9da5ff14896d9

data/lib/relaton/render/general/render.rb

@@ -2,7 +2,9 @@ require_relative "render_classes"
 require_relative "citations"
 require "yaml"
 require "liquid"
+require "date"
 require "relaton_bib"
+require "net/http"
 require_relative "../template/template"
 require_relative "../../../isodoc/i18n"
 
@@ -133,6 +135,7 @@ module Relaton
       def parse1(doc)
         r = renderer(doc.type || "misc")
         data = @parse.extract(doc)
+        enhance_data(data, r.template_raw)
         data_liquid = @fieldsklass.new(renderer: self)
           .compound_fields_format(data)
         valid_parse(@i18n.l10n(r.render(data_liquid)))
@@ -173,6 +176,23 @@ module Relaton
         end
       end
 
+      # add to liquid data based on template
+      def enhance_data(data, template)
+        template.is_a?(String) or return
+        add_date_accessed(data, template)
+      end
+
+      def add_date_accessed(data, template)
+        (/\{\{\s*date_accessed\s*\}\}/.match?(template) &&
+          /\{\{\s*uri\s*\}\}/.match?(template) &&
+          data[:uri_raw] && !data[:date_accessed]) or return
+        if url_exist?(data[:uri_raw])
+          data[:date_accessed] = { on: ::Date.today.to_s }
+        else
+          warn "BIBLIOGRAPHY WARNING: cannot access #{data[:uri_raw]}"
+        end
+      end
+
       private
 
       def template_hash_fill(templates)
@@ -182,6 +202,23 @@ module Relaton
           m[type] = template
         end
       end
+
+      def url_exist?(url_string)
+        res = access_url(url_string)
+        res.is_a?(Net::HTTPRedirection) and return url_exist?(res["location"])
+        res.code[0] != "4"
+      rescue Errno::ENOENT, SocketError
+        false # false if can't find the server
+      end
+
+      def access_url(url_string)
+        url = URI.parse(url_string)
+        req = Net::HTTP.new(url.host, url.port)
+        req.use_ssl = (url.scheme == "https")
+        path = url.path or return false
+        path.empty? and path = "/"
+        req.request_head(path)
+      end
     end
   end
 end

data/lib/relaton/render/parse/parse_contributors.rb

@@ -109,7 +109,7 @@ module Relaton
           ret = date.detect { |x| x.type == t } and
             return ret
         end
-        date.first
+        date.reject { |x| x.type == "accessed" }.first
       end
 
       # year-only

data/lib/relaton/render/template/template.rb

@@ -5,6 +5,8 @@ module Relaton
   module Render
     module Template
       class General
+        attr_reader :template_raw
+
         def initialize(opt = {})
           @htmlentities = HTMLEntities.new
           customise_liquid
@@ -43,7 +45,7 @@ module Relaton
 
         def punct_field?(name)
           name or return false
-          name = name.gsub(/'/, '"')
+          name = name.gsub("'", '"')
           %w(labels["qq-open"] labels["qq-close"] labels["q-open"]
              labels["q-close"]).include?(name)
         end
@@ -60,7 +62,7 @@ module Relaton
               a[3] = "}}#{FIELD_DELIM}"
             end
             a.join
-          end.join.gsub(/\t/, " ")
+          end.join.gsub("\t", " ")
           t.gsub(/\}\}#{FIELD_DELIM}\|/o, "}}#{FIELD_DELIM}\t")
             .gsub(/\|#{FIELD_DELIM}\{\{/o, "\t#{FIELD_DELIM}{{")
         end
@@ -96,7 +98,7 @@ module Relaton
             .sub(/^\s*[,.:;]\s*/, "")
             .sub(/[,:;]\s*$/, "")
             .gsub(/(?<!\\)_/, " ")
-            .gsub(/\\_/, "_")
+            .gsub("\\_", "_")
             .gsub(/#{NON_SPACING_DELIM}/o, "").gsub(/\s+/, " ")
         end
 
@@ -110,7 +112,7 @@ module Relaton
           when Array
             hash.map { |v| liquid_hash(v) }
           when String
-            hash.empty? ? nil : hash.gsub(/_/, "\\_").gsub(/ /, "_")
+            hash.empty? ? nil : hash.gsub("_", "\\_").gsub(/ /, "_")
           else hash
           end
         end
@@ -165,7 +167,7 @@ module Relaton
           t = nametemplate_split(template)
 
           mid = (1..size - 2).each_with_object([]) do |i, m|
-            m << t[1].gsub(/\[1\]/, "[#{i}]")
+            m << t[1].gsub("[1]", "[#{i}]")
           end
           t[1] = mid.join
           t[2].gsub!(/\[\d+\]/, "[#{size - 1}]")

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.5.13".freeze
+    VERSION = "0.5.14".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-10 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler