gbbib 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3e3ee80ed7fef30b07a956b8ec13313615c0e164ac523824fff69e63850539f
-  data.tar.gz: 9a753e31b51f631f710f96d3f38ba6bff254980f4faa5ed51571288acf5dc40d
+  metadata.gz: 6b003d92490a9a1c6bc3ae124b2c315232336f57fd113ddeb0edc5a1cc3aab83
+  data.tar.gz: 5f75e05b76700d7901af1cbde25be569a2519c196b4e6753c8e8d82b2dee5b8e
 SHA512:
-  metadata.gz: c5ed82a9de4bb8cf57de8d5271f0e3de47f64496509581600dc2f398e64042adc621f2a3ac3ff5321f11bddfea5ac5b5a11c9dca35ae642e702de8fc7624e5b4
-  data.tar.gz: 21954b24468a3ea22ad0db05b606be95b37a19e1dae13d35d9ce2a766ba212366978f35d3991bb24b6d403bb8cc26c9d7c7bdbc0477c58c1d760839b5e01d03d
+  metadata.gz: 236ebaf149fdfd887f88109f6941c11e29b826a5d25763fdd0e100e438c6b2244c162197de20c2f049d290e75b86339b2e0c50526fcd98095b5b5d910e2079a6
+  data.tar.gz: 63fc93e2558e790221d96fd367c30d009798d0b4971049e342d85475a71ae20a5b97e78e6c94d7c3a4d5ab9588b88e90c87c049dee5168450860cdf84c527bbc

data/Gemfile.lock

@@ -10,18 +10,18 @@ GEM
   remote: https://rubygems.org/
   specs:
     byebug (10.0.2)
-    cnccs (0.1.2)
+    cnccs (0.1.3)
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    gb-agencies (0.0.1)
-    iso-bib-item (0.2.3)
+    gb-agencies (0.0.3)
+    iso-bib-item (0.2.5)
       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)
@@ -34,19 +34,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

@@ -1,21 +1,25 @@
-The MIT License (MIT)
+BSD 2-Clause License
 
-Copyright (c) 2018 Andrei Kislichenko
+Copyright (c) 2018, Ribose
+All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+* 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/gbbib.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'GdBib: retrieve Chinese GB Standards for bibliographic'\
                        ' use using the BibliographicItem model.'
   spec.homepage      = 'https://github.com/riboseinc/gdbib'
-  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/gbbib/gb_bibliographic_item.rb

@@ -58,11 +58,12 @@ module Gbbib
       inspect
     end
 
-    def id(attribute, delim = '')
+    def makeid(id, attribute, delim = '')
       return nil if attribute && !@id_attribute
-      idstr = "#{@docidentifier.prefix}#{delim}#{@docidentifier.project_number}"
-      if @docidentifier.part_number&.size&.positive?
-        idstr = idstr + "-#{@docidentifier.part_number}"
+      id = @docidentifier.reject { |i| i.type == "DOI" }[0] unless id
+      idstr = id.project_number.to_s
+      if id.part_number&.size&.positive?
+        idstr = idstr + "-#{id.part_number}"
       end
       idstr.strip
     end

data/lib/gbbib/gb_bibliography.rb

@@ -39,7 +39,6 @@ module Gbbib
       # @param opts [Hash] options; restricted to :all_parts if all-parts reference is required
       # @return [String] Relaton XML serialisation of reference
       def get(code, year, opts)
-        return iev.to_xml if code.casecmp('IEV') == 0
         code += '.1' if opts[:all_parts]
         ret = get1(code, year, opts)
         return nil if ret.nil?
@@ -68,7 +67,6 @@ module Gbbib
       end
 
       def get1(code, year, opts)
-        return iev if code.casecmp("IEV") == 0
         result = search_filter(code) or return nil
         ret = results_filter(result, year)
         return ret[:ret] if ret[:ret]
@@ -115,42 +113,6 @@ module Gbbib
         workers.end
         workers.result.sort { |x, y| x[:i] <=> y[:i] }.map { |x| x[:hit] }
       end
-
-      def iev
-        Nokogiri::XML.fragment(<<~"END")
-          <bibitem type="international-standard" id="IEV">
-            <title format="text/plain" language="en" script="Latn">Electropedia: The World's Online Electrotechnical Vocabulary</title>
-            <source type="src">http://www.electropedia.org</source>
-            <docidentifier>IEV</docidentifier>
-            <date type="published"> <on>#{Date.today.year}</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>
-            <copyright>
-              <from>#{Date.today.year}</from>
-              <owner>
-                <organization>
-                <name>International Electrotechnical Commission</name>
-                <abbreviation>IEC</abbreviation>
-                <uri>www.iec.ch</uri>
-                </organization>
-              </owner>
-            </copyright>
-            <relation type="updates">
-              <bibitem>
-                <formattedref>IEC 60050</formattedref>
-              </bibitem>
-            </relation>
-          </bibitem>
-        END
-      end
     end
   end
 end

data/lib/gbbib/scrapper.rb

@@ -37,9 +37,9 @@ module Gbbib
     #   * :project_number [String]
     #   * :part_number [String]
     def get_docid(doc, xpt = '//dt[text()="标准号"]/following-sibling::dd[1]')
-      item_ref = doc.xpath(xpt).text.match(/(?<=\s)(\d+)\.?((?<=\.)\d+|)/)
-      prefix = doc.xpath(xpt).text.match(/^[^\s]+/).to_s
-      { project_number: item_ref[1], part_number: item_ref[2], prefix: prefix }
+      item_ref = doc.xpath(xpt).text.match(/^([^–—.-]*\d+)\.?((?<=\.)\d+|)/)
+      #prefix = doc.xpath(xpt).text.match(/^[^\s]+/).to_s
+      { project_number: item_ref[1], part_number: item_ref[2], prefix: nil }
     end
 
     def get_contributors(doc, xpt = '//dt[text()="标准号"]/following-sibling::dd[1]')

data/lib/gbbib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gbbib
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,7 +173,7 @@ files:
 - lib/relaton/processor.rb
 homepage: https://github.com/riboseinc/gdbib
 licenses:
-- MIT
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []