relaton-bib 1.6.pre1 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9741b425d8415304b51078b9a7c649560abccdecbec0ead58986994209b4baf
-  data.tar.gz: 9ec3425ae7f42bc668be546058c6d7b7ff5a4be4bd345b9f0f74c4ca26be2db5
+  metadata.gz: e9ebdb538f6fb256157a23a01994bb4654df470e7d9abe245d8de7ff88d5fecf
+  data.tar.gz: 56e5146c1d0a6f0c02c12d17d30a3041bb3eabff1b54e0c6f0478f7c7a4743ac
 SHA512:
-  metadata.gz: 66bd1804ab23745be33b2990dec11c84e7a9e1b70e192604e131d298cf88893bff94f20648085099c7505d5b201d54886f6e96eeb9d5ef4694495794e7203242
-  data.tar.gz: c0d5e9ce4b7dba3f22f1834017f58afbf2a826be3eefbe67e6bfd6ca0fb9fe1310dc7dc55f71b783137d5f3df2011c4f54cb717bb07aa798cc28c535b94ccc34
+  metadata.gz: 692cce83ac3ce023196a5dd6a06ed30a07cfb442407c02249e948866932db7d0c81a49a7aa8b34afa05c995e9cbcbccdbb7141bd10e699657b545ec3d906918a
+  data.tar.gz: c823d2926c8c50810c2989de01f06afbd47e104ff458269d8c17db79e2281550d499d5f267fa1324924005a15de86111b52c2b3cc62142140d09fb9526b14025

data/grammars/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -141,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -1164,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">

data/lib/relaton_bib.rb

@@ -15,7 +15,7 @@ module RelatonBib
     # @param date [String, Integer, Date]
     # @param str [Boolean]
     # @return [Date, nil]
-    def parse_date(date, str = true) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    def parse_date(date, str = true) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity,Metrics/AbcSize
       return date if date.is_a?(Date)
 
       case date.to_s

data/lib/relaton_bib/biblio_note.rb

@@ -62,9 +62,10 @@ module RelatonBib
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
       pref = prefix.empty? ? prefix : prefix + "."
-      out = count > 1 ? "#{pref}biblionote::\n" : ""
-      out + "#{pref}biblionote.type:: #{type}\n" if type
-      out += super "#{pref}biblionote"
+      has_attrs = !(type.nil? || type.empty?)
+      out = count > 1 && has_attrs ? "#{pref}biblionote::\n" : ""
+      out += "#{pref}biblionote.type:: #{type}\n" if type
+      out += super "#{pref}biblionote", 1, has_attrs
       out
     end
   end

data/lib/relaton_bib/bibliographic_date.rb

@@ -31,12 +31,12 @@ module RelatonBib
     # @return [String, Date, nil]
     def from(part = nil)
       d = instance_variable_get "@#{__callee__}".to_sym
-      return d unless part
+      return d unless part && d
 
       date = parse_date(d)
       return date if part == :date
 
-      date.send part
+      date.is_a?(Date) ? date.send(part) : date
     end
 
     alias_method :to, :from
@@ -87,20 +87,23 @@ module RelatonBib
     # @param format [Symbol, nil] :full (yyyy-mm-dd), :short (yyyy-mm) or nil
     # @return [String]
     def date_format(date, format = nil)
-      case format
-      when :short then parse_date(date).strftime "%Y-%m"
-      when :full then parse_date(date).strftime "%Y-%m-%d"
-      else date
-      end
+      tmplt = case format
+              when :short then "%Y-%m"
+              when :full then "%Y-%m-%d"
+              else return date
+              end
+      d = parse_date(date)
+      d.is_a?(Date) ? d.strftime(tmplt) : d
     end
 
     # @param date [String]
     # @return [Date]
     def parse_date(date)
       case date
-      when /\d{4}-\d{2}-\d{2}/ then Date.parse(date) # 2012-02-11
-      when /\d{4}-\d{2}/ then Date.strptime(date, "%Y-%m") # 2012-02
-      when /\d{4}/ then Date.strptime(date, "%Y") # 2012
+      when /^\d{4}-\d{2}-\d{2}/ then Date.parse(date) # 2012-02-11
+      when /^\d{4}-\d{2}/ then Date.strptime(date, "%Y-%m") # 2012-02
+      when /^\d{4}/ then Date.strptime(date, "%Y") # 2012
+      else date
       end
     end
   end

data/lib/relaton_bib/bibliographic_item.rb

@@ -399,7 +399,7 @@ module RelatonBib
     # @param type [Symbol] type of url, can be :src/:obp/:rss
     # @return [String]
     def url(type = :src)
-      @link.detect { |s| s.type == type.to_s }.content.to_s
+      @link.detect { |s| s.type == type.to_s }&.content&.to_s
     end
 
     def abstract=(value)

data/lib/relaton_bib/contribution_info.rb

@@ -81,8 +81,11 @@ module RelatonBib
     attr_reader :entity
 
     # @param entity [RelatonBib::Person, RelatonBib::Organization]
-    # @param role [Array<String>]
-    def initialize(entity:, role: [{ type: "publisher" }])
+    # @param role [Array<Hash>]
+    def initialize(entity:, role: [])
+      if role.empty?
+        role << { type: entity.is_a?(Person) ? "author" : "publisher" }
+      end
       @entity = entity
       @role   = role.map { |r| ContributorRole.new(**r) }
     end

data/lib/relaton_bib/formatted_string.rb

@@ -44,7 +44,8 @@ module RelatonBib
     # @param prefix [String]
     # @param count [Integer] number of elements
     # @return [String]
-    def to_asciibib(prefix = "", count = 1)
+    def to_asciibib(prefix = "", count = 1, has_attrs = false)
+      has_attrs ||= !(format.nil? || format.empty?)
       pref = prefix.empty? ? prefix : prefix + "."
       # out = count > 1 ? "#{prefix}::\n" : ""
       out = super

data/lib/relaton_bib/hash_converter.rb

@@ -120,12 +120,12 @@ module RelatonBib
         end
       end
 
-      def docid_hash_to_bib(ret)
+      def docid_hash_to_bib(ret) # rubocop:disable Metrics/AbcSize
         return unless ret[:docid]
 
         ret[:docid] = array(ret[:docid])
         ret[:docid]&.each_with_index do |id, i|
-          type = id[:type] || id[:id].match(/^\w+\s/)&.to_s
+          type = id[:type] || id[:id].match(/^\w+(?=\s)/)&.to_s
           ret[:docid][i] = DocumentIdentifier.new(id: id[:id], type: type,
                                                   scope: id[:scope])
         end
@@ -219,7 +219,7 @@ module RelatonBib
         )
       end
 
-      def fullname_hash_to_bib(person) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+      def fullname_hash_to_bib(person) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         n = person[:name]
         FullName.new(
           forename: array(n[:forename])&.map { |f| localname(f, person) },

data/lib/relaton_bib/localized_string.rb

@@ -77,9 +77,13 @@ module RelatonBib
     # @param prefix [String]
     # @param count [Integer] number of elements
     # @return [String]
-    def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    def to_asciibib(prefix = "", count = 1, has_attrs = false) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
       pref = prefix.empty? ? prefix : prefix + "."
       if content.is_a? String
+        unless language&.any? || script&.any? || has_attrs
+          return "#{prefix}:: #{content}\n"
+        end
+
         out = count > 1 ? "#{prefix}::\n" : ""
         out += "#{pref}content:: #{content}\n"
         language&.each { |l| out += "#{pref}language:: #{l}\n" }

data/lib/relaton_bib/typed_title_string.rb

@@ -162,7 +162,7 @@ module RelatonBib
       pref = prefix.empty? ? prefix : prefix + "."
       out = count > 1 ? "#{pref}title::\n" : ""
       out += "#{pref}title.type:: #{type}\n" if type
-      out += title.to_asciibib "#{pref}title"
+      out += title.to_asciibib "#{pref}title", 1, !(type.nil? || type.empty?)
       out
     end
   end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.6.pre1".freeze
+  VERSION = "1.7.1".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -177,16 +177,22 @@ module RelatonBib
       def ttitle(title)
         return unless title
 
-        variants = title.xpath("variant").map do |v|
-          LocalizedString.new v.text, v[:language], v[:script]
-        end
-        content = variants.any? ? variants : title.text
+        content = variants(title)
+        content = title.text unless content.any?
         TypedTitleString.new(
           type: title[:type], content: content, language: title[:language],
           script: title[:script], format: title[:format]
         )
       end
 
+      # @param title [Nokogiri::XML::Element]
+      # @return [Array<RelatonBib::LocalizedString>]
+      def variants(elm)
+        elm.xpath("variant").map do |v|
+          LocalizedString.new v.text, v[:language], v[:script]
+        end
+      end
+
       def fetch_status(item)
         status = item.at("./status")
         return unless status

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.6.pre1
+  version: 1.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -259,9 +259,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: