relaton-bib 1.5.pre → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 718bae79646e15f68243d997e053ed614d8309dafad8cbb8e9d0189d49198171
-  data.tar.gz: e54d51485d37662aa2507d074f859b896277d13fe298158ce84faf9570e037bc
+  metadata.gz: 68c51d5b5aa557ccabc5d856b7409d7d8adcd0b9c78f34dc1a057ca54e72190a
+  data.tar.gz: f7aba8995fc0ea2021f02956db58e8f3b32525b887e558584036dab471371cda
 SHA512:
-  metadata.gz: 630aee8ec416f891616c5efcdd068994422bfca2415f57a9e211fec53bece058c51af62220301dd7dc547c5fcde34852f5fc970256d6a845040fd58745ab5ca7
-  data.tar.gz: 7dfc99a09a5e896a76c27fed1c0dcc8ff02b126d51c019831532849626a972a28f2f1593f1d5e59b3a8ced5b97264a6d2abdb876f2874b2a3aad037017aa2757
+  metadata.gz: fbf3250413e9c23af6b001532523f11ba94ecb67e0e913d35d6f79180a9a51f7700becd426d51a948db222b52c7b03fe5e7f643536c134eb78fe95a30e1d157c
+  data.tar.gz: 31b2762918ff1692d12cc1cfafdd830142a1e79b33d7b172ef18897d7bd9d10e31291a6f1eee1c7a37851dc7bd45e50fceafdee73d8298af6ec3874f34c1be0a

data/.github/workflows/macos.yml

@@ -32,6 +32,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/grammars/isodoc.rng

@@ -42,7 +42,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -864,6 +863,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>

data/lib/relaton_bib.rb

@@ -1,6 +1,7 @@
 require "forwardable"
 require "relaton_bib/version"
 require "relaton_bib/deep_dup"
+require "relaton_bib/localized_string"
 require "relaton_bib/bibliographic_item"
 require "relaton_bib/hit_collection"
 require "relaton_bib/hit"
@@ -12,21 +13,24 @@ module RelatonBib
 
   class << self
     # @param date [String, Integer, Date]
-    # @return [Date, NilClass]
-    def parse_date(date) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # @param str [Boolean]
+    # @return [Date, nil]
+    def parse_date(date, str = true) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
       return date if date.is_a?(Date)
 
-      sdate = date.to_s
-      case sdate
+      case date.to_s
       when /(?<date>\w+\s\d{4})/ # February 2012
-        Date.strptime($~[:date], "%B %Y")
+        d = Date.strptime($~[:date], "%B %Y")
+        str ? d.strftime("%Y-%m") : d
       when /(?<date>\w+\s\d{1,2},\s\d{4})/ # February 11, 2012
-        Date.strptime($~[:date], "%B %d, %Y")
+        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
-        Date.parse($~[:date])
+        str ? $~[:date] : Date.strptime($~[:date], "%Y-%m-%d")
       when /(?<date>\d{4}-\d{2})/ # 2012-02
-        Date.strptime date, "%Y-%m"
-      when /(?<date>\d{4})/ then Date.strptime $~[:date], "%Y" # 2012
+        str ? $~[:date] : Date.strptime($~[:date], "%Y-%m")
+      when /(?<date>\d{4})/ # 2012
+        str ? $~[:date] : Date.strptime($~[:date], "%Y")
       end
     end
   end

data/lib/relaton_bib/biblio_note.rb

@@ -3,7 +3,7 @@ module RelatonBib
     extend Forwardable
 
     def_delegators :@array, :[], :first, :last, :empty?, :any?, :size,
-                   :each, :map, :detect, :length
+                   :each, :map, :reduce, :detect, :length
 
     def initialize(notes)
       @array = notes

data/lib/relaton_bib/bibliographic_date.rb

@@ -12,15 +12,6 @@ module RelatonBib
     # @return [String]
     attr_reader :type
 
-    # @return [Date]
-    attr_reader :from
-
-    # @return [Date]
-    attr_reader :to
-
-    # @return [Date]
-    attr_reader :on
-
     # @param type [String] "published", "accessed", "created", "activated"
     # @param on [String]
     # @param from [String]
@@ -36,6 +27,21 @@ module RelatonBib
       @to   = RelatonBib.parse_date to
     end
 
+    # @param part [Symbol] :year, :month, :day, :date
+    # @return [String, Date, nil]
+    def from(part = nil)
+      d = instance_variable_get "@#{__callee__}".to_sym
+      return d unless part
+
+      date = parse_date(d)
+      return date if part == :date
+
+      date.send part
+    end
+
+    alias_method :to, :from
+    alias_method :on, :from
+
     # rubocop:disable Metrics/AbcSize
 
     # @param builder [Nokogiri::XML::Builder]
@@ -77,14 +83,24 @@ module RelatonBib
     private
 
     # Formats date
-    # @param date [Time]
-    # @param format [Symbol, nil] :full (yyyy-mm-dd), :short (yyyy-mm) or nil (yyyy)
+    # @param date [String]
+    # @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 date.strftime "%Y-%m"
-      when :full then date.strftime "%Y-%m-%d"
-      else date.year
+      when :short then parse_date(date).strftime "%Y-%m"
+      when :full then parse_date(date).strftime "%Y-%m-%d"
+      else date
+      end
+    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
       end
     end
   end

