relaton-bib 1.5.pre1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c135ae20e6dedad964161c4688f955bc1f6ff9945e36dcfbb4aaed73bf6d6bf
-  data.tar.gz: 7e1775460d12c0c2b8e4014cced56a7dbd84abf215c0882e34a11c198977d28c
+  metadata.gz: e1acb1bee569016f446bebcaeac0a98d1491d19be9a87dbd072cabec368c1aea
+  data.tar.gz: 48897d74a02ea1fe1d2578ac8fbe9f6bd89d1f0fb47b19000f75dbc7697caac7
 SHA512:
-  metadata.gz: f6ca89938617badf59e7e92503e1b08a87428ea0cadca42af71e93c9e528a5d2f9fd1a2f7c1a90893233db16cad05c46295561f42962c3fcdb8402cbf331e723
-  data.tar.gz: 82204e17e4ce3dc1df5555eea3f7817b1cbfa4d1f1bd2de22ef3499ea84539dbce1ef114e651a303367ae35b1a78823b043dc954d907f1717b3305662d692312
+  metadata.gz: ef1c0e62f60371c2416af0d0436165ba187d95004a2b8e6401b0c56ac98c0a4a4d1a75a4ec44f65bc5c50130e38d453107bbc370c291c23697efb8aae5f1c422
+  data.tar.gz: 2c7a9ccf203fe180282339700b580b575db35ce712901784b3c0e72005279561ad0e9218202b2d4f1a9ed609fc9118412a1ae9a7919fb913015efae150e2eeb1

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

@@ -13,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,Metrics/PerceivedComplexity,Metrics/AbcSize
       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 && d
+
+      date = parse_date(d)
+      return date if part == :date
+
+      date.is_a?(Date) ? date.send(part) : date
+    end
+
+    alias_method :to, :from
+    alias_method :on, :from
+
     # rubocop:disable Metrics/AbcSize
 
     # @param builder [Nokogiri::XML::Builder]
@@ -77,14 +83,27 @@ 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
+      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
+      else date
       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

data/lib/relaton_bib/document_identifier.rb

@@ -71,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/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.pre1".freeze
+  VERSION = "1.6.1".freeze
 end

metadata

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