relaton-itu 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d41566d2edd5f2e8c2757b8c74fb68c26c4b56943f84dcad3cb98d129023db1
-  data.tar.gz: ad70f1d469d40195f950201d3e15db288764469f6d940d8abe8bdafdec450222
+  metadata.gz: 1f50d54c2e89599301de03650f1bd7f6b9ea410cbcd85f4753ac9f441a940bfb
+  data.tar.gz: 7485282974b8374f8791229381993e1e90de289af569733d5cb1c84562373331
 SHA512:
-  metadata.gz: 992227b0d7c971aa6908aa68e4b274033232067af58c534a53ec7e4faab024faeb79ae9cbda91f7251d6f3ccb895e484bb5f5821500d8c2e946e0d30205af7f2
-  data.tar.gz: 3f6cff1e0c18a5e94c8f1f5c9beac1c24b346b7b462060f133c7da634b33f497d5d65a0bf807d5e0a43e57e96d8dcdfd259cfb6bf97e7233975870f6b9f76efe
+  metadata.gz: e43eeefa738288462921e1af23add87ddd011f93eee783a83353318e9afa875cf46ba0affc6a26ece803c2568b7f7e20bbe2fe0c4c618d0ef0fc943ad416727c
+  data.tar.gz: 4ea0111e1967df492955e8a654e760e0f5115fd4497a4a0acc137fb28aa1c8e13c175e40dc61ab8b9097401df2c85a8d35803585f6830d5b76a5c34bf5616203

data/lib/relaton_itu/itu_bibliography.rb

@@ -42,8 +42,8 @@ module RelatonItu
         ret = itubib_get1(code, year, opts)
         return nil if ret.nil?
 
-        ret.to_most_recent_reference unless year || opts[:keep_year]
-        ret.to_all_parts if opts[:all_parts]
+        ret = ret.to_most_recent_reference unless year || opts[:keep_year]
+        ret = ret.to_all_parts if opts[:all_parts]
         ret
       end
 
@@ -51,15 +51,15 @@ module RelatonItu
 
       def fetch_ref_err(code, year, missed_years)
         id = year ? "#{code}:#{year}" : code
-        warn "WARNING: no match found online for #{id}. "\
+        warn "[relaton-itu] WARNING: no match found online for #{id}. "\
           "The code must be exactly like it is on the standards website."
-        warn "(There was no match for #{year}, though there were matches "\
+        warn "[relaton-itu] (There was no match for #{year}, though there were matches "\
           "found for #{missed_years.join(', ')}.)" unless missed_years.empty?
         if /\d-\d/ =~ code
-          warn "The provided document part may not exist, or the document "\
+          warn "[relaton-itu] The provided document part may not exist, or the document "\
             "may no longer be published in parts."
         else
-          warn "If you wanted to cite all document parts for the reference, "\
+          warn "[relaton-itu] If you wanted to cite all document parts for the reference, "\
             "use \"#{code} (all parts)\".\nIf the document is not a standard, "\
             "use its document type abbreviation (TS, TR, PAS, Guide)."
         end
@@ -77,7 +77,7 @@ module RelatonItu
       def search_filter(code)
         docidrx = %r{\w+.\d+|\w\sSuppl\.\s\d+} # %r{^ITU-T\s[^\s]+}
         c = code.match(docidrx).to_s
-        warn "fetching #{code}..."
+        warn "[relaton-itu] (\"#{code}\") fetching..."
         result = search(code)
         result.select do |i|
           i.hit[:code] &&
@@ -94,7 +94,7 @@ module RelatonItu
       def isobib_results_filter(result, year)
         missed_years = []
         result.each_slice(3) do |s| # ISO website only allows 3 connections
-          fetch_pages(s, 3).each_with_index do |r, i|
+          fetch_pages(s, 3).each do |r|
             return { ret: r } if !year
 
             r.date.select { |d| d.type == "published" }.each do |d|
@@ -107,12 +107,15 @@ module RelatonItu
         { years: missed_years }
       end
 
-      def itubib_get1(code, year, opts)
-        result = search_filter(code) or return nil
+      def itubib_get1(code, year, _opts)
+        result = search_filter(code) || return
         ret = isobib_results_filter(result, year)
-        return ret[:ret] if ret[:ret]
-
-        fetch_ref_err(code, year, ret[:years])
+        if ret[:ret]
+          warn "[relaton-itu] (\"#{code}\") found #{ret[:ret].docidentifier.first&.id}"
+          ret[:ret]
+        else
+          fetch_ref_err(code, year, ret[:years])
+        end
       end
     end
   end

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "0.8.1".freeze
+  VERSION = "0.9.0".freeze
 end

data/lib/relaton_itu/xml_parser.rb

@@ -12,7 +12,7 @@ module RelatonItu
         if ituitem
           ItuBibliographicItem.new item_data(ituitem)
         elsif
-          warn "[relato-itu] can't find bibitem or bibdata element in the XML"
+          warn "[relaton-itu] can't find bibitem or bibdata element in the XML"
         end
       end
 

data/relaton-itu.gemspec

@@ -32,10 +32,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "ruby-debug-ide"
+  spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr", "~> 5.0.0"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "ruby-jing"
 
-  spec.add_dependency "relaton-iso-bib", "~> 0.8.0"
+  spec.add_dependency "relaton-iso-bib", "~> 0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,35 +109,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: ruby-jing
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 description: 'RelatonItu: retrieve ITU Standards for bibliographic use using the BibliographicItem
   model'
 email: