relaton-nist 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93987ca6ac6f597f394c317a843b423635418eefe9e1e0512d972382cf15bd78
-  data.tar.gz: ee7c447e8292f0fd9fa21b0e436f348c044400b69e3116d05bb66405f66b092c
+  metadata.gz: 2ab3d1123704cbe701f2f8158ee2d60be05a762141a8c10f2d9f196f8b905dab
+  data.tar.gz: f06320c0918cf4d5b6354015e370b2cc7bab93247bfd842875086005de9ca247
 SHA512:
-  metadata.gz: ed9f2703b8a68262f1b476c5111a93d160ba53ae2e065778e9ab71308a99503be6ec50096ba1653f267f314ac281d8be286b2f9784c59a2c9022478990e0f199
-  data.tar.gz: decbc81d52f7edcfa06db0028e2d5152fe75199e2d2510d7bab7df3e766da98d61e735ced81e4e6a827404806bd16e402d395de501c8a14eb362038b3e8fba46
+  metadata.gz: 6a1bb823322716ac5115428bedbcad2cee3667bc24b8f7fc02030856f5028b92377196eaa8b4c1c6afe6cd67357af4a9d34d4fe7d09b8313e3310f6cc02394b8
+  data.tar.gz: 4fddf90e843ed03dc7d2dc281674a5ecf0ce69d58509682a36f39044dcfb7a769378153f194872f2199c1c8b702a6ca3c88be6f618d22a28283814ead733c37c

data/.travis.yml

@@ -8,12 +8,10 @@ os:
 rvm:
 - 2.5
 - 2.4
-- 2.3
 - ruby-head
 before_install: 
 - gem install bundler -v 2.0.1
 - bundle update
 matrix:
   allow_failures:
-    - rvm: 2.3
     - rvm: ruby-head

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-nist (0.2.0)
+    relaton-nist (0.2.1)
       relaton-bib (~> 0.2.0)
 
 GEM
@@ -15,9 +15,9 @@ GEM
       safe_yaml (~> 1.0.0)
     debase (0.2.2)
       debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.4)
+    debase-ruby_core_source (0.10.5)
     diff-lcs (1.3)
-    docile (1.3.1)
+    docile (1.3.2)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     hashdiff (0.4.0)
@@ -34,23 +34,23 @@ GEM
       pry (~> 0.10)
     public_suffix (3.1.0)
     rake (10.5.0)
-    relaton-bib (0.2.0)
+    relaton-bib (0.2.1)
       addressable
       nokogiri (~> 1.8.4)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.1)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    ruby-debug-ide (0.6.1)
+    rspec-support (3.8.2)
+    ruby-debug-ide (0.7.0)
       rake (>= 0.8.1)
     safe_yaml (1.0.5)
     simplecov (0.16.1)
@@ -59,10 +59,10 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     vcr (5.0.0)
-    webmock (3.5.1)
+    webmock (3.6.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby

data/lib/relaton_nist/hit.rb

@@ -43,11 +43,21 @@ module RelatonNist
 
     # @return [Iteger]
     def sort_value
-      case hit[:status]
-      when "final" then 1
-      when "withdrawn" then 2
-      when "draft (withdrawn)" then 3
-      else 4
+      @sort_value ||= begin
+        sort_phrase = [hit[:serie], hit[:code], hit[:title]].join " "
+        corr = hit_collection.text.split.map do |w|
+          if w =~ /\w+/ &&
+              sort_phrase =~ Regexp.new(Regexp.escape(w), Regexp::IGNORECASE)
+            1
+          else 0
+          end
+        end.sum
+        corr + case hit[:status]
+               when "final" then 3
+               when "withdrawn" then 2
+               when "draft (withdrawn)" then 1
+               else 0
+               end
       end
     end
   end

data/lib/relaton_nist/hit_collection.rb

@@ -59,7 +59,14 @@ module RelatonNist
           }, self
         )
       end
-      concat(hits.sort { |a, b| a.sort_value - b.sort_value })
+      hits.sort! do |a, b|
+        if a.sort_value != b.sort_value
+          b.sort_value - a.sort_value
+        else
+          (b.hit[:release_date] - a.hit[:release_date]).to_i
+        end
+      end
+      concat hits
       # concat(hits.map { |h| Hit.new(h, self) })
       @fetched = false
       # @hit_pages = hit_pages

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-15 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: 'RelatonNist: retrive NIST standards.'