lita-your-weather 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce7b969254307d97f449249fe2f18a1190deecf9
-  data.tar.gz: 369f4a3132c52542b9b54ee7a21db9f79d1b4251
+  metadata.gz: aec3979dfb9d9d1aab41dac6d7c4831e592e0a5e
+  data.tar.gz: f634092bba0bb745a33e1436e530cab0364a8919
 SHA512:
-  metadata.gz: b57d7f4fa2ff6781f8e20e8ebb21a3ba0beb97bd23773a0558ba4e4f7d17987ce81c05d8bf8d7fd2d4b0a7ac73ef7ba88f7770fd3fbfb06f899b8472f2d4434f
-  data.tar.gz: 8b7e08440973b99fd54fd9c29bf518e21204c5e9e766f7d4b085f70bbb485058336d32f448a801ae90203944d43a2bcad7c1153712ef17cac6387fd8b88cb04a
+  metadata.gz: 5a077eaab58a478e4e7d9ee918c4fc672b4b849cdfd8caf083db5c7bc69c28d04032e2b7c68caa9c68b3be141d0c4e43d8ffa0ebcfd64e39e1adedfa4f9e9553
+  data.tar.gz: e88ae9f476bc0aaffa7515579b09e5ad2c7d375e7ee53bcbcbc5e29cfe9773a9dfbe27cdddbae19cb132b17af6b1122a08b28452c6a0ae87b634b7cc9bb566d7

data/README.md

@@ -1,6 +1,6 @@
 # lita-your-weather
 
-lita-your-weather provides the ability to ask for the current weather conditions or for a 7 day forecast.
+lita-your-weather provides the ability to ask for the current weather conditions or for a 7 day forecast. This gem uses the www.apixu.com api to get the current weather and a 7 day weather forecast.
 
 ## Installation
 
@@ -17,7 +17,7 @@ Obtain an API Key from www.apixu.com
 Add the following to your lita_config.rb :
 
 ``` ruby
-config.handlers.your_weather.default_location = 'City, State'
+config.handlers.your_weather.default_location = 'City, State, Country'
 config.handlers.your_weather.api_key = 'www.apixu.com Api Key'
 ```
 
@@ -26,11 +26,11 @@ config.handlers.your_weather.api_key = 'www.apixu.com Api Key'
 Commands include:
 
 <!-- For current weather of default location -->
-weather c
+$ weather or $ weather c
 <!-- For current weather of specified location-->
-weather c Your_Location,Your_State
+$ weather c Your_Location,Your_State,Your_Country
 
 <!-- For weather forecast of default location-->
-weather f
+$ weather f
 <!-- For weather forecast of specified location-->
-weather f Your_Location,Your_State
+$ weather f Your_Location,Your_State,Your_Country

data/lib/lita/handlers/your_weather.rb

@@ -3,8 +3,6 @@ require 'json'
 module Lita
   module Handlers
     class YourWeather < Handler
-      # insert handler code here
-
       Lita.register_handler(self)
 
       # Variables
@@ -13,53 +11,57 @@ module Lita
       config :api_key, type: String, required: true
 
       # Routes
-      route(/^weather\s{1}c\s*(.*)/, :weather_current, command: false, help: { "weather c CITY/CITY,COUNTRY" => "Responds with the specified city's current weather." })
-      route(/^weather\s{1}f\s*(.*)/, :weather_forecast, command: false, help: { "weather f CITY/CITY,COUNTRY" => "Responds with the specified city's 7 day forecast." })
+      route(/^weather\s{1}*(.*)/, :weather_current, command: false, help: { "weather CITY/STATE,COUNTRY" => "Responds with the specified city's current weather." })
+      route(/^weather\s{1}c\s*(.*)/, :weather_current, command: false, help: { "weather c CITY/STATE,COUNTRY" => "Responds with the specified city's current weather." })
+      route(/^weather\s{1}f\s*(.*)/, :weather_forecast, command: false, help: { "weather f CITY/STATE,COUNTRY" => "Responds with the specified city's 7 day forecast." })
 
       # Current Weather
       def weather_current(response)
-
-          location = response.matches[0][0]
-
-          data = request('/current.json?key=' + config.api_key , 'c', location)
+          location = get_location(response.matches[0][0])
+          data = request('/current.json?key=' + config.api_key , location)
 
           if data['error']
-            response.reply('The location does not exist or weather has exceeded the query limit error: ' + data['error']['message'])
+            response.reply('Error: ' + data['error']['message'])
           else
             response.reply( data['location']['name'] + ', ' + data['location']['region'] + ', ' + data['location']['country'] + ' currently is ' +  data['current']['condition']['text'] + ' and ' + data['current']['temp_c'].to_s + "\xC2\xB0" + 'C. It feels like ' + data['current']['feelslike_c'].to_s  + "\xC2\xB0" + 'C' )
+
+            if location.downcase.include? "edmonton"
+              response.reply('https://ssl.eas.ualberta.ca/sitecore/camera/live/camera-ne.jpg')
+              response.reply('https://ssl.eas.ualberta.ca/sitecore/camera/live/camera-nw.jpg')
+              response.reply('https://ssl.eas.ualberta.ca/sitecore/camera/live/camera-w.jpg')
+            end
           end
       end
 
       # Forecast Weather
       def weather_forecast(response)
-
-          location = response.matches[0][0]
-
-          data = request('/forecast.json?key=' + config.api_key + '&days=7', 'c', location)
+          location = get_location(response.matches[0][0])
+          data = request('/forecast.json?key=' + config.api_key + '&days=7', location)
 
           if data['error']
-            response.reply('The location does not exist or weather has exceeded the query limit error: ' + data['error']['message'])
+            response.reply('Error: ' + data['error']['message'])
           else
             response.reply('The forecast for ' + data['location']['name'] + ', ' + data['location']['region'] + ', ' + data['location']['country'] + ':')
             data['forecast']['forecastday'].each do |object|
               # binding.pry
               response.reply('On ' + object['date'] + ' forecasted is a high of ' +  object['day']['maxtemp_c'].to_s + "\xC2\xB0" + 'C' + ' and a low of ' + object['day']['mintemp_c'].to_s + "\xC2\xB0" + 'C It is expected to be ' + object['day']['condition']['text'] )
             end
-
           end
       end
 
-      # Request method
-      def request(url, type, location)
-
-        if location == ''
+      # Get location
+      def get_location(location)
+        if location.eql? ''
           location = config.default_location
         end
+        location
+      end
 
+      # Request method
+      def request(url, location)
         http_response = http.get( URL + url, q: location)
         return JSON.parse(http_response.body)
       end
-
     end
   end
 end

data/lita-your-weather.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-your-weather"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Zoie Carnegie"]
   spec.email         = ["zoie.carnegie@gmail.com"]
   spec.description   = "lita-your-weather provides the ability to ask for the current weather conditions or for a 7 day forecast."

data/spec/lita/handlers/your_weather_spec.rb

@@ -1,18 +1,15 @@
 require "spec_helper"
 
 describe Lita::Handlers::YourWeather, lita_handler: true do
-  it { is_expected.to route("weather c") }
-  it { is_expected.to route("weather c 90210") }
-  it { is_expected.to route_command("weather c") }
+
+  it "route weather to correct method" do
+    is_expected.to route("weather").to(:weather_current)
+  end
 
   it "route weather f to correct method" do
     is_expected.to route("weather c").to(:weather_current)
   end
 
-  it { is_expected.to route("weather f") }
-  it { is_expected.to route("weather f 90210") }
-  it { is_expected.to route_command("weather f") }
-
   it "route weather f to correct method" do
     is_expected.to route("weather f").to(:weather_forecast)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-your-weather
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Zoie Carnegie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita