weather_jp 1.0.0 → 1.0.1

data/.travis.yml

@@ -2,3 +2,6 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+notifications:
+  email: false
+

data/HISTORY.md

@@ -0,0 +1,7 @@
+v 1.0.0
+
+Add parse method to WeatherJp
+
+see READEME for more description
+
+----

data/README.jp.md

@@ -37,6 +37,10 @@ tsuyama = WeatherJp.get "津山"
 tokyo.today.to_s
   #=> これは "東京都 東京の天気は曇りのち晴れ、最高気温34度...etc" になります
 
+# もしくは解析したい文字列があるなら
+WeatherJp.parse("今日のうどん県の天気教えて下され〜〜").to_s
+  #=> "香川県 高松の今日の天気は曇のち晴れ 最高気温25度 最低気温17度 降水確率は20% です。"
+
 # Weather オブジェクトを取得するいくつかの方法
 akiba.get_weather(4) #=> <#DayWeather object>
 tokyo.today.forecast #=> can be "晴れ"

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/Taiki45/weather_jp.png?branch=master)](http://travis-ci.org/Taiki45/weather_jp)
+[![Build Status](https://secure.travis-ci.org/taiki45/weather_jp.png)](http://travis-ci.org/taiki45/weather_jp)
 
 ## About
 
@@ -37,6 +37,10 @@ tsuyama = WeatherJp.get "津山"
 tokyo.today.to_s
   #=> can be "東京都 東京の天気は曇りのち晴れ、最高気温34度...etc"
 
+# or your have unparsed string
+WeatherJp.parse("今日のうどん県の天気教えて下され〜〜").to_s
+  #=> "香川県 高松の今日の天気は曇のち晴れ 最高気温25度 最低気温17度 降水確率は20% です。"
+
 # to get weather info in differrnt ways
 akiba.get_weather(4) #=> <#DayWeather object>
 tokyo.today.forecast #=> can be "晴れ"

data/lib/weather_jp.rb

@@ -7,7 +7,6 @@ require 'rss'
 require 'nokogiri'
 
 module WeatherJp
-
   class << self
     def get(city_name, option = nil)
       if option
@@ -31,26 +30,28 @@ module WeatherJp
 
     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]}
+          (?<day>今日|きょう|明日|あした|明後日|あさって|３日後|４日後|3日後|4日後)
+          の(天気|てんき).*) |
+          ((?<day>今日|きょう|明日|あした|明後日|あさって|３日後|４日後|3日後|4日後)の
+          (?<city>.*)の(天気|てんき))
+      /ux
+        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
@@ -61,9 +62,7 @@ module WeatherJp
     include Enumerable
 
     def initialize(city_name)
-      city_name = city_name.to_s if city_name.class == Symbol
-      @area_code, @city_name = get_area_code(city_name)
-      @weathers = set_weathers
+      @area_code, @city_name, @weathers = Wrapper.get(city_name)
       @day_weathers = Array.new(@weathers.size) do |n| 
         DayWeather.new(@weathers,@city_name, n)
       end
@@ -71,7 +70,6 @@ module WeatherJp
 
     attr_reader :city_name, :area_code, :day_weathers
 
-    public
     def to_hash
       @weathers
     end
@@ -109,35 +107,36 @@ module WeatherJp
         get_weather(s)
       end
     end
+  end
 
-    private
-    def set_weathers
-      begin
-        weathers = Array.new
-        get_weather_data.each do |i|
-          h = Hash.new
-          h[:day] = i.slice(/(.*?):\s+(.*?)\./, 1)
-          h[:forecast] = i.slice(/(.*?):\s+(.*?)\./, 2)
-          h[:max_temp] = i.slice(/(最高).*?(\d+)/u, 2)
-          h[:min_temp] = i.slice(/(最低).*?(\d+)/u, 2)
-          h[:rain] = i.slice(/(降水確率).*?(\d+)/u, 2)
-          weathers << h
+  module Wrapper
+    class << self
+      def get(city_name)
+        area_code, city_name = get_area_code(city_name.to_s)
+        weathers = set_weathers(parse_rss(get_rss(area_code)))
+        [area_code, city_name, weathers]
+      end
+
+      def get_area_code(city_name)
+        get_xml city_name do |xml|
+          parse_xml xml
         end
