relaton-bib 1.12.4 → 1.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4361f2c87e045e86e3ca8dd81e4e729f88598476daf14be487d8d5972bb9c8
-  data.tar.gz: 962832013669c49bd25b813d003f454a552d7427b45774a1e936c2146f31c391
+  metadata.gz: be4b986a04f391a2e552c13d8ee897e73c398f3acb27deda3bb203da627f585b
+  data.tar.gz: 05540e11934396b938df0c902d926c37b1c49c8aa215b7888827bb42d19d4042
 SHA512:
-  metadata.gz: cee39b14e0fe58a1db12205f3294144103c46fe8e82cf48a81c95195952d9130d999e5f8bb809ce2a500100d05fa3692d2bbf19a341598c37304f86a4f2d077c
-  data.tar.gz: afd5a003dc908a9bc895269ff4e3d0ca46762c16f7c3ec7d4007f86b35d150f3251994e9ee3dffd63095fe6fba75607be5ef461903064c408cbbb91230a02895
+  metadata.gz: f82094e85351832f3738216ce8ba72c68f7f26e9bcd7379cbe49b2e9a2bc0318ce1d4507462d3dbfed61ba57fc9bc692daf4998cbc84fb3bc2f54a14bed7e72a
+  data.tar.gz: 66de7c5f7b612c203694d6adacb0fdbf09dd34380f24bfe6e3d298f50d61d52af844f2803f8e75644839ce0b256726db55fc9058a649f9f42c8c3198f6e279ab

data/lib/relaton_bib/bibliographic_date.rb

@@ -109,8 +109,8 @@ module RelatonBib
     # @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}-\d{1,2}-\d{1,2}/ then Date.parse(date) # 2012-02-11
+      when /^\d{4}-\d{1,2}/ then Date.strptime(date, "%Y-%m") # 2012-02
       when /^\d{4}/ then Date.strptime(date, "%Y") # 2012
       else date
       end

data/lib/relaton_bib/document_relation.rb

@@ -17,7 +17,7 @@ module RelatonBib
     ].freeze
 
     # @return [String]
-    attr_reader :type
+    attr_accessor :type
 
     # @return [RelatonBib::FormattedString, NilClass]
     attr_reader :description

data/lib/relaton_bib/document_relation_collection.rb

@@ -6,7 +6,7 @@ module RelatonBib
     extend Forwardable
 
     def_delegators :@array, :<<, :[], :first, :last, :empty?, :any?, :size,
-                   :each, :detect, :map, :reduce, :length, :unshift
+                   :each, :detect, :map, :reduce, :length, :unshift, :max_by
 
     # @param relation [Array<RelatonBib::DocumentRelation, Hash>]
     # @option relation [String] :type
@@ -21,6 +21,21 @@ module RelatonBib
       @array = relation.map { |r| r.is_a?(Hash) ? DocumentRelation.new(**r) : r }
     end
 
+    #
+    # Returns new DocumentRelationCollection with selected relations.
+    #
+    # @example Select relations with type "obsoletes"
+    #   relations.select { |r| r.type == "obsoletes" }
+    #   #=> <RelatonBib::DocRelationCollection:0x00007f9a0191d5f0 @array=[...]>
+    #
+    # @return [RelatonBib::DocRelationCollection] new DocumentRelationCollection
+    #   with selected relations
+    #
+    def select(&block)
+      arr = @array.select(&block)
+      self.class.new arr
+    end
+
     # @todo We don't have replace type anymore. Suppose we should update this
     #   method or delete it.
     #

data/lib/relaton_bib/document_status.rb

@@ -6,15 +6,15 @@ module RelatonBib
     # @return [RelatonBib::DocumentStatus::Stage]
     attr_reader :stage
 
-    # @return [RelatonBib::DocumentStatus::Stage, NilClass]
+    # @return [RelatonBib::DocumentStatus::Stage, nil]
     attr_reader :substage
 
-    # @return [String, NilClass]
+    # @return [String, nil]
     attr_reader :iteration
 
     # @param stage [String, Hash, RelatonBib::DocumentStatus::Stage]
-    # @param substage [String, Hash, NilClass, RelatonBib::DocumentStatus::Stage]
-    # @param iteration [String, NilClass]
+    # @param substage [String, Hash, nil, RelatonBib::DocumentStatus::Stage]
+    # @param iteration [String, nil]
     def initialize(stage:, substage: nil, iteration: nil)
       @stage = stage_new stage
       @substage = stage_new substage
@@ -51,7 +51,7 @@ module RelatonBib
 
     private
 
-    # @param stg [RelatonBib::DocumentStatus::Stage, Hash, String, NilClass]
+    # @param stg [RelatonBib::DocumentStatus::Stage, Hash, String, nil]
     # @return [RelatonBib::DocumentStatus::Stage]
     def stage_new(stg)
       case stg
@@ -65,11 +65,11 @@ module RelatonBib
       # @return [String]
       attr_reader :value
 
-      # @return [String, NilClass]
+      # @return [String, nil]
       attr_reader :abbreviation
 
       # @param value [String]
-      # @param abbreviation [String, NilClass]
+      # @param abbreviation [String, nil]
       def initialize(value:, abbreviation: nil)
         @value = value
         @abbreviation = abbreviation

data/lib/relaton_bib/localized_string.rb

@@ -68,14 +68,17 @@ module RelatonBib
     # @return [String] encoded content
     #
     def encode(cnt) # rubocop:disable Metrics/MethodLength
-      regex = /(?<prf>.*?)(?<xml><(?<tag>\w+)>.*<\/\k<tag>>)(?<sfx>.*)/m
+      return unless cnt
+
+      # regex = /(?<prf>.*?)(?<xml><(?<tag>\w+)>.*<\/\k<tag>>)(?<sfx>.*)/m
+      regex = /(?<prf>.*?)(?<xml><(?<tag>\w+)[^>]*(?:>.*<\/\k<tag>)?>)(?<rest>.*)/m
       if cnt.match(regex)
         prf = Regexp.last_match(:prf).lstrip
         xml = Regexp.last_match[:xml]
-        sfx = Regexp.last_match(:sfx).rstrip
-        parts = xml.scan(/\s*<(?<tago>\w+)>(?<cnt1>.*?)(?=<\/?\w+>)|(?<cnt2>.*?)<\/(?<tagc>\w+)>/)
+        rest = Regexp.last_match(:rest).rstrip
+        parts = xml.scan(/\s*<(?<tago>\w+)(?<attrs>[^>]*)>(?:(?<cnt1>.*?)(?=<\/\w+>|<\w+[^>]*>))?|(?<cnt2>.*?)<\/(?<tagc>\w+)>/)
         out = scan_xml parts
-        "#{escp(prf)}#{out}#{escp(sfx)}"
+        "#{escp(prf)}#{out}#{encode(rest)}"
       else
         escp cnt
       end
@@ -84,22 +87,24 @@ module RelatonBib
     #
     # Scan XML and escape HTML entities.
     #
-    # @param [Array<Array<String,nik>>] parts XML parts
+    # @param [Array<Array<String,nil>>] parts XML parts
     #
     # @return [String] output string
     #
     def scan_xml(parts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
       return "" unless parts.any? && parts.first[0]
 
-      tago, cnt1, = parts.shift
-      if tago && tago == parts.first[3]
-        _, _, cnt2, tagc = parts.shift
-        "<#{tago}>#{escp(cnt1)}#{escp(cnt2)}</#{tagc}>"
+      tago, attrs, cnt1, = parts.shift
+      if tago && tago == parts.first&.last
+        _, _, _, cnt2, tagc = parts.shift
+        "<#{tago}#{attrs}>#{escp(cnt1)}#{escp(cnt2)}</#{tagc}>"
+      elsif tago && attrs && attrs[-1] == "/"
+        "<#{tago}#{attrs}>"
       elsif tago
         inr = scan_xml parts
-        _, _, cnt2, tagc = parts.shift
+        _, _, _, cnt2, tagc = parts.shift
         if tago == tagc
-          "<#{tago}>#{escp(cnt1)}#{inr}#{escp(cnt2)}</#{tagc}>"
+          "<#{tago}#{attrs}>#{escp(cnt1)}#{inr}#{escp(cnt2)}</#{tagc}>"
         else
           "#{escp("<#{tago}>#{cnt1}")}#{inr}#{escp("#{cnt2}</#{tagc}>")}"
         end

data/lib/relaton_bib/typed_title_string.rb

@@ -68,7 +68,7 @@ module RelatonBib
     # @param [BibTeX::Entry] item bibtex entry
     #
     def to_bibtex(item)
-      tl = titles.detect { |t| t.type == "main" }
+      tl = titles.detect { |t| t.type == "main" } || titles.first
       return unless tl
 
       item.title = tl.title.content

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.12.4".freeze
+  VERSION = "1.12.7".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -472,7 +472,7 @@ module RelatonBib
         return unless ident
 
         FormattedRef.new(
-          content: ident&.text, format: ident[:format],
+          content: ident.children.to_s, format: ident[:format],
           language: ident[:language], script: ident[:script]
         )
       end

data/lib/relaton_bib.rb

@@ -23,20 +23,33 @@ module RelatonBib
 
       case date.to_s
       when /(?<date>\w+\s\d{4})/ # February 2012
-        d = Date.strptime($~[:date], "%B %Y")
-        str ? d.strftime("%Y-%m") : d
+        format_date $~[:date], "%B %Y", str, "%Y-%m"
       when /(?<date>\w+\s\d{1,2},\s\d{4})/ # February 11, 2012
-        d = Date.strptime($~[:date], "%B %d, %Y")
-        str ? d.strftime("%Y-%m-%d") : d
-      when /(?<date>\d{4}-\d{2}-\d{2})/ # 2012-02-11
-        str ? $~[:date] : Date.strptime($~[:date], "%Y-%m-%d")
-      when /(?<date>\d{4}-\d{2})/ # 2012-02
-        str ? $~[:date] : Date.strptime($~[:date], "%Y-%m")
+        format_date $~[:date], "%B %d, %Y", str, "%Y-%m-%d"
+      when /(?<date>\d{4}-\d{1,2}-\d{1,2})/ # 2012-02-03 or 2012-2-3
+        format_date $~[:date], "%Y-%m-%d", str
+      when /(?<date>\d{4}-\d{1,2})/ # 2012-02 or 2012-2
+        format_date $~[:date], "%Y-%m", str
       when /(?<date>\d{4})/ # 2012
-        str ? $~[:date] : Date.strptime($~[:date], "%Y")
+        format_date $~[:date], "%Y", str
       end
     end
 
+    #
+    # Parse date string to Date object and format it
+    #
+    # @param [String] date date string
+    # @param [String] format format string
+    # @param [Boolean] str return string if true in other case return Date
+    # @param [String, nil] outformat output format
+    #
+    # @return [Date, String] date object or formatted date string
+    #
+    def format_date(date, format, str, outformat = nil)
+      date = Date.strptime(date, format)
+      str ? date.strftime(outformat || format) : date
+    end
+
     # @param arr [NilClass, Array, #is_a?]
     # @return [Array]
     def array(arr)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.12.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-29 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug