relaton-nist 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8ecd59e55592824d0fc5dbdf74153a3239bc692d8c85245302487fb15b06a43
-  data.tar.gz: 3e2f8467fcf4fec8c84ded04a6f3b56fe6c12e158efd0194ecc9e141b5c0e1fe
+  metadata.gz: c87f09763dbcc319401cbc3b2c86de4a1cdd60743f00db8526d2a28e52a71dfd
+  data.tar.gz: 9d690b4c771ae2f7256c6dd0770022b7709e00f08ee4efa625cbb144d3ba80b6
 SHA512:
-  metadata.gz: 23774ffcc458ffb19987383373313f4829b73115765100e123727ec961c6e8410c50d42382b18eb5715b8b204d172ceeb278ffbc967835e26bdc2ed802048124
-  data.tar.gz: 15def1a57fdd91e48166238ce6a2da7691ceccf7157ce7aa8c687bcfa82e91482e4f2ebf2ea009c9aa94659307f7cab4afe78ceae9b20d38ffcfc80339b48623
+  metadata.gz: ad3251b6140a8b79de2a952eed6ba721011efe3d77dff8f195147e0a0819356a6dcd52b48868d883bbb8572d32ff27216ec29bc76f942e2da51c2f69f5a687e7
+  data.tar.gz: a6f32c9121980c23c324e6a1c7daead5baf266401dcad3efab1dfe0f46e6d886b21c84fe9750df2ed1a14f3cfc2377183b497e95c84f739c8277e727514459f2

data/.github/workflows/macos.yml

@@ -1,14 +1,19 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: macos
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +25,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          sudo gem install bundler -v "~> 2" --force
+          sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/.github/workflows/ubuntu.yml

@@ -1,14 +1,19 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: ubuntu
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +25,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/.github/workflows/windows.yml

@@ -1,14 +1,19 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -21,7 +26,7 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler
           bundle config --local path vendor/bundle
           bundle update
           bundle install --jobs 4 --retry 3

data/.gitignore

@@ -12,3 +12,5 @@
 # rspec failure tracking
 .rspec_status
 pubs-export.json
+Gemfile.lock
+.byebug_history

data/README.adoc

@@ -1,9 +1,12 @@
 = RelatonNist: retrieve NIST Standards for bibliographic use using the BibliographicItem model
 
 image:https://img.shields.io/gem/v/relaton-nist.svg["Gem Version", link="https://rubygems.org/gems/relaton-nist"]
-image:https://img.shields.io/travis/metanorma/relaton-nist/master.svg["Build Status", link="https://travis-ci.com/metanorma/relaton-nist"]
-image:https://ci.appveyor.com/api/projects/status/vk85u3df4f3kertr?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/relaton-nist"]
-image:https://codeclimate.com/github/metanorma/relaton-nist/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/relaton-nist"]
+image:https://github.com/relaton/relaton-nist/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/relaton/relaton-nist/actions?workflow=macos"]
+image:https://github.com/relaton/relaton-nist/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/relaton/relaton-nist/actions?workflow=windows"]
+image:https://github.com/relaton/relaton-nist/workflows/ubuntu/badge.svg["Build Status (Ubuntu)", link="https://github.com/relaton/relaton-nist/actions?workflow=ubuntu"]
+image:https://codeclimate.com/github/relaton/relaton-nist/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/relaton/relaton-nist"]
+image:https://img.shields.io/github/issues-pr-raw/relaton/relaton-nist.svg["Pull Requests", link="https://github.com/relaton/relaton-nist/pulls"]
+image:https://img.shields.io/github/commits-since/relaton/relaton-nist/latest.svg["Commits since latest",link="https://github.com/relaton/relaton-nist/releases"]
 
 
 RelatonNist is a Ruby gem that implements the https://github.com/metanorma/metanorma-model-iso#iso-bibliographic-item[IsoBibliographicItem model].

data/grammars/biblio.rng

@@ -638,9 +638,9 @@
     <zeroOrMore>
       <ref name="license"/>
     </zeroOrMore>
-    <optional>
+    <zeroOrMore>
       <ref name="bclassification"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="bkeyword"/>
     </zeroOrMore>

data/lib/relaton_nist/hash_converter.rb

@@ -9,17 +9,12 @@ module RelatonNist
         ret = super
         return if ret.nil?
 
-        keyword_hash_to_bib(ret)
         commentperiod_hash_to_bib(ret)
         ret
       end
 
       private
 
-      def keyword_hash_to_bib(ret)
-        ret[:keyword]&.map! { |kw| Keyword.new kw }
-      end
-
       def commentperiod_hash_to_bib(ret)
         return unless ret[:commentperiod]
 

data/lib/relaton_nist/hit.rb

@@ -16,17 +16,18 @@ module RelatonNist
     def sort_value
       @sort_value ||= begin
         sort_phrase = [hit[:serie], hit[:code], hit[:title]].join " "
-        corr = hit_collection.text.split.map do |w|
+        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
+        end&.sum.to_i
         corr + case hit[:status]
-               when "final" then 3
-               when "withdrawn" then 2
-               when "draft (withdrawn)" then 1
+               when "final" then 4
+               when "withdrawn" then 3
+               when "draft" then 2
+               when "draft (obsolete)" then 1
                else 0
                end
       end

data/lib/relaton_nist/hit_collection.rb

@@ -66,12 +66,12 @@ module RelatonNist
         serie = h.at("td[1]").text.strip
         code  = h.at("td[2]").text.strip
         title = link.text
-        url   = DOMAIN + link[:href]
+        doc_url   = DOMAIN + link[:href]
         status = h.at("td[4]").text.strip.downcase
         release_date = Date.strptime h.at("td[5]").text.strip, "%m/%d/%Y"
         Hit.new(
           {
-            code: code, serie: serie, title: title, url: url, status: status,
+            code: code, serie: serie, title: title, url: doc_url, status: status,
             release_date: release_date
           }, self
         )

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -4,7 +4,7 @@ module RelatonNist
     attr_reader :doctype
 
     # @return [Array<RelatonNist::Keyword>]
-    attr_reader :keyword
+    # attr_reader :keyword
 
     # @return [RelatonNist::CommentPeriod, NilClass]
     attr_reader :commentperiod
@@ -57,7 +57,7 @@ module RelatonNist
     # @option relation [Array<RelatonBib::BibItemLocality>] :bib_locality
     def initialize(**args)
       @doctype = args.delete(:doctype) || "standard"
-      @keyword = args.delete(:keyword) || []
+      # @keyword = args.delete(:keyword) || []
       @commentperiod = args.delete :commentperiod
       super
     end
@@ -78,7 +78,7 @@ module RelatonNist
     # @return [Hash]
     def to_hash
       hash = super
-      hash["keyword"] = single_element_array(keyword) if keyword&.any?
+      # hash["keyword"] = single_element_array(keyword) if keyword&.any?
       hash["commentperiod"] = commentperiod.to_hash if commentperiod
       hash
     end

data/lib/relaton_nist/nist_bibliography.rb

@@ -3,7 +3,6 @@ require "relaton_nist/nist_bibliographic_item"
 require "relaton_nist/scrapper"
 require "relaton_nist/hit_collection"
 require "relaton_nist/xml_parser"
-require "relaton_nist/keyword"
 require "relaton_nist/comment_period"
 require "relaton_nist/document_status"
 require "relaton_nist/hash_converter"

data/lib/relaton_nist/scrapper.rb

@@ -47,6 +47,7 @@ module RelatonNist
           docstatus: fetch_status(json, hit_data[:status]),
           copyright: fetch_copyright(json["published-date"]),
           relation: fetch_relations_json(json),
+          place: ["Gaithersburg, MD"],
           keyword: fetch_keywords(json),
           commentperiod: fetch_commentperiod_json(json),
         }
@@ -86,7 +87,12 @@ module RelatonNist
       # @return [Array<Nokogiri::HTML::Document, String>]
       def get_page(url)
         uri = URI url
-        resp = Net::HTTP.get_response(uri) # .encode("UTF-8")
+        resp = Net::HTTP.get_response(uri)
+        %r{(?<=newLocation = 'https://' \+ window.location.hostname \+ ')(?<path>[^']+)} =~ resp.body
+        if path
+          uri = URI HitCollection::DOMAIN + path
+          resp = Net::HTTP.get_response(uri)
+        end
         Nokogiri::HTML(resp.body)
       rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
              Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
@@ -103,7 +109,7 @@ module RelatonNist
                    else
                      doc.at(
                        "//div[contains(@class, 'publications-detail')]/h3",
-                     )&.text&.strip
+                     )&.text&.strip.sub(/(?<=\w)\([^\)]+\)$/) { |m| " " + m.upcase}.squeeze " "
                    end
         item_ref ||= "?"
         [RelatonBib::DocumentIdentifier.new(id: item_ref, type: "NIST")]
@@ -128,7 +134,7 @@ module RelatonNist
           iter = doc["iteration"] == "initial" ? 1 : doc["iteration"]
         else
           case status
-          when "draft (withdrawn)"
+          when "draft (obsolete)"
             stage = "draft-public"
             subst = "withdrawn"
           when "retired draft"
@@ -137,7 +143,7 @@ module RelatonNist
           when "withdrawn"
             stage = "final"
             subst = "withdrawn"
-          when "draft"
+          when /^draft/
             stage = "draft-public"
             subst = "active"
           else
@@ -351,9 +357,9 @@ module RelatonNist
           links << { type: "uri", content: doc["uri"] } if doc["uri"]
           doi = "https://doi.org/" + doc["doi"] if doc["doi"]
         else
