lita-onewheel-forecast-io 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c77c755bedbee74f17703c30b13b7490252e98b4
-  data.tar.gz: 7da86bdd011f972083d6a4f475aae630cffc7344
+  metadata.gz: f4b44a03d3d25a90686c1988820639d662f072cd
+  data.tar.gz: a523d787ccd37b49e40658bd372383eec8033735
 SHA512:
-  metadata.gz: cbec25862c6ca80d83d771cae2d992bb302279052c071aa7904f42d593a631f07a4f72debc0209de19f3a888b9854395be63040cf084fc1d62eab1e028db8eb0
-  data.tar.gz: 9238a0aeb45b29ef4d766a80828f187eb98a91c52b9c9d90d9b37ddb797c0adad7631c0dfa8f347d8b1a0290eff02224717e07d8e494d58478414dcd6f4cb0c0
+  metadata.gz: d88668247347f49f22d655b7b9b18d9e18038f6751afa8773a55d2fb20fcd890235e3f362fe71e67244f6e052caa794624066799a75831fe536ca8247ce995ee
+  data.tar.gz: 03b5fa29ac34e836735a63374322e895fc6475ee329b8e1d7e82f88e873e354cf8fd0909a56e2b51cda4bc4f391db4ac6888d19e2d173cd7627823f19605acc8

data/lib/lita/handlers/utils.rb

@@ -1,3 +1,4 @@
+require 'geocoder'
 module ForecastIo
   module Utils
     REDIS_KEY = 'forecast_io'
@@ -55,8 +56,21 @@ module ForecastIo
       geocoded
     end
 
+    # Perform a geocoder lookup based on a) the query or b) the user's serialized state.
+    # If neither of those exist, default to Portland.
     def geo_lookup(user, query)
       Lita.logger.debug "Performing geolookup for '#{user.name}' for '#{query}'"
+
+      default_location = {
+        'formatted_address' => 'Portland, OR',
+        'geometry' => {
+          'location' => {
+            'lat' => 45.5230622,
+            'lng' => -122.6764816
+          }
+        }
+      }
+
       if query.nil? or query.empty?
         Lita.logger.debug "No query specified, pulling from redis #{REDIS_KEY}, #{user.name}"
         serialized_geocoded = redis.hget(REDIS_KEY, user.name)
@@ -67,9 +81,6 @@ module ForecastIo
       end
 
       Lita.logger.debug "q & g #{query.inspect} #{geocoded.inspect}"
-      if (query.nil? or query.empty?) and geocoded.nil?
-        query = 'Portland, OR'
-      end
 
       unless geocoded
         Lita.logger.debug "Redis hget failed, performing lookup for #{query}"
@@ -78,6 +89,13 @@ module ForecastIo
         redis.hset(REDIS_KEY, user.name, geocoded.to_json)
       end
 
+      # Let's set up the defaults in the event that the geocoder fails.
+      # See https://github.com/onewheelskyward/lita-onewheel-forecast-io/issues/34
+      unless geocoded
+        Lita.logger.debug "Geocoded was #{geocoded.inspect}, setting to default."
+        geocoded = default_location
+      end
+
       Lita.logger.debug "geocoded: '#{geocoded}'"
 
       loc = Location.new(

data/lita-onewheel-forecast-io.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-forecast-io'
-  spec.version       = '0.1.0'
+  spec.version       = '0.1.1'
   spec.authors       = ['Andrew Kreps']
   spec.email         = ['andrew.kreps@gmail.com']
   spec.description   = <<-EOS

data/spec/lita/handlers/forecast_io_spec.rb

@@ -1,4 +1,5 @@
 require_relative '../../spec_helper'
+require 'geocoder'
 
 describe Lita::Handlers::OnewheelForecastIo, lita_handler: true do
 

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'simplecov'
 require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-forecast-io
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kreps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A text-based interactive query engine for http://forecast.io's api.