relaton-iec 0.4.6 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 382616c833c9a8c8b9bba8e4bc8402ad16964512
-  data.tar.gz: 5748210bf40ef66e0eeea6e3abd945e3298fcdaa
+SHA256:
+  metadata.gz: 7ffda8bff3cfc8eb622b02dc02ab54dcd1a585e1e510b279d1e8b86b84f33e81
+  data.tar.gz: fa65f4f24e2215170c3c6e000cd297c3f1080c2bf8472dc9518acea873fc499d
 SHA512:
-  metadata.gz: 5536938f0990091ab32a56ae344831210b4c26fe7469c1f5225644ee51c3458189a49f790758f728e170abbab5c18ec9219f3b1cf2ee6ae5335d89a537457ea6
-  data.tar.gz: c7ca012b59181f4d79912d55c3fa43037f82217a0a5ea447f4b8270f4b6321dc517978e852ae78d94cb6c05a9dcedfa01807e360b19b252c1e7e70328acbd54f
+  metadata.gz: f8b5af3a9860cd6bbbfd302f0265f5c900987e48b611822687e314d8a1a2722424bd437d33136bc799773c315510b69c8021af10f7dbc42aa898dd1cc9d391a7
+  data.tar.gz: 9e0d30dfdd67ad3e90029c4891ed611552c99ca4828244fa7f68e278eab88e28ae5947d691f6180c219d90c61153f035c7cf0a4764989863f30ec62238410cdf

data/.github/workflows/macos.yml

@@ -0,0 +1,29 @@
+# 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
+        with:
+          submodules: recursive
+      - 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,29 @@
+# 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
+        with:
+          submodules: recursive
+      - 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,32 @@
+# 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
+        with:
+          submodules: recursive
+      - 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-iec (0.4.6)
+    relaton-iec (0.4.12)
       addressable
       relaton-iso-bib (~> 0.3.0)
 
@@ -22,7 +22,7 @@ GEM
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     hashdiff (1.0.0)
-    isoics (0.1.7)
+    isoics (0.1.8)
     json (2.2.0)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
@@ -36,10 +36,10 @@ GEM
       pry (~> 0.10)
     public_suffix (4.0.1)
     rake (10.5.0)
-    relaton-bib (0.3.8)
+    relaton-bib (0.3.12)
       addressable
       nokogiri
-    relaton-iso-bib (0.3.7)
+    relaton-iso-bib (0.3.12)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
@@ -88,4 +88,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/lib/relaton_iec/iec_bibliography.rb

@@ -29,7 +29,7 @@ module RelatonIec
       # @return [String] Relaton XML serialisation of reference
       def get(code, year = nil, opts = {})
         if year.nil?
-          /^(?<code1>[^:]+):(?<year1>[^:]+)$/ =~ code
+          /^(?<code1>[^:]+):(?<year1>[^:]+)/ =~ code
           unless code1.nil?
             code = code1
             year = year1
@@ -38,7 +38,8 @@ module RelatonIec
 
         return iev if code.casecmp("IEV").zero?
 
-        code += "-1" if opts[:all_parts]
+        opts[:all_parts] ||= !(code =~ / \(all parts\)/).nil?
+        code = code.sub(/ \(all parts\)/, "")
         ret = iecbib_get1(code, year, opts)
         return nil if ret.nil?
 
@@ -81,7 +82,7 @@ module RelatonIec
         result = search(code)
         result.select do |i|
           i.hit[:code] &&
-            i.hit[:code].match(docidrx).to_s == code &&
+            i.hit[:code].match(docidrx).to_s.include?(code) &&
             corrigrx !~ i.hit[:code]
         end
       end

data/lib/relaton_iec/processor.rb

@@ -5,7 +5,7 @@ module RelatonIec
     def initialize
       @short = :relaton_iec
       @prefix = "IEC"
-      @defaultprefix = %r{^(IEC)[ /]|^IEV($| )}
+      @defaultprefix = %r{^IEC\s|^IEV($|\s)}
       @idtype = "IEC"
     end
 

data/lib/relaton_iec/scrapper.rb

@@ -57,13 +57,14 @@ module RelatonIec
         status, relations = fetch_status_relations hit_data[:url]
 
         RelatonIsoBib::IsoBibliographicItem.new(
+          fetched: Date.today.to_s,
           docid: [RelatonBib::DocumentIdentifier.new(id: hit_data[:code], type: "IEC")],
           structuredidentifier: fetch_structuredidentifier(doc),
           edition: edition,
           language: ["en"],
           script: ["Latn"],
           title: fetch_titles(hit_data),
-          type: fetch_type(doc),
+          doctype: fetch_type(doc),
           docstatus: status,
           ics: fetch_ics(doc),
           date: fetch_dates(doc),
@@ -293,8 +294,8 @@ module RelatonIec
       # @param doc [Nokogiri::HTML::Document]
       # @return [String]
       def fetch_type(doc)
-        doc.at('//th[contains(., "Publication type")]/following-sibling::td/span')
-           .text.downcase.tr " ", "-"
+        doc.at('//th[contains(., "Publication type")]/following-sibling::td/span').
+          text.downcase.tr " ", "-"
         # type_match = title.match(%r{^(ISO|IWA|IEC)(?:(/IEC|/IEEE|/PRF|
         #   /NP)*\s|/)(TS|TR|PAS|AWI|CD|FDIS|NP|DIS|WD|R|Guide|(?=\d+))}x)
         # #return "international-standard" if type_match.nil?

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "0.4.6".freeze
+  VERSION = "0.4.12".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,16 +186,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.adoc
 - Rakefile
-- appveyor.yml
 - bin/console
 - bin/setup
 - lib/relaton_iec.rb
@@ -226,8 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: 'RelatonIec: retrieve IEC Standards for bibliographic use using the IsoBibliographicItem

data/.travis.yml

@@ -1,18 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-language: ruby
-cache: bundler
-os:
-- linux
-- osx
-rvm:
-- 2.6
-- 2.5
-- 2.4
-- ruby-head
-before_install: 
-- gem install bundler -v "~> 2"
-- bundle update
-matrix:
-  allow_failures:
-    - rvm: ruby-head

data/appveyor.yml

@@ -1,37 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-version: '{build}'
-
-cache:
-  - vendor/bundle
-
-environment:
-  matrix:
-    - RUBY_VERSION: 26
-    - RUBY_VERSION: 25
-    - RUBY_VERSION: 24
-    - RUBY_VERSION: _trunk
-
-matrix:
-  allow_failures:
-    - RUBY_VERSION: _trunk
-
-install:
-  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
-  - refreshenv
-
-build_script:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - set GIT_TERMINAL_PROMPT=0
-  - gem install bundler -v "~> 2"
-  - bundle config --local path vendor/bundle
-  - bundle update
-  - bundle install
-
-before_test:
-  - ruby -v
-  - gem -v
-  - bundle -v
-
-test_script:
-  - bundle exec rake