relaton-iso 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98227cd064516c2a45ef5c8e7603ac921412a6484fe52a59068abd0811f3ba03
-  data.tar.gz: 59fd8f722ee9581e690553c9933df5aafb8c1903aa23fa86f2c7f58256d57c04
+  metadata.gz: a73ac19c4da469921da4bad644b50f148d750476852e1a43c85c2cf0ffe52b87
+  data.tar.gz: b7bf3b134c1dc1d851b136a78d35241572cd9706f4c451791e268932b4a68b70
 SHA512:
-  metadata.gz: 17e76f8369a9fd3b98300227b8a9ea2933cab8a9bd3c5a90b89f6017fd5f1b1964bfb44274d45d23d268fffba9d57d9c94823480a4706ac725fa02fa90ae4d3b
-  data.tar.gz: 90d98d23acf5ec1f82d234756920d250424cad1421af5e7c2fba8edbea69ea6067c592875840b3e70197e165ebb8ea669804b6b3464ff88a00e314e03fe729a6
+  metadata.gz: bd884caa8c53e3d4b020335e1adbf2abab31f657069a249f821e4cac21a1d126b69d8d3c281058217b3d3aaa9c5f2f4a6d6b361ca328c8a0872fb5e1cba16565
+  data.tar.gz: 0c92680ecce087a3437176f5d980b59e5fca2416d9f99ac5cdd094b93106c7286cf2f9fded7544c156b54aecf988dc83917c2cf08ddfb8fa05c6f8049bf578d2

data/.gitignore

@@ -14,3 +14,4 @@
 
 .vscode/
 .rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
+Gemfile.lock

data/README.adoc

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

data/lib/relaton_iso/iso_bibliography.rb

@@ -10,7 +10,7 @@ module RelatonIso
   class IsoBibliography
     class << self
       # @param text [String]
-      # @return [RelatonIso::HitPages]
+      # @return [RelatonIso::HitCollection]
       def search(text)
         HitCollection.new text
       rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
@@ -25,19 +25,21 @@ module RelatonIso
       #   Scrapper.get(text)
       # end
 
-      # @param code [String] the ISO standard Code to look up (e..g "ISO 9000")
+      # @param ref [String] the ISO standard Code to look up (e..g "ISO 9000")
       # @param year [String] the year the standard was published (optional)
       # @param opts [Hash] options; restricted to :all_parts if all-parts reference is required,
       #   :keep_year if undated reference should return actual reference with year
       # @return [String] Relaton XML serialisation of reference
-      def get(code, year, opts)
+      def get(ref, year, opts)
+        opts[:ref] = ref
+
         %r{
           ^(?<code1>[^\s]+\s[^/]+) # match code
           /?
           (?<corr>(Amd|DAmd|(CD|WD|AWI|NP)\sAmd|Cor|CD\sCor|FDAmd)\s\d+ # correction name
           :?(\d{4})?(/Cor\s\d+:\d{4})?) # match correction year
-        }x =~ code
-        code = code1 if code1
+        }x =~ ref
+        code = code1 || ref
 
         if year.nil?
           /^(?<code1>[^\s]+(\s\w+)?\s[\d-]+)(:(?<year1>\d{4}))?(?<code2>\s\w+)?/ =~ code
@@ -89,7 +91,7 @@ module RelatonIso
       # @param corr [String] correction
       # @return [Array<RelatonIso::Hit>]
       def isobib_search_filter(code, corr, opts)
-        warn "fetching #{code}..."
+        warn "[relaton-iso] (\"#{opts[:ref]}\") fetching..."
         result = search(code)
         res = search_code result, code, corr, opts
         return res unless res.empty?
@@ -108,17 +110,19 @@ module RelatonIso
         end
 
         if %r{^ISO\s} =~ code # try ISO/IEC if ISO not found
-          warn "Attempting ISO/IEC retrieval"
+          warn "[relaton-iso] Attempting ISO/IEC retrieval"
           c = code.sub "ISO", "ISO/IEC"
           res = search_code result, c, corr, opts
         end
         res
       end
 
+      # @param result [RelatonIso::HitCollection]
+      # @param corr [String] correction
+      # @param opts [Hash]
       def try_stages(result, corr, opts)
         res = nil
         %w[NP WD CD DIS FDIS PRF IS AWI].each do |st| # try stages
-          warn "Attempting #{st} stage retrieval"
           c = yield st
           res = search_code result, c, corr, opts
           return res unless res.empty?
@@ -164,9 +168,12 @@ module RelatonIso
         # return iev(code) if /^IEC 60050-/.match code
         result = isobib_search_filter(code, corr, opts) || return
         ret = isobib_results_filter(result, year, opts)
-        return ret[:ret] if ret[:ret]
-
-        fetch_ref_err(code, year, ret[:years])
+        if ret[:ret]
+          warn "[relaton-iso] (\"#{opts[:ref]}\") found #{ret[:ret].docidentifier.first.id}"
+          ret[:ret]
+        else
+          fetch_ref_err(code, year, ret[:years])
+        end
       end
     end
   end

data/lib/relaton_iso/scrapper.rb

@@ -58,6 +58,7 @@ module RelatonIso
           copyright: fetch_copyright(hit_data["docRef"], doc),
           link: fetch_link(doc, url),
           relation: fetch_relations(doc),
+          place: ["Geneva"],
           structuredidentifier: fetch_structuredidentifier(doc),
         )
       end
@@ -205,8 +206,7 @@ module RelatonIso
                    "updates"
                  else r_type
                  end
-          if ["Now", "Now under review"].include? type
-            a
+          if ["Now", "Now under review"].include?(type) then a
           else
             a + r.css("a").map do |id|
               fref = RelatonBib::FormattedRef.new(

data/lib/relaton_iso/version.rb

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

data/relaton_iso.gemspec

@@ -26,7 +26,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.1"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -38,6 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-iec", "~> 0.5.0"
-  spec.add_dependency "relaton-iso-bib", "~> 0.4.0"
+  spec.add_dependency "relaton-iec", "~> 0.6.0"
+  spec.add_dependency "relaton-iso-bib", "~> 0.5.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-01-11 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.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 description: 'RelatonIso: retrieve ISO Standards for bibliographic use using the IsoBibliographicItem
   model'
 email:
@@ -209,7 +195,6 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.adoc
 - Rakefile

data/Gemfile.lock

@@ -1,95 +0,0 @@
-PATH
-  remote: .
-  specs:
-    relaton-iso (0.7.1)
-      relaton-iec (~> 0.5.0)
-      relaton-iso-bib (~> 0.4.0)
-
-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.3)
-      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)
-    isoics (0.1.8)
-    json (2.2.0)
-    method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.7)
-      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.4.1)
-      addressable
-      nokogiri
-    relaton-iec (0.5.1)
-      addressable
-      relaton-iso-bib (~> 0.4.0)
-    relaton-iso-bib (0.4.1)
-      isoics (~> 0.1.6)
-      relaton-bib (~> 0.4.0)
-      ruby_deep_clone (~> 0.8.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      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_deep_clone (0.8.0)
-    safe_yaml (1.0.5)
-    simplecov (0.17.0)
-      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.1)
-  byebug
-  debase
-  equivalent-xml (~> 0.6)
-  pry-byebug
-  rake (~> 10.0)
-  relaton-iso!
-  rspec (~> 3.0)
-  ruby-debug-ide
-  simplecov
-  vcr
-  webmock
-
-BUNDLED WITH
-   2.0.2