cowa 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7221473f7e42737b6fa859fd5166b264ae1a8433
-  data.tar.gz: 69376f4ec6eb2aab52ffce0c38e49428a70c35c6
+  metadata.gz: c78333a21c50c9e97a78f485bca73b7af3f82939
+  data.tar.gz: 7cb93ca574d6bc43b446ef090b556cccb55c6e00
 SHA512:
-  metadata.gz: c9dfdd96de9352959d9e4a775e371cfaa1c9227d33edb8a18da59b9e3f6f6529cf20fa2b52524ee07c98077b289dd4f5a79b511c002eebd6b72c890151265f03
-  data.tar.gz: 21ab63906fb61de7bc5a49cd4aa8948fd4061caa2e37670ca9e600a6d2dcc84c4fa45dd34970b2d684cf4936a5e3ba26297d9329f8117d3429120c1e885643e6
+  metadata.gz: e0da50b61f9e103592b537fb58bd669549a3342ba7b1198fff603fc421d30fe511db667064b805136821feb356469d6fe776b43d3a2076aa7a9916236a6590bc
+  data.tar.gz: 0e5e737825c59c7d8746ff72c93f57f3be6c7fd4af469bf5dfe606c93f89c0068e6e27099ec1e52ebee3fae089df343bae085e554f0c746547dc1183d6870e4b

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/**/.DS_Store

data/example/cowa.rb

@@ -2,12 +2,14 @@
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cowa'
+require 'pry'
 
 open_weathermap_api_key = ""
-info = Cowa::OpenWeatherMap.new(open_weathermap_api_key)
+yahoo_api_key = ""
+info = Cowa::OpenWeatherMap.new(open_weathermap_api_key, yahoo_api_key)
 puts info.get_information_place("千葉")
 puts info.get_information_latlon(35,140)
+exit
 
-yahoo_api_key = ""
 fore = Cowa::WeatherHacks.new(yahoo_api_key)
-puts fore.forecast("千代田区")
+puts fore.forecast("千代田区")

data/lib/cowa/open_weatherMap.rb

@@ -3,28 +3,33 @@ require 'json'
 
 module Cowa
   class OpenWeatherMap
+    NotFound = Class.new(StandardError)
+
     attr_accessor :api_key
-    
-    def initialize(api_key)
-      @api_key = api_key
+
+    def initialize(open_weathermap_api_key, yahoo_api_key)
+      @contentsgeocoder = Yapi::OpenLocalPlatform::ContentsGeoCoder.new(yahoo_api_key)
+      @api_key = open_weathermap_api_key
     end
-    
+
     def client url
-      return open(URI.encode(url)).read
+      open(URI.encode(url)).read
     end
-    
+
     def get_icon icon
-      return open("http://openweathermap.org/img/w/#{icon}.png")
+      open("http://openweathermap.org/img/w/#{icon}.png")
     end
-    
+
     def get_information_place location
-      req_url = "http://api.openweathermap.org/data/2.5/weather?q=#{location}&APPID=#{@api_key}"
-      return JSON.parse(client(req_url), symbolize_names: true)
+      json = @contentsgeocoder.contentsGeoCoder(location)
+      raise NotFound if json[:YDF][:ResultInfo][:Count] == "0"
+      lon, lat = json[:YDF][:Feature][:Geometry][:Coordinates].split(',')
+      get_information_latlon lat, lon
     end
-    
+
     def get_information_latlon lat, lon
       req_url = "http://api.openweathermap.org/data/2.5/weather?lat=#{lat}&lon=#{lon}&APPID=#{@api_key}"
-      return JSON.parse(client(req_url), symbolize_names: true)
+      JSON.parse(client(req_url), symbolize_names: true)
     end
   end
 end

data/lib/cowa/version.rb

@@ -1,3 +1,3 @@
 module Cowa
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: cowa
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - flum1025
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yapi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: composite library for weather api
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .project
-- .travis.yml
+- ".gitignore"
+- ".project"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -110,17 +110,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: composite library for weather api