-        weathers
-      rescue
-        raise StandardError,
-          "the MSN weather sever may be downed, or something wrong"
       end
-    end
 
-    def get_area_code(city_name)
-      uri = URI.encode(
-        "http://weather.service.msn.com/" + \
-        "find.aspx?outputview=search&weadegreetype=C&culture=ja-JP&" + \
-        "weasearchstr=#{city_name}")
-        doc = Nokogiri::XML(open(uri))
+      def get_xml(city_name)
+        result = []
+        open(URI.encode("http://weather.service.msn.com/" +
+          "find.aspx?outputview=search&weadegreetype=C&culture=ja-JP&" +
+          "weasearchstr=#{city_name}")) do |xml|
+          result = yield xml
+        end
+        result
+      end
+
+      def parse_xml(xml)
+        doc = Nokogiri::XML(xml)
         begin 
-          code = 
+          code =
             doc.xpath('//weather').attr('weatherlocationcode').value
           full_name = 
             doc.xpath('//weather').attr('weatherlocationname').value
@@ -146,36 +145,51 @@ module WeatherJp
             "invaild city name '#{city_name}'!"
         end
         [code.slice(3..-1), full_name]
-    end
-
-
-    def get_weather_data
-      parse_rss(get_rss)
-    end
+      end
 
-    def get_rss
-      begin
-        uri = URI.parse(
-          "http://weather.jp.msn.com/" + \
-          "RSS.aspx?wealocations=wc:#{@area_code}&" + \
-          "weadegreetype=C&culture=ja-JP")
+      def get_rss(area_code)
+        begin
+          uri = URI.parse(
+            "http://weather.jp.msn.com/" +
+            "RSS.aspx?wealocations=wc:#{area_code}&" +
+            "weadegreetype=C&culture=ja-JP"
+          )
           RSS::Parser.parse(uri, false)
-      rescue
-        raise StandardError,
-          "the MSN weather sever may be downed, or got invaild city code"
+        rescue
+          raise StandardError,
+            "the MSN weather sever may be downed, or got invaild city code"
+        end
       end
-    end
 
