weather_hacker 0.1.1 → 0.1.2

data/lib/weather_hacker.rb

@@ -1,6 +1,7 @@
 require "httparty"
 
 require "weather_hacker/version"
+require "weather_hacker/area_data"
 require "weather_hacker/client"
 
 class WeatherHacker

data/lib/weather_hacker/area_data.rb

@@ -0,0 +1,295 @@
+# encoding: UTF-8
+
+class WeatherHacker
+  module AreaData
+    ID_BY_CITY = {
+      "稚内"     => 1,
+      "旭川"     => 2,
+      "留萌"     => 3,
+      "札幌"     => 4,
+      "岩見沢"   => 5,
+      "倶知安"   => 6,
+      "網走"     => 7,
+      "北見"     => 8,
+      "紋別"     => 9,
+      "根室"     => 10,
+      "釧路"     => 11,
+      "帯広"     => 12,
+      "室蘭"     => 13,
+      "浦河"     => 14,
+      "函館"     => 15,
+      "江差"     => 16,
+      "青森"     => 17,
+      "むつ"     => 18,
+      "八戸"     => 19,
+      "秋田"     => 20,
+      "横手"     => 21,
+      "盛岡"     => 22,
+      "宮古"     => 23,
+      "大船渡"   => 24,
+      "仙台"     => 25,
+      "白石"     => 26,
+      "山形"     => 27,
+      "米沢"     => 28,
+      "酒田"     => 29,
+      "新庄"     => 30,
+      "福島"     => 31,
+      "小名浜"   => 32,
+      "若松"     => 33,
+      "水戸"     => 54,
+      "土浦"     => 55,
+      "宇都宮"   => 56,
+      "大田原"   => 57,
+      "前橋"     => 58,
+      "みなかみ" => 59,
+      "さいたま" => 60,
+      "熊谷"     => 61,
+      "秩父"     => 62,
+      "東京"     => 63,
+      "大島"     => 64,
+      "八丈島"   => 65,
+      "父島"     => 66,
+      "千葉"     => 67,
+      "銚子"     => 68,
+      "館山"     => 69,
+      "横浜"     => 70,
+      "小田原"   => 71,
+      "甲府"     => 75,
+      "河口湖"   => 76,
+      "富山"     => 44,
+      "伏木"     => 45,
+      "金沢"     => 46,
+      "輪島"     => 47,
+      "福井"     => 48,
+      "敦賀"     => 49,
+      "新潟"     => 50,
+      "長岡"     => 51,
+      "高田"     => 52,
+      "相川"     => 53,
+      "長野"     => 72,
+      "松本"     => 73,
+      "飯田"     => 74,
+      "静岡"     => 34,
+      "網代"     => 35,
+      "三島"     => 36,
+      "浜松"     => 37,
+      "名古屋"   => 38,
+      "豊橋"     => 39,
+      "岐阜"     => 40,
+      "高山"     => 41,
+      "津"       => 42,
+      "尾鷲"     => 43,
+      "大津"     => 77,
+      "彦根"     => 78,
+      "京都"     => 79,
+      "舞鶴"     => 80,
+      "大阪"     => 81,
+      "神戸"     => 82,
+      "豊岡"     => 83,
+      "奈良"     => 84,
+      "風屋"     => 85,
+      "和歌山"   => 86,
+      "潮岬"     => 87,
+      "岡山"     => 88,
+      "津山"     => 89,
+      "広島"     => 90,
+      "庄原"     => 91,
+      "松江"     => 92,
+      "浜田"     => 93,
+      "西郷"     => 94,
+      "鳥取"     => 95,
+      "米子"     => 96,
+      "下関"     => 97,
+      "山口"     => 98,
+      "柳井"     => 99,
+      "萩"       => 100,
+      "徳島"     => 101,
+      "日和佐"   => 102,
+      "高松"     => 103,
+      "松山"     => 104,
+      "新居浜"   => 105,
+      "宇和島"   => 106,
+      "高知"     => 107,
+      "室戸"     => 108,
+      "清水"     => 109,
+      "福岡"     => 110,
+      "八幡"     => 111,
+      "飯塚"     => 112,
+      "久留米"   => 113,
+      "大分"     => 114,
+      "中津"     => 115,
+      "日田"     => 116,
+      "佐伯"     => 117,
+      "長崎"     => 118,
+      "佐世保"   => 119,
+      "厳原"     => 120,
+      "福江"     => 121,
+      "佐賀"     => 122,
+      "伊万里"   => 123,
+      "熊本"     => 124,
+      "阿蘇乙姫" => 125,
+      "牛深"     => 126,
+      "人吉"     => 127,
+      "宮崎"     => 128,
+      "延岡"     => 129,
+      "都城"     => 130,
+      "高千穂"   => 131,
+      "鹿児島"   => 132,
+      "鹿屋"     => 133,
+      "種子島"   => 134,
+      "名瀬"     => 135,
+      "那覇"     => 136,
+      "名護"     => 137,
+      "久米島"   => 138,
+      "南大東島" => 139,
+      "宮古島"   => 140,
+      "石垣島"   => 141,
+      "与那国島" => 142
+    }
+
+    PREF_BY_CITY = {
+      "稚内"     => "北海",
+      "旭川"     => "北海",
+      "留萌"     => "北海",
+      "札幌"     => "北海",
+      "岩見沢"   => "北海",
+      "倶知安"   => "北海",
+      "網走"     => "北海",
+      "北見"     => "北海",
+      "紋別"     => "北海",
+      "根室"     => "北海",
+      "釧路"     => "北海",
+      "帯広"     => "北海",
+      "室蘭"     => "北海",
+      "浦河"     => "北海",
+      "函館"     => "北海",
+      "江差"     => "北海",
+      "青森"     => "青森",
+      "むつ"     => "青森",
+      "八戸"     => "青森",
+      "秋田"     => "秋田",
+      "横手"     => "秋田",
+      "盛岡"     => "岩手",
+      "宮古"     => "岩手",
+      "大船渡"   => "岩手",
+      "仙台"     => "宮城",
+      "白石"     => "宮城",
+      "山形"     => "山形",
+      "米沢"     => "山形",
+      "酒田"     => "山形",
+      "新庄"     => "山形",
+      "福島"     => "福島",
+      "小名浜"   => "福島",
+      "若松"     => "福島",
+      "水戸"     => "茨城",
+      "土浦"     => "茨城",
+      "宇都宮"   => "栃木",
+      "大田原"   => "栃木",
+      "前橋"     => "群馬",
+      "みなかみ" => "群馬",
+      "さいたま" => "埼玉",
+      "熊谷"     => "埼玉",
+      "秩父"     => "埼玉",
+      "東京"     => "東京",
+      "大島"     => "東京",
+      "八丈島"   => "東京",
+      "父島"     => "東京",
+      "千葉"     => "千葉",
+      "銚子"     => "千葉",
+      "館山"     => "千葉",
+      "横浜"     => "神奈川",
+      "小田原"   => "神奈川",
+      "甲府"     => "山梨",
+      "河口湖"   => "山梨",
+      "富山"     => "富山",
+      "伏木"     => "富山",
+      "金沢"     => "石川",
+      "輪島"     => "石川",
+      "福井"     => "福井",
+      "敦賀"     => "福井",
+      "新潟"     => "新潟",
+      "長岡"     => "新潟",
+      "高田"     => "新潟",
+      "相川"     => "新潟",
+      "長野"     => "長野",
+      "松本"     => "長野",
+      "飯田"     => "長野",
+      "静岡"     => "静岡",
+      "網代"     => "静岡",
+      "三島"     => "静岡",
+      "浜松"     => "静岡",
+      "名古屋"   => "愛知",
+      "豊橋"     => "愛知",
+      "岐阜"     => "岐阜",
+      "高山"     => "岐阜",
+      "津"       => "三重",
+      "尾鷲"     => "三重",
+      "大津"     => "滋賀",
+      "彦根"     => "滋賀",
+      "京都"     => "京都",
+      "舞鶴"     => "京都",
+      "大阪"     => "大阪",
+      "神戸"     => "兵庫",
+      "豊岡"     => "兵庫",
+      "奈良"     => "奈良",
+      "風屋"     => "奈良",
+      "和歌山"   => "和歌山",
+      "潮岬"     => "和歌山",
+      "岡山"     => "岡山",
+      "津山"     => "岡山",
+      "広島"     => "広島",
+      "庄原"     => "広島",
+      "松江"     => "島根",
+      "浜田"     => "島根",
+      "西郷"     => "島根",
+      "鳥取"     => "鳥取",
+      "米子"     => "鳥取",
+      "下関"     => "山口",
+      "山口"     => "山口",
+      "柳井"     => "山口",
+      "萩"       => "山口",
+      "徳島"     => "徳島",
+      "日和佐"   => "徳島",
+      "高松"     => "香川",
+      "松山"     => "愛媛",
+      "新居浜"   => "愛媛",
+      "宇和島"   => "愛媛",
+      "高知"     => "高知",
+      "室戸"     => "高知",
+      "清水"     => "高知",
+      "福岡"     => "福岡",
+      "八幡"     => "福岡",
+      "飯塚"     => "福岡",
+      "久留米"   => "福岡",
+      "大分"     => "大分",
+      "中津"     => "大分",
+      "日田"     => "大分",
+      "佐伯"     => "大分",
+      "長崎"     => "長崎",
+      "佐世保"   => "長崎",
+      "厳原"     => "長崎",
+      "福江"     => "長崎",
+      "佐賀"     => "佐賀",
+      "伊万里"   => "佐賀",
+      "熊本"     => "熊本",
+      "阿蘇乙姫" => "熊本",
+      "牛深"     => "熊本",
+      "人吉"     => "熊本",
+      "宮崎"     => "宮崎",
+      "延岡"     => "宮崎",
+      "都城"     => "宮崎",
+      "高千穂"   => "宮崎",
+      "鹿児島"   => "鹿児島",
+      "鹿屋"     => "鹿児島",
+      "種子島"   => "鹿児島",
+      "名瀬"     => "鹿児島",
+      "那覇"     => "沖縄",
+      "名護"     => "沖縄",
+      "久米島"   => "沖縄",
+      "南大東島" => "沖縄",
+      "宮古島"   => "沖縄",
+      "石垣島"   => "沖縄",
+      "与那国島" => "沖縄"
+    }
+  end
+end

