relaton-bib 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57c6be55831892ce4762c2a9e8f4526cc6e7efadb3f99b0a1cf0cea7219ed001
-  data.tar.gz: ae71060872bb8fb1630a66fda9a7af01c9dbc5497efbe16669193fbca4c426a8
+  metadata.gz: 1f046b9f9c341d92cec95e89a817afea83133a322255f259c34c869aafcea60c
+  data.tar.gz: e9535bc5707436472ef9986faa9e429d2c451c94bc9b46f0ed10b21b8304dc41
 SHA512:
-  metadata.gz: b3074c5b9dc2ee9e963b766e7428f1c56aa2cd961e11618e4eea8e0c0f5d20e35bd9d16a1ede8f821f2840bb0de4cf1e053666c486dfe6f6927d07999ad5c9b6
-  data.tar.gz: 9b5f8e1c773a95438942b6a69e13ce0f82e4fb194c364d141580d38726adc2329a00fc8b5b2ac96197591ae8993a1886148313b75676ca2b32865b1d7b17fbbc
+  metadata.gz: 85b19d11a3eef57448df18fee645c53539fc485cf90f6b07b303311bf0d7dd2f4666c1bacfeae3f15aafc372cc93a60bfbcb3993783cba3103dd018633607633
+  data.tar.gz: 6a91bcba71ca9d070eb906a827ee8b5be314b888691e1f4849081163efc1c9e2b2218ac3d03e791569852cfa49ec9c2d1af7e8e16a45ff2facbf2af9b1c32824

data/lib/relaton_bib.rb

@@ -13,7 +13,8 @@ module RelatonBib
     # @param date [String]
     # @return [Date, NilClass]
     def parse_date(sdate)
-      if /(?<date>\w+\s\d{4})/ =~ sdate # February 2012
+      if sdate.is_a?(Date) then sdate
+      elsif /(?<date>\w+\s\d{4})/ =~ sdate # February 2012
         Date.strptime(date, "%B %Y")
       elsif /(?<date>\w+\s\d{1,2},\s\d{4})/ =~ sdate # February 11, 2012
         Date.strptime(date, "%B %d, %Y")
@@ -21,8 +22,7 @@ module RelatonBib
         Date.parse(date)
       elsif /(?<date>\d{4}-\d{2})/ =~ sdate # 2012-02
         Date.strptime date, "%Y-%m"
-      elsif /(?<date>\d{4})/ =~ sdate # 2012
-        Date.strptime date, "%Y"
+      elsif /(?<date>\d{4})/ =~ sdate then Date.strptime date, "%Y" # 2012
       end
     end
   end

data/lib/relaton_bib/bibliographic_item.rb

@@ -83,7 +83,7 @@ module RelatonBib
     # @return [RelatonBib::DocumentStatus, NilClass]
     attr_reader :status
 
-    # @return [RelatonBib::CopyrightAssociation, NilClass]
+    # @return [Array<RelatonBib::CopyrightAssociation>]
     attr_reader :copyright
 
     # @return [RelatonBib::DocRelationCollection]
@@ -141,10 +141,11 @@ module RelatonBib
     # @param fetched [Date, NilClass] default nil
     # @param keyword [Array<String>]
     #
-    # @param copyright [Hash, RelatonBib::CopyrightAssociation, NilClass]
-    # @option copyright [Hash, RelatonBib::ContributionInfo] :owner
-    # @option copyright [String] :form
+    # @param copyright [Array<Hash, RelatonBib::CopyrightAssociation>]
+    # @option copyright [Array<Hash, RelatonBib::ContributionInfo>] :owner
+    # @option copyright [String] :from
     # @option copyright [String, NilClass] :to
+    # @option copyright [String, NilClass] :scope
     #
     # @param date [Array<Hash>]
     # @option date [String] :type
@@ -202,11 +203,8 @@ module RelatonBib
         a.is_a?(Hash) ? FormattedString.new(a) : a
       end
 
-      if args[:copyright]
-        @copyright = if args[:copyright].is_a?(Hash)
-                       CopyrightAssociation.new args[:copyright]
-                     else args[:copyright]
-                     end
+      @copyright = args.fetch(:copyright, []).map do |c|
+        c.is_a?(Hash) ? CopyrightAssociation.new(c) : c
       end
 
       @docidentifier  = args[:docid] || []
@@ -308,7 +306,7 @@ module RelatonBib
       hash["formattedref"] = formattedref.to_hash if formattedref
       hash["abstract"] = single_element_array(abstract) if abstract&.any?
       hash["docstatus"] = status.to_hash if status
