relaton-nist 0.3.9 → 0.6.0

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
@@ -68,7 +68,7 @@ module RelatonNist
         if opts[:bibdata]
           b.ext do
             b.doctype doctype
-            keyword.each { |kw| kw.to_xml b }
+            # keyword.each { |kw| kw.to_xml b }
             commentperiod&.to_xml b
           end
         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"
@@ -29,6 +28,8 @@ module RelatonNist
       #
       # @return [String] Relaton XML serialisation of reference
       def get(code, year = nil, opts = {})
+        return fetch_ref_err(code, year, []) if code =~ /\sEP$/
+
         /^(?<code2>[^\(]+)(\((?<date2>\w+\s(\d{2},\s)?\d{4})\))?\s?\(?((?<=\()(?<stage>[^\)]+))?/ =~ code
         if code2
           code = code2.strip

data/lib/relaton_nist/processor.rb

@@ -5,7 +5,7 @@ module RelatonNist
     def initialize
       @short = :relaton_nist
       @prefix = "NIST"
-      @defaultprefix = %r{^(NIST|NISTGCR|ITL Bulletin|JPCRD|NISTIR|CSRC)(/[^\s])?\s}
+      @defaultprefix = %r{^(NIST|NISTGCR|ITL Bulletin|JPCRD|NISTIR|CSRC|FIPS)(/[^\s])?\s}
       @idtype = "NIST"
     end
 
@@ -29,5 +29,11 @@ module RelatonNist
       item_hash = ::RelatonNist::HashConverter.hash_to_bib(hash)
       ::RelatonNist::NistBibliographicItem.new item_hash
     end
+
+    # Returns hash of XML grammar
+    # @return [String]
+    def grammar_hash
+      @grammar_hash ||= ::RelatonNist.grammar_hash
+    end
   end
 end

data/lib/relaton_nist/scrapper.rb

@@ -27,7 +27,7 @@ module RelatonNist
         item_data[:fetched] = Date.today.to_s
         item_data[:type] = "standard"
         item_data[:title] = titles
-        item_data[:doctype] = doctype
+        item_data[:doctype] = "standard" # doctype
 
         NistBibliographicItem.new(**item_data)
       end
@@ -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.3.9".freeze
+  VERSION = "0.6.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"
@@ -34,7 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "ruby-jing"
 
-  spec.add_dependency "relaton-bib", "~> 0.3.0"
+  spec.add_dependency "relaton-bib", "~> 0.6.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.3.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-02-15 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
@@ -164,20 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-jing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -206,19 +206,23 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.adoc
 - Rakefile
 - bin/console
 - bin/setup
+- grammars/basicdoc.rng
+- grammars/biblio.rng
+- grammars/isodoc.rng
+- grammars/isostandard.rng
+- grammars/nist.rng
+- grammars/reqt.rng
 - lib/relaton_nist.rb
 - lib/relaton_nist/comment_period.rb
 - lib/relaton_nist/document_status.rb
 - 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,87 +0,0 @@
-PATH
-  remote: .
-  specs:
-    relaton-nist (0.3.9)
-      relaton-bib (~> 0.3.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.4)
-      mini_portile2 (~> 2.4.0)
-    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.3.12)
-      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)
-    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
-  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