weather_jp 0.1.1 → 1.0.0

data/lib/weather_jp/version.rb

@@ -1,3 +1,3 @@
 module WeatherJp
-  VERSION = "0.1.1"
+  VERSION = "1.0.0"
 end

data/lib/weather_jp.rb

@@ -7,17 +7,53 @@ require 'rss'
 require 'nokogiri'
 
 module WeatherJp
-  def self.get(city_name, option = nil)
-    if option
-      Weather.new(city_name).get_weather(option)
-    else
-      Weather.new(city_name)
+
+  class << self
+    def get(city_name, option = nil)
+      if option
+        Weather.new(city_name).get_weather(option)
+      else
+        Weather.new(city_name)
+      end
+    end
+
+    def customize_to_s(&code)
+      Weather::DayWeather.class_eval do
+        define_method(:to_s, &code)
+      end
     end
-  end
 
-  def self.customize_to_s(&code)
-    Weather::DayWeather.class_eval do
-      define_method(:to_s, &code)
+    def parse(str)
+      if day_and_city = parser(str)
+        WeatherJp.get(day_and_city[:city]).get_weather(day_and_city[:day])
+      end
+    end
+
+    def parser(str)
+      if str =~ /((?<city>.*)の
+              (?<day>今日|きょう|明日|あした|明後日|あさって|３日後|４日後|3日後|4日後)の(天気|てんき).*) |
+              ((?<day>今日|きょう|明日|あした|明後日|あさって|３日後|４日後|3日後|4日後)の
+               (?<city>.*)の(天気|てんき))/ux then
+      data = Regexp.last_match
+      day = data[:day]
+      case day
+      when /今日|きょう/u
+        day = 'today'
+      when /明日|あした/u
+        day = 'tomorrow'
+      when /明後日|あさって/u
+        day = 'day_after_tomorrow'
+      when /3日後|３日後/u
+        day = 3
+      when /4日後|４日後/u
+        day = 4
+      else
+        raise "No matched"
+      end
+      {day: day, city: data[:city]}
+      else
+        nil
+      end
     end
   end
 

data/spec/weather_jp_spec.rb

@@ -23,5 +23,29 @@ describe "WeatherJp" do
       WeatherJp.get(:tokyo, :today).to_s.should == 'success'
     end
   end
+
+    describe ".parse" do
+      WeatherJp.parse("今日の東京の天気教えて").to_s.should =~ /東京都\s東京の今日の天気は.*です。/u
+    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: "東京"},
+        #"ε(  ε^o^)э東京の今日の天気教えてほしいでし…！" => {day: "today", city: "東京"},
+        "あきるの市の今日の天気" => {day: "today", city: "あきるの市"},
+        "あきるの市の今日の天気教えなさい" => {day: "today", city: "あきるの市"},
+        "今日のあきるの市の天気" => {day: "today", city: "あきるの市"}
+      }.each do |test, expect|
+        WeatherJp.parser(test).should == expect
+      end
+    end
 end
 

data/spec/weather_spec.rb

@@ -143,10 +143,12 @@ describe "Weather" do
   end
 
   describe "with fixtures" do
-    before(:all) do
+    before :all do
       dummy = ''
       rss_one {|rss| dummy = RSS::Parser.parse rss }
       WeatherJp::Weather.class_exec dummy do |dummy|
+        alias :back_code :get_area_code
+        alias :back_rss :get_rss
         define_method(:get_area_code) {|city_name| ["JAXX0085", 'tokyo'] }
         define_method(:get_rss) { dummy }
       end
@@ -182,5 +184,12 @@ describe "Weather" do
         end
       end
     end
+
+    after :all do
+      WeatherJp::Weather.class_exec do
+        alias :get_area_code :back_code
+        alias :get_rss :back_rss
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weather_jp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-30 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 113366814983018964
+      hash: 1993595247945938449
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 113366814983018964
+      hash: 1993595247945938449
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23