relaton-iec 0.3.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39823bb2ce85889ef0f32b013d8cd9abf9f5a2e2
-  data.tar.gz: 1e960de033ac1d430b9260742a6ab779e3f2f2e3
+  metadata.gz: 7b0ad75aacbf0360cdcacc6e744dd6c26e6df9f0
+  data.tar.gz: 847e68d1a06123dfa521d7779f5608aa0702c4fa
 SHA512:
-  metadata.gz: dc8c6e5c58767bbbd56c82b092d888e132a412f5f4230bc1f5ffedc43d3b15015d4e55556dcaebeaed1f5075b75e3cb9aa583774480de4aa3f4e7903a5d4809a
-  data.tar.gz: 461357b85402b3cc8b921aa3ace9accd91f6a7936896c146267695c8b1e6cb7ffb2860c622d12c4b0cb357c19c263b79f99d9c554a556c08bf706b74399b5693
+  metadata.gz: bf0ceb4def8efe09e404c2b540700fb60709d52e184796742b6f5d7bd1e29dff3d6656201b631ecd1e50c27e6f96ec3749518eb2a82c7037c78f79102f334730
+  data.tar.gz: 4541bd9010a9ab99eb2a6903c03e5e07bbbc46710432bfc14d461196e8e52f81145c497294416e8b0605d66babfc6f20365d037d38a39169acb1f5d6ada7c32e

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    relaton-iec (0.3.2)
+    relaton-iec (0.4.4)
       addressable
-      relaton-iso-bib (~> 0.2.0)
+      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)
@@ -26,7 +26,7 @@ GEM
     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,14 +34,14 @@ 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.2.5)
+    relaton-bib (0.3.6)
       addressable
-      nokogiri (~> 1.10)
-    relaton-iso-bib (0.2.4)
+      nokogiri
+    relaton-iso-bib (0.3.5)
       isoics (~> 0.1.6)
-      relaton-bib (~> 0.2.0)
+      relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.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
 
@@ -131,7 +131,7 @@ module RelatonIec
           fetch_pages(s, 3).each_with_index do |r, _i|
             return { ret: r } if !year
 
-            r.dates.select { |d| d.type == "published" }.each do |d|
+            r.date.select { |d| d.type == "published" }.each do |d|
               return { ret: r } if year.to_i == d.on.year
 
               missed_years << d.on.year

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

@@ -62,17 +62,17 @@ module RelatonIec
           edition: edition,
           language: ["en"],
           script: ["Latn"],
-          titles: fetch_titles(hit_data),
+          title: fetch_titles(hit_data),
           type: fetch_type(doc),
           docstatus: status,
           ics: fetch_ics(doc),
-          dates: fetch_dates(doc),
-          contributors: fetch_contributors(hit_data[:code]),
+          date: fetch_dates(doc),
+          contributor: fetch_contributors(hit_data[:code]),
           editorialgroup: fetch_workgroup(doc),
           abstract: fetch_abstract(doc),
           copyright: fetch_copyright(hit_data[:code], doc),
           link: fetch_link(doc, hit_data[:url]),
-          relations: relations,
+          relation: relations,
         )
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
@@ -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 },
-            roles: ["publisher"] }
+            role: [type: "publisher"] }
         end
       end
 

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "0.3.2".freeze
+  VERSION = "0.4.4".freeze
 end

data/relaton_iec.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "addressable"
-  spec.add_dependency "relaton-iso-bib", "~> 0.2.0"
+  spec.add_dependency "relaton-iso-bib", "~> 0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 description: 'RelatonIec: retrieve IEC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email:
@@ -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