relaton-bib 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60c49a41357c85d67963be4c8260759919e4ec11b14444e0ebaea3eb71c51597
-  data.tar.gz: 7f1e174522173f072112e5230fefb1d490f4d7aae472f36c92a7fe82c7bb2303
+  metadata.gz: 2c556856365ed3b55dfead00fa129508a6d541aaa04fa96d4a37997761d77aaf
+  data.tar.gz: 1e819257d4ee84d00bd6a0634a6abbc91b19ed6d9854275c0b9c04db4bb43c1a
 SHA512:
-  metadata.gz: 85aebc56a9f88e43dcac88b74a951557536e183549ef32340493cdeea30612a7443bd09472886e7d0b4494538c57b1109eebc9fd2c940f7df94e0bebbb02eb02
-  data.tar.gz: 470d434701c6c2ba04ffd444ac7f4e056b7cd3220b1fa6121f63bee273a97056643156ab455e0ed526cd981d124ae4535b3f70b0aa754139e3c541fe51ae7615
+  metadata.gz: a65cc8f9435f61a0313d744f3827a55a91e7ccb7edc1d143f318d38cb2fb07b7fa75b7cdb871133c631d4deee778ba1c552811b11aa4aec479370cfcbe28d87f
+  data.tar.gz: 3c105c0244fd7e2f3fbdca1a9fd0626560f9d6e5f754743ff23530311885f0fca8c31e70cfcaae1961cc0ee957908854063d2972390885bbe46a3beb8179d194

data/lib/relaton_bib.rb

@@ -10,24 +10,27 @@ module RelatonBib
   class RequestError < StandardError; end
 
   class << self
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
 
-    # @param date [String]
+    # @param date [String, Integer, Date]
     # @return [Date, NilClass]
-    def parse_date(sdate)
-      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")
-      elsif /(?<date>\d{4}-\d{2}-\d{2})/ =~ sdate # 2012-02-11
-        Date.parse(date)
-      elsif /(?<date>\d{4}-\d{2})/ =~ sdate # 2012-02
+    def parse_date(date)
+      return date if date.is_a?(Date)
+
+      sdate = date.to_s
+      case sdate
+      when /(?<date>\w+\s\d{4})/ # February 2012
+        Date.strptime($~[:date], "%B %Y")
+      when /(?<date>\w+\s\d{1,2},\s\d{4})/ # February 11, 2012
+        Date.strptime($~[:date], "%B %d, %Y")
+      when /(?<date>\d{4}-\d{2}-\d{2})/ # 2012-02-11
+        Date.parse($~[:date])
+      when /(?<date>\d{4}-\d{2})/ # 2012-02
         Date.strptime date, "%Y-%m"
-      elsif /(?<date>\d{4})/ =~ sdate then Date.strptime date, "%Y" # 2012
+      when /(?<date>\d{4})/ then Date.strptime $~[:date], "%Y" # 2012
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
   end
 
   private

data/lib/relaton_bib/hash_converter.rb

@@ -375,18 +375,29 @@ module RelatonBib
         end
       end
 
-      # rubocop:disable Metrics/AbcSize
-
       # @param ret [Hash]
       def validity_hash_to_bib(ret)
         return unless ret[:validity]
 
-        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)
+        b = parse_validity_time(ret[:validity], :begins)
+        e = parse_validity_time(ret[:validity], :ends)
+        r = parse_validity_time(ret[:validity], :revision)
         ret[:validity] = Validity.new(begins: b, ends: e, revision: r)
       end
-      # rubocop:enable Metrics/AbcSize
+
+      def parse_validity_time(val, period)
+        t = val[period]&.to_s
+        return unless t
+
+        p = period == :ends ? -1 : 1
+        case t
+        when /^\d{4}$/
+          Date.new(t.to_i, p, p).to_time
+        when /^(?<year>\d{4})-(?<month>\d{1,2})$/
+          Date.new($~[:year].to_i, $~[:month].to_i, p).to_time
+        else Time.parse t
+        end
+      end
 
       # @param ret [Hash]
       def editorialgroup_hash_to_bib(ret)

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.2.2".freeze
+  VERSION = "1.2.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug