simple_forecast 0.0.2 → 0.0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55167aba9bc0078e3ca220ca45251b5e141e04b
-  data.tar.gz: 9453f1260b7b6be4783c1aabe2b90a6f51ad90e4
+  metadata.gz: ceb60046f195e4e07230cd783255fa77f01fb6c9
+  data.tar.gz: 6b994bd43ec0be2c3c58a810527be4ef96358e13
 SHA512:
-  metadata.gz: d78b42052ff134d30a0ff8d8ac8cf716f624526f7db29505cedf856caf28ebf2ad6d3fb884e8d6d5e99abe337c40272d3e0a0d8f642c8e82a5b2cde7cb20145a
-  data.tar.gz: 67797b201fcb5b82da75532b3c944f3f98b86f94f65ce997f7652330fe53cf70fa0826581c2728191c7b3a64abb7e524c15b44159ddf221143b74fba3181fb17
+  metadata.gz: 7ac73c3629ee0265f83d006dcdc8d8846a18c0bfd54489f389782bfa440c999b0e91af902dc4a86339183035bc1df5903eaf4af2b250e568f842d070bae67c53
+  data.tar.gz: 1b27160d13f9618cd15552b43098fb48489008c8a024f22e25fb66a91b11e8f38c0f55ed1c24322fd3d63a401f21c3b38e3671271998f9068e65f2f6b475a743

data/.gitignore

@@ -16,3 +16,5 @@ tmp
 .yardoc
 _yardoc
 doc/
+
+reference/

data/bin/forecast

@@ -1,14 +1,4 @@
 #!/usr/bin/env ruby
-
-# require 'simple_forecast'
-
 require_relative '../config/environment.rb'
-
 cli = CLIRouter.new(ARGV)
-
-# if ARGV.empty?
-#   # this should return the same as 'forecast today'
-#   ARGV[0] = "help"
-# end
-
-cli.commands
+#cli.parse_commands

data/config/environment.rb

@@ -1,10 +1,12 @@
 require 'forecast_io'
-#require 'pry'
+require 'geocoder'
+require 'open-uri'
+
+# TODO: set this gem to only be used in dev
+require 'pry'
 
 ForecastIO.api_key = '2b5cab93f5051c1207517df51d39ceee'
 
-require_relative '../config/cli'
-require_relative '../lib/models/scraper'
 require_relative '../lib/models/forecast'
-require_relative '../lib/weather_data'
+require_relative '../lib/models/weather_data'
 require_relative '../lib/models/cli_router'

data/lib/models/cli_router.rb

@@ -1,33 +1,64 @@
 class CLIRouter
 
-  attr_reader :weather_forecast, :args
+  attr_reader :weather_forecast, :commands
 
-  def initialize(args)
-    @weather_forecast = Forecast.new(WeatherData.new)
-    @args = args # in fact this is ARGV
-  end
+  APPROVED_COMMANDS = ["help","today","tomorrow","weekend"]
 
-  def help
-    weather_forecast.today
-    puts "if you'd like a different forecast try something like 'forecast tomorrow'"
-  end
+  def initialize(commands)
+    @commands = commands # in fact this is ARGV
 
-  def commands
-    if args.length == 1
-      puts weather_forecast.send(self.args[0])
-    elsif args.length == 0
+    if commands.length == 0
+      puts "Please enter something like 'forecast tomorrow' or enter 'forecast help' to learn more."
+    elsif commands.include?("help")
       help
+    else
+      parse_commands
     end
   end
+ 
+  def collect_weather_data
+    get_user_location
+    set_forecast_location
+    wd = WeatherData.new(@forecast_location.first, @forecast_location.last)
+    @weather_forecast = Forecast.new(wd)
+  end
 
-  # def this_weekend
-  #   puts weather_data.this_weekend
+  def get_user_location
+    @longitude_latitude = Geocoder.coordinates(open('http://whatismyip.akamai.com').read)
+  end
+
+  def set_forecast_location
+    #based on idea that location would live in second slot
 
-  # end
+    #if other location false, use current location
+    @forecast_location = Geocoder.coordinates(commands[1]) || @longitude_latitude
+  end
 
