jma_feed 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e548f6f36c66d5fbf33b4827e9dc92ebb5a3db3e7afe5d65ab6e3438e7c2636
-  data.tar.gz: 8624233d9b3ad4e95b31ee409103aed698df7be193f32a3dd1b092cb049bfd52
+  metadata.gz: 5c76dfa5b24cec264aa047de3a21871a1cce3fcf7bee5908a88ecd0029d8fda1
+  data.tar.gz: 10abdfb01733d13e2d733a6f2499e6a2a614f3fb181797852602db2f5b45441a
 SHA512:
-  metadata.gz: 3e0ce670bfdeb22f6ff8a1bfeae084643acbe03706c73dce37eb5851720852bcd79c04da42fc2dcfebb7c04afa9af679e75b1fcecebe7a1c722fd576d6b0cbf9
-  data.tar.gz: 48de3a2546694270418a5b4175e97187aedb65c876863b66bb58f90f899b0d034100cc11d4c04a7181d44a58347b49ad534961930a3c0e29701bc07e178b069f
+  metadata.gz: 31aa0529c9797ef626849ecf3392dbea29a449917751f142c765dc0818b4f73e35642d4e481d9f05fd92acf8ec23ef2d51a333f8c6d9cdc7af2a1b92ce2affc7
+  data.tar.gz: ca936a1a99345e281a278c8aa1d234397ca90c600c2a4e3efc500d2bcdb463276ee28faac9bd45ba5d5bbd0dc4fc67773c0148f620635023517b82784bcce3cf

data/lib/jma_feed/api/extra.rb

@@ -0,0 +1,7 @@
+class JMAFeed::Extra
+  include JMAFeed::Api
+  
+  def feed_type
+    :extra
+  end
+end

data/lib/jma_feed/api/regular.rb

@@ -0,0 +1,7 @@
+class JMAFeed::Regular
+  include JMAFeed::Api
+
+  def feed_type
+    :regular
+  end
+end

data/lib/jma_feed/api.rb

@@ -1,20 +1,20 @@
 require "net/http"
 
-class JMAFeed::Api
-  def initialize
-  end
+module JMAFeed::Api
 
-  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)
+  def self.type(feed_type, **args)
+    feed_type = feed_type.to_sym
+    if feed_type == :regular
+      JMAFeed::Regular.new(**args)
+    elsif feed_type == :extra
+      JMAFeed::Extra.new(**args)
+    else
+      raise "feed_type=#{feed_type} not supported"
+    end
   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: {
+  def get(if_modified_since: nil, &block)
+    res = execute(:get, "https://www.data.jma.go.jp/developer/xml/feed/#{feed_type}.xml", headers: {
       "If-Modified-Since" => if_modified_since ? 
         if_modified_since.httpdate :
         nil
@@ -22,6 +22,24 @@ class JMAFeed::Api
     JMAFeed::Result.new(res)
   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)

data/lib/jma_feed/entity/{alert.rb → weather_alert.rb}

@@ -1,4 +1,4 @@
-class JMAFeed::Alert < Struct.new(:code, :name, :risk_level, :cluster, keyword_init: true)
+class JMAFeed::WeatherAlert < 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 = {
@@ -161,12 +161,7 @@ class JMAFeed::Alert < Struct.new(:code, :name, :risk_level, :cluster, keyword_i
     },
   }
 
-  # 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
 

data/lib/jma_feed/report.rb

@@ -1,3 +1,5 @@
+require "csv"
+
 class JMAFeed::Report < Struct.new(
   :name, :title, :kind, :category, :code_represented, :codes, keyword_init: true
 )
@@ -34,6 +36,10 @@ class JMAFeed::Report < Struct.new(
       end
     end
 
+    def get
+      @data ||= load
+    end
+
     def build_by_csv_row(row)
       codes = build_codes(row[:code])
       code_represented = build_code_represented(row[:code])
@@ -43,7 +49,7 @@ class JMAFeed::Report < Struct.new(
         kind: row[:kind].split('／'),
         category: row[:category],
         code_represented: code_represented,
-        code: codes,
+        codes: codes,
       )
     end
 

data/lib/jma_feed/report_entry/vpww54.rb

@@ -27,14 +27,14 @@ class JMAFeed::VPWW54 < JMAFeed::ReportEntry
             text_node :note, collection: true
           end
 
-          def alert
-            @alert ||= JMAFeed::Alert.all.find{|a| a.code == code}
+          def weather_alert
+            @weather_alert ||= JMAFeed::WeatherAlert.all.find{|a| a.code == code}
           end
         end
         text_node :change_status
         xml_node :area, type: "JMAFeed::JMX::Area"
 
-        JMAFeed::Alert.clusters.each do |cluster,alerts|
+        JMAFeed::WeatherAlert.clusters.each do |cluster,alerts|
           define_method cluster do
             kind.find{|k| alerts.map(&:code).include?(k.code)}
           end

data/lib/jma_feed/result.rb

@@ -13,52 +13,47 @@ class JMAFeed::Result
     http_result.body
   end
 
+  def modified?
+    http_result.kind_of?(Net::HTTPSuccess)
+  end
+
   def last_modified
     DateTime.parse(http_result["Last-Modified"])
   end
 
   def doc
-    @doc ||= Nokogiri::XML(body)
+    @doc ||= JMAFeed::ResultDoc.new(body)
   end
 
-  def namespace
-    {atom: doc.root.namespace.href}
-  end
+  # def namespace
+  #   {atom: doc.root.namespace.href}
+  # end
 
-  def text(name)
-    doc.xpath("/atom:feed/atom:#{name}", namespace).text
-  end
+  # def text(name)
+  #   doc.xpath("/atom:feed/atom:#{name}", namespace).text
+  # end
 
   def title
-    text('title')
+    doc.title
   end
 
   def subtitle
-    text('subtitle')
+    doc.subtitle
   end
 
   def id
-    text('id')
+    doc.id
   end
 
   def updated
-    DateTime.parse(text('updated'))
+    doc.updated
   end
 
   def related
-    text('link[@rel="related"]/@href')
+    doc.related
   end
 
   def entries
-    @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
+    doc.entries
   end
 end

data/lib/jma_feed/result_doc.rb

@@ -0,0 +1,49 @@
+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 entries
+    @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
+end

data/lib/jma_feed/version.rb

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

data/lib/jma_feed.rb

@@ -8,10 +8,13 @@ end
 
 require "jma_feed/version"
 require "jma_feed/report"
-require "jma_feed/result_entry"
 require "jma_feed/result"
+require "jma_feed/result_doc"
+require "jma_feed/result_entry"
 require "jma_feed/api"
-require "jma_feed/entity/alert"
+require "jma_feed/api/extra"
+require "jma_feed/api/regular"
+require "jma_feed/entity/weather_alert"
 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.4
 platform: ruby
 authors:
 - metheglin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     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
 - !ruby/object:Gem::Dependency
   name: giri
   requirement: !ruby/object:Gem::Requirement
@@ -76,8 +76,10 @@ files:
 - 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/api/extra.rb
+- lib/jma_feed/api/regular.rb
 - lib/jma_feed/entity/risk_level.rb
+- lib/jma_feed/entity/weather_alert.rb
 - lib/jma_feed/report.rb
 - lib/jma_feed/report_entry.rb
 - lib/jma_feed/report_entry/jmx/area.rb
@@ -91,6 +93,7 @@ files:
 - lib/jma_feed/report_entry/vpww54.rb
 - lib/jma_feed/report_entry/vxko.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