-          pub = doc.at "//p/strong[.='Publication:']"
-          pdf = pub.at "./following-sibling::a[.=' Local Download']"
-          doi = pub.at("./following-sibling::a[contains(.,'(DOI)')]")&.attr :href
+          pub = doc.at "//p/strong[contains(., 'Publication:')]"
+          pdf = pub&.at "./following-sibling::a[.=' Local Download']"
+          doi = pub&.at("./following-sibling::a[contains(.,'(DOI)')]")&.attr :href
           links << { type: "pdf", content: pdf[:href] } if pdf
         end
         links << { type: "doi", content: doi } if doi
@@ -416,10 +422,12 @@ module RelatonNist
                  else idx + 1
                  end
 
-          content = s.text.match(/^[^\(]+/).to_s.strip.gsub "  ", " "
+          content = s.text.match(/^[^\(]+/).to_s.strip.squeeze " "
 
-          ref = case content.match(/\w+/).to_s
-                when "Draft" then content.match(/(?<=Draft\s).+/).to_s + " (#{iter}PD)"
+          ref = case s.text
+                when /^Draft/ then content.match(/(?<=Draft\s).+/).to_s + " (#{iter}PD)"
+                when /\(Draft\)/ then content + " (#{iter}PD)"
+                else content
                 end
 
           fref = RelatonBib::FormattedRef.new(
@@ -437,7 +445,7 @@ module RelatonNist
               else
                 doc.xpath "//span[@id='pub-keywords-container']/span"
               end
-        kws.map { |kw| Keyword.new kw.is_a?(String) ? kw : kw.text }
+        kws.map { |kw| kw.is_a?(String) ? kw : kw.text }
       end
 
       # @param doc [Nokogiri::HTML::Document]

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "0.4.0".freeze
+  VERSION = "0.7.0".freeze
 end

data/lib/relaton_nist/xml_parser.rb

@@ -14,7 +14,6 @@ module RelatonNist
         ext = nistitem.at "./ext"
         return data unless ext
 
-        data[:keyword] = fetch_keyword(ext)
         data[:commentperiod] = fetch_commentperiod(ext)
         data
       end
@@ -39,12 +38,6 @@ module RelatonNist
           extended: cp.at("extended")&.text
         )
       end
-
-      def fetch_keyword(item)
-        item.xpath("./keyword").map do |kw|
-          Keyword.new kw.children.first.to_xml
-        end
-      end
     end
   end
 end

data/relaton_nist.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -36,6 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "ruby-jing"
 
-  spec.add_dependency "relaton-bib", "~> 0.4.0"
+  spec.add_dependency "relaton-bib", "~> 0.7.0"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +206,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.adoc
 - Rakefile
@@ -238,7 +223,6 @@ files:
 - lib/relaton_nist/hash_converter.rb
 - lib/relaton_nist/hit.rb
 - lib/relaton_nist/hit_collection.rb
-- lib/relaton_nist/keyword.rb
 - lib/relaton_nist/nist_bibliographic_item.rb
 - lib/relaton_nist/nist_bibliography.rb
 - lib/relaton_nist/processor.rb

data/Gemfile.lock

@@ -1,91 +0,0 @@
-PATH
-  remote: .
-  specs:
-    relaton-nist (0.4.0)
-      relaton-bib (~> 0.4.0)
-      rubyzip
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    byebug (11.0.1)
-    coderay (1.1.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    debase (0.2.2)
-      debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.5)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    equivalent-xml (0.6.0)
-      nokogiri (>= 1.4.3)
-    hashdiff (0.4.0)
-    json (2.2.0)
-    method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.7)
-      mini_portile2 (~> 2.4.0)
-    optout (0.0.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
-      byebug (~> 11.0)
-      pry (~> 0.10)
-    public_suffix (4.0.1)
-    rake (10.5.0)
-    relaton-bib (0.4.0)
-      addressable
-      nokogiri
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    ruby-debug-ide (0.7.0)
-      rake (>= 0.8.1)
-    ruby-jing (0.0.1)
-      optout (>= 0.0.2)
-    rubyzip (2.0.0)
-    safe_yaml (1.0.5)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    vcr (5.0.0)
-    webmock (3.6.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  byebug
-  debase
-  equivalent-xml (~> 0.6)
-  pry-byebug
-  rake (~> 10.0)
-  relaton-nist!
-  rspec (~> 3.0)
-  ruby-debug-ide
-  ruby-jing
-  simplecov
-  vcr
-  webmock
-
-BUNDLED WITH
-   2.0.2

data/lib/relaton_nist/keyword.rb

@@ -1,23 +0,0 @@
-module RelatonNist
-  class Keyword
-    include RelatonBib
-
-    # @return [Nokogiri::XML::DocumentFragment]
-    attr_reader :element
-
-    # @param element [String]
-    def initialize(element)
-      @element = Nokogiri::XML.fragment element
-    end
-
-    # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
-      builder.keyword element.to_xml
-    end
-
-    # @return [String]
-    def to_hash
-      element.text
-    end
-  end
-end