kisyo 0.0.2 → 0.1.0

data/lib/kisyo/cache.rb

@@ -0,0 +1,35 @@
+module Kisyo
+  class Cache
+    CACHE_SIZE = 100
+
+    def initialize
+      @keys = []
+      @values = {}
+      @m = Mutex.new
+    end
+
+    def get(key)
+      values[key]
+    end
+
+    def set(key, value)
+      m.synchronize do
+        if values[key]
+          return
+        end
+
+        keys << key
+        values[key] = value
+
+        if keys.size > CACHE_SIZE
+          oldest_key = keys.shift
+          values.delete(oldest_key)
+        end
+      end
+    end
+
+    private
+
+    attr_reader :keys, :values, :m
+  end
+end

data/lib/kisyo/daily.rb

@@ -3,32 +3,47 @@ require 'open-uri'
 
 module Kisyo
   class Daily
+    CACHE_SIZE = 100
+
     def initialize(location)
       @location = location
+      @cache = Cache.new
     end
 
     def at(date)
-      url = 'http://www.data.jma.go.jp/obd/stats/etrn/view/daily_s1.php?prec_no=%i&block_no=%i&year=%i&month=%i&day=01&view=p1' % [
-        @location.prefecture_id,
-        @location.block_id,
-        date.year,
-        date.month
-      ]
-
-      content = open(url).read
-      doc = Nokogiri::HTML(content)
+      key = [date.year, date.month, date.day].join(',')
+
+      if value = cache.get(key)
+        return value
+      end
+
+      url =
+        'http://www.data.jma.go.jp/obd/stats/etrn/view/daily_s1.php?prec_no=%s&block_no=%s&year=%i&month=%i&day=01&view=p1' % [
+          location.prefecture_id,
+          location.block_id,
+          date.year,
+          date.month
+        ]
+
+      content = URI.open(url).read
+      doc = Nokogiri.HTML(content)
       days = doc.css('div.a_print')
 
       raise WeatherInformationNotAvailable if days.size == 0
 
       days.each do |el|
-        if el.text.to_i == date.day
-          tr = el.parent.parent
-          values = tr.css('td').map(&:text)
+        tr = el.parent.parent
+        values = tr.css('td').map(&:text)
 
-          return Element::Day.new(*values[1 .. -1])
-        end
+        k = [date.year, date.month, values[0]].join(',')
+        cache.set(k, Element::Day.new(*values[1..-1]))
       end
+
+      cache.get(key)
     end
+
+    private
+
+    attr_reader :cache, :location
   end
 end

data/lib/kisyo/location.rb

@@ -1,7 +1,30 @@
+require 'csv'
+
 module Kisyo
   class Location
     attr_reader :prefecture_id, :block_id
 
+    def self.dms_to_degrees(d, m, s = 0)
+      d + m / 60.0 + s / 3600.0
+    end
+
+    def self.nearest(lat, lng)
+      CSV.open(File.dirname(__FILE__) + '/../blocks.csv') do |csv|
+        distances =
+          csv.map do |row|
+            la = dms_to_degrees(row[5].to_f, row[6].to_f)
+            ln = dms_to_degrees(row[7].to_f, row[8].to_f)
+
+            [Math.sqrt((lat - la)**2 + (lng - ln)**2), row]
+          end
+
+        distance = distances.min_by { |(dist, _)| dist }
+        row = distance[1]
+
+        new(row[3], row[4])
+      end
+    end
+
     def initialize(prefecture_id, block_id)
       @prefecture_id = prefecture_id
       @block_id = block_id

data/lib/kisyo/version.rb

@@ -1,3 +1,3 @@
 module Kisyo
-  VERSION = "0.0.2"
+  VERSION = '0.1.0'
 end

data/lib/kisyo.rb

@@ -1,5 +1,6 @@
 require "kisyo/error"
 require "kisyo/location"
+require "kisyo/cache"
 require "kisyo/daily"
 require "kisyo/elements/day"
 require "kisyo/version"

data/spec/kisyo/daily_spec.rb

@@ -2,73 +2,85 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Kisyo::Daily do
-  let(:date) {
-    Date.parse('2016-11-02')
-  }
-
-  let(:location) {
-    Kisyo::Location.new(44, 47662)
-  }
-
-  let(:daily) {
-    Kisyo::Daily.new(location)
-  }
+  let(:date) { Date.parse('2016-11-02') }
+  let(:location) { Kisyo::Location.new('44', '47662') }
+  let(:daily) { Kisyo::Daily.new(location) }
 
   describe '#at' do
-    let(:url) {
+    let(:url) do
       'http://www.data.jma.go.jp/obd/stats/etrn/view/daily_s1.php?block_no=47662&day=01&month=11&prec_no=44&view=p1&year=2016'
-    }
+    end
 
-    let(:fixture_file_name) {
-      '201611.html'
-    }
+    let(:fixture_file_name) { '201611.html' }
 
-    before do
-      stub_request(:get, url).
-        to_return(:body => read_fixture_file(fixture_file_name))
-    end
+    context 'single request' do
+      before do
+        stub_request(:get, url).to_return(
+          body: read_fixture_file(fixture_file_name)
+        )
+      end
 
-    context 'information is available' do
-      it 'returns weather information for given day' do
-        info = daily.at(date)
+      context 'information is available' do
+        it 'returns weather information for given day' do
+          info = daily.at(date)
 
-        expect(info.precipitation_total).to eql(1.5)
-        expect(info.precipitation_hourly_max).to eql(1.0)
-        expect(info.precipitation_10min_max).to eql(0.5)
-        expect(info.temperature_avg).to eql(10.9)
-        expect(info.temperature_max).to eql(12.2)
-        expect(info.temperature_min).to eql(8.6)
-        expect(info.humidity_avg).to eql(68.0)
-        expect(info.humidity_min).to eql(53.0)
-        expect(info.day_length).to eql(0.0)
-        expect(info.general_weather_condition_day).to eql('曇後時々雨')
-        expect(info.general_weather_condition_night).to eql('雨時々曇')
+          expect(info.precipitation_total).to eql(1.5)
+          expect(info.precipitation_hourly_max).to eql(1.0)
+          expect(info.precipitation_10min_max).to eql(0.5)
+          expect(info.temperature_avg).to eql(10.9)
+          expect(info.temperature_max).to eql(12.2)
+          expect(info.temperature_min).to eql(8.6)
+          expect(info.humidity_avg).to eql(68.0)
+          expect(info.humidity_min).to eql(53.0)
+          expect(info.day_length).to eql(0.0)
+          expect(info.general_weather_condition_day).to eql('曇後時々雨')
+          expect(info.general_weather_condition_night).to eql('雨時々曇')
+        end
       end
-    end
 
-    context 'information is not available' do
-      let(:fixture_file_name) {
-        'ng.html'
-      }
+      context 'information is not available' do
+        let(:fixture_file_name) { 'ng.html' }
 
-      it 'raises error' do
-        expect {
-          daily.at(date)
-        }.to raise_error(Kisyo::WeatherInformationNotAvailable)
+        it 'raises error' do
+          expect { daily.at(date) }.to raise_error(
+            Kisyo::WeatherInformationNotAvailable
+          )
+        end
+      end
+
+      context 'value is "--"' do
+        let(:date) { Date.parse('2016-11-04') }
+
+        it '"--" is converted to nil' do
+          info = daily.at(date)
+
+          expect(info.precipitation_total).to be_nil
+          expect(info.precipitation_hourly_max).to be_nil
+          expect(info.precipitation_10min_max).to be_nil
+        end
       end
     end
+    context 'multiple request' do
+      before do
+        stub_request(:get, url)
+          .to_return(body: read_fixture_file(fixture_file_name))
+          .times(number_of_request)
+      end
+
+      context '2016-11-01 - 2016-11-05' do
+        let(:number_of_request) { 1 }
 
-    context 'value is "--"' do
-      let(:date) {
-        Date.parse('2016-11-04')
-      }
+        it 'caches and reuses first response' do
+          date = Date.parse('2016-11-01')
 
-      it '"--" is converted to nil' do
-        info = daily.at(date)
+          expect(daily.at(date).precipitation_total).to eql(10.0)
+          expect(daily.at(date + 1).precipitation_total).to eql(1.5)
+          expect(daily.at(date + 2).precipitation_total).to eql(3.0)
+          expect(daily.at(date + 3).precipitation_total).to be_nil
+          expect(daily.at(date + 4).precipitation_total).to eql(0.0)
 
-        expect(info.precipitation_total).to be_nil
-        expect(info.precipitation_hourly_max).to be_nil
-        expect(info.precipitation_10min_max).to be_nil
+          expect(a_request(:get, url)).to have_been_made.times(1)
+        end
       end
     end
   end

data/spec/kisyo/location_spec.rb

@@ -0,0 +1,13 @@
+# coding: utf-8
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Kisyo::Location do
+  describe '.nearest' do
+    it 'returns the location closest to the specified latitude and longitude' do
+      loc = Kisyo::Location.nearest(35.6809591, 139.7673068)
+
+      expect(loc.prefecture_id).to eql('44')
+      expect(loc.block_id).to eql('47662')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kisyo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - youpy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,34 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +80,9 @@ files:
 - README.md
 - Rakefile
 - kisyo.gemspec
+- lib/blocks.csv
 - lib/kisyo.rb
+- lib/kisyo/cache.rb
 - lib/kisyo/daily.rb
 - lib/kisyo/elements/day.rb
 - lib/kisyo/error.rb
@@ -103,6 +91,7 @@ files:
 - spec/fixtures/201611.html
 - spec/fixtures/ng.html
 - spec/kisyo/daily_spec.rb
+- spec/kisyo/location_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -123,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A ruby tool for getting weather information from www.data.jma.go.jp
@@ -132,4 +120,5 @@ test_files:
 - spec/fixtures/201611.html
 - spec/fixtures/ng.html
 - spec/kisyo/daily_spec.rb
+- spec/kisyo/location_spec.rb
 - spec/spec_helper.rb