kisyo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64fc33cac93f764fed948343fadfddb24f3baf6
-  data.tar.gz: 219f910e4b428373b6d0c31fdf7116720f214030
+  metadata.gz: 6d5eabd129f1b2191de6fdd0116779aa1104a091
+  data.tar.gz: 563fda3733d0e577057212146d90d23112801716
 SHA512:
-  metadata.gz: 55b39ac75b8c72539adcb780194d8d26439398d141c73193070b66e3e31c3f879d986ee0522f8421cbe6062097cfd0d535d6b51a03dfd11c2393f4284517014a
-  data.tar.gz: 401344277d57491d9f47e0aa93570974b1eb5236222c74fcfcfd2ae0a1f3ae3a42b98b09608759a73ea25cdafbcba2f74984e975bd650b8e9f901c8e0d67984a
+  metadata.gz: f0c75847c3f5fa34c177eeabb730291936e38457a531ad3f504a7aa8eec2251ef474222f021a8d0897c2c31b4241d1faa13a9f88596b631f35c0413aa797f694
+  data.tar.gz: d63e03065ce76e92f2b6a9de8846794c86f570062cefaa37c710e38622c20aec370a28cf84077f39e2774f61244fa1325b9279674f006ab72e3a56b15dac79f8

data/lib/kisyo/daily.rb

@@ -19,14 +19,12 @@ module Kisyo
       doc = Nokogiri::HTML(content)
       days = doc.css('div.a_print')
 
-      raise Error.new('invalid date') if days.size == 0
+      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 do |td|
-            td.text
-          end
+          values = tr.css('td').map(&:text)
 
           return Element::Day.new(*values[1 .. -1])
         end

data/lib/kisyo/elements/day.rb

@@ -31,18 +31,27 @@ module Kisyo
             general_weather_condition_day,
             general_weather_condition_night
           )
-        @precipitation_total = precipitation_total.to_f
-        @precipitation_hourly_max = precipitation_hourly_max.to_f
-        @precipitation_10min_max = precipitation_10min_max.to_f
-        @temperature_avg = temperature_avg.to_f
-        @temperature_max = temperature_max.to_f
-        @temperature_min = temperature_min.to_f
-        @humidity_avg = humidity_avg.to_f
-        @humidity_min = humidity_min.to_f
-        @day_length = day_length.to_f
+        @precipitation_total = convert_value(precipitation_total)
+        @precipitation_hourly_max = convert_value(precipitation_hourly_max)
+        @precipitation_10min_max = convert_value(precipitation_10min_max)
+        @temperature_avg = convert_value(temperature_avg)
+        @temperature_max = convert_value(temperature_max)
+        @temperature_min = convert_value(temperature_min)
+        @humidity_avg = convert_value(humidity_avg)
+        @humidity_min = convert_value(humidity_min)
+        @day_length = convert_value(day_length)
         @general_weather_condition_day = general_weather_condition_day
         @general_weather_condition_night = general_weather_condition_night
       end
+
+      def convert_value(value)
+        case value
+        when '--'
+          nil
+        else
+          value.to_f
+        end
+      end
     end
   end
 end

data/lib/kisyo/error.rb

@@ -1,3 +1,4 @@
 module Kisyo
   class Error < StandardError; end
+  class WeatherInformationNotAvailable < Error; end
 end

data/lib/kisyo/version.rb

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

data/spec/kisyo/daily_spec.rb

@@ -19,19 +19,22 @@ describe Kisyo::Daily 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'
     }
 
-    context 'information is available' do
-      before do
-        stub_request(:get, url).
-          to_return(:body => read_fixture_file('201611.html'))
-      end
+    let(:fixture_file_name) {
+      '201611.html'
+    }
 
+    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)
 
         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.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)
@@ -44,15 +47,28 @@ describe Kisyo::Daily do
     end
 
     context 'information is not available' do
-      before do
-        stub_request(:get, url).
-          to_return(:body => read_fixture_file('ng.html'))
-      end
+      let(:fixture_file_name) {
+        'ng.html'
+      }
 
       it 'raises error' do
         expect {
           daily.at(date)
-        }.to raise_error(Kisyo::Error, 'invalid 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kisyo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - youpy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri