gbbib 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78ab0edb324c7147e21cdffdb800cac302407fbcbe024ebc58c7b33b62656cd7
-  data.tar.gz: 3c94800617a4b09995b458bc07def7f54f097abc75ff8539f3a609d70adf2ddc
+  metadata.gz: 6eac6d0000a21b3dc52113ebda470cb6be672d2088e033648e090765559f0684
+  data.tar.gz: 7fb3b022408232970d3812713d14de9f32eb8ed5c3de9cec00533effd188e5c0
 SHA512:
-  metadata.gz: 53a84eee4cb2b23876c5a3c4a96dfc4694893ee888da34570f2f93df3c34c9bb46095271fdb2198f5f221d76dce32a181a4ee4b3291207892fe6c6ebb9179e45
-  data.tar.gz: dfd414fc158282b1c744bcfc96f23464ae75659af1f2d065311b6fcb3e2d6faa3711d525717b26302bd0272d64586857d054fd9ab2598f59a32e62c944a5d250
+  metadata.gz: e640701864d9f49b65a8b2842a3e6a29d0a6f4178f6598266cc95f690f9ac022fb4329a8e727e1c86d66369a64ab1e881523e51b30b2d1555f1af25a2bb88dd1
+  data.tar.gz: 13ec0e6d6e4c15a3a3475fccf541bb3ab37027bfa1f712e544fb55d58d96e4285eb6d9fc6a6e8f972352063a3ee30b3ea6e1bfe4fa7fc5f771d647874d801b20

data/.hound.yml

@@ -0,0 +1,3 @@
+ruby:
+  Enabled: true
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -1,5 +1,10 @@
-AllCops:
-  TargetRubyVersion: 2.4.0
+# This project follows the Ribose OSS style guide.
+# https://github.com/riboseinc/oss-guides
+# All project-specific additions and overrides should be specified in this file.
 
-Style/Encoding:
-  Enabled: false
+inherit_from:
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+AllCops:
+  TargetRubyVersion: 2.3
+Rails:
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gbbib (0.4.1)
+    gbbib (0.4.2)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       iso-bib-item (~> 0.4.2)
@@ -16,18 +16,18 @@ GEM
     docile (1.3.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    gb-agencies (0.0.3)
-    iso-bib-item (0.4.2)
+    gb-agencies (0.0.5)
+    iso-bib-item (0.4.4)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
     isoics (0.1.7)
     json (2.1.0)
-    method_source (0.9.0)
+    method_source (0.9.2)
     mini_portile2 (2.3.0)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.6.0)
@@ -67,4 +67,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.16.6
+   1.17.1

data/README.adoc

@@ -12,6 +12,10 @@ The standards scraped form:
 * Social organization standards - http://www.ttbz.org.cn
 * Sector standards - http://www.std.gov.cn/hb
 
+NOTE: Unlike the ISO website, the GB websites require the year of publication to be included in the search.
+So a standard will not be found successfully through this gem unless the year is included in its document
+identifier: for example, not `CN(GB/T 1.1)`, but `CN(GB/T 1.1-2009)`.
+
 == Installation
 
 Add this line to your application's Gemfile:

data/lib/gbbib/gb_bibliography.rb

@@ -40,6 +40,7 @@ module Gbbib
       # @return [String] Relaton XML serialisation of reference
       def get(code, year, opts)
         code += '.1' if opts[:all_parts]
+        code, year = code.split(/-/, 2) if /-/.match(code)
         ret = get1(code, year, opts)
         return nil if ret.nil?
         ret.to_most_recent_reference unless year
@@ -51,7 +52,7 @@ module Gbbib
 
       def fetch_ref_err(code, year, missed_years)
         id = year ? "#{code}:#{year}" : code
-        warn "WARNING: no match found on the ISO website for #{id}. "\
+        warn "WARNING: no match found on the GB website for #{id}. "\
           "The code must be exactly like it is on the website."
         warn "(There was no match for #{year}, though there were matches "\
           "found for #{missed_years.join(', ')}.)" unless missed_years.empty?
@@ -67,14 +68,17 @@ module Gbbib
       end
 
       def get1(code, year, opts)
-        result = search_filter(code) or return nil
+        # search must include year whenever available
+        searchcode = code + (year.nil? ? "" : "-#{year}")
+        result = search_filter(searchcode) or return nil
         ret = results_filter(result, year)
         return ret[:ret] if ret[:ret]
         fetch_ref_err(code, year, ret[:years])
       end
 
       def search_filter(code)
-        docidrx = %r{^[^\s]+\s[\d\.]+}
+        # search filter needs to incorporate year
+        docidrx = %r{^[^\s]+\s[\d\.-]+}
         # corrigrx = %r{^[^\s]+\s[\d\.]+-[0-9]+/}
         warn "fetching #{code}..."
         result = search(code)

data/lib/gbbib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gbbib
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"