-      hash["copyright"] = copyright.to_hash if copyright
+      hash["copyright"] = single_element_array(copyright) if copyright&.any?
       hash["relation"] = single_element_array(relation) if relation&.any?
       hash["series"] = single_element_array(series) if series&.any?
       hash["medium"] = medium.to_hash if medium
@@ -530,7 +528,7 @@ module RelatonBib
         script.each { |s| builder.script s }
         abstract.each { |a| builder.abstract { a.to_xml(builder) } }
         status&.to_xml builder
-        copyright&.to_xml builder
+        copyright&.each { |c| c.to_xml builder }
         relation.each { |r| r.to_xml builder, **opts }
         series.each { |s| s.to_xml builder }
         medium&.to_xml builder

data/lib/relaton_bib/copyright_association.rb

@@ -1,29 +1,41 @@
 module RelatonBib
   # Copyright association.
   class CopyrightAssociation
+    include RelatonBib
+
     # @return [Date]
     attr_reader :from
 
     # @return [Date, NilClass]
     attr_reader :to
 
-    # @return [RelatonBib::ContributionInfo]
+    # @return [String, NilClass]
+    attr_reader :scope
+
+    # @return [Array<RelatonBib::ContributionInfo>]
     attr_reader :owner
 
-    # @param owner [Hash, RelatonBib::ContributionInfo] contributor
+    # rubocop:disable Metrics/AbcSize
+
+    # @param owner [Array<Hash, RelatonBib::ContributionInfo>] contributor
     # @option owner [String] :name
     # @option owner [String] :abbreviation
     # @option owner [String] :url
     # @param from [String] date
     # @param to [String, NilClass] date
-    def initialize(owner:, from:, to: nil)
-      @owner = if owner.is_a?(Hash)
-                 ContributionInfo.new entity: Organization.new(owner)
-               else owner
-               end
+    # @param scope [String, NilClass]
+    def initialize(owner:, from:, to: nil, scope: nil)
+      unless owner.any?
+        raise ArgumentError, "at least one owner should exist."
+      end
+
+      @owner = owner.map do |o|
+        o.is_a?(Hash) ? ContributionInfo.new(entity: Organization.new(o)) : o
+      end
 
       @from  = Date.strptime(from.to_s, "%Y") if from.to_s =~ /\d{4}/
       @to    = Date.strptime(to.to_s, "%Y") unless to.to_s.empty?
+      @scope = scope
     end
 
     # @param builder [Nokogiri::XML::Builder]
@@ -31,14 +43,21 @@ module RelatonBib
       builder.copyright do
         builder.from from ? from.year : "unknown"
         builder.to to.year if to
-        builder.owner { owner.to_xml builder }
+        owner.each { |o| builder.owner { o.to_xml builder } }
+        builder.scope scope if scope
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # @return [Hash]
     def to_hash
-      hash = { "owner" => owner.to_hash["organization"], "from" => from.year.to_s }
+      owners = single_element_array(owner.map { |o| o.to_hash["organization"] })
+      hash = {
+        "owner" => owners,
+        "from" => from.year.to_s,
+      }
       hash["to"] = to.year.to_s if to
+      hash["scope"] = scope if scope
       hash
     end
   end

data/lib/relaton_bib/document_status.rb

@@ -5,10 +5,10 @@ require "relaton_bib/localized_string"
 module RelatonBib
   # Document status.
   class DocumentStatus
-    # @return [String]
+    # @return [RelatonBib::DocumentStatus::Stage]
     attr_reader :stage
 
-    # @return [String, NilClass]
+    # @return [RelatonBib::DocumentStatus::Stage, NilClass]
     attr_reader :substage
 
     # @return [String, NilClass]
@@ -44,6 +44,7 @@ module RelatonBib
     private
 
     # @param stg [RelatonBib::DocumentStatus::Stage, Hash, String, NilClass]
+    # @return [RelatonBib::DocumentStatus::Stage]
     def stage_new(stg)
       if stg.is_a?(Stage) then stg
       elsif stg.is_a?(Hash) then Stage.new(stg)

data/lib/relaton_bib/hash_converter.rb

@@ -23,6 +23,7 @@ module RelatonBib
         formattedref_hash_to_bib(ret)
         docstatus_hash_to_bib(ret)
         contributors_hash_to_bib(ret)
+        copyright_hash_to_bib(ret)
         relations_hash_to_bib(ret)
         series_hash_to_bib(ret)
         medium_hash_to_bib(ret)
@@ -58,7 +59,8 @@ module RelatonBib
         ret[:title] = ret[:title].map do |t|
           if t.is_a?(Hash) then t
           else
-            { content: t, language: "en", script: "Latn", format: "text/plain", type: "main" }
+            { content: t, language: "en", script: "Latn", format: "text/plain",
+              type: "main" }
           end
         end
       end