data/lib/weather_hacker/client.rb

@@ -30,12 +30,6 @@ class WeatherHacker
       self.class.get(*args)
     end
 
-    # set @pref_by_city and @id_by_city
-    def update_area_table
-      hash = get AREA_TABLE_URL
-      parse_area_table(hash)
-    end
-
     # return city id via zipcode API
     def city_id_by_zipcode(zipcode)
       zipcode = zipcode.to_s.tr("０-９", "0-9").tr("-", "").tr("-", "")
@@ -44,7 +38,10 @@ class WeatherHacker
       hash = info_by_zipcode(zipcode)
       city = canonical_city(hash["city"])
       pref = canonical_pref(hash["state"])
-      id_by_city[city] || id_by_city[pref] || id_by_pref[pref]
+
+      WeatherHacker::AreaData::ID_BY_CITY[city] ||
+      WeatherHacker::AreaData::ID_BY_CITY[pref] ||
+      WeatherHacker::AreaData::ID_BY_PREF[pref]
     end
 
     # return like following Hash
@@ -64,7 +61,23 @@ class WeatherHacker
       Hash[values.map { |v| v.to_a.flatten }]
     end
 
-    # update area table once
+    # canonical prefecture name
+    # 道東 => 北海道
+    # 道央 => 北海道
+    # 道南 => 北海道
+    # 道北 => 北海道
+    def canonical_pref(name)
+      name = name.gsub(/^道.*/, "北海道")
+      name = name.gsub(/[都道府県]$/, "")
+      name
+    end
+
+    # canonical city name
+    def canonical_city(city)
+      city.gsub(/市$/, "")
+    end
+
+    # use this wehn you want to update AreaData
     def pref_by_city
       @pref_by_city ||= begin
         update_area_table
