relaton-bib 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68c51d5b5aa557ccabc5d856b7409d7d8adcd0b9c78f34dc1a057ca54e72190a
-  data.tar.gz: f7aba8995fc0ea2021f02956db58e8f3b32525b887e558584036dab471371cda
+  metadata.gz: e1acb1bee569016f446bebcaeac0a98d1491d19be9a87dbd072cabec368c1aea
+  data.tar.gz: 48897d74a02ea1fe1d2578ac8fbe9f6bd89d1f0fb47b19000f75dbc7697caac7
 SHA512:
-  metadata.gz: fbf3250413e9c23af6b001532523f11ba94ecb67e0e913d35d6f79180a9a51f7700becd426d51a948db222b52c7b03fe5e7f643536c134eb78fe95a30e1d157c
-  data.tar.gz: 31b2762918ff1692d12cc1cfafdd830142a1e79b33d7b172ef18897d7bd9d10e31291a6f1eee1c7a37851dc7bd45e50fceafdee73d8298af6ec3874f34c1be0a
+  metadata.gz: ef1c0e62f60371c2416af0d0436165ba187d95004a2b8e6401b0c56ac98c0a4a4d1a75a4ec44f65bc5c50130e38d453107bbc370c291c23697efb8aae5f1c422
+  data.tar.gz: 2c7a9ccf203fe180282339700b580b575db35ce712901784b3c0e72005279561ad0e9218202b2d4f1a9ed609fc9118412a1ae9a7919fb913015efae150e2eeb1

data/lib/relaton_bib.rb

@@ -15,7 +15,7 @@ module RelatonBib
     # @param date [String, Integer, Date]
     # @param str [Boolean]
     # @return [Date, nil]
-    def parse_date(date, str = true) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    def parse_date(date, str = true) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity,Metrics/AbcSize
       return date if date.is_a?(Date)
 
       case date.to_s

data/lib/relaton_bib/bibliographic_date.rb

@@ -31,12 +31,12 @@ module RelatonBib
     # @return [String, Date, nil]
     def from(part = nil)
       d = instance_variable_get "@#{__callee__}".to_sym
-      return d unless part
+      return d unless part && d
 
       date = parse_date(d)
       return date if part == :date
 
-      date.send part
+      date.is_a?(Date) ? date.send(part) : date
     end
 
     alias_method :to, :from
@@ -87,20 +87,23 @@ module RelatonBib
     # @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 parse_date(date).strftime "%Y-%m"
-      when :full then parse_date(date).strftime "%Y-%m-%d"
-      else date
-      end
+      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
+      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/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.6.0".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.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug