relaton-ogc 1.7.2 → 1.9.1

data/grammars/ogc.rng

@@ -63,21 +63,35 @@
       </element>
     </define>
   </include>
-  <define name="docsubtype">
-    <element name="docsubtype">
-      <choice>
-        <value>conceptual-model</value>
-        <value>conceptual-model-and-encoding</value>
-        <value>conceptual-model-and-implementation</value>
-        <value>encoding</value>
-        <value>extension</value>
-        <value>implementation</value>
-        <value>profile</value>
-        <value>profile-with-extension</value>
-        <value>general</value>
-      </choice>
+  <define name="TextElement" combine="choice">
+    <ref name="hi"/>
+  </define>
+  <define name="PureTextElement" combine="choice">
+    <ref name="hi"/>
+  </define>
+  <define name="hi">
+    <element name="hi">
+      <zeroOrMore>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+        </choice>
+      </zeroOrMore>
     </element>
   </define>
+  <define name="DocumentSubtype">
+    <choice>
+      <value>conceptual-model</value>
+      <value>conceptual-model-and-encoding</value>
+      <value>conceptual-model-and-implementation</value>
+      <value>encoding</value>
+      <value>extension</value>
+      <value>implementation</value>
+      <value>profile</value>
+      <value>profile-with-extension</value>
+      <value>general</value>
+    </choice>
+  </define>
   <define name="submitters">
     <element name="submitters">
       <ref name="Basic-Section"/>
@@ -115,6 +129,9 @@
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -126,6 +143,9 @@
         <ref name="annex"/>
       </zeroOrMore>
       <ref name="bibliography"/>
+      <zeroOrMore>
+        <ref name="indexsect"/>
+      </zeroOrMore>
     </element>
   </define>
 </grammar>

data/grammars/reqt.rng

@@ -30,15 +30,34 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="subsequence"/>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>
     <optional>
       <attribute name="filename"/>
     </optional>
+    <optional>
+      <attribute name="model"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -48,9 +67,9 @@
     <optional>
       <ref name="subject"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="reqinherit"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>
@@ -135,6 +154,16 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_ogc/editorial_group.rb

@@ -74,7 +74,7 @@ module RelatonOgc
     # @return {RelatonIsoBib::IsoSubgroup}
     def subgroup(group)
       if group.is_a?(Hash)
-        RelatonIsoBib::IsoSubgroup.new(**group)
+        RelatonBib::WorkGroup.new(**group)
       else group
       end
     end

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

@@ -34,7 +34,7 @@ module RelatonOgc
     class << self
       # papam hit [Hash]
       # @return [RelatonOgc::OrcBibliographicItem]
-      def parse_page(hit)
+      def parse_page(hit) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         type = fetch_type(hit["type"])
         OgcBibliographicItem.new(
           fetched: Date.today.to_s,
@@ -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.7.2".freeze
+  VERSION = "1.9.1".freeze
 end

data/lib/relaton_ogc/xml_parser.rb

@@ -9,20 +9,20 @@ module RelatonOgc
       # @param item_hash [Hash]
       # @return [RelatonOgc::OgcBibliographicItem]
       def bib_item(item_hash)
-        OgcBibliographicItem.new **item_hash
+        OgcBibliographicItem.new(**item_hash)
       end
 
       # 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]
@@ -35,7 +35,7 @@ module RelatonOgc
         sc = iso_subgroup eg&.at("subcommittee")
         wg = iso_subgroup eg&.at("workgroup")
         EditorialGroup.new(
-          committee: committe, subcommittee: sc, workgroup: wg
+          committee: committe, subcommittee: sc, workgroup: wg,
         )
       end
     end

data/relaton_ogc.gemspec

@@ -23,18 +23,17 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  # spec.add_development_dependency "debase"
   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-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "faraday", "~> 1.0.0"
-  spec.add_dependency "relaton-iso-bib", "~> 1.7.0"
+  spec.add_dependency "faraday", "~> 1.1"
+  spec.add_dependency "relaton-iso-bib", "~> 1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ogc
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-19 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
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
 description: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem
   model'
 email:
@@ -167,6 +167,7 @@ files:
 - README.adoc
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - grammars/basicdoc.rng
 - grammars/biblio.rng
@@ -197,14 +198,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem