relaton 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62cef7ae686de32684c5f0f7c75c6df634efc4445fe59ce306de4c3c6d21882d
-  data.tar.gz: 8a263e312bdbb73e56ce891c1d9c3d9b03ac81def88a328bf3a8ee5ced4b3101
+  metadata.gz: f2cdb7e20a0cd747ce7bfa12efcfff9cd0b23d16f5107740a7ea3b997edd8c66
+  data.tar.gz: f478d531b7ac76b43166a25b921582ddc4db510969569d605b48bd00f6f96fe2
 SHA512:
-  metadata.gz: b53e3d71749b14d51c168315ab65314c03d3dc07758fe158fa1d8963ec41ddcfe8cc2b920ae1c42aa8aa94978b4d0f6c23fa5448981aa4de1d1885441b6676e9
-  data.tar.gz: '085835618cb8c17d09f710bf418a88932a44734b978889f1ce3a468b6a98afdbc5b37260c56e01b1983a90a0182eb15a91d8572aec84b339b761bd6ab47532e0'
+  metadata.gz: 2154ea82ecaf7f66cf304fba55ef92814d96a7522d45d7f509caeabde9f5b3da73448c434f9722af45c87f7d18249ed304a8442a5baf9695273914ec9cdf47c0
+  data.tar.gz: 68c3e37b5e3960400c21f28e9abe046425cd011d235702bd5e525041f5406a5882b3535653cd3fdd6722586d82c6485dc5d6526ef274bd9993d58d53c5816dca

data/.github/workflows/macos.yml

@@ -0,0 +1,27 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: macos
+
+on: [push]
+
+jobs:
+  test-macos:
+    name: Test on Ruby ${{ matrix.ruby }} macOS
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        run: |
+          sudo gem install bundler -v "~> 2" --force
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,27 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: ubuntu
+
+on: [push]
+
+jobs:
+  test-linux:
+    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        run: |
+          gem install bundler -v "~> 2"
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/.github/workflows/windows.yml

@@ -0,0 +1,30 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: windows
+
+on: [push]
+
+jobs:
+  test-windows:
+    name: Test on Ruby ${{ matrix.ruby }} Windows
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        shell: pwsh
+        run: |
+          gem install bundler -v "~> 2"
+          bundle config --local path vendor/bundle
+          bundle update
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton (0.5.10)
+    relaton (0.5.11)
       relaton-calconnect (~> 0.1.0)
       relaton-gb (~> 0.6.0)
       relaton-iec (~> 0.4.0)
@@ -94,7 +94,7 @@ GEM
     relaton-iec (0.4.10)
       addressable
       relaton-iso-bib (~> 0.3.0)
-    relaton-ietf (0.6.8)
+    relaton-ietf (0.6.9)
       relaton-bib (~> 0.3.0)
     relaton-iso (0.6.9)
       relaton-iec (~> 0.4.0)

data/lib/relaton/db.rb

@@ -97,7 +97,10 @@ module Relaton
       allowed = @registry.processors.reduce([]) do |m, (_k, v)|
         m << v.prefix
       end
-      warn "#{code} does not have a recognised prefix: #{allowed.join(', ')}"
+      warn <<~WARN
+       #{code} does not have a recognised prefix: #{allowed.join(', ')}.
+       See https://github.com/relaton/relaton/ for instructions on prefixing and wrapping document identifiers to disambiguate them.
+       WARN
     end
 
     # TODO: i18n
@@ -110,7 +113,7 @@ module Relaton
     def std_id(code, year, opts, stdclass)
       prefix, code = strip_id_wrapper(code, stdclass)
       ret = code
-      ret += ":#{year}" if year
+      ret += (stdclass == :relaton_gb ? "-" : ":") + year if year
       ret += " (all parts)" if opts[:all_parts]
       ["#{prefix}(#{ret.strip})", code]
     end
@@ -175,7 +178,7 @@ module Relaton
     # @return [String]
     def new_bib_entry(code, year, opts, stdclass, **args)
       bib = @registry.processors[stdclass].get(code, year, opts)
