relaton-iec 0.4.1 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: '07119c00b2305b22248c286fe2109109c0f155591ddf8cd2796cbc4aaa35c695'
-  data.tar.gz: a7631ec9e3eb9b0484ccf1cace3e199303d7a99e23d0da3a7ac0e9d8b39cb820
+SHA1:
+  metadata.gz: 7f223511bcf5da27381a805deae65c76f0f4a162
+  data.tar.gz: 6edce17c72bd41fdd860db9b8ce639d601f06f30
 SHA512:
-  metadata.gz: ca6ffa63dafd1993a4d8615f1d4025a8df799625e179ecae80676d9904432d5a5aedc1244482e1bd55ad2adadaead82e711cc6e082f55cc321049771ffaf2f9e
-  data.tar.gz: 1368d6ff919457b8ec24363b8381cb0cc34c0f5c2c57847dff405804cab0a87361517c4b51a5bb9c1bd2d0df611488bf47e00a283a9641ea33b1fbcea5b1fc47
+  metadata.gz: bc39291b67506f26cf760f1528d15d8b1fb8c44c160d044a9fe031fa13d99cb0751cf285bb2381c1f7de7214c4d6f8f5e2a002daf46893048ead454e5917fcb8
+  data.tar.gz: 5c04836bad95cc3988bd7431c1c1251a83c8319c40b9399600723d2d2b9ff3c292c98fc35ee9127f8818ba3d4bbc61902270cba705b42f74c9891bd82cba8070

data/Gemfile

@@ -1,3 +1,6 @@
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
 source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

data/Gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: .
   specs:
-    relaton-iec (0.4.0)
+    relaton-iec (0.4.8)
       addressable
       relaton-iso-bib (~> 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    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 (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)
-    hashdiff (0.4.0)
-    isoics (0.1.7)
+    hashdiff (1.0.0)
+    isoics (0.1.8)
     json (2.2.0)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -34,12 +34,12 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rake (10.5.0)
-    relaton-bib (0.3.0)
+    relaton-bib (0.3.9)
       addressable
-      nokogiri (~> 1.10)
-    relaton-iso-bib (0.3.0)
+      nokogiri
+    relaton-iso-bib (0.3.9)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
@@ -47,7 +47,7 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -60,13 +60,13 @@ GEM
       rake (>= 0.8.1)
     ruby_deep_clone (0.8.0)
     safe_yaml (1.0.5)
-    simplecov (0.16.1)
+    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)
+    webmock (3.7.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/lib/relaton_iec.rb

@@ -1,9 +1,13 @@
 require "relaton_iec/version"
 require "relaton_iec/iec_bibliography"
-if defined? Relaton
-  require_relative "relaton/processor"
-  Relaton::Registry.instance.register(Relaton::RelatonIec::Processor)
-end
+
+# if defined? Relaton
+#   require "relaton_iec/processor"
+#   # don't register the gem if it's required form relaton's registry
+#   return if caller.detect { |c| c.include? "register_gems" }
+
+#   Relaton::Registry.instance.register(RelatonIec::Processor)
+# end
 
 module RelatonIec
   # Your code goes here...

data/lib/relaton_iec/iec_bibliography.rb

@@ -13,7 +13,7 @@ module RelatonIec
       # @return [RelatonIec::HitCollection]
       def search(text, year = nil)
         HitCollection.new text, year
-      rescue SocketError, OpenURI::HTTPError
+      rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Could not access http://www.iec.ch"
       end
 

data/lib/relaton_iec/processor.rb

@@ -0,0 +1,33 @@
+require "relaton/processor"
+
+module RelatonIec
+  class Processor < Relaton::Processor
+    def initialize
+      @short = :relaton_iec
+      @prefix = "IEC"
+      @defaultprefix = %r{^(IEC)[ /]|^IEV($| )}
+      @idtype = "IEC"
+    end
+
+    # @param code [String]
+    # @param date [String, NilClass] year
+    # @param opts [Hash]
+    # @return [RelatonIsoBib::IsoBibliographicItem]
+    def get(code, date, opts)
+      ::RelatonIec::IecBibliography.get(code, date, opts)
+    end
+
+    # @param xml [String]
+    # @return [RelatonIsoBib::IsoBibliographicItem]
+    def from_xml(xml)
+      RelatonIsoBib::XMLParser.from_xml xml
+    end
+
+    # @param hash [Hash]
+    # @return [RelatonIsoBib::IsoBibliographicItem]
+    def hash_to_bib(hash)
+      item_hash = ::RelatonIsoBib::HashConverter.hash_to_bib(hash)
+      ::RelatonIsoBib::IsoBibliographicItem.new item_hash
+    end
+  end
+end

data/lib/relaton_iec/scrapper.rb

@@ -57,13 +57,14 @@ module RelatonIec
         status, relations = fetch_status_relations hit_data[:url]
 
         RelatonIsoBib::IsoBibliographicItem.new(
+          fetched: Date.today.to_s,
           docid: [RelatonBib::DocumentIdentifier.new(id: hit_data[:code], type: "IEC")],
           structuredidentifier: fetch_structuredidentifier(doc),
           edition: edition,
           language: ["en"],
           script: ["Latn"],
           title: fetch_titles(hit_data),
-          type: fetch_type(doc),
+          doctype: fetch_type(doc),
           docstatus: status,
           ics: fetch_ics(doc),
           date: fetch_dates(doc),
@@ -169,7 +170,8 @@ module RelatonIec
         # end
         Nokogiri::HTML(resp.body)
       rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError
+             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
+             OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Could not access #{url}"
       end
       # rubocop:enable Metrics/AbcSize
@@ -292,8 +294,8 @@ module RelatonIec
       # @param doc [Nokogiri::HTML::Document]
       # @return [String]
       def fetch_type(doc)
-        doc.at('//th[contains(., "Publication type")]/following-sibling::td/span')
-           .text.downcase.tr " ", "-"
+        doc.at('//th[contains(., "Publication type")]/following-sibling::td/span').
+          text.downcase.tr " ", "-"
         # type_match = title.match(%r{^(ISO|IWA|IEC)(?:(/IEC|/IEEE|/PRF|
         #   /NP)*\s|/)(TS|TR|PAS|AWI|CD|FDIS|NP|DIS|WD|R|Guide|(?=\d+))}x)
         # #return "international-standard" if type_match.nil?
@@ -375,7 +377,7 @@ module RelatonIec
             url  = "www.iec.ch"
           end
           { entity: { name: name, url: url, abbreviation: abbrev },
-            role: ["publisher"] }
+            role: [type: "publisher"] }
         end
       end
 

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "0.4.1".freeze
+  VERSION = "0.4.8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,11 +198,11 @@ files:
 - appveyor.yml
 - bin/console
 - bin/setup
-- lib/relaton/processor.rb
 - lib/relaton_iec.rb
 - lib/relaton_iec/hit.rb
 - lib/relaton_iec/hit_collection.rb
 - lib/relaton_iec/iec_bibliography.rb
+- lib/relaton_iec/processor.rb
 - lib/relaton_iec/scrapper.rb
 - lib/relaton_iec/statuses.yml
 - lib/relaton_iec/version.rb
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: 'RelatonIec: retrieve IEC Standards for bibliographic use using the IsoBibliographicItem

data/lib/relaton/processor.rb

@@ -1,23 +0,0 @@
-require "relaton/processor"
-
-module Relaton
-  module RelatonIec
-    class Processor < Relaton::Processor
-
-      def initialize
-        @short = :relaton_iec
-        @prefix = "IEC"
-        @defaultprefix = %r{^(IEC)[ /]|^IEV($| )}
-        @idtype = "IEC"
-      end
-
-      def get(code, date, opts)
-        ::RelatonIec::IecBibliography.get(code, date, opts)
-      end
-
-      def from_xml(xml)
-        RelatonIsoBib::XMLParser.from_xml xml
-      end
-    end
-  end
-end