kisyo 0.0.3 → 0.1.1

data/lib/kisyo/cache.rb

@@ -5,6 +5,7 @@ module Kisyo
     def initialize
       @keys = []
       @values = {}
+      @m = Mutex.new
     end
 
     def get(key)
@@ -12,17 +13,23 @@ module Kisyo
     end
 
     def set(key, value)
-      keys << key
-      values[key] = value
+      m.synchronize do
+        if values[key]
+          return
+        end
 
-      if keys.size > CACHE_SIZE
-        oldest_key = keys.shift
-        values.delete(oldest_key)
+        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
+    attr_reader :keys, :values, :m
   end
 end

data/lib/kisyo/daily.rb

@@ -17,15 +17,16 @@ module Kisyo
         return value
       end
 
-      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)
+      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
@@ -35,7 +36,7 @@ module Kisyo
         values = tr.css('td').map(&:text)
 
         k = [date.year, date.month, values[0]].join(',')
-        cache.set(k, Element::Day.new(*values[1 .. -1]))
+        cache.set(k, Element::Day.new(*values[1..-1]))
       end
 
       cache.get(key)

data/lib/kisyo/location.rb

@@ -1,7 +1,32 @@
+require 'csv'
+require 'geocoder'
+
 module Kisyo
   class Location
     attr_reader :prefecture_id, :block_id
 
+    def self.distance(lat1, lng1, lat2, lng2)
+      Geocoder::Calculations.distance_between([lat1, lng1], [lat2, lng2])
+    end
+
+    def self.dms_to_degrees(d, m, s = 0)
+      d + m / 60.0 + s / 3600.0
+    end
+
+    def self.nearest(lat, lng)
+      distances =
+        BLOCKS.map do |block|
+          la = dms_to_degrees(block[3].to_f, block[4].to_f)
+          ln = dms_to_degrees(block[5].to_f, block[6].to_f)
+
+          [distance(lat, lng, la, ln), block]
+        end
+
+      block = distances.min_by { |(dist, _)| dist }[1]
+
+      new(block[1], block[2])
+    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.3"
+  VERSION = '0.1.1'
 end

data/lib/kisyo.rb

@@ -1,9 +1,10 @@
-require "kisyo/error"
-require "kisyo/location"
-require "kisyo/cache"
-require "kisyo/daily"
-require "kisyo/elements/day"
-require "kisyo/version"
+require 'kisyo/error'
+require 'kisyo/blocks'
+require 'kisyo/location'
+require 'kisyo/cache'
+require 'kisyo/daily'
+require 'kisyo/elements/day'
+require 'kisyo/version'
 
 module Kisyo
 end

data/spec/kisyo/daily_spec.rb

@@ -2,31 +2,22 @@
 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' }
 
     context 'single request' do
       before do
-        stub_request(:get, url).
-          to_return(:body => read_fixture_file(fixture_file_name))
+        stub_request(:get, url).to_return(
+          body: read_fixture_file(fixture_file_name)
+        )
       end
 
       context 'information is available' do
@@ -48,21 +39,17 @@ describe Kisyo::Daily do
       end
 
       context 'information is not available' do
-        let(:fixture_file_name) {
-          'ng.html'
-        }
+        let(:fixture_file_name) { 'ng.html' }
 
         it 'raises error' do
-          expect {
-            daily.at(date)
-          }.to raise_error(Kisyo::WeatherInformationNotAvailable)
+          expect { daily.at(date) }.to raise_error(
+            Kisyo::WeatherInformationNotAvailable
+          )
         end
       end
 
       context 'value is "--"' do
-        let(:date) {
-          Date.parse('2016-11-04')
-        }
+        let(:date) { Date.parse('2016-11-04') }
 
         it '"--" is converted to nil' do
           info = daily.at(date)
@@ -75,9 +62,9 @@ describe Kisyo::Daily do
     end
     context 'multiple request' do
       before do
-        stub_request(:get, url).
-          to_return(:body => read_fixture_file(fixture_file_name)).
-          times(number_of_request)
+        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

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.3
+  version: 0.1.1
 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
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: geocoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !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
@@ -95,6 +95,7 @@ files:
 - Rakefile
 - kisyo.gemspec
 - lib/kisyo.rb
+- lib/kisyo/blocks.rb
 - lib/kisyo/cache.rb
 - lib/kisyo/daily.rb
 - lib/kisyo/elements/day.rb
@@ -104,6 +105,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:
@@ -124,8 +126,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
@@ -133,4 +134,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