-      bib_id = bib&.docidentifier&.first&.id&.sub(%r{(?<=\d)-(?=\d{4})}, ":")
+      bib_id = bib&.docidentifier&.first&.id
 
       # when docid doesn't match bib's id then return a reference to bib's id
       if args[:db] && args[:id] && bib_id && args[:id] !~ %r{\(#{bib_id}\)}

data/lib/relaton/static_cache/version

@@ -1 +1 @@
-0.5.10
+0.5.11

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "0.5.10".freeze
+  VERSION = "0.5.11".freeze
 end

data/relaton/cache/version

@@ -1 +1 @@
-0.5.10
+0.5.11

data/spec/relaton_spec.rb

@@ -1,6 +1,4 @@
 RSpec.describe Relaton::Db do
-  # let!(:db) { Relaton::Db.new("testcache", "testcache2") }
-
   before :each do
     FileUtils.rm_rf %w(testcache testcache2)
     @db = Relaton::Db.new "testcache", "testcache2"
@@ -12,7 +10,6 @@ RSpec.describe Relaton::Db do
 
   context "gets an ISO reference" do
     it "and caches it" do
-      # stub_bib Isobib::IsoBibliography
       VCR.use_cassette "iso_19115_1" do
         bib = @db.fetch("ISO 19115-1", nil, {})
         expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
@@ -70,7 +67,6 @@ RSpec.describe Relaton::Db do
   end
 
   it "deals with a non-existant ISO reference" do
-    # stub_bib Isobib::IsoBibliography
     VCR.use_cassette "iso_111111119115_1" do
       bib = @db.fetch("ISO 111111119115-1", nil, {})
       expect(bib).to be_nil
@@ -86,7 +82,6 @@ RSpec.describe Relaton::Db do
   end
 
   it "list all elements as a serialization" do
-    # stub_bib Isobib::IsoBibliography, 2
     VCR.use_cassette "iso_19115_1_2", match_requests_on: [:path] do
       @db.fetch "ISO 19115-1", nil, {}
       @db.fetch "ISO 19115-2", nil, {}
@@ -110,23 +105,37 @@ RSpec.describe Relaton::Db do
     expect(@db.load_entry("test key")).to be_nil
   end
 
-  it "get GB reference and cache it" do
-    # stub_bib Gbbib::GbBibliography
-    VCR.use_cassette "gb_t_20223_2006" do
-      bib = @db.fetch "CN(GB/T 20223)", "2006", {}
-      expect(bib).to be_instance_of RelatonGb::GbBibliographicItem
-      expect(bib.to_xml(bibdata: true)).to include "<project-number>GB/T 20223</project-number>"
-      expect(File.exist?("testcache")).to be true
-      expect(File.exist?("testcache2")).to be true
-      testcache = Relaton::DbCache.new "testcache"
-      expect(testcache["CN(GB/T 20223:2006)"]).to include "<project-number>GB/T 20223</project-number>"
-      testcache = Relaton::DbCache.new "testcache2"
-      expect(testcache["CN(GB/T 20223:2006)"]).to include "<project-number>GB/T 20223</project-number>"
+  context "get GB reference" do
+    it "and cache it" do
+      VCR.use_cassette "gb_t_20223_2006" do
+        bib = @db.fetch "CN(GB/T 20223)", "2006", {}
+        expect(bib).to be_instance_of RelatonGb::GbBibliographicItem
+        expect(bib.to_xml(bibdata: true)).to include "<project-number>GB/T 20223</project-number>"
+        expect(File.exist?("testcache")).to be true
+        expect(File.exist?("testcache2")).to be true
+        testcache = Relaton::DbCache.new "testcache"
+        expect(testcache["CN(GB/T 20223:2006)"]).to include "<project-number>GB/T 20223</project-number>"
+        testcache = Relaton::DbCache.new "testcache2"
+        expect(testcache["CN(GB/T 20223:2006)"]).to include "<project-number>GB/T 20223</project-number>"
+      end
+    end
+
+    it "with year" do
+      VCR.use_cassette "gb_t_20223_2006" do
+        bib = @db.fetch "CN(GB/T 20223-2006)", nil, {}
+        expect(bib).to be_instance_of RelatonGb::GbBibliographicItem
+        expect(bib.to_xml(bibdata: true)).to include "<project-number>GB/T 20223</project-number>"
+        expect(File.exist?("testcache")).to be true
+        expect(File.exist?("testcache2")).to be true
+        testcache = Relaton::DbCache.new "testcache"
+        expect(testcache["CN(GB/T 20223:2006)"]).to include "<project-number>GB/T 20223</project-number>"
+        testcache = Relaton::DbCache.new "testcache2"
+        expect(testcache["CN(GB/T 20223:2006)"]).to include "<project-number>GB/T 20223</project-number>"
+      end
     end
   end
 
   it "get RFC reference and cache it" do
-    # stub_bib IETFBib::RfcBibliography
     VCR.use_cassette "rfc_8341" do
       bib = @db.fetch "RFC 8341", nil, {}
       expect(bib).to be_instance_of RelatonIetf::IetfBibliographicItem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-calconnect
@@ -344,6 +344,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"