-    def parse_rss(rss)
-      str = rss.channel.item(0).description
-      data = remove_html_tag(str).split(/%/)
-      data.pop
-      data.map {|i| i.delete!('"') }
-    end
+      def parse_rss(rss)
+        str = rss.channel.item(0).description
+        data = remove_html_tag(str).split(/%/)
+        data.pop
+        data.map {|i| i.delete!('"') }
+      end
+
+      def remove_html_tag(str)
+        str.gsub(/<(\"[^\"]*\"|'[^']*'|[^'\">])*>/,'""')
+      end
 
-    def remove_html_tag(string)
-      string.gsub!(/<(\"[^\"]*\"|'[^']*'|[^'\">])*>/,'""')
+      def set_weathers(raw_data)
+        weathers = Array.new
+        begin
+          raw_data.each do |i|
+            h = Hash.new
+            h[:day] = i.slice(/(.*?):\s+(.*?)\./, 1)
+            h[:forecast] = i.slice(/(.*?):\s+(.*?)\./, 2)
+            h[:max_temp] = i.slice(/(最高).*?(\d+)/u, 2)
+            h[:min_temp] = i.slice(/(最低).*?(\d+)/u, 2)
+            h[:rain] = i.slice(/(降水確率).*?(\d+)/u, 2)
+            weathers << h
+          end
+          weathers
+        rescue
+          raise StandardError,
+            "the MSN weather sever may be downed, or something wrong"
+        end
+      end
     end
   end
 end
-

data/lib/weather_jp/version.rb

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

data/spec/day_weather_spec.rb

@@ -2,14 +2,13 @@
 require 'spec_helper'
 
 describe "DayWeather" do
-  before(:all) do
-    @tokyo = WeatherJp::Weather.new(:tokyo)
-    @weather = @tokyo.get_weather(:today)
+  before :all do
+    @weather = WeatherJp.get(:tokyo, :today)
   end
 
   describe "#initialize" do
     it "should have @city_name" do
-      @weather.city_name.should == "東京都 東京"
+      @weather.city_name.should == "tokyo"
     end
 
     it "should have @weather as Hash" do
@@ -22,15 +21,9 @@ describe "DayWeather" do
     it "should return String" do
       @weather.inspect.class.should == String
     end
-  end
 
-  describe "#to_s" do
-    it "should return String" do
-      @weather.to_s.class.should == String
-    end
-
-    it "should be certain string format" do
-      @weather.to_s.should =~ /東京都\s東京の今日の天気は.*\sです。/u
+    it "should have certain format" do
+      @weather.inspect.should == "#<DayWeather:@city_name = tokyo, @day=今日, @forecast=晴のち雨, @max_temp=29, @min_temp=24, @rain=80>"
     end
   end
 
@@ -73,3 +66,4 @@ describe "DayWeather" do
     end
   end
 end
+

data/spec/spec_helper.rb

@@ -6,12 +6,27 @@ require 'rubygems'
 require 'nokogiri'
 require 'weather_jp'
 
+module WeatherJp::Wrapper
+  class << self
+    def get_area_code(city_name)
+      ["JAXX0085", 'tokyo']
+    end
+
+    def get_rss(area_code)
+      get_dummy_rss
+    end
+  end
+end
+
 def fixture_path
   File.expand_path('../fixture/', __FILE__)
 end
 
-def rss_one
-  file = open(fixture_path + '/RSS.rss')
-  yield file.read
-  file.close
+def get_dummy_rss
+  rss = ''
+  open(fixture_path + '/RSS.rss') do |file|
+    rss = RSS::Parser.parse(file.read)
+  end
+  rss
 end
+

data/spec/weather_jp_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe "WeatherJp" do
-  before(:all) do
+  before :all do
     @weather = WeatherJp.get :tokyo
   end
 
@@ -24,28 +24,22 @@ describe "WeatherJp" do
     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
+  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
     end
+  end
 end
 

data/spec/weather_spec.rb

@@ -13,18 +13,9 @@ describe "Weather" do
         @weather.area_code.should == "JAXX0085"
       end
 
-      it "should have @city_name and can access" do
-        @weather.city_name.should == "東京都 東京"
-      end
-
-      it "should accept String argument" do
-        weather = WeatherJp::Weather.new "東京都府中市"
-        weather.city_name.should == "東京都 府中市"
-      end
-
       it "should accept Symbol argument" do
         weather = WeatherJp::Weather.new :tokyo
-        weather.city_name.should == "東京都 東京"
+        weather.city_name.should == "tokyo"
       end
 
       it "should have @day_weathers as Array" do
@@ -42,16 +33,6 @@ describe "Weather" do
       end
     end
 
-    describe "#get_area_code" do
-      it "should get vaild area code" do
-        @weather.area_code.should == "JAXX0085"
-      end
-
-      it "should raise error when invaild city name taken" do
-        WeatherJp::Weather.new(:aaa).city_name.should == "アメリカ合衆国 マイアミ"
-      end
-    end
-
     describe "#to_hash" do 
       it "should return Array and include Hashs" do
         @weather.to_hash.class.should == Array
@@ -141,55 +122,4 @@ describe "Weather" do
       end
     end
   end
-
-  describe "with fixtures" 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
-      @weather = WeatherJp::Weather.new(:tokyo)
-    end
-
-    describe "#set_weathers" do
-      it "should have vaild data" do
-        expect = [{:day=>"今日", :forecast=>"晴のち雨", :max_temp=>"29", :min_temp=>"24", :rain=>"80"},
-          {:day=>"明日", :forecast=>"雨のち晴", :max_temp=>"30", :min_temp=>"22", :rain=>"60"},
-          {:day=>"火曜日", :forecast=>"曇時々晴", :max_temp=>"27", :min_temp=>"22", :rain=>"30"},
-          {:day=>"水曜日", :forecast=>"曇時々雨", :max_temp=>"25", :min_temp=>"20", :rain=>"50"},
-          {:day=>"木曜日", :forecast=>"曇り", :max_temp=>"28", :min_temp=>"20", :rain=>"40"}
-        ]
-        @weather.to_hash.should == expect
-      end
-    end
-
-    describe "#get_weather_data" do
-      describe "#parse_rss" do
-        it "should parse rss data" do
-          expect = ["今日: 晴のち雨. 最低: 24°C. 最高: 29°C. 降水確率: 80", "明日: 雨のち晴. 最低: 22°C. 最高: 30°C. 降水確率: 60", "火曜日: 曇時々晴. 最低: 22°C. 最高: 27°C. 降水確率: 30", "水曜日: 曇時々雨. 最低: 20°C. 最高: 25°C. 降水確率: 50", "木曜日: 曇り. 最低: 20°C. 最高: 28°C. 降水確率: 40"]
-          rss_one do |rss|
-            @weather.send(:parse_rss, RSS::Parser.parse(rss)).should == expect
-          end
-        end
-      end
-
-      describe "#remove_html_tag" do
-        it "should remove html tags" do
-          data = %q(<html>a<a href="dummy">b</a><span>c</sapan></html>)
-          @weather.send(:remove_html_tag, data).should == %(""a""b""""c"""")
-        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

data/spec/wrapper_spec.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe "Wrapper" do
+  describe ".set_weathers" do
+    it "should make vaild data" do
+      expect = [{:day=>"今日", :forecast=>"晴のち雨", :max_temp=>"29", :min_temp=>"24", :rain=>"80"},
+        {:day=>"明日", :forecast=>"雨のち晴", :max_temp=>"30", :min_temp=>"22", :rain=>"60"},
+        {:day=>"火曜日", :forecast=>"曇時々晴", :max_temp=>"27", :min_temp=>"22", :rain=>"30"},
+        {:day=>"水曜日", :forecast=>"曇時々雨", :max_temp=>"25", :min_temp=>"20", :rain=>"50"},
+        {:day=>"木曜日", :forecast=>"曇り", :max_temp=>"28", :min_temp=>"20", :rain=>"40"}
+      ]
+      dummy_data = ["今日: 晴のち雨. 最低: 24°C. 最高: 29°C. 降水確率: 80", "明日: 雨のち晴. 最低: 22°C. 最高: 30°C. 降水確率: 60", "火曜日: 曇時々晴. 最低: 22°C. 最高: 27°C. 降水確率: 30", "水曜日: 曇時々雨. 最低: 20°C. 最高: 25°C. 降水確率: 50", "木曜日: 曇り. 最低: 20°C. 最高: 28°C. 降水確率: 40"]
+      WeatherJp::Wrapper.set_weathers(dummy_data) == expect
+    end
+  end
+
+  describe ".parse_rss" do
+    it "should parse rss data" do
+      expect = ["今日: 晴のち雨. 最低: 24°C. 最高: 29°C. 降水確率: 80", "明日: 雨のち晴. 最低: 22°C. 最高: 30°C. 降水確率: 60", "火曜日: 曇時々晴. 最低: 22°C. 最高: 27°C. 降水確率: 30", "水曜日: 曇時々雨. 最低: 20°C. 最高: 25°C. 降水確率: 50", "木曜日: 曇り. 最低: 20°C. 最高: 28°C. 降水確率: 40"]
+      WeatherJp::Wrapper.parse_rss(get_dummy_rss).should == expect
+    end
+
+    describe ".remove_html_tag" do
+      it "should remove html tags" do
+        str = %q(<html>a<a href="dummy">b</a><span>c</sapan></html>)
+        WeatherJp::Wrapper.remove_html_tag(str).should == %(""a""b""""c"""")
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weather_jp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -85,6 +85,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- HISTORY.md
 - LICENSE
 - README.jp.md
 - README.md
@@ -97,6 +98,7 @@ files:
 - spec/spec_helper.rb
 - spec/weather_jp_spec.rb
 - spec/weather_spec.rb
+- spec/wrapper_spec.rb
 - weather_jp.gemspec
 homepage: http://taiki45.github.com/weather_jp
 licenses: []
@@ -112,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1993595247945938449
+      hash: 2403131100939033497
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1993595247945938449
+      hash: 2403131100939033497
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -134,3 +136,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/weather_jp_spec.rb
 - spec/weather_spec.rb
+- spec/wrapper_spec.rb