relaton-calconnect 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 404577ba181bef9338ec6f924ebbba1ca4c2865007726eefdb2a0377cc3920a7
-  data.tar.gz: 47c664cad7285a7df4361452f22c011ab7cfbdca0f6bc962dd671add7eb2ad4b
+  metadata.gz: 75cd96311bc9d733df4437f05c3d2b0a9569d0337931ca9a78f32aa190149195
+  data.tar.gz: 4af9889521433e624cf5f5b16317c361467cf3d496eb1f71013fa2ac02ce7c8c
 SHA512:
-  metadata.gz: 187442955bd472db4cfd2a702c9d91dbdce7d311fabb5b395ae7bafbbe68536270d9c05c8c0fe0d12544f1aa7accec4ad5d904517c7ee8a153471f6a2aa72abb
-  data.tar.gz: 7a2bc22cc7fb6ed229f264a7d8e130f1798165968eb2c520811f2c623328e95005f3c59fd61948f8c737affcf2f5b53abf070451930e0ae73f77eef78dff1037
+  metadata.gz: 0d0c5017fd6d1475f26ac80743691731fcbae5ba2596f0bd792a6c8aafecfe4e0a352a011ee7282d79c6c1f98d45ee6ec79d80b1d6207c2b20524ca880e28305
+  data.tar.gz: 5d3a9b8f81111de7c1db67f31e6cb21b5592bd64733c82e4d7963d646e29aa5a53b5c6a18af5b80b303e1179f9b52ba16c0c640369e2e014193fd24dbd06bee3

data/.gitignore

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

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_calconnect/cc_bibliography.rb

@@ -5,11 +5,11 @@ module RelatonCalconnect
       # @return [RelatonCalconnect::HitCollection]
       def search(text, year = nil, opts = {})
         HitCollection.new text, year, opts
-      rescue Faraday::Error::ConnectionFailed
+      rescue Faraday::ConnectionFailed
         raise RelatonBib::RequestError, "Could not access https://standards.calconnect.org"
       end
 
-      # @param code [String] the OGC standard Code to look up (e..g "8200")
+      # @param ref [String] the OGC standard Code to look up (e..g "8200")
       # @param year [String] the year the standard was published (optional)
       #
       # @param opts [Hash] options
@@ -18,26 +18,31 @@ module RelatonCalconnect
       # @option opts [TrueClass, FalseClass] :bibdata
       #
       # @return [RelatonCalconnect::CcBibliographicItem]
-      def get(code, year = nil, opts = {})
+      def get(ref, year = nil, opts = {})
+        code = ref
+
         if year.nil?
-          /^(?<code1>[^\s]+(\s\w+)?\s[\d-]+):?(?<year1>\d{4})?/ =~ code
+          /^(?<code1>[^\s]+(\s\w+)?\s[\d-]+):?(?<year1>\d{4})?/ =~ ref
           unless code1.nil?
             code = code1
             year = year1
           end
         end
 
+        warn "[relaton-calconnect] (\"#{ref}\") fetching..."
         result = bib_search_filter(code, year, opts) || (return nil)
         ret = bib_results_filter(result, year)
-        return ret[:ret] if ret[:ret]
-
-        fetch_ref_err(code, year, ret[:years])
+        if ret[:ret]
+          warn "[relaton-calconnect] (\"#{ref}\") found #{ret[:ret].docidentifier.first.id}"
+          ret[:ret]
+        else
+          fetch_ref_err(code, year, ret[:years])
+        end
       end
 
       private
 
       def bib_search_filter(code, year, opts)
-        warn "fetching #{code}..."
         search(code, year, opts)
       end
 
@@ -72,10 +77,10 @@ module RelatonCalconnect
       # @param missed_years [Array<Strig>]
       def fetch_ref_err(code, year, missed_years)
         id = year ? "#{code} year #{year}" : code
-        warn "WARNING: no match found online for #{id}. "\
+        warn "[relaton-calconnect] WARNING: no match found online for #{id}. "\
           "The code must be exactly like it is on the standards website."
         unless missed_years.empty?
-          warn "(There was no match for #{year}, though there were matches "\
+          warn "[relaton-calconnect] (There was no match for #{year}, though there were matches "\
             "found for #{missed_years.join(', ')}.)"
         end
         nil

data/lib/relaton_calconnect/version.rb

@@ -1,3 +1,3 @@
 module RelatonCalconnect
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/relaton_calconnect.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"
   spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "rake", "~> 10.0"
@@ -38,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday"
-  spec.add_dependency "relaton-iso-bib", "~> 0.4.0"
+  spec.add_dependency "relaton-iso-bib", "~> 0.5.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-calconnect
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.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'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +156,14 @@ dependencies:
     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 CC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email:
@@ -193,7 +179,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.adoc
 - Rakefile

data/Gemfile.lock

@@ -1,88 +0,0 @@
-PATH
-  remote: .
-  specs:
-    relaton-calconnect (0.2.1)
-      faraday
-      relaton-iso-bib (~> 0.4.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    debase (0.2.4.1)
-      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)
-    faraday (0.17.1)
-      multipart-post (>= 1.2, < 3)
-    hashdiff (1.0.0)
-    isoics (0.1.8)
-    json (2.2.0)
-    mini_portile2 (2.4.0)
-    multipart-post (2.1.1)
-    nokogiri (1.10.7)
-      mini_portile2 (~> 2.4.0)
-    optout (0.0.2)
-    public_suffix (4.0.1)
-    rake (10.5.0)
-    relaton-bib (0.4.1)
-      addressable
-      nokogiri
-    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-jing (0.0.1)
-      optout (>= 0.0.2)
-    ruby_deep_clone (0.8.0)
-    safe_yaml (1.0.5)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    vcr (5.0.0)
-    webmock (3.7.1)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  debase
-  equivalent-xml (~> 0.6)
-  rake (~> 10.0)
-  relaton-calconnect!
-  rspec (~> 3.0)
-  ruby-debug-ide
-  ruby-jing
-  simplecov
-  vcr
-  webmock
-
-BUNDLED WITH
-   2.0.2