relaton-bib 1.5.1 → 1.6.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de6c6f8d155863ad2ac349a7f700057304a853d49bef05cccef7d0b18f077efa
-  data.tar.gz: 3507f0906a299bfa8cd08a052077bc3293f1814414d29f3a1ffe53979bdd1532
+  metadata.gz: c9741b425d8415304b51078b9a7c649560abccdecbec0ead58986994209b4baf
+  data.tar.gz: 9ec3425ae7f42bc668be546058c6d7b7ff5a4be4bd345b9f0f74c4ca26be2db5
 SHA512:
-  metadata.gz: a36b8aaca8049117da0b969df10e60ea09d3788b5e1e337073bb9b2a38add00319343a813db4e4b403f7a88a391b2c404c50bdd360aee7d5da9334c8d3a8b0ba
-  data.tar.gz: 5192b67352e20fbdbcc9ab491cd9161a2bde3c526ad99ccd8829f1c967e2d4eda12ff92be2022e218269d5a0fe9aaa2925519bd8c49cb9c8faebbf124e87a610
+  metadata.gz: 66bd1804ab23745be33b2990dec11c84e7a9e1b70e192604e131d298cf88893bff94f20648085099c7505d5b201d54886f6e96eeb9d5ef4694495794e7203242
+  data.tar.gz: c0d5e9ce4b7dba3f22f1834017f58afbf2a826be3eefbe67e6bfd6ca0fb9fe1310dc7dc55f71b783137d5f3df2011c4f54cb717bb07aa798cc28c535b94ccc34

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/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
       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/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

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

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.5.1".freeze
+  VERSION = "1.6.pre1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.pre1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-11-11 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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
 signing_key: