relaton-ogc 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e0c167aee5738996ba54d4e53e9b528db53d837b519b6784b5fba212674ec70
-  data.tar.gz: a9c45d212c851a64c8bc195ad9d7d98f58a62284a9a57d05ce701589474bef81
+  metadata.gz: 7fa7cf7cb4a2e7b21cb49a4fbb482f08119776626d18b6ab186080905783d516
+  data.tar.gz: d4bb20a2c3f35b1c25ac99882c5a3f7a405a420cc5d3dbcb2f6359b0f2f6166f
 SHA512:
-  metadata.gz: c6c41f000b72a4ae126a7a2df77cf2d216c90f9378a9569b7a1b7e77c9970ae65b2c9b45fe54e32b4acf3695c66691b89a93a88bfd2a658b5b22407b79f58d97
-  data.tar.gz: 643cd929a4c34d44676777005c04aa44e1034491f138e54300f53e710153cb26f28cd59da58d5d3b62c435164906e09ffe0bdd730e4e91d425fec9b738d509a3
+  metadata.gz: d5679900661ae943e2e929500314cfbb98fe416ebe8c809fccd0daa6f5d2c6232d9c85844d406372ab41af3c413de914944fd7b0433e24c7582a80942fe7d710
+  data.tar.gz: c187307b81cc069bc652f38e494ed01de8dfe96de9c00b7fc4c719f73dcff62335cc3d4167a4d32b1b402d31ac9df7e76fe5a77e6e2295cf4c6f1937c6b1f4a5

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/relaton_ogc/hash_converter.rb

@@ -12,7 +12,7 @@ module RelatonOgc
           committee: eg[:committee],
           subcommittee: eg[:subcommittee],
           workgroup: eg[:workgroup],
-          secretariat: eg[:secretariat]
+          secretariat: eg[:secretariat],
         )
       end
     end

data/lib/relaton_ogc/ogc_bibliographic_item.rb

@@ -14,17 +14,13 @@ module RelatonOgc
       profile profile-with-extension general
     ].freeze
 
-    # @return [String]
-    attr_reader :docsubtype
-
-    # @param docsubtype [String]
     def initialize(**args)
-      if args[:docsubtype] && !SUBTYPES.include?(args[:docsubtype])
+      if args[:subdoctype] && !SUBTYPES.include?(args[:subdoctype])
         warn "[relaton-ogc] WARNING: invalid document "\
-        "subtype: #{args[:docsubtype]}"
+             "subtype: #{args[:subdoctype]}"
       end
 
-      @docsubtype = args.delete :docsubtype
+      # @docsubtype = args.delete :docsubtype
       # @doctype = args.delete :doctype
       super
     end
@@ -33,15 +29,15 @@ module RelatonOgc
     # @return [RelatonOgc::OgcBibliographicItem]
     def self.from_hash(hash)
       item_hash = ::RelatonOgc::HashConverter.hash_to_bib(hash)
-      new **item_hash
+      new(**item_hash)
     end
 
     # @return [Hash]
-    def to_hash
-      hash = super
-      hash["docsubtype"] = docsubtype if docsubtype
-      hash
-    end
+    # def to_hash
+    #   hash = super
+    #   hash["docsubtype"] = docsubtype if docsubtype
+    #   hash
+    # end
 
     # @param opts [Hash]
     # @option opts [Nokogiri::XML::Builder] :builder XML builder
@@ -50,10 +46,10 @@ module RelatonOgc
     # @option opts [String, Symbol] :lang language
     # @return [String] XML
     def to_xml(**opts)
-      super **opts do |b|
+      super(**opts) do |b|
         b.ext do
           b.doctype doctype if doctype
-          b.docsubtype docsubtype if docsubtype
+          b.subdoctype subdoctype if subdoctype
           editorialgroup&.to_xml b
           ics.each { |i| i.to_xml b }
         end
@@ -62,11 +58,11 @@ module RelatonOgc
 
     # @param prefix [String]
     # @return [String]
-    def to_asciibib(prefix = "")
-      pref = prefix.empty? ? prefix : prefix + "."
-      out = super
-      out += "#{pref}docsubtype:: #{docsubtype}\n" if docsubtype
-      out
-    end
+    # def to_asciibib(prefix = "")
+    #   pref = prefix.empty? ? prefix : prefix + "."
+    #   out = super
+    #   out += "#{pref}docsubtype:: #{docsubtype}\n" if docsubtype
+    #   out
+    # end
   end
 end

data/lib/relaton_ogc/scrapper.rb

@@ -43,7 +43,7 @@ module RelatonOgc
           docid: fetch_docid(hit["identifier"]),
           link: fetch_link(hit["URL"]),
           doctype: type[:type],
-          docsubtype: type[:subtype],
+          subdoctype: type[:subtype],
           docstatus: fetch_status(type[:stage]),
           edition: fetch_edition(hit["identifier"]),
           abstract: fetch_abstract(hit["description"]),

data/lib/relaton_ogc/version.rb

@@ -1,3 +1,3 @@
 module RelatonOgc
-  VERSION = "1.9.0".freeze
+  VERSION = "1.9.1".freeze
 end

data/lib/relaton_ogc/xml_parser.rb

@@ -15,14 +15,14 @@ module RelatonOgc
       # Override RelatonIsoBib::XMLParser.item_data method.
       # @param item [Nokogiri::XML::Element]
       # @returtn [Hash]
-      def item_data(item)
-        data = super
-        ext = item.at "./ext"
-        return data unless ext
+      # def item_data(item)
+      #   data = super
+      #   ext = item.at "./ext"
+      #   return data unless ext
 
-        data[:docsubtype] = ext.at("./docsubtype")&.text
-        data
-      end
+      #   data[:docsubtype] = ext.at("./docsubtype")&.text
+      #   data
+      # end
 
       # @TODO Organization doesn't recreated
       # @param ext [Nokogiri::XML::Element]

data/relaton_ogc.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ogc
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +167,7 @@ files:
 - README.adoc
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - grammars/basicdoc.rng
 - grammars/biblio.rng