-  # def next_week
-  #   puts weather_data.next_week
-  # end
+  def help
+    # TODO: rewrite with more detailed help block
+    #puts weather_forecast.today
+    #puts weather_forecast.separator
+    puts <<-TEXT
+
+    Thanks for using Simple Forecast. Currently, the following commands are supported:
+
+    help        Displays help (what you're viewing now)
+    today       Today's forecast (compared to yesterday)
+    tomorrow    Tomorrow's forecast (compared to today)
+    weekend     Average temperature for this weekend (compared to today) 
+
+    TEXT
+  end
+
+  def parse_commands
+    #binding.pry
+    if commands.length == 1 && APPROVED_COMMANDS.include?(commands[0])
+      collect_weather_data
+      puts weather_forecast.send(self.commands[0])
+    else
+      puts "Sorry, not sure what you're asking for, please enter 'forecast help' to learn more."
+    end
+  end
 
 end
 

data/lib/models/forecast.rb

@@ -1,47 +1,67 @@
 class Forecast
 
-  attr_accessor :today_temp, :yesterday_temp, :tomorrow_temp, :weather_data
+  attr_accessor :today_temp, :yesterday_temp, :tomorrow_temp, :weather_data, :compare_loc
 
   def initialize(weather_data_object)
     @weather_data = weather_data_object
-
-    @today_temp = self.weather_data.temp_today
-    @tomorrow_temp = self.weather_data.temp_tomorrow
-    # @this_weekend = self.avg_temp_this_weekend
-    # @next_week = self.avg_temp_next_week
+    @today_temp = self.weather_data.today_temp
+    @tomorrow_temp = self.weather_data.tomorrow_temp
   end
 
   def today
-    puts "hmm, interesting!"
-    @yesterday_temp = self.weather_data.temp_yesterday
-    compare(today_temp, yesterday_temp) + "yesterday"
+    @yesterday_temp = self.weather_data.yesterday_temp
+    separator + 
+    "#{compare(today_temp, yesterday_temp)}yesterday, #{self.weather_data.today_summary}"
   end
 
   def tomorrow
-    compare(tomorrow_temp, today_temp) + "today"
+    separator +
+    "#{compare(tomorrow_temp, today_temp)}today, #{self.weather_data.tomorrow_summary}"
+  end
+
+  def weekend
+    separator +
+    "this weekend will be " + 
+    compare(avg_temp_this_weekend, today_temp) + "today"
   end
 
+  def next_week
+    # TODO: compare(this_week_avg, today)
+  end
+  
   def avg_temp_this_weekend
+    data = find_weekend_data
+    weekend_avg = (data[0]["temperatureMax"] + data[1]["temperatureMax"])/2
+  end
 
+  def find_weekend_data
+    weekend_data = weather_data.today_data["daily"]["data"][1..7].select do |data_hash|
+      ruby_datetime = Time.at(data_hash["time"])
+      ruby_datetime.saturday? || ruby_datetime.sunday?
+    end
   end
 
-  def avg_temp_next_weekend
+  def avg_temp_this_week
 
   end
 
-  def this_weekend
-    # compare(this_week_avg_temp?, temp_for_upcoming_weekend)
+  def avg_temp_next_week
   end
 
-  def next_week
-    # compare(this_week_avg, next_week_avg)
+  def find_week_time
+    week_data = weather_data.today_data["daily"]["data"][1..7].reject do |data_hash|
+      ruby_datetime = Time.at(data_hash["time"])
+      ruby_datetime.saturday? || ruby_datetime.sunday?
+    end
+    pp week_data
+    week_data
   end
 
   def compare(temp1, temp2)
-    diff = temp1-temp2
+    diff = (temp1.round-temp2.round).abs
 
-    case diff.abs
-    when (1..2)
+    case diff
+    when (0..2)
       temp1 = temp2
     when (3..7)
       mod = "slightly "
@@ -54,7 +74,7 @@ class Forecast
     end
 
     if temp1 == temp2
-      "pretty much the same as "
+      "about the same as "
     elsif temp1 < temp2
       mod + "colder than "
     else
@@ -62,15 +82,9 @@ class Forecast
     end
   end
 
-# categorization
-# "same"
-# "colder than"
-# "warmer than"
-
-# compared objects
-# "yesterday"
-# "today"
-# "tomorrow"
+  def separator
+    "\n"
+  end
 
 end
 

data/lib/models/weather_data.rb

@@ -0,0 +1,43 @@
+class WeatherData
+
+  attr_accessor :yesterday_data, :today_data, :lat, :long
+
+  NYC = [40.714623, -74.006605]
+  NYC_LAT = NYC[0]
+  NYC_LONG = NYC[1] 
+
+  def initialize(lat = NYC.first, long = NYC.last)
+    @lat = lat
+    @long = long
+    print '.'
+    @today_data = ForecastIO.forecast(self.lat, self.long) 
+    # when you don't specify a time in the ForecastIO call, you can get the daily high temps
+  end
+
+  def yesterday_temp
+    print '.'
+    @yesterday_data = ForecastIO.forecast(self.lat, self.long, time: time_yesterday)
+    self.yesterday_data["daily"]["data"].first["temperatureMax"]
+  end
+
+  def today_temp
+    self.today_data["daily"]["data"].first["temperatureMax"]
+  end
+
+  def today_summary
+    self.today_data["daily"]["data"][0]["summary"].downcase.gsub(/\./,'')
+  end
+
+  def tomorrow_temp
+    self.today_data["daily"]["data"][1]["temperatureMax"]
+  end
+
+  def tomorrow_summary
+    self.today_data["daily"]["data"][1]["summary"].downcase.gsub(/\./,'')
+  end
+
+  def time_yesterday
+    Time.now.to_i - 86400
+  end
+
+end

data/simple_forecast.gemspec

@@ -1,19 +1,22 @@
 Gem::Specification.new do |s|
   s.name        = 'simple_forecast'
   s.executables  << 'forecast'
-  s.version     = "0.0.2"
-  s.date        = "2013-10-19"
+  s.version     = "0.0.3.1"
+  s.date        = "2013-10-27"
   s.summary     = "A simple weather forecaster"
-  s.description = "A weather forecast relative to current conditions where you are.  Currently only works for New York, NY."
+  s.description = "A weather forecast relative to current conditions where you are.  Allows for getting the forecast for today, tomorrow, or the upcoming weekend."
   s.authors     = ["Anders Ramsay", "Joe O'Conor"]
   s.email       = ["andersr@gmail.com", "joe.oconor@gmail.com"]
   s.files       = `git ls-files`.split("\n")
-  s.homepage    = 'https://github.com/andersr/simple_weather'
+  s.homepage    = 'https://github.com/simple-forecast/ruby-gem'
   s.license     = 'MIT'
   s.require_path = '.'
   s.add_runtime_dependency 'forecast_io', ['>= 2.0.0']
+  s.add_runtime_dependency 'geocoder', ['>= 1.1.8']
   s.post_install_message = <<-MSG
-  Thanks for installing Simple Forecast.  Enter 'forecast' to get the current forecast or something like 'forecast tomorrow' for a different forecast.
+
+  Thanks for installing Simple Forecast.  Enter 'forecast today' to get today's forecast. Enter 'forecast help' for more commands.
+
   MSG
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_forecast
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3.1
 platform: ruby
 authors:
 - Anders Ramsay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forecast_io
@@ -25,8 +25,22 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-description: A weather forecast relative to current conditions where you are.  Currently
-  only works for New York, NY.
+- !ruby/object:Gem::Dependency
+  name: geocoder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.8
+description: A weather forecast relative to current conditions where you are.  Allows
+  for getting the forecast for today, tomorrow, or the upcoming weekend.
 email:
 - andersr@gmail.com
 - joe.oconor@gmail.com
@@ -40,15 +54,10 @@ files:
 - LICENSE
 - README.md
 - bin/forecast
-- bin/run.rb
-- config/cli.rb
 - config/environment.rb
-- data/forecast_io_sample.rb
 - lib/models/cli_router.rb
 - lib/models/forecast.rb
-- lib/models/scraper.rb
-- lib/weather_data.rb
-- notes.md
+- lib/models/weather_data.rb
 - simple_forecast.gemspec
 - spec/cli_spec.rb
 - spec/geo_locate_spec.rb
@@ -56,12 +65,14 @@ files:
 - spec/spec_helper.rb
 - spec/weather_data_spec.rb
 - spec/weather_report_spec.rb
-homepage: https://github.com/andersr/simple_weather
+homepage: https://github.com/simple-forecast/ruby-gem
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2
-    Thanks for installing Simple Forecast.  Enter 'forecast' to get the current forecast or something like 'forecast tomorrow' for a different forecast.
+post_install_message: |2+
+
+    Thanks for installing Simple Forecast.  Enter 'forecast today' to get today's forecast. Enter 'forecast help' for more commands.
+
 rdoc_options: []
 require_paths:
 - .

data/bin/run.rb

@@ -1,9 +0,0 @@
-require_relative '../config/environment.rb'
-
-# weather = WeatherData.new
-# forecast = Forecast.new(weather)
-# forecast.generate_forecast
-
-CLI.new
-
-# binding.pry

data/config/cli.rb

@@ -1,56 +0,0 @@
-class CLI
-
-  def initialize
-    @on = true
-    #self.call
-  end
-
-  def on?
-    @on
-  end
-
-  def call
-    while @on == true
-      self.command
-    end
-  end
-
-  def command
-    input = command_request
-    self.send(input)
-  end
-
-  def command_request
-    gets.downcase.strip
-  end
-  
-  ### COMMANDS ### 
-  # COMMANDS = {
-  #   :now => ["", "now", "today"],
-  #   :tonight => ["tonight"],
-  #   :tomorrow =>  ["tomorrow"],
-  #   :next_week => ["next week"]
-  #   :help => ["help"]
-  # }
-  
-  def exit
-    @on = false
-  end
-
-  def help
-    puts "Please enter something like 'today' or 'tomorrow'."
-  end
-
-  def tomorrow
-    get_data = Forecast.new(WeatherData.new)
-    puts get_data.tomorrow
-    # exit
-  end
-
-  def today
-    get_data = Forecast.new(WeatherData.new)
-    puts get_data.today
-  end
-
-
-end