isobib 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64c73a00ef0f10f6c53dbb601cc5eb8b947c86be7de4201400201443bc83b06f
-  data.tar.gz: e86135b785a8c68b684261dd061508a9be8c7731b40f9d98295fd9c201c7e28d
+  metadata.gz: 7851c423e4bc7ce5b9458d963fd83e349c13390cf27a2e3d6cc953c7cd79be77
+  data.tar.gz: bd8d76b7b837508fde36e62d33dc1a6ae89d03f1227497f9cbac98c3e593370e
 SHA512:
-  metadata.gz: 4708293a8131415f1e97d4e4e6b0b5dac524726d319cf4638c0e957bc228d8538d5ba2da773594bb9e191e36b38e8ca604da1b49be59f92ea7e7a5107eaa7a76
-  data.tar.gz: 0763bff478f04f86333bdebe4e2c5f8608c6bd368d83fc688c7fed3564f301db3ddc9a3a246271baa3e2b1bf89abd5f76ef3904df3970f27ff65a1a288045601
+  metadata.gz: ba666c143d7d7246d9e12ac8a8d727b9cd628fbde411eefd58f3a000774275edaaa04ed705f32123276ef5dd62369e46065e9b039a5de77018774a40e1767007
+  data.tar.gz: 0e99131a0abf469ea2e2fc7acf061a9ff84e5005666315516a0ce70c91739136c90a14e49702056b5e6346afaed062c3d84b7d5b099a09f95038165170a41a96

data/Gemfile.lock

@@ -1,13 +1,16 @@
 PATH
   remote: .
   specs:
-    isobib (0.3.1)
+    isobib (0.4.0)
       algoliasearch
-      iso-bib-item (~> 0.3.0)
+      iecbib (~> 0.2.0)
+      iso-bib-item (~> 0.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     algoliasearch (1.23.2)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
@@ -18,7 +21,10 @@ GEM
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     httpclient (2.8.3)
-    iso-bib-item (0.3.0)
+    iecbib (0.2.0)
+      addressable
+      iso-bib-item (~> 0.4.0)
+    iso-bib-item (0.4.0)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
@@ -26,7 +32,7 @@ GEM
     json (2.1.0)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
@@ -34,6 +40,7 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
+    public_suffix (3.0.3)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -41,7 +48,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
@@ -69,4 +76,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.16.2
+   1.16.6

data/isobib.gemspec

@@ -34,5 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
 
   spec.add_dependency 'algoliasearch'
-  spec.add_dependency 'iso-bib-item', '~> 0.3.0'
+  spec.add_dependency 'iso-bib-item', '~> 0.4.0'
+  spec.add_dependency 'iecbib', '~> 0.2.0'
 end

data/lib/isobib/iso_bibliography.rb

@@ -3,6 +3,7 @@
 # require 'isobib/iso_bibliographic_item'
 require 'isobib/scrapper'
 require 'isobib/hit_pages'
+require 'iecbib'
 
 module Isobib
   # Class methods for search ISO standards.
@@ -26,13 +27,13 @@ module Isobib
       #   :keep_year if undated reference should return actual reference with year
       # @return [String] Relaton XML serialisation of reference
       def get(code, year, opts)
-        return iev if code.casecmp('IEV') == 0
         code += '-1' if opts[:all_parts]
+        return Iecbib::IecBibliography.get(code, year, opts) if %r[^ISO/IEC DIR].match code
         ret = isobib_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 # .to_xml
+        ret
       end
 
       private
@@ -78,39 +79,6 @@ module Isobib
         []
       end
 
-      def iev(code = "IEC 60050")
-        IsoBibItem.from_xml(<<~"END")
-          <bibitem type="international-standard" id="IEV">
-  <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
-  <link type="src">http://www.electropedia.org</link>
-  <docidentifier>#{code}:2011</docidentifier>
-  <date type="published"><on>2011</on></date>
-  <contributor>
-    <role type="publisher"/>
-    <organization>
-      <name>International Electrotechnical Commission</name>
-      <abbreviation>IEC</abbreviation>
-      <uri>www.iec.ch</uri>
-    </organization>
-  </contributor>
-  <language>en</language> <language>fr</language>
-  <script>Latn</script>
-  <status> <stage>60</stage> </status>
-  <copyright>
-    <from>2018</from>
-    <owner>
-      <organization>
-      <name>International Electrotechnical Commission</name>
-      <abbreviation>IEC</abbreviation>
-      <uri>www.iec.ch</uri>
-      </organization>
-    </owner>
-  </copyright>
-</bibitem>
-        END
-      end
-
-
       # Sort through the results from Isobib, fetching them three at a time,
       # and return the first result that matches the code,
       # matches the year (if provided), and which # has a title (amendments do not).
@@ -133,8 +101,7 @@ module Isobib
       end
 
       def isobib_get1(code, year, opts)
-        return iev if code.casecmp("IEV") == 0
-        return iev(code) if /^IEC 60050-/.match code
+        # return iev(code) if /^IEC 60050-/.match code
         result = isobib_search_filter(code) or return nil
         ret = isobib_results_filter(result, year)
         return ret[:ret] if ret[:ret]

data/lib/isobib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Isobib
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/lib/relaton/processor.rb

@@ -7,13 +7,17 @@ module Relaton
       def initialize
         @short = :isobib
         @prefix = "ISO"
-        @defaultprefix = %r{^(ISO)[ /]|^IEV($| )|^IEC 60050}
+        @defaultprefix = %r{^(ISO)[ /]}
         @idtype = "ISO"
       end
 
       def get(code, date, opts)
         ::Isobib::IsoBibliography.get(code, date, opts)
       end
+
+      def from_xml(xml)
+        IsoBibItem::XMLParser.from_xml xml
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isobib
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: iecbib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: 'IsoBib: retrieve ISO Standards for bibliographic use using the BibliographicItem
   model'
 email: