relaton-render 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2495f2c083785da7e91cb8a512af90c47a1b47cc3e1f3fc2749453008e50255b
-  data.tar.gz: 73ec9b1aad3fa6dea3473a842f3cc5b91a99beb978fb32481b286a2c2fad5b04
+  metadata.gz: 4af2a199386cc0a95ba9f02a2ba08f5ba146783acfc3c8eb0fb420e50c29bc70
+  data.tar.gz: b6d8e184fd3cd9709bfb3836613a38d43f0959d26f8c9f23316df31633870252
 SHA512:
-  metadata.gz: 7fe97369899d14717f7f7cefbdd5fa5f0cf3b297005e0a30b7172b4a7f001f1586dc9088c90a6025733b680cf09041b3adf5206dff429e4ad712b2a35208a775
-  data.tar.gz: 7f3e4c19809cbfa730fab9aa844891a879844279e6a95808f77541edce3e9d1b5986d3d20e5b9a6b618e984dfb9ddcdfa399181e4cc191cf1058dc9773723b00
+  metadata.gz: 7edf0a562d388abfb02883976c40155d7c92aeb9563f06d16ee1fda8da0c63ad88094af034562a61fa0aa1ebf798842d04c8f357cc62eb64cd370ef94db8d1ca
+  data.tar.gz: 41e86886b6d865301f98b86d1aa95c8cb9ced5da5db42c3cd2bc35697242b9fb0f007e1bd1ee5a1531230a13a162c70e4371ed060abbd12aa53c03eb0b23dff7

data/lib/relaton/render/fields/fields.rb

@@ -24,6 +24,7 @@ module Relaton
           .each do |k|
           hash[k[0]] = nameformat(hash[k[1]])
         end
+        hash[:publisher_abbrev] = hash[:publisher_abbrev_raw]&.join(", ")
       end
 
       def role_fields_format(hash)

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

@@ -29,6 +29,7 @@ module Relaton
       def simple_or_host_xml2hash(doc, host)
         { edition_raw: edition(doc, host), medium_raw: medium(doc, host),
           place_raw: place(doc, host), publisher_raw: publisher(doc, host),
+          publisher_abbrev_raw: publisher_abbrev(doc, host),
           distributor_raw: distributor(doc, host), draft_raw: draft(doc, host),
           access_location: access_location(doc, host),
           date: date(doc, host), date_updated: date_updated(doc, host),

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

@@ -48,17 +48,20 @@ module Relaton
         [cr.map { |x| extractname(x) }, contributor_role(cr)]
       end
 
+      def creatornames_roles_allowed
+        %w(author performer adapter translator editor publisher distributor)
+      end
+
       def creatornames1(doc)
         cr = []
         return [] if doc.nil?
 
-        %w(author performer adapter translator editor publisher distributor)
-          .each do |r|
-            add = pick_contributor(doc, r)
-            next if add.nil?
+        creatornames_roles_allowed.each do |r|
+          add = pick_contributor(doc, r)
+          next if add.nil?
 
-            cr = add and break
-          end
+          cr = add and break
+        end
         cr.nil? and cr = doc.contributor
         cr
       end
@@ -100,6 +103,27 @@ module Relaton
         host and ret ||= host.date.detect { |x| x.type == "accessed" }
         datepick(ret)
       end
+
+      def publisher(doc, host)
+        x = pick_contributor(doc, "publisher")
+        host and x ||= pick_contributor(host, "publisher")
+        x.nil? and return nil
+        x.map { |c| extractname(c) }
+      end
+
+      def publisher_abbrev(doc, host)
+        x = pick_contributor(doc, "publisher")
+        host and x ||= pick_contributor(host, "publisher")
+        x.nil? and return nil
+        x.map { |c| c.entity.abbreviation&.content }
+      end
+
+      def distributor(doc, host)
+        x = pick_contributor(doc, "distributor")
+        host and x ||= pick_contributor(host, "distributor")
+        x.nil? and return nil
+        x.map { |c| extractname(c) }
+      end
     end
   end
 end

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

@@ -43,20 +43,6 @@ module Relaton
         x.map(&:name)
       end
 
-      def publisher(doc, host)
-        x = pick_contributor(doc, "publisher")
-        host and x ||= pick_contributor(host, "publisher")
-        x.nil? and return nil
-        x.map { |c| extractname(c) }
-      end
-
-      def distributor(doc, host)
-        x = pick_contributor(doc, "distributor")
-        host and x ||= pick_contributor(host, "distributor")
-        x.nil? and return nil
-        x.map { |c| extractname(c) }
-      end
-
       def series(doc)
         doc.series.detect { |s| s.type == "main" } ||
           doc.series.detect { |s| s.type.nil? } ||
@@ -103,7 +89,7 @@ module Relaton
 
       def uri(doc)
         uri = nil
-        %i(doi uri src).each do |t|
+        %w(doi uri src).each do |t|
           uri = doc.link.detect { |u| u.type == t } and break
         end
         uri ||= doc.link.first

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

@@ -79,6 +79,7 @@ module Relaton
             .gsub(/(:\s+)(&\s)/, "\\2")
             .gsub(/\s+([,.:;)])/, "\\1")
             .sub(/^\s*[,.:;]\s*/, "")
+            .sub(/[,:;]\s*$/, "")
             .gsub(/_/, " ")
             .gsub(/#{NON_SPACING_DELIM}/o, "").gsub(/\s+/, " ")
         end
@@ -133,9 +134,9 @@ module Relaton
         end
 
         def template_select_etal(names)
-          if @etal_count && names.size >= @etal_count
+          if @etal_count && names[:surname].size >= @etal_count
             @template[:etal]
-          else expand_nametemplate(@template_raw[:more], names.size)
+          else expand_nametemplate(@template_raw[:more], names[:surname].size)
           end
         end
 

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.3.2".freeze
+    VERSION = "0.3.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler