relaton-ogc 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9ddd36656e221ad7ceb82adf637197b15648451b42fbd78069bc02078082c05
-  data.tar.gz: 9179d1d896e37f26841c392701c500990eafbfdb1060a4120bb85189014d788e
+  metadata.gz: 98e672b4b0d18f3feb9eb6d825d7111e40f3ee97d3886fb452c30c41f4a1dcc0
+  data.tar.gz: c9d939a8086f497f95390fd927bb1dee14986bf1b24825a4d0394a3467d9ec3c
 SHA512:
-  metadata.gz: 0ab0f2b5ed50fd8f218c92ae1a8589df818f92bb2480fffc450fbe930c16185cc9855d683dc4aafb5d34ad4f808ffd1cc44ba11b19adc6550d62dc029e7c0b11
-  data.tar.gz: c62733901e8f8790eaaccf90345503fd187bba8e8a08655400fdd77aa508df640ec7a4f11ef1146e41b0e456c538954769cbb4ef2d6eacba3b6b2cac73a70e01
+  metadata.gz: de8f29ea78226046ce2138ebacbe2625b0f2b07a6b402d24c3eb5ffb4f9dec2f88062ea185eeb34c04ee363f138664df040342257d04bdbc44a5b5dab3fb2497
+  data.tar.gz: d158cfaa42d1ea4cca7bc60463414723d7f78e81a0d8671a9fe647f8d17fb6cf88098d1d46085999a4712f7ffc989a6bf8ad65b20303f949ec1718774e02b3f9

data/README.adoc

@@ -39,7 +39,7 @@ require 'relaton_ogc'
 => true
 
 hits = RelatonOgc::OgcBibliography.search("OGC 19-025r1")
-=> <RelatonOgc::HitCollection:0x007fcc8e085ba8 @ref=OGC 19-025r1 @fetched=false>
+=> <RelatonOgc::HitCollection:0x007fcc8e085ba8 @ref=OGC 19-025r1 @fetched=true>
 
 tem = hits[0].fetch
 => #<RelatonOgc::OgcBibliographicItem:0x007fcab3cb4758

data/grammars/ogc.rng

@@ -62,6 +62,19 @@
         </optional>
       </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>
   </include>
   <define name="TextElement" combine="choice">
     <ref name="hi"/>
@@ -79,19 +92,6 @@
       </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"/>

data/lib/relaton_ogc/data_fetcher.rb

@@ -67,6 +67,8 @@ module RelatonOgc
       get_data do |etag, json|
         no_errors = true
         json.each do |_, hit|
+          next if hit["type"] == "CC"
+
           bib = Scrapper.parse_page hit
           write_document bib
         rescue StandardError => e

data/lib/relaton_ogc/hit.rb

@@ -1,9 +1,20 @@
 module RelatonOgc
   class Hit < RelatonBib::Hit
+    #
+    # <Description>
+    #
+    # @param [RelatonOgc::OgcBibliographicItem] bibitem
+    # @param [RelatonOgc::HitCollection, nil] hitcoll
+    #
+    def initialize(bibitem, hitcoll = nil)
+      super({ id: bibitem.docidentifier[0].id}, hitcoll)
+      @fetch = bibitem
+    end
+
     # Parse page.
     # @return [RelatonNist::NistBliographicItem]
     def fetch
-      @fetch ||= Scrapper.parse_page @hit
+      @fetch # ||= Scrapper.parse_page @hit
     end
   end
 end

data/lib/relaton_ogc/hit_collection.rb

@@ -4,63 +4,71 @@ require "fileutils"
 
 module RelatonOgc
   class HitCollection < RelatonBib::HitCollection
-    include DataFetcher::Utils
+    # include DataFetcher::Utils
 
     # ENDPOINT = "https://raw.githubusercontent.com/opengeospatial/"\
     #            "NamingAuthority/master/incubation/bibliography/"\
     #            "bibliography.json".freeze
-    DATADIR = File.expand_path ".relaton/ogc/", Dir.home
-    DATAFILE = File.expand_path "bibliography.json", DATADIR
+    ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-ogc/main/data/".freeze
+    # DATADIR = File.expand_path ".relaton/ogc/", Dir.home
+    # DATAFILE = File.expand_path "bibliography.json", DATADIR
     # ETAGFILE = File.expand_path "etag.txt", DATADIR
 
-    # @param ref [Strig]
+    # @param code [Strig]
     # @param year [String]
     # @param opts [Hash]
-    def initialize(ref, year = nil)
+    def initialize(code, year = nil)
       super
-      @etagfile = File.expand_path "etag.txt", DATADIR
-      @array = from_json(ref).sort_by do |hit|
-        hit.hit["date"] ? Date.parse(hit.hit["date"]) : Date.new
-      rescue ArgumentError
-        Date.parse "0000-01-01"
-      end.reverse
+      # @etagfile = File.expand_path "etag.txt", DATADIR
+      # @array = from_json(ref).sort_by do |hit|
+      #   hit.hit["date"] ? Date.parse(hit.hit["date"]) : Date.new
+      # rescue ArgumentError
+      #   Date.parse "0000-01-01"
+      # end.reverse
+      resp = Faraday.get "#{ENDPOINT}#{code.upcase.gsub(/[\s:.]/, '_')}.yaml"
+      @array = case resp.status
+               when 200
+                 bib = OgcBibliographicItem.from_hash YAML.safe_load(resp.body)
+                 [Hit.new(bib, self)]
+               else []
+               end
     end
 
-    private
+    # private
 
     #
     # Fetch data form json
     #
     # @param docid [String]
-    def from_json(docid, **_opts)
-      ref = docid.sub(/^OGC\s/, "").strip
-      return [] if ref.empty?
+    # def from_json(docid, **_opts)
+    #   ref = docid.sub(/^OGC\s/, "").strip
+    #   return [] if ref.empty?
 
-      data.select do |_k, doc|
-        doc["type"] != "CC" && doc["identifier"].include?(ref)
-      end.map { |_k, h| Hit.new(h, self) }
-    end
+    #   data.select do |_k, doc|
+    #     doc["type"] != "CC" && doc["identifier"].include?(ref)
+    #   end.map { |_k, h| Hit.new(h, self) }
+    # end
 
     #
     # Fetches json data
     #
     # @return [Hash]
-    def data
-      ctime = File.ctime DATAFILE if File.exist? DATAFILE
-      fetch_data if !ctime || ctime.to_date < Date.today
-      @data ||= JSON.parse File.read(DATAFILE, encoding: "UTF-8")
-    end
+    # def data
+    #   ctime = File.ctime DATAFILE if File.exist? DATAFILE
+    #   fetch_data if !ctime || ctime.to_date < Date.today
+    #   @data ||= JSON.parse File.read(DATAFILE, encoding: "UTF-8")
+    # end
 
     #
     # fetch data form server and save it to file.
     #
-    def fetch_data
-      json = get_data
-      return unless json
+    # def fetch_data
+    #   json = get_data
+    #   return unless json
 
-      FileUtils.mkdir_p DATADIR unless Dir.exist? DATADIR
-      @data = json
-      File.write DATAFILE, @data.to_json, encoding: "UTF-8"
-    end
+    #   FileUtils.mkdir_p DATADIR unless Dir.exist? DATADIR
+    #   @data = json
+    #   File.write DATAFILE, @data.to_json, encoding: "UTF-8"
+    # end
   end
 end

data/lib/relaton_ogc/ogc_bibliography.rb

@@ -4,7 +4,8 @@ module RelatonOgc
       # @param text [String]
       # @return [RelatonOgc::HitCollection]
       def search(text, year = nil, _opts = {})
-        HitCollection.new text, year
+        code = text.sub(/^OGC\s/, "")
+        HitCollection.new code, year
       rescue Faraday::ConnectionFailed
         raise RelatonBib::RequestError, HitCollection::ENDPOINT
       end

data/lib/relaton_ogc/version.rb

@@ -1,3 +1,3 @@
 module RelatonOgc
-  VERSION = "1.9.2".freeze
+  VERSION = "1.9.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ogc
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Ribose Inc.