weather_jp 1.0.2 → 1.0.3

data/lib/weather_jp/version.rb

@@ -1,3 +1,3 @@
 module WeatherJp
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/weather_jp.rb

@@ -7,6 +7,8 @@ require 'rss'
 require 'nokogiri'
 
 module WeatherJp
+  class WeatherJpError < StandardError; end
+
   class << self
     def get(city_name, option = nil)
       if option
@@ -30,15 +32,15 @@ module WeatherJp
 
     def parser(str)
       if str =~ /((?<city>.*)の
-          (?<day>今日|きょう|明日|あした|明後日|あさって|３日後|４日後|3日後|4日後)
+          (?<day>今日|きょう|今|いま|明日|あした|明後日|あさって|３日後|４日後|3日後|4日後)
           の(天気|てんき).*) |
-          ((?<day>今日|きょう|明日|あした|明後日|あさって|３日後|４日後|3日後|4日後)の
+          ((?<day>今日|きょう|今|いま|明日|あした|明後日|あさって|３日後|４日後|3日後|4日後)の
           (?<city>.*)の(天気|てんき))
       /ux
         data = Regexp.last_match
         day = data[:day]
         case day
-        when /今日|きょう/u
+        when /今日|きょう|今|いま/u
           day = 'today'
         when /明日|あした/u
           day = 'tomorrow'
@@ -49,7 +51,7 @@ module WeatherJp
         when /4日後|４日後/u
           day = 4
         else
-          raise "No matched"
+          raise WeatherJpError, "Can't parse given String"
         end
         {day: day, city: data[:city]}
       else
@@ -94,10 +96,10 @@ module WeatherJp
         when :day_after_tomorrow
           day = 2
         end
-        raise ArgumentError if @day_weathers[day] == nil
+        raise WeatherJpError if @day_weathers[day] == nil
         @day_weathers[day]
       rescue
-        raise ArgumentError,
+        raise WeatherJpError,
           "unvaild argument '#{day}' for get_weather"
       end
     end
@@ -141,8 +143,7 @@ module WeatherJp
           full_name = 
             doc.xpath('//weather').attr('weatherlocationname').value
         rescue
-          raise ArgumentError,
-            "invaild city name '#{city_name}'!"
+          raise WeatherJpError, "Cant't parse XML"
         end
         [code.slice(3..-1), full_name]
       end
@@ -156,7 +157,7 @@ module WeatherJp
           )
           RSS::Parser.parse(uri, false)
         rescue
-          raise StandardError,
+          raise WeatherJpError,
             "the MSN weather sever may be downed, or got invaild city code"
         end
       end
@@ -188,8 +189,8 @@ module WeatherJp
             weathers << h
           end
           weathers
-        rescue
-          raise StandardError,
+        rescue NameError
+          raise WeatherJpError,
             "the MSN weather sever may be downed, or something wrong"
         end
       end

data/spec/weather_jp_spec.rb

@@ -25,20 +25,27 @@ describe "WeatherJp" do
   end
 
   describe ".parser" do
-    {"東京の今日の天気" => {day: "today", city: "東京"},
-      "今日の東京の天気" => {day: "today", city: "東京"},
-      "東京の明日の天気" => {day: "tomorrow", city: "東京"},
-      "東京の明後日の天気" => {day: "day_after_tomorrow", city: "東京"},
-      "東京の3日後の天気" => {day: 3, city: "東京"},
-      "東京の３日後の天気" => {day: 3, city: "東京"},
-      "東京の4日後の天気" => {day: 4, city: "東京"},
-      "東京の４日後の天気" => {day: 4, city: "東京"},
-      "東京の今日の天気教えて〜" => {day: "today", city: "東京"},
-      "あきるの市の今日の天気" => {day: "today", city: "あきるの市"},
-      "あきるの市の今日の天気教えなさい" => {day: "today", city: "あきるの市"},
-      "今日のあきるの市の天気" => {day: "today", city: "あきるの市"}
-    }.each do |test, expect|
-      WeatherJp.parser(test).should == expect
+    it "should parse japanese string" do
+      {
+        "東京の今日の天気" => {day: "today", city: "東京"},
+        "今日の東京の天気" => {day: "today", city: "東京"},
+        "東京のいまの天気" => {day: "today", city: "東京"},
+        "いまの東京の天気" => {day: "today", city: "東京"},
+        "東京の今の天気" => {day: "today", city: "東京"},
+        "今の東京の天気" => {day: "today", city: "東京"},
+        "東京の明日の天気" => {day: "tomorrow", city: "東京"},
+        "東京の明後日の天気" => {day: "day_after_tomorrow", city: "東京"},
+        "東京の3日後の天気" => {day: 3, city: "東京"},
+        "東京の３日後の天気" => {day: 3, city: "東京"},
+        "東京の4日後の天気" => {day: 4, city: "東京"},
+        "東京の４日後の天気" => {day: 4, city: "東京"},
+        "東京の今日の天気教えて〜" => {day: "today", city: "東京"},
+        "あきるの市の今日の天気" => {day: "today", city: "あきるの市"},
+        "あきるの市の今日の天気教えなさい" => {day: "today", city: "あきるの市"},
+        "今日のあきるの市の天気" => {day: "today", city: "あきるの市"}
+      }.each do |test, expect|
+        WeatherJp.parser(test).should == expect
+      end
     end
   end
 end

data/spec/weather_spec.rb

@@ -74,30 +74,30 @@ describe "Weather" do
     describe "#get_weather" do
       it "should accept Symbol argument" do
         ->(){ @weather.get_weather(:today) }.
-          should_not raise_error(ArgumentError)
+          should_not raise_error(WeatherJp::WeatherJpError)
         ->(){ @weather.get_weather(:tomorrow) }.
-          should_not raise_error(ArgumentError)
+          should_not raise_error(WeatherJp::WeatherJpError)
       end
 
       it "should accept String argument" do
         ->(){ @weather.get_weather('today') }.
-          should_not raise_error(ArgumentError)
+          should_not raise_error(WeatherJp::WeatherJpError)
         ->(){ @weather.get_weather('tomorrow') }.
-          should_not raise_error(ArgumentError)
+          should_not raise_error(WeatherJp::WeatherJpError)
       end
 
       it "should accept 0 to 4 number as argument" do
         (0..4).each do |n|
           ->(){ @weather.get_weather(n) }.
-            should_not raise_error(ArgumentError)
+            should_not raise_error(WeatherJp::WeatherJpError)
         end
       end
 
-      it "should raise ArgumentError when got invaild aregument" do
+      it "should raise WeatherJp::WeatherJpError when got invaild aregument" do
         ->(){ @weather.get_weather(:yesterday) }.
-          should raise_error(ArgumentError)
+          should raise_error(WeatherJp::WeatherJpError)
         ->(){ @weather.get_weather(5) }.
-          should raise_error(ArgumentError)
+          should raise_error(WeatherJp::WeatherJpError)
       end
 
       it "should return DayWeather object" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weather_jp
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2712567142271719011
+      hash: -4408068253640136415
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2712567142271719011
+      hash: -4408068253640136415
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23