data/lib/relaton_bib/bibliographic_item.rb

@@ -292,7 +292,7 @@ module RelatonBib
     def shortref(identifier, **opts) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize,Metrics/PerceivedComplexity
       pubdate = date.select { |d| d.type == "published" }
       year = if opts[:no_year] || pubdate.empty? then ""
-             else ":" + pubdate&.first&.on&.year.to_s
+             else ":" + pubdate&.first&.on(:year).to_s
              end
       year += ": All Parts" if opts[:all_parts] || @all_parts
 
@@ -610,8 +610,8 @@ module RelatonBib
       date.each do |d|
         case d.type
         when "published"
-          item.year = d.on.year
-          item.month = d.on.month
+          item.year = d.on :year
+          item.month = d.on :month
         when "accessed" then item.urldate = d.on.to_s
         end
       end
@@ -678,7 +678,7 @@ module RelatonBib
         title.to_xml **opts
         formattedref&.to_xml builder
         link.each { |s| s.to_xml builder }
-        docidentifier.each { |di| di.to_xml builder }
+        docidentifier.each { |di| di.to_xml **opts }
         builder.docnumber docnumber if docnumber
         date.each { |d| d.to_xml builder, **opts }
         contributor.each do |c|

data/lib/relaton_bib/document_identifier.rb

@@ -45,10 +45,15 @@ module RelatonBib
     #
     # Add docidentifier xml element
     #
-    # @param [Nokogiri::XML::Builder] builder
-    #
-    def to_xml(builder)
-      element = builder.docidentifier id
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [String] :lang language
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize
+      lid = if type == "URN" && opts[:lang]
+              id.sub %r{(?<=:)(?:\w{2},)*?(#{opts[:lang]})(?:,\w{2})*}, '\1'
+            else id
+            end
+      element = opts[:builder].docidentifier lid
       element[:type] = type if type
       element[:scope] = scope if scope
     end
@@ -66,11 +71,12 @@ module RelatonBib
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
       pref = prefix.empty? ? prefix : prefix + "."
+      return "#{pref}docid:: #{id}\n" unless type || scope
+
       out = count > 1 ? "#{pref}docid::\n" : ""
       out += "#{pref}docid.type:: #{type}\n" if type
       out += "#{pref}docid.scope:: #{scope}\n" if scope
-      out += "#{pref}docid.id:: #{id}\n"
-      out
+      out + "#{pref}docid.id:: #{id}\n"
     end
 
     private

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, :length
+                   :each, :detect, :map, :reduce, :length
 
     # @param relation [Array<RelatonBib::DocumentRelation, Hash>]
     # @option relation [String] :type

data/lib/relaton_bib/document_status.rb

@@ -1,7 +1,4 @@
 # frozen_string_literal: true
-
-require "relaton_bib/localized_string"
-
 module RelatonBib
   # Document status.
   class DocumentStatus

data/lib/relaton_bib/hash_converter.rb

@@ -125,7 +125,7 @@ module RelatonBib
 
         ret[:docid] = array(ret[:docid])
         ret[:docid]&.each_with_index do |id, i|
-          type = id[:type] || id[:id].match(/^\w+/)&.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

data/lib/relaton_bib/hit_collection.rb

@@ -4,7 +4,8 @@ module RelatonBib
   class HitCollection
     extend Forwardable
 
-    def_delegators :@array, :<<, :[], :first, :empty?, :any?, :size, :each, :each_slice
+    def_delegators :@array, :<<, :[], :first, :empty?, :any?, :size, :each,
+                   :each_slice, :reduce
 
     # @return [TrueClass, FalseClass]
     attr_reader :fetched

data/lib/relaton_bib/structured_identifier.rb

@@ -3,7 +3,8 @@ module RelatonBib
     include RelatonBib
     extend Forwardable
 
-    def_delegators :@collection, :any?, :size, :[], :detect
+    def_delegators :@collection, :any?, :size, :[], :detect, :map, :each,
+                   :reduce
 
     # @param collection [Array<RelatonBib::StructuredIdentifier>]
     def initialize(collection)

data/lib/relaton_bib/typed_title_string.rb

@@ -3,7 +3,7 @@ module RelatonBib
     extend Forwardable
 
     def_delegators :@array, :[], :first, :last, :empty?, :any?, :size,
-                   :each, :detect, :map, :length
+                   :each, :detect, :map, :reduce, :length
 
     # @param title [Array<RelatonBib::TypedTitleString, Hash>]
     def initialize(title = [])
@@ -30,6 +30,12 @@ module RelatonBib
       TypedTitleStringCollection.new(titles.select { |t| yield t })
     end
 
+    # @param init [Array, Hash]
+    # @return [RelatonBib::TypedTitleStringCollection]
+    # def reduce(init)
+    #   self.class.new @array.reduce(init) { |m, t| yield m, t }
+    # end
+
     # @param title [RelatonBib::TypedTitleString]
     # @return [self]
     def <<(title)

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.5.pre".freeze
+  VERSION = "1.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.5.pre
+  version: 1.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-11-13 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: