jma_feed 0.0.2 → 0.0.6

data/lib/jma_feed/result_doc.rb

@@ -0,0 +1,53 @@
+class JMAFeed::ResultDoc
+  attr_reader :doc
+  
+  def initialize(body)
+    @body = body
+    @doc = Nokogiri::XML(body)
+  end
+
+  def namespace
+    {atom: doc.root.namespace.href}
+  end
+
+  def text(name)
+    doc.xpath("/atom:feed/atom:#{name}", namespace).text
+  end
+
+  def title
+    text('title')
+  end
+
+  def subtitle
+    text('subtitle')
+  end
+
+  def id
+    text('id')
+  end
+
+  def updated
+    DateTime.parse(text('updated'))
+  end
+
+  def related
+    text('link[@rel="related"]/@href')
+  end
+
+  def all_entries
+    @all_entries ||= doc.xpath('/atom:feed/atom:entry', namespace).map do |entry|
+      JMAFeed::ResultEntry.new(
+        title: entry.xpath('atom:title', namespace).text,
+        link: entry.xpath('atom:link/@href', namespace).text,
+        id: entry.xpath('atom:id', namespace).text,
+        updated: entry.xpath('atom:updated', namespace).text,
+        author: entry.xpath('atom:author/atom:name', namespace).text,
+        content: entry.xpath('atom:content', namespace).text,
+      )
+    end
+  end
+
+  def entries
+    all_entries.uniq(&:identity)
+  end
+end

data/lib/jma_feed/result_entry.rb

@@ -9,16 +9,39 @@ class JMAFeed::ResultEntry < Struct.new(
     time, number, report_code, report_area_code = identifier.split('_')
   end
 
+  # 気象警報・注意報（Ｈ２７）_解説資料.pdf
+  # ---------------
+  # 「前回電文」とは、参照中の電文(当該電文)と、
+  # - 情報名称(Control/Title)
+  # - 運用種別(Control/Status)
+  # - 発信官署(Control/EditorialOffice)
+  # が同一である電文の中で、発表時刻(Head/ReportDateTime)が当該電文の直近過去である電文を指す。
+  # 
+  # idに記載されるファイル名アンダースコア区切りの2番目がStatusを意味しているのかどうかは2024Aug時点で不明
+  # Status="通常" の電文しか取得できておらず確証はないが、この値をidに含んでいる可能性が高いと見切っての実装
+  def identity
+    [report_code, report_status, report_area_code].join('_')
+  end
+
   def report_code
     @report_code ||= identifier_components[2]
   end
 
   def report
     return nil if report_code.nil?
-    @report ||= JMAFeed::Report.latest.detect{_1.has_code?(report_code)}
+    @report ||= JMAFeed::Report.get.detect{_1.has_code?(report_code)}
   end
 
   def report_area_code
     @report_area_code ||= identifier_components[3]
   end
+
+  def report_status
+    @report_status ||= identifier_components[1]
+  end
+
+  def get_report_entry!
+    return unless report
+    report.report_entry_class.get(id)
+  end
 end

data/lib/jma_feed/version.rb

@@ -1,3 +1,3 @@
 module JMAFeed
-  VERSION = "0.0.2"
+  VERSION = "0.0.6"
 end

data/lib/jma_feed.rb

@@ -8,10 +8,17 @@ end
 
 require "jma_feed/version"
 require "jma_feed/report"
-require "jma_feed/result_entry"
 require "jma_feed/result"
-require "jma_feed/api"
-require "jma_feed/entity/alert"
+require "jma_feed/result_doc"
+require "jma_feed/result_entry"
+require "jma_feed/atom"
+require "jma_feed/atom/extra"
+require "jma_feed/atom/regular"
+require "jma_feed/atom/eqvol"
+require "jma_feed/atom/other"
+require "jma_feed/node/base_node"
+require "jma_feed/entity/weather_alert"
+require "jma_feed/entity/weather_alert/metrics_item"
 require "jma_feed/entity/risk_level"
 
 require "jma_feed/report_entry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jma_feed
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - metheglin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: giri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 description: JMA Feed
 email: pigmybank@gmail.com
 executables: []
@@ -75,22 +75,40 @@ files:
 - README.md
 - data/jmaxml_20240216_format_v1_3_hyo1.csv
 - lib/jma_feed.rb
-- lib/jma_feed/api.rb
-- lib/jma_feed/entity/alert.rb
+- lib/jma_feed/atom.rb
+- lib/jma_feed/atom/eqvol.rb
+- lib/jma_feed/atom/extra.rb
+- lib/jma_feed/atom/other.rb
+- lib/jma_feed/atom/regular.rb
 - lib/jma_feed/entity/risk_level.rb
+- lib/jma_feed/entity/weather_alert.rb
+- lib/jma_feed/entity/weather_alert/metrics_item.rb
+- lib/jma_feed/node/base_node.rb
 - lib/jma_feed/report.rb
 - lib/jma_feed/report_entry.rb
 - lib/jma_feed/report_entry/jmx/area.rb
 - lib/jma_feed/report_entry/jmx/discharge.rb
+- lib/jma_feed/report_entry/jmx/earthquake.rb
+- lib/jma_feed/report_entry/jmx/earthquake_intensity.rb
+- lib/jma_feed/report_entry/jmx/humidity.rb
 - lib/jma_feed/report_entry/jmx/precipitation.rb
 - lib/jma_feed/report_entry/jmx/significancy.rb
+- lib/jma_feed/report_entry/jmx/snow_fall_depth.rb
+- lib/jma_feed/report_entry/jmx/tidal_level.rb
+- lib/jma_feed/report_entry/jmx/time_define.rb
+- lib/jma_feed/report_entry/jmx/visibility.rb
 - lib/jma_feed/report_entry/jmx/water_level.rb
+- lib/jma_feed/report_entry/jmx/wave_height.rb
+- lib/jma_feed/report_entry/jmx/wind_direction.rb
+- lib/jma_feed/report_entry/jmx/wind_speed.rb
 - lib/jma_feed/report_entry/vphw50.rb
 - lib/jma_feed/report_entry/vprn50.rb
 - lib/jma_feed/report_entry/vptaii.rb
 - lib/jma_feed/report_entry/vpww54.rb
 - lib/jma_feed/report_entry/vxko.rb
+- lib/jma_feed/report_entry/vxse53.rb
 - lib/jma_feed/result.rb
+- lib/jma_feed/result_doc.rb
 - lib/jma_feed/result_entry.rb
 - lib/jma_feed/version.rb
 homepage: https://rubygems.org/gems/jma_feed

data/lib/jma_feed/api.rb

@@ -1,48 +0,0 @@
-require "net/http"
-
-class JMAFeed::Api
-  def initialize
-  end
-
-  def get_feed_regular(if_modified_since: nil, &block)
-    res = execute(:get, "https://www.data.jma.go.jp/developer/xml/feed/regular.xml", headers: {
-      "If-Modified-Since" => if_modified_since ? 
-        if_modified_since.httpdate :
-        nil
-    }, &block)
-    JMAFeed::Result.new(res)
-  end
-
-  def get_feed_extra(if_modified_since: nil, &block)
-    res = execute(:get, "https://www.data.jma.go.jp/developer/xml/feed/extra.xml", headers: {
-      "If-Modified-Since" => if_modified_since ? 
-        if_modified_since.httpdate :
-        nil
-    }, &block)
-    JMAFeed::Result.new(res)
-  end
-
-  def execute(verb, uri, query: nil, body: nil, headers: {})
-    uri = uri.is_a?(URI::HTTP) ? uri : URI.parse(uri)
-    request = build_request(verb, uri, query: query, body: body)
-    headers.each {|k,v| request[k] = v}
-    res = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
-      yield(request, http) if block_given?
-      # http.read_timeout = 30 # sec
-      http.request(request)
-    end
-  end
-
-  def build_request(verb, uri, query: nil, body: nil, headers: {})
-    if query
-      uri.query = URI.encode_www_form(query)
-    end
-    request = "Net::HTTP::#{verb.to_s.camelize}".constantize.new(uri)
-    
-    if body
-      request.body = body
-    end
-    
-    request
-  end
-end

data/lib/jma_feed/entity/alert.rb

@@ -1,176 +0,0 @@
-class JMAFeed::Alert < Struct.new(:code, :name, :risk_level, :cluster, keyword_init: true)
-  # 気象警報・注意（Ｈ２７）_解説資料.pdf > 別表1
-  # https://www.jma.go.jp/jma/kishou/know/bosai/warning_kind.html
-  LIST = {
-    "00" => {
-      name: "解除",
-      risk_level: :level5,
-      cluster: :clear,
-    },
-    "02" => {
-      name: "暴風雪警報",
-      risk_level: :level3,
-      cluster: :snowstorm,
-    },
-    "03" => {
-      name: "大雨警報",
-      risk_level: :level3,
-      cluster: :heavy_rain,
-    },
-    "04" => {
-      name: "洪水警報",
-      risk_level: :level3,
-      cluster: :flood,
-    },
-    "05" => {
-      name: "暴風警報",
-      risk_level: :level3,
-      cluster: :storm,
-    },
-    "06" => {
-      name: "大雪警報",
-      risk_level: :level3,
-      cluster: :heavy_snow,
-    },
-    "07" => {
-      name: "波浪警報",
-      risk_level: :level3,
-      cluster: :high_wave,
-    },
-    "08" => {
-      name: "高潮警報",
-      risk_level: :level3,
-      cluster: :storm_surge,
-    },
-    "10" => {
-      name: "大雨注意報",
-      risk_level: :level2,
-      cluster: :heavy_rain,
-    },
-    "12" => {
-      name: "大雪注意報",
-      risk_level: :level2,
-      cluster: :heavy_snow,
-    },
-    "13" => {
-      name: "風雪注意報",
-      risk_level: :level2,
-      cluster: :snowstorm,
-    },
-    "14" => {
-      name: "雷注意報",
-      risk_level: :level2,
-      cluster: :thunderstorm,
-    },
-    "15" => {
-      name: "強風注意報",
-      risk_level: :level2,
-      cluster: :storm,
-    },
-    "16" => {
-      name: "波浪注意報",
-      risk_level: :level2,
-      cluster: :high_wave,
-    },
-    "17" => {
-      name: "融雪注意報",
-      risk_level: :level2,
-      cluster: :snow_melting,
-    },
-    "18" => {
-      name: "洪水注意報",
-      risk_level: :level2,
-      cluster: :flood,
-    },
-    "19" => {
-      name: "高潮注意報",
-      risk_level: :level2,
-      cluster: :storm_surge,
-    },
-    "20" => {
-      name: "濃霧注意報",
-      risk_level: :level2,
-      cluster: :dense_fog,
-    },
-    "21" => {
-      name: "乾燥注意報",
-      risk_level: :level2,
-      cluster: :dry_air,
-    },
-
-    "22" => {
-      name: "なだれ注意報",
-      risk_level: :level2,
-      cluster: :avalanche,
-    },
-    "23" => {
-      name: "低温注意報",
-      risk_level: :level2,
-      cluster: :low_temperature,
-    },
-    "24" => {
-      name: "霜注意報",
-      risk_level: :level2,
-      cluster: :frost,
-    },
-    "25" => {
-      name: "着氷注意報",
-      risk_level: :level2,
-      cluster: :ice_accretion,
-    },
-    "26" => {
-      name: "着雪注意報",
-      risk_level: :level2,
-      cluster: :snow_accretion,
-    },
-    "27" => {
-      name: "その他の注意",
-      risk_level: :level2,
-      cluster: :other,
-    },
-
-    "32" => {
-      name: "暴風雪特別警報",
-      risk_level: :level5,
-      cluster: :snowstorm,
-    },
-    "33" => {
-      name: "大雨特別警報",
-      risk_level: :level5,
-      cluster: :heavy_rain,
-    },
-    "35" => {
-      name: "暴風特別警報",
-      risk_level: :level5,
-      cluster: :storm,
-    },
-    "36" => {
-      name: "大雪特別警報",
-      risk_level: :level5,
-      cluster: :heavy_snow,
-    },
-    "37" => {
-      name: "波浪特別警報",
-      risk_level: :level5,
-      cluster: :high_wave,
-    },
-    "38" => {
-      name: "高潮特別警報",
-      risk_level: :level5,
-      cluster: :storm_surge,
-    },
-  }
-
-  # def self.clusters
-  #   LIST.map{|k,v| v[:cluster]}.uniq
-  # end
-
-  def self.clusters
-    # LIST.map{|k,v| v[:cluster]}.uniq
-    all.group_by(&:cluster)
-  end
-
-  def self.all
-    @all ||= LIST.map{|k,v| new(v.merge(code: k.to_s))}
-  end
-end