myweatherforecast 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c9481c585541381ffdd0f2438c3c6cd544de517
-  data.tar.gz: 9ed410b8543dcce6a68fc5584d2391f688bb8150
+  metadata.gz: 93c3e36f8033e7eabc0485df30f2c3c2dd71aee7
+  data.tar.gz: 80958f8cb9d2474d34688a966fd1e0c0d3626973
 SHA512:
-  metadata.gz: c76d8341b125144e9b6292aa26ab663479d05cacbd4e71db79f8c284459d2acd417d7d5b71df84637cf97ce0fedace106c32adccfcb513ad6ee4219f7dac90f4
-  data.tar.gz: 887b2ce647d2fdf2003a71fd3e92ac3694cf4a411a6e12bd4f1e77680e98fb35dc890a3c8a2259c612e22d17d6c6be26e80f3a1955950159057470fbafadb25b
+  metadata.gz: f55f4b2838c35cec9e250d302e66085c651f5264203c8ef54e472ecc3b0464c1365c78a73e7e80d3182710941bc789beac0eb93567167c1bf474b9ad7b169d95
+  data.tar.gz: 039dfc0543cd1e003e2a17dff23cf833fd2c5cc768ac1eea845bca6a32263de73a6959258d7703400dd1b7c084751f7b6aa774fc596dd7a5ea30259d2e963ec2

data/lib/myweatherforecast.rb

@@ -2,28 +2,40 @@
 
 # file: myweatherforecast.rb
 
-require 'forecast_io'
 require 'time'
+require 'geocoder'
+require 'forecast_io'
+
+
 
 # This gem is a wrapper of the forecast_io gem
 # SI explained: https://en.wikipedia.org/wiki/SI_derived_unit
 
 class MyWeatherForecast
 
-  def initialize(lat, lon, api_key: nil, si: true)
+  def initialize(*location, api_key: nil, units: :auto)
+    
+    lat, lon = if location.length > 1 then
+    
+      location
+      
+    else
+      
+      results = Geocoder.search(location.first)
+      return puts 'location not found' unless results.any?
+      results[0].coordinates
+      
+    end
 
     ForecastIO.api_key = api_key
-  
-
-    if si then
-      params = { units: 'si' }
-      @tlabel = '°C'
-    else 
-      params = {}
-      @tlabel = '°F'
-    end
 
+    params = { units: units.to_s }
     @forecast = ForecastIO.forecast(lat, lon, params: params)
+
+    autounits = @forecast['flags']['units']
+    
+    @tlabel = autounits == 'us' ? '°F' : '°C'      
+    
   end
 
   class Day
@@ -100,9 +112,11 @@ class MyWeatherForecast
     
     # select tomorrow at midday
     i = 0
+    
+    i += 7 if Time.at(@forecast['hourly']['data'][i]['time']).hour >= 6
+    
     i += 1 until Time.at(@forecast['hourly']['data'][i]['time']).hour ==  12
     DaysAhead.new(@forecast, @tlabel, index: i)
   end
 
-end
-
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myweatherforecast
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -53,6 +53,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: geocoder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.11
 description: 
 email: james@r0bertson.co.uk
 executables: []