@@ -72,7 +85,7 @@ class WeatherHacker
       end
     end
 
-    # update area table once
+    # use this wehn you want to update AreaData
     def id_by_city
       @id_by_city ||= begin
         update_area_table
@@ -80,6 +93,12 @@ class WeatherHacker
       end
     end
 
+    # set @pref_by_city and @id_by_city
+    def update_area_table
+      hash = get AREA_TABLE_URL
+      parse_area_table(hash)
+    end
+
     # return typical city's id
     def id_by_pref
       @id_by_pref ||= pref_by_city.inject({}) { |hash, item|
@@ -112,22 +131,6 @@ class WeatherHacker
       raise ParseError, "Failed to parse area data from API"
     end
 
-    # canonical prefecture name
-    # 道東 => 北海道
-    # 道央 => 北海道
-    # 道南 => 北海道
-    # 道北 => 北海道
-    def canonical_pref(name)
-      name = name.gsub(/^道.*/, "北海道")
-      name = name.gsub(/[都道府県]$/, "")
-      name
-    end
-
-    # canonical city name
-    def canonical_city(city)
-      city.gsub(/市$/, "")
-    end
-
     # Custom Error class to raise in parse response from API
     class ParseError < StandardError; end
   end

data/lib/weather_hacker/version.rb

@@ -1,3 +1,3 @@
 class WeatherHacker
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weather_hacker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-08 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70218237022340 !ruby/object:Gem::Requirement
+  requirement: &70181545291080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70218237022340
+  version_requirements: *70181545291080
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70218237021920 !ruby/object:Gem::Requirement
+  requirement: &70181545290660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218237021920
+  version_requirements: *70181545290660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70218237021460 !ruby/object:Gem::Requirement
+  requirement: &70181545290200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218237021460
+  version_requirements: *70181545290200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70218237021040 !ruby/object:Gem::Requirement
+  requirement: &70181545289780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218237021040
+  version_requirements: *70181545289780
 - !ruby/object:Gem::Dependency
   name: simplecov-vim
-  requirement: &70218237020620 !ruby/object:Gem::Requirement
+  requirement: &70181545289360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218237020620
+  version_requirements: *70181545289360
 description: Library for Livedoor Weather Web Service
 email:
 - r7kamura@gmail.com
@@ -80,6 +80,7 @@ files:
 - README.md
 - Rakefile
 - lib/weather_hacker.rb
+- lib/weather_hacker/area_data.rb
 - lib/weather_hacker/client.rb
 - lib/weather_hacker/version.rb
 - spec/fixtures/id_by_city.rb
@@ -103,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1826125772160872950
+      hash: -14138050602801517
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1826125772160872950
+      hash: -14138050602801517
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15