isobib 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 014de3839ec12b7fed6d51bdae6aa9184fc68d0ac9b0d3ce93e2612027131c23
-  data.tar.gz: 5b56a485e23bcd6b62a807c65f7ba8ce7f01781105cfaa2d7c998424a2c808c0
+  metadata.gz: ff27e088b8184634663981a6df34301e5958e02b04ff94af0c36e9a0aa1c2e8f
+  data.tar.gz: a31f26d8fef8e57b7b04932c120ff55e7c5630cfe7a43c2a749f2edea693c1f2
 SHA512:
-  metadata.gz: 3768a1e26e41ebae555e4ce56cad226b4fed37e11c2068f5002f7d24da07c3bd33f97f04a4e73a07f1375ba465000899e7a573b86c11078951b8b9dc461b59a1
-  data.tar.gz: 2de63e7914bb7391048ff5d9dda3e47fe98ff2fac7d50326913b8588346f45e7f5d299ab49ac14b860222b508d8ac4ae2cfdde5d0a8c659462e72c6a128b1f62
+  metadata.gz: dfee675bebd17b8a4ede137b9e2006c5728335606c303501aaa8dfe495557e144c815d987d13f3549b44e857d5420becc0bde0631a9ea1e33b24c67bdd39d27f
+  data.tar.gz: aa37f8219f11525a6c02cff2f0f5b264c074739dcf81f0f6b13476f88ebd27a5798ba95cb5f94494612d28bb2d30beb82b4535420cf8aee2129153c7bff24cc9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isobib (0.2.2)
+    isobib (0.2.4)
       algoliasearch
       iso-bib-item (~> 0.2.4)
 
@@ -22,7 +22,7 @@ GEM
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
-    isoics (0.1.6)
+    isoics (0.1.7)
     json (2.1.0)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
@@ -35,19 +35,19 @@ GEM
       byebug (~> 10.0)
       pry (~> 0.10)
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     ruby_deep_clone (0.8.0)
     simplecov (0.16.1)
       docile (~> 1.1)

data/LICENSE.txt

@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2018, Ribose
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/isobib.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
                        'using the BibliographicItem model'
 
   spec.homepage      = 'https://github.com/riboseinc/isobib'
-  spec.license       = 'MIT'
+  spec.license       = 'BSD-2-Clause'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})

data/lib/isobib/iso_bibliography.rb

@@ -22,14 +22,15 @@ module Isobib
 
       # @param code [String] the ISO standard Code to look up (e..g "ISO 9000")
       # @param year [String] the year the standard was published (optional)
-      # @param opts [Hash] options; restricted to :all_parts if all-parts reference is required
+      # @param opts [Hash] options; restricted to :all_parts if all-parts reference is required,
+      #   :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]
         ret = isobib_get1(code, year, opts)
         return nil if ret.nil?
-        ret.to_most_recent_reference unless year
+        ret.to_most_recent_reference unless year || opts[:keep_year]
         ret.to_all_parts if opts[:all_parts]
         ret # .to_xml
       end
@@ -77,15 +78,13 @@ module Isobib
         []
       end
 
-
-      def iev
+      def iev(code = "IEC 60050")
         IsoBibItem.from_xml(<<~"END")
           <bibitem type="international-standard" id="IEV">
-  <title format="text/plain" language="en" script="Latn">Electropedia: 
-  The World's Online Electrotechnical Vocabulary</title>
+  <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
   <link type="src">http://www.electropedia.org</link>
-  <docidentifier>IEV</docidentifier>
-  <date type="published"> <on>#{Date.today.year}</on> </date>
+  <docidentifier>#{code}</docidentifier>
+  <date type="published"><on>2011</on></date>
   <contributor>
     <role type="publisher"/>
     <organization>
@@ -98,7 +97,7 @@ module Isobib
   <script>Latn</script>
   <status> <stage>60</stage> </status>
   <copyright>
-    <from>#{Date.today.year}</from>
+    <from>2018</from>
     <owner>
       <organization>
       <name>International Electrotechnical Commission</name>
@@ -107,11 +106,6 @@ module Isobib
       </organization>
     </owner>
   </copyright>
-  <relation type="updates">
-    <bibitem>
-      <formattedref>IEC 60050</formattedref>
-    </bibitem>
-  </relation>
 </bibitem>
         END
       end
@@ -127,6 +121,7 @@ module Isobib
         missed_years = []
         result.each_slice(3) do |s| # ISO website only allows 3 connections
           fetch_pages(s, 3).each_with_index do |r, i|
+            next if r.nil?
             return { ret: r } if !year
             r.dates.select { |d| d.type == "published" }.each do |d|
               return { ret: r } if year.to_i == d.on.year
@@ -139,6 +134,7 @@ module Isobib
 
       def isobib_get1(code, year, opts)
         return iev if code.casecmp("IEV") == 0
+        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/scrapper.rb

@@ -26,7 +26,7 @@ module Isobib
       'TS'    => 'technicalSpecification',
       'TR'    => 'technicalReport',
       'PAS'   => 'publiclyAvailableSpecification',
-      'AWI'   => 'appruvedWorkItem',
+      'AWI'   => 'approvedWorkItem',
       'CD'    => 'committeeDraft',
       'FDIS'  => 'finalDraftInternationalStandard',
       'NP'    => 'newProposal',
@@ -54,11 +54,12 @@ module Isobib
       # @return [Hash]
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def parse_page(hit_data)
+        return unless hit_data['path'].match(/\d+$/)
         doc, url = get_page "/standard/#{hit_data['path'].match(/\d+$/)}.html"
 
         # Fetch edition.
-        edition = doc.xpath("//strong[contains(text(), 'Edition')]/..")
-                     .children.last.text.match(/\d+/).to_s
+        edition = doc&.xpath("//strong[contains(text(), 'Edition')]/..")
+                     &.children&.last&.text&.match(/\d+/)&.to_s
 
         titles, abstract = fetch_titles_abstract(doc)
 
@@ -219,7 +220,7 @@ module Isobib
           url:                 'www.iso.org',
           technical_committee: {
             name:   wg_link.text + doc.css('div.entry-title')[0].text,
-            type:   'technicalCommittee',
+            type:   'TC',
             number: workgroup[1]&.match(/\d+/)&.to_s&.to_i
           } }
       end

data/lib/isobib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isobib
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,6 +151,7 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
+- LICENSE.txt
 - README.adoc
 - Rakefile
 - bin/bundle
@@ -177,7 +178,7 @@ files:
 - lib/relaton/processor.rb
 homepage: https://github.com/riboseinc/isobib
 licenses:
-- MIT
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []