relaton-ieee 1.14.5 → 1.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00e27e5a5b433c742b68257cf7e5255e6ca00340ce418ce6abd8a25c01e7c45f
-  data.tar.gz: 36f8f46ba0a3f255b559b60e66abe396d72ce2bd6ef86641714be2ac38c48e3d
+  metadata.gz: ada9626ba7d42d2b18555142d178896b289c1d55910b64bd2de05e2be230aee8
+  data.tar.gz: 696191fb9c3a4aa1f35b444e84a82aed4121a55ca599df6cad4428cdec0ce6fc
 SHA512:
-  metadata.gz: fef0694b4d753c8472a95dce28e2be839bc9a163ae1ae8b9737148f10dbb0b7ca30256d69a98d68e496b6672c773251f14242665c05abf1adf8f4c965bcce916
-  data.tar.gz: f02c71b8da934372620aeff7efd6d2c3ad22b6881209fe593d67bc15e9839cdc3b258eeb1b58868dee1658aea8bb67c4001230f5a7ff23cac2ffd2d36afab63d
+  metadata.gz: 4def0f35dcbbee001582ef10a9ae33c14421740c9e2c791df064c1e050adaff51419e80c13e6e2d5e16318eb850d8ed6325f63dbad39b0b15af029356fccd214
+  data.tar.gz: 55c4b23088e260c7679e5dbaaf5283c222f45df06d61909c81cb3d6498e5652da2f751dba9ed8a1b9504c2e185172646c4b47463f85687997b7df0cc65b05de8

data/.github/workflows/rake.yml

@@ -5,6 +5,7 @@ name: rake
 on:
   push:
     branches: [ master, main ]
+    tags: [ v* ]
   pull_request:
 
 jobs:

data/.github/workflows/release.yml

@@ -10,8 +10,9 @@ on:
           Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
+
 
 jobs:
   release:

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rspec_status

data/Gemfile

@@ -5,3 +5,10 @@ gemspec
 
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
+
+gem "pry-byebug"
+gem "ruby-jing"
+gem "simplecov"
+gem "vcr"
+gem "webmock"
+gem "webrick"

data/lib/relaton_ieee/data_fetcher.rb

@@ -31,7 +31,7 @@ module RelatonIeee
       @ext = format.sub(/^bib/, "")
       @crossrefs = {}
       @backrefs = {}
-      # @normtitles = []
+      @index = Relaton::Index.find_or_create :IEEE
     end
 
     #
@@ -44,7 +44,7 @@ module RelatonIeee
     def self.fetch(output: "data", format: "yaml")
       t1 = Time.now
       puts "Started at: #{t1}"
-      FileUtils.mkdir_p output # unless Dir.exist? output
+      FileUtils.mkdir_p output
       new(output, format).fetch
       t2 = Time.now
       puts "Stopped at: #{t2}"
@@ -99,7 +99,8 @@ module RelatonIeee
       stdid = doc.at("./publicationinfo/standard_id")&.text
       return if stdid == "0"
 
-      bib = DataParser.parse doc, self
+      fetcher = DataParser.new doc, self
+      bib = fetcher.parse
       if bib.docnumber.nil?
         nt = doc&.at("./normtitle")&.text
         warn "PubID parse error. Normtitle: #{nt}, file: #{filename}"

data/lib/relaton_ieee/data_parser.rb

@@ -4,7 +4,7 @@ module RelatonIeee
                   "LastInspecUpd" => "updated" }.freeze
     ATTRS = %i[
       docnumber title date docid contributor abstract copyright docstatus
-      relation link keyword ics editorialgroup standard_status standard_modifier
+      relation link keyword ics editorialgroup standard_status standard_modified
       pubstatus holdstatus doctype
     ].freeze
 
@@ -223,7 +223,7 @@ module RelatonIeee
     # @return [RelatonIee::DocumentStatus, nil]
     #
     def parse_docstatus
-      st = parse_standard_modifier
+      st = parse_standard_modified
       return unless %w[Draft Approved Superseded Withdrawn].include?(st)
 
       DocumentStatus.new stage: st.downcase
@@ -307,7 +307,7 @@ module RelatonIeee
     #
     # @return [String, nil] standard modifier or nil
     #
-    def parse_standard_modifier
+    def parse_standard_modified
       doc.at("./publicationinfo/standardmodifierset/standard_modifier")&.text
     end
 
@@ -335,7 +335,7 @@ module RelatonIeee
     # @return [String] doctype
     #
     def parse_doctype
-      parse_standard_modifier == "Redline" ? "redline" : "standard"
+      parse_standard_modified == "Redline" ? "redline" : "standard"
     end
   end
 end

data/lib/relaton_ieee/hash_converter.rb

@@ -30,7 +30,7 @@ module RelatonIeee
         ext = hash.delete(:ext)
         return unless ext
 
-        attrs = %i[standard_status standard_modifier pubstatus holdstatus]
+        attrs = %i[standard_status standard_modified pubstatus holdstatus]
         ext.select { |k, _| attrs.include? k }.each do |k, v|
           hash[k] = v
         end

data/lib/relaton_ieee/ieee_bibliographic_item.rb

@@ -10,7 +10,7 @@ module RelatonIeee
     attr_reader :trialuse
 
     # @return [String, nil]
-    attr_reader :standard_status, :standard_modifier, :pubstatus, :holdstatus
+    attr_reader :standard_status, :standard_modified, :pubstatus, :holdstatus
 
     #
     # @param [Hash] args
@@ -18,7 +18,7 @@ module RelatonIeee
     # @option args [Array<RelatonIeee::EditorialGroup>] :editorialgroup
     #   Editorial group
     # @option args [String, nil] :standard_status Active, Inactive, Superseded
-    # @option args [String, nil] :standard_modifier Draft, Withdrawn, Suspended,
+    # @option args [String, nil] :standard_modified Draft, Withdrawn, Suspended,
     #   Approved, Reserved, Redline
     # @option args [String, nil] :pubstatus Active, Inactive
     # @option args [String, nil] :holdstatus Held, Publish
@@ -35,7 +35,7 @@ module RelatonIeee
       eg = args.delete(:editorialgroup)
       @trialuse = args.delete(:trialuse)
       @standard_status = args.delete(:standard_status)
-      @standard_modifier = args.delete(:standard_modifier)
+      @standard_modified = args.delete(:standard_modified)
       @pubstatus = args.delete(:pubstatus)
       @holdstatus = args.delete(:holdstatus)
       super
@@ -66,7 +66,7 @@ module RelatonIeee
     def to_xml(**opts) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       super(**opts) do |bldr|
         if opts[:bibdata] && (doctype || subdoctype || !trialuse.nil? || editorialgroup ||
-           ics.any? || standard_status || standard_modifier || pubstatus || holdstatus)
+           ics.any? || standard_status || standard_modified || pubstatus || holdstatus)
           ext = bldr.ext do |b|
             b.doctype doctype if doctype
             b.subdoctype subdoctype if subdoctype
@@ -74,7 +74,7 @@ module RelatonIeee
             editorialgroup&.to_xml(b)
             ics.each { |ic| ic.to_xml(b) }
             b.standard_status standard_status if standard_status
-            b.standard_modifier standard_modifier if standard_modifier
+            b.standard_modified standard_modified if standard_modified
             b.pubstatus pubstatus if pubstatus
             b.holdstatus holdstatus if holdstatus
           end
@@ -94,7 +94,7 @@ module RelatonIeee
       hash = super
       hash["trialuse"] = trialuse unless trialuse.nil?
       hash["ext"]["standard_status"] = standard_status unless standard_status.nil?
-      hash["ext"]["standard_modifier"] = standard_modifier unless standard_modifier.nil?
+      hash["ext"]["standard_modified"] = standard_modified unless standard_modified.nil?
       hash["ext"]["pubstatus"] = pubstatus unless pubstatus.nil?
       hash["ext"]["holdstatus"] = holdstatus unless holdstatus.nil?
       hash

data/lib/relaton_ieee/version.rb

@@ -1,3 +1,3 @@
 module RelatonIeee
-  VERSION = "1.14.5".freeze
+  VERSION = "1.14.7".freeze
 end

data/lib/relaton_ieee/xml_parser.rb

@@ -13,7 +13,7 @@ module RelatonIeee
 
         data[:editorialgroup] = parse_editorialgroup(item)
         data[:standard_status] = ext.at("./standard_status")&.text
-        data[:standard_modifier] = ext.at("./standard_modifier")&.text
+        data[:standard_modified] = ext.at("./standard_modified")&.text
         data[:pubstatus] = ext.at("./pubstatus")&.text
         data[:holdstatus] = ext.at("./holdstatus")&.text
         data

data/lib/relaton_ieee.rb

@@ -1,6 +1,7 @@
 require "digest/md5"
 require "faraday"
 require "yaml"
+require "relaton/index"
 require "relaton_bib"
 require "relaton_ieee/version"
 require "relaton_ieee/document_status"

data/relaton_ieee.gemspec

@@ -32,15 +32,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "ruby-jing"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
-  spec.add_development_dependency "webrick"
-
-  spec.add_dependency "faraday", "~> 1.0"
-  spec.add_dependency "mini_portile2"
+
+  spec.add_dependency "faraday", "~> 2.7.0"
+  spec.add_dependency "mini_portile2", "~> 2.8.0"
   spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-index", "~> 0.2.0"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ieee
 version: !ruby/object:Gem::Version
-  version: 1.14.5
+  version: 1.14.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-07 00:00:00.000000000 Z
+date: 2023-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -25,131 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webrick
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.7.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: mini_portile2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
-  name: mini_portile2
+  name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
-  name: relaton-bib
+  name: relaton-index
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: 'RelatonIeee: retrieve IEEE Standards for bibliographic use using the IeeeBibliographicItem