@@ -267,6 +269,16 @@ module RelatonBib
         end
       end
 
+      # @param ret [Hash]
+      def copyright_hash_to_bib(ret)
+        return unless ret[:copyright]
+
+        ret[:copyright] = array(ret[:copyright]).map do |c|
+          c[:owner] = array(c[:owner])
+          c
+        end
+      end
+
       # @param ret [Hash]
       def relations_hash_to_bib(ret)
         return unless ret[:relation]
@@ -361,9 +373,9 @@ module RelatonBib
       def validity_hash_to_bib(ret)
         return unless ret[:validity]
 
-        ret[:validity][:begins] && b = Time.parse(ret[:validity][:begins])
-        ret[:validity][:ends] && e = Time.parse(ret[:validity][:ends])
-        ret[:validity][:revision] && r = Time.parse(ret[:validity][:revision])
+        ret[:validity][:begins] && b = Time.parse(ret[:validity][:begins].to_s)
+        ret[:validity][:ends] && e = Time.parse(ret[:validity][:ends].to_s)
+        ret[:validity][:revision] && r = Time.parse(ret[:validity][:revision].to_s)
         ret[:validity] = Validity.new(begins: b, ends: e, revision: r)
       end
 

data/lib/relaton_bib/typed_title_string.rb

@@ -1,14 +1,12 @@
 module RelatonBib
   class TypedTitleString
-    # TITLE_TYPES = %w[alternative original unofficial subtitle main].freeze
-
     # @return [String]
     attr_reader :type
 
     # @return [RelatonBib::FormattedString]
     attr_reader :title
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength
 
     # @param type [String]
     # @param title [RelatonBib::FormattedString, Hash]
@@ -16,10 +14,6 @@ module RelatonBib
     # @param language [String]
     # @param script [String]
     def initialize(**args)
-      # if args[:type] && !TITLE_TYPES.include?(args[:type])
-      #   warn %{[relaton-bib] title type "#{args[:type]}" is invalid.}
-      # end
-
       unless args[:title] || args[:content]
         raise ArgumentError, %{Keyword "title" or "content" should be passed.}
       end
@@ -35,7 +29,7 @@ module RelatonBib
         @title = FormattedString.new(fsargs)
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength
 
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.0.4".freeze
+  VERSION = "1.1.0".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -244,14 +244,9 @@ module RelatonBib
         end
 
         cn = person.at "./name/completename"
-        cname = if cn
-                  LocalizedString.new(cn.text, cn[:language], cn[:script])
-                else
-                  nil
-                end
-
+        cname = cn && LocalizedString.new(cn.text, cn[:language], cn[:script])
         sn = person.at "./name/surname"
-        sname = sn ? LocalizedString.new(sn.text, sn[:language], sn[:script]) : nil
+        sname = sn && LocalizedString.new(sn.text, sn[:language], sn[:script])
 
         name = FullName.new(
           completename: cname, surname: sname,
@@ -291,25 +286,24 @@ module RelatonBib
       # @return [Array<RelatonBib::FormattedString>]
       def fetch_abstract(item)
         item.xpath("./abstract").map do |a|
-          FormattedString.new(
-            content: a.text, language: a[:language], script: a[:script], format: a[:format]
-          )
+          FormattedString.new(content: a.text, language: a[:language],
+                              script: a[:script], format: a[:format])
         end
       end
 
       # @param item [Nokogiri::XML::Element]
-      # @return [RelatonBib::CopyrightAssociation]
+      # @return [Array<RelatonBib::CopyrightAssociation>]
       def fetch_copyright(item)
-        cp     = item.at("./copyright") || return
-        org    = cp&.at("owner/organization")
-        name   = org&.at("name")&.text
-        abbr   = org&.at("abbreviation")&.text
-        url    = org&.at("uri")&.text
-        entity = Organization.new(name: name, abbreviation: abbr, url: url)
-        from   = cp.at("from")&.text
-        to     = cp.at("to")&.text
-        owner  = ContributionInfo.new entity: entity
-        CopyrightAssociation.new(owner: owner, from: from, to: to)
+        item.xpath("./copyright").map do |cp|
+          owner = cp.xpath("owner").map do |o|
+            ContributionInfo.new entity: get_org(o.at("organization"))
+          end
+          from = cp.at("from")&.text
+          to   = cp.at("to")&.text
+          scope = cp.at("scope")&.text
+          CopyrightAssociation.new(owner: owner, from: from, to: to,
+                                   scope: scope)
+        end
       end
 
       # @param item [Nokogiri::XML::Element]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug