relaton-bib 1.12.3 → 1.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3610adb6319fa59f2a67b10146c3e976c7c827d91df441b504de6534cb285020
-  data.tar.gz: 75f324998da686277dee651003ba6bb2e0dea57bcb170e8db0e0566f12a45ca3
+  metadata.gz: ff390021e9158da2d1167e55d988d5dd920c7c9deba9e37838435c7f903d8852
+  data.tar.gz: a0fd8d9929ff51df3604243e9dc28770d3b38721950e1886dc6995a90fa95b4c
 SHA512:
-  metadata.gz: 4d732c577746afab2468f58404b93ab207999425ab8f9069589622ea3b89172ed9230390bdb033652440c478ab2b723977ec62064e92ce5202cde0dc753ca3c5
-  data.tar.gz: 3ac992c12c4dd00a17314a5f49ea79d82f8a66b1e8707087a2e52c17f863ea547d793f5d429fa2d63024ca6f9b22ce258e35fe55c4bfc4c947a81dcb44bd5209
+  metadata.gz: ec5005c4ae8ed03918f6933ed7329990977ab1347eb57626dfdaa1a9dddbd60eada93dc5dfdb365bb1ae06aaf60b8f7fd23ab75837022cbd1f3b6ce4009b797c
+  data.tar.gz: 864a6000626e238808513075dc9343debc59a9440e5806092c4af5e90e38e8927e62b3767903e1fc6b65611c8af60e6c4c8b5cb697c91d666f7662501ce0b7ec

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/bibxml_parser.rb

@@ -251,7 +251,10 @@ module RelatonBib
       #   "front/author[not(@surname)][not(@fullname)]/organization",
       # ).map do |org|
       org = contrib.at("./organization")
-      name = ORGNAMES[org.text] || org.text
+      orgname = org.text.strip
+      return if orgname.empty?
+
+      name = ORGNAMES[orgname] || orgname
       { entity: new_org(name, org[:abbrev]), role: [contributor_role(contrib)] }
       # end
     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/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.12.3".freeze
+  VERSION = "1.12.6".freeze
 end

data/lib/relaton_bib.rb

@@ -23,20 +23,32 @@ 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 or Date if true
+    #
+    # @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.3
+  version: 1.12.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug