weather_pinpoint_jp 0.0.1 → 0.0.2

data/lib/weather_pinpoint_jp/version.rb

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

data/lib/weather_pinpoint_jp.rb

@@ -3,8 +3,8 @@
 require "weather_pinpoint_jp/version"
 require 'net/http'
 require 'uri'
-require 'nokogiri'
 require 'open-uri'
+require 'rexml/document'
 require 'pp'
 
 module WeatherPinpointJp
@@ -13,42 +13,57 @@ module WeatherPinpointJp
   STATION     = 2
   POSTAL_CODE = 3
 
+  # weather code
+  SUNNY      = 100
+  CLOUDY     = 200
+  RAINY      = 300
+  SNOWY      = 400
+  HEAT_WAVE  = 500
+  HEAVY_RAIN = 850
+
   class << self
     def get(keyword, type = ADDRESS)
       search_url = URI.parse("http://weathernews.jp/pinpoint/cgi/search_point.cgi")
-      html_url   = nil
-      xml_url    = nil
-      name       = nil
 
       # search location...
+      body = ""
       Net::HTTP.start(search_url.host, search_url.port) do |http|
         query = "<search><keyword>#{keyword}</keyword><category>#{type}</category></search>"
-
         res = http.post(search_url.path, query, {})
-        escaped_body = res.body.gsub(/\&/, "&amp;")
-        doc = Nokogiri::XML(escaped_body)
-
-        result_num = doc.search('seac_cnt').children[0].content.to_i
-        if result_num == 0
-          raise "cannot find the location..."
-        end
-
-        html_url = doc.search('url').children[0].content
-        name     = doc.search('name').children[0].content
+        body = res.body
       end
 
-      # get html...
-      doc = Nokogiri::HTML(open(html_url))
+      # get location name & html url
+      (name, html_url) = get_name_and_url(body)
 
       # find the location code...
-      onload_str = doc.search('body').first.attribute('onload').value
-      location_code = onload_str.scan(/obsOrg=(.*?)&xmlFile/)[0][0]
+      location_code = get_code(html_url)
 
       # return pinpoint forecast instance...
       xml_url = "http://weathernews.jp/pinpoint/xml/#{location_code}.xml"
       return load(name, xml_url)
     end
 
+    def get_name_and_url(xml_str)
+      escaped_body = xml_str.gsub(/\&/, "&amp;")
+
+      doc = REXML::Document.new(escaped_body)
+      result_num = doc.elements['/pin_result/seac_cnt'].text.to_i
+      if result_num == 0
+        raise "cannot find the location..."
+      end
+
+      html_url = doc.elements['/pin_result/data_ret/ret/url'].text
+      name     = doc.elements['/pin_result/data_ret/ret/name'].text
+
+      [name, html_url]
+    end
+
+    def get_code(url)
+      html = open(url).read
+      location_code = html.scan(/obsOrg=(.*?)&xmlFile/)[0][0]
+    end
+
     def load(name, url)
       return Forecast.new(name, url)
     end
@@ -60,33 +75,33 @@ module WeatherPinpointJp
       @url = url
 
       # load xml
-      doc = Nokogiri::XML(open(url))
-      day = doc.xpath('//weathernews/data/day')[0]
+      doc = REXML::Document.new(open(url))
+      day = doc.elements['//weathernews/data/day']
 
       # get starttime
-      year  = day.attribute('startYear').content.to_i
-      month = day.attribute('startMonth').content.to_i
-      date  = day.attribute('startDate').content.to_i
-      hour  = day.attribute('startHour').content.to_i
+      year  = day.attributes['startYear'].to_i
+      month = day.attributes['startMonth'].to_i
+      date  = day.attributes['startDate'].to_i
+      hour  = day.attributes['startHour'].to_i
 
       @start_time = Time.local(year, month, date, hour, 0, 0)
 
       # weather
       @weather = []
-      day.xpath('weather/hour').children.each do |e|
-        @weather << e.content.to_i
+      day.elements.each('weather/hour') do |e|
+        @weather << e.text.to_i
       end
 
       # temperature
       @temperature = []
-      day.xpath('temperature/hour').children.each do |e|
-        @temperature << e.content.to_i
+      day.elements.each('temperature/hour') do |e|
+        @temperature << e.text.to_i
       end
 
       # precipitation
       @precipitation = []
-      day.xpath('precipitation/hour').children.each do |e|
-        @precipitation << e.content.to_i
+      day.elements.each('precipitation/hour') do |e|
+        @precipitation << e.text.to_i
       end
     end
 

data/test/test_data.html

@@ -0,0 +1 @@
+obsOrg=12345&xmlFile

data/test/test_data.xml

@@ -116,4 +116,5 @@
     <hour>46</hour>
    </precipitation>
   </day>
+ </data>
 </weathernews>

data/test/test_data_result.xml

@@ -0,0 +1,14 @@
+<pin_result>
+  <ret_cnt>1</ret_cnt>
+  <seac_cnt>1</seac_cnt>
+  <data_ret>
+    <ret>
+      <name>地名1</name>
+      <url>http://example.com/result_url_1?text=1&test2=2&test3=3</url>
+    </ret>
+    <ret>
+      <name>地名2</name>
+      <url>http://example.com/result_url_2?text=1&test2=2&test3=3</url>
+    </ret>
+  </data_ret>
+</pin_result>

data/test/test_load.rb

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*-
 require 'rubygems'
 require 'bundler/setup'
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
@@ -18,12 +19,25 @@ class TestLoad < Minitest::Test
     assert_equal f.nil?, true
   end
 
+  def test_get_name_and_url
+    result_xml = open(File.dirname(__FILE__) + "/test_data_result.xml").read
+    (name, url) = WeatherPinpointJp.get_name_and_url(result_xml)
+    assert_equal name, "地名1"
+    assert_equal url, "http://example.com/result_url_1?text=1&test2=2&test3=3"
+  end
+
+  def test_get_code
+    url = File.dirname(__FILE__) + "/test_data.html"
+    code = WeatherPinpointJp.get_code(url)
+    assert_equal code, "12345"
+  end
+
   def test_load
     f = WeatherPinpointJp.load("test_data", File.dirname(__FILE__) + "/test_data.xml")
     assert_equal f.nil?, false, "load() failed..."
 
     # start time
-    assert_equal f.start_time, Time.new(2013, 11, 12, 13, 0, 0)
+    assert_equal  f.start_time, Time.new(2013, 11, 12, 13, 0, 0) 
 
     # weather
     assert_equal f.weather.size, 36

data/weather_pinpoint_jp.gemspec

@@ -21,6 +21,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-
-  spec.add_dependency "nokogiri", "~> 1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weather_pinpoint_jp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
 description: weather information library for ruby
 email:
 - yoggy0@gmail.com
@@ -92,7 +76,9 @@ files:
 - samples/address.rb
 - samples/postalcode.rb
 - samples/station.rb
+- test/test_data.html
 - test/test_data.xml
+- test/test_data_result.xml
 - test/test_load.rb
 - weather_pinpoint_jp.gemspec
 homepage: https://github.com/yoggy/weather_pinpoint_jp
@@ -121,5 +107,7 @@ signing_key:
 specification_version: 3
 summary: weather information library for ruby
 test_files:
+- test/test_data.html
 - test/test_data.xml
+- test/test_data_result.xml
 - test/test_load.rb