relaton-iso 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc801b7e86beb613871c89c758a03461e3731c5b
-  data.tar.gz: 11de8f75ad6b7db84bc8c6d8015f2817a02001be
+  metadata.gz: 36087254e7d4a03e2b10043bf3982b8302c4b03e
+  data.tar.gz: 410db681abb2e79f7cc6f20adc94ea760fb68c5f
 SHA512:
-  metadata.gz: 2fde58ae095f74a36131efb6bebbc3dde7dfcda12d23d3b5204d13cfac7d5f024b093fb8d718c8ceac3c055076a4fbc71dd4ec3be1fb0ff46c2da0752aad9d68
-  data.tar.gz: dc57fb39f91e4eeec4f2988ced6a0c0d0108d440db528db592c8242bc21a635afc27f617db7a65e4d572bd14b2c14341c9d84a2437603a40c43d5d2eca528502
+  metadata.gz: 4de83577a94249d2a11217f279fcd83d1ea982d5a4e3f37ff50f5a1ab2050d8fcffe402ff18f27ae37c06de35af7e612fd07d678bb46623c5258b5646d8f3227
+  data.tar.gz: 8d01def2dddc97a28e4bf7f37f5ea1ebc8210adb55d505a555028762269801a8aed7114040ad89a76cd9e0283c221e6daad739efb7b464638093a0566d249abc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-iso (0.6.0)
+    relaton-iso (0.6.1)
       relaton-iec (~> 0.4.0)
       relaton-iso-bib (~> 0.3.0)
 
@@ -36,13 +36,13 @@ GEM
       pry (~> 0.10)
     public_suffix (3.1.1)
     rake (10.5.0)
-    relaton-bib (0.3.0)
+    relaton-bib (0.3.1)
       addressable
       nokogiri (~> 1.10)
     relaton-iec (0.4.0)
       addressable
       relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.0)
+    relaton-iso-bib (0.3.1)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)

data/lib/relaton_iso/hit.rb

@@ -48,5 +48,15 @@ module RelatonIso
         builder.doc.root.to_xml
       end
     end
+
+    def sort_weight
+      case hit["publicationStatus"]
+      when "Published" then 0
+      when "Under development" then 1
+      when "Withdrawn" then 2
+      else
+        3
+      end
+    end
   end
 end

data/lib/relaton_iso/hit_collection.rb

@@ -35,6 +35,13 @@ module RelatonIso
 
       json = JSON.parse resp.body
       concat(json["standards"].map { |h| Hit.new h, self })
+      sort! do |a, b|
+        if a.sort_weight == b.sort_weight
+          (parse_date(b.hit) - parse_date(a.hit)).to_i
+        else
+          a.sort_weight - b.sort_weight
+        end
+      end
     end
 
     # @return [RelatonIso::HitCollection]
@@ -69,5 +76,19 @@ module RelatonIso
       end
       builder.to_xml
     end
+
+    private
+
+    def parse_date(hit)
+      if hit["publicationDate"]
+        Date.strptime(hit["publicationDate"], "%Y-%m")
+      elsif %r{:(?<year>\d{4})} =~ hit["docRef"]
+        Date.strptime(year, "%Y")
+      elsif hit["newProjectDate"]
+        Date.parse hit["newProjectDate"]
+      else
+        Date.new 0
+      end
+    end
   end
 end

data/lib/relaton_iso/iso_bibliography.rb

@@ -142,7 +142,8 @@ module RelatonIso
       def isobib_results_filter(result, year)
         missed_years = []
         result.each do |s|
-          return { ret: s.fetch } if !year
+          next if !year && s.hit["publicationStatus"] == "Withdrawn"
+          return { ret: s.fetch } unless year
 
           %r{:(?<iyear>\d{4})} =~ s.hit["docRef"]
           return { ret: s.fetch } if iyear == year

data/lib/relaton_iso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIso
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler