kisyo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d5eabd129f1b2191de6fdd0116779aa1104a091
-  data.tar.gz: 563fda3733d0e577057212146d90d23112801716
+  metadata.gz: d8a99f62b8535e4a98f5852dfe53fafa38452f83
+  data.tar.gz: 99a1477bb5740fcda0fea9b75b0434491ce70933
 SHA512:
-  metadata.gz: f0c75847c3f5fa34c177eeabb730291936e38457a531ad3f504a7aa8eec2251ef474222f021a8d0897c2c31b4241d1faa13a9f88596b631f35c0413aa797f694
-  data.tar.gz: d63e03065ce76e92f2b6a9de8846794c86f570062cefaa37c710e38622c20aec370a28cf84077f39e2774f61244fa1325b9279674f006ab72e3a56b15dac79f8
+  metadata.gz: d8c8bb2db8af4f8950f4fb9c173df90b63d35bf931dc505e45aaa0eeba91bdc71e5805500ac64032f6e1c3f7519cfdd989e4455eedb7622563c7c8d482c73744
+  data.tar.gz: 8a8e10cc74bd021ef9dc5921f8163447233d19f0e009a0ee91590ea5c92388a19432b0d55344aa0e5bc0f1532cb0b83bcdaab5a91ce5b92e8a746d90c048f2ed

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/lib/kisyo/cache.rb

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

data/lib/kisyo/daily.rb

@@ -3,14 +3,23 @@ require 'open-uri'
 
 module Kisyo
   class Daily
+    CACHE_SIZE = 100
+
     def initialize(location)
       @location = location
+      @cache = Cache.new
     end
 
     def at(date)
+      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=%i&block_no=%i&year=%i&month=%i&day=01&view=p1' % [
-        @location.prefecture_id,
-        @location.block_id,
+        location.prefecture_id,
+        location.block_id,
         date.year,
         date.month
       ]
@@ -22,13 +31,18 @@ module Kisyo
       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/version.rb

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

data/spec/kisyo/daily_spec.rb

@@ -23,52 +23,77 @@ describe Kisyo::Daily do
       '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)
+        end
+      end
+
+      context 'value is "--"' do
+        let(:date) {
+          Date.parse('2016-11-04')
+        }
+
+        it '"--" is converted to nil' do
+          info = daily.at(date)
 
-      it 'raises error' do
-        expect {
-          daily.at(date)
-        }.to raise_error(Kisyo::WeatherInformationNotAvailable)
+          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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kisyo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - youpy
@@ -95,6 +95,7 @@ files:
 - Rakefile
 - kisyo.gemspec
 - lib/kisyo.rb
+- lib/kisyo/cache.rb
 - lib/kisyo/daily.rb
 - lib/kisyo/elements/day.rb
 - lib/kisyo/error.rb