relaton-iec 0.4.0 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23eafbff8adc2eeb681a3294dcd33ee9bbba5e46
-  data.tar.gz: 6073ba90262a12ab5c2584424754b5a657705084
+  metadata.gz: 382616c833c9a8c8b9bba8e4bc8402ad16964512
+  data.tar.gz: 5748210bf40ef66e0eeea6e3abd945e3298fcdaa
 SHA512:
-  metadata.gz: 5f1fcb49417d2baa88219296f5c31db8333b3c360e477fa56217e190d1992506ec3b15a059ac9e5e47c3e922a2c6bfabda28f2b502458f2e1fade6cede058577
-  data.tar.gz: 42fe6b9fac32553cedf6b7b5d8eef34f0f1c023cd99d63fd40fe72ca65d7ef3c1f588bb2bc2df2a11fb5cd3a86dd5d1880ac79f3322a5654ce39ae5d99434d36
+  metadata.gz: 5536938f0990091ab32a56ae344831210b4c26fe7469c1f5225644ee51c3458189a49f790758f728e170abbab5c18ec9219f3b1cf2ee6ae5335d89a537457ea6
+  data.tar.gz: c7ca012b59181f4d79912d55c3fa43037f82217a0a5ea447f4b8270f4b6321dc517978e852ae78d94cb6c05a9dcedfa01807e360b19b252c1e7e70328acbd54f

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.6)
       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)
+    hashdiff (1.0.0)
     isoics (0.1.7)
     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.8)
       addressable
-      nokogiri (~> 1.10)
-    relaton-iso-bib (0.3.0)
+      nokogiri
+    relaton-iso-bib (0.3.7)
       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

@@ -169,7 +169,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
@@ -326,7 +327,11 @@ module RelatonIec
             intro, main, part = titles[0], titles[1], nil
           end
         when 3
-          intro, main, part = titles[0], titles[1], titles[2]
+          if /^(Part|Partie) \d+:/ =~ titles[1]
+            intro, main, part = nil, titles[0], titles[1..2].join(" - ")
+          else
+            intro, main, part = titles[0], titles[1], titles[2]
+          end
         else
           intro, main, part = titles[0], titles[1], titles[2..-1]&.join(" -- ")
         end
@@ -371,7 +376,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.0".freeze
+  VERSION = "0.4.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-09-27 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

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