masonellwood_cli_app_two 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c33665250b15469ecaaca7f25159980f8b65672
-  data.tar.gz: e843819d45ada343f93196865bc1d3872ad25681
+  metadata.gz: 4ad776e66245d9f40cf8f7cb7f2077d05d540ac0
+  data.tar.gz: 9bf0c9aacd0dedeffd74b17a1e31e26c29fe4c25
 SHA512:
-  metadata.gz: 480fde390aea2001c029264cf0d5828954b04dd5030c5a362b4d7d19005fa57b5232450ff712483589b16d3908adb626ebcc87b234813425a4ed0633e12e7778
-  data.tar.gz: fd00fd5b0d3db368fd879dc6186e316150a66c4addb827d99a3ebfcaa496dc85e6f7042d9d295cf1ae9cc62adb7f29c02eca0ba329d4936c26c0ab39ccc7b789
+  metadata.gz: fa12bc769421fc0a5026f7cc583c7085788cef33f79ff2a6c22593e3e517aa0146462e8d136a81e213dbf3cfa4be6c0c31db3126e2fc0b15217feb8f99e0b554
+  data.tar.gz: 908040f4443678f44f3f377ec4dfd9bb1c1127001714d0bb300301a7bf474b153adfc808d3890973c705626e9802ea6008579dfd3893cdae0e1e35a83e6bc0a7

data/bin/weather-channel

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "masonellwood_cli_app_two"
+require_relative "../lib/masonellwood_cli_app_two"
 
 MasonellwoodCliAppTwo::CLI.new.call

data/lib/masonellwood_cli_app_two/city.rb

@@ -0,0 +1,7 @@
+class MasonellwoodCliAppTwo::City
+  attr_accessor :name, :url
+  def initialize(name, url)
+    @url = url
+    @name = name
+  end
+end

data/lib/masonellwood_cli_app_two/cli.rb

@@ -1,7 +1,8 @@
 class MasonellwoodCliAppTwo::CLI
 
   attr_accessor :state_info
-
+  EVERY_STATE = ["alabama", "alaska", "arizona", "arkansas", "california", "colorado", "connecticut", "delaware", "florida", "georgia", "hawaii", "idaho", "illinois", "indiana", "iowa", "kansas", "kentucky", "louisiana", "maine", "maryland", "massachusetts", "michigan", "minnesota", "mississippi", "missouri", "montana", "nebraska", "nevada", "new hampshire", "new jersey", "new mexico", "new york", "north carolina", "north dakota", "ohio", "oklahoma", "oregon", "pennsylvania", "rhode island",
+  "south carolina", "south dakota", "tennessee", "texas", "utah", "vermont", "virginia", "washington", "west virginia", "wisconsin", "wyoming" ]
   def call
     greet_with_prompt
     set_up_instance_variable
@@ -13,15 +14,13 @@ class MasonellwoodCliAppTwo::CLI
   end
 
   def set_up_instance_variable
-    every_state = ["alabama", "alaska", "arizona", "arkansas", "california", "colorado", "connecticut", "delaware", "florida", "georgia", "hawaii", "idaho", "illinois", "indiana", "iowa", "kansas", "kentucky", "louisiana", "maine", "maryland", "massachusetts", "michigan", "minnesota", "mississippi", "missouri", "montana", "nebraska", "nevada", "new hampshire", "new jersey", "new mexico", "new york", "north carolina", "north dakota", "ohio", "oklahoma", "oregon", "pennsylvania", "rhode island",
-    "south carolina", "south dakota", "tennessee", "texas", "utah", "vermont", "virginia", "washington", "west virginia", "wisconsin", "wyoming" ]
     puts "Please type your State of interest."
     puts "If you forgot how to spell some of the state names, just type states."
     puts "If you don't care about the weather today, just type exit."
     state = nil
     while state != "exit"
       state = gets.strip.downcase
-        if every_state.include?(state)
+        if EVERY_STATE.include?(state)
           @state_info = MasonellwoodCliAppTwo::StateScraper.new(state)
           @state_info.scrape_cities
           display_citie_option
@@ -33,7 +32,7 @@ class MasonellwoodCliAppTwo::CLI
             puts "#{index}. #{the_state.capitalize}"
           end
           puts "Here are all the valid States, which one would you like to know the weather?"
-        elsif every_state.include?(state) == false && state != "states" && state != "exit"
+        elsif state != "exit"
           puts "Not sure what you want bud. Please type exit to quit. Or see the valid states by typing states."
         end
     end
@@ -44,52 +43,31 @@ class MasonellwoodCliAppTwo::CLI
     puts "Here are all of the cities in #{@state_info.state.capitalize}!"
     @state_info.cities.each_with_index.each do |city, index|
       index += 1
-      citys = city.split(/ : /)
-      puts "#{index}: #{citys[0]}"
+      puts "#{index}: #{city.name}"
     end
     display_city_weather
   end
 
   def display_city_weather
-    puts "Now type the name of the city you want to know the weather of."
+    puts "Enter the number of the city you want to view"
     input = nil
-    array = []
-      @state_info.cities.each_with_index.each do |city, index|
-        index += 1
-        city = city.split(/ : /)
-        array << city[0].downcase
-      end
     while input != "exit"
       input = gets.strip.downcase
       if input == "cities"
         @state_info.cities.each_with_index.each do |city, index|
-          index += 1
-          city = city.split(/ : /)
-          puts "#{index}: #{city[0]}"
-        end
+        index += 1
+        puts "#{index}: #{city.name}"
+      end
         puts "Now type the name of the city you want to know the weather of."
-      elsif array.include?(input)
-        @state_info.city_weather(input)
+      elsif input.to_i.between?(1, @state_info.cities.size)
+        city = @state_info.cities[input.to_i - 1]
+        @state_info.city_weather(city)
       elsif input != "exit"
         puts "Please type a valid city, or type exit."
       end
     end
   end
 
-  def another_state
-    puts "would you like to check a different state? Type yes or no."
-    input = nil
-    input = gets.strip.downcase
-    case input
-    when "yes"
-      set_up_instance_variable
-    when "no"
-      goodbye
-    else
-      puts "Please type yes or no"
-    end
-  end
-
   def goodbye
     puts "See you tomorrow for more weather reports!"
   end

data/lib/masonellwood_cli_app_two/state-scraper.rb

@@ -3,37 +3,30 @@ class MasonellwoodCliAppTwo::StateScraper
 
   def initialize(state)
     @state = state
+    @cities = []
   end
 
   def scrape_cities
     html = open("https://www.wunderground.com/cgi-bin/findweather/getForecast?query=#{@state}") #pulls html
     student_file = Nokogiri::HTML(html)
-    cities_array = []
     student_file.css("tbody tr").each do |x|
        city = x.css("a").text
        url = x.search("a").attr("href").value
-       cities_array << "#{city} : #{url}"
+      new_city = MasonellwoodCliAppTwo::City.new(city, url)
+      @cities << new_city
     end
-    @cities = cities_array
   end
 
-  def city_weather(input)
-    input_city = input
-    self.cities.each do |x|
-      citys = x.split(/ : /)
-      downcase_city = citys[0].downcase
-      if downcase_city == input_city
-        html = open("https://www.wunderground.com/#{citys[1]}") #pulls html
+  def city_weather(city)
+        html = open("https://www.wunderground.com/#{city.url}") #pulls html
         student_file = Nokogiri::HTML(html)
           weather_conditions = student_file.css("#curCond .wx-value").text
           temperature = student_file.css("#curTemp .wx-value").text
-        puts "It looks like you are interested in beautiful #{input_city.capitalize}!"
+        puts "It looks like you are interested in beautiful #{city.name}!"
         puts "Weather Conditions for Today: #{weather_conditions}"
         puts "Current Temperature: #{temperature} Degrees Fahrenheit"
-        puts "Check more or the Cities in your area by typing the City name."
+        puts "Check more or the Cities in your area by typing the Number Name."
         puts "If you want to see all the Cities again, type Cities."
         puts "Or type exit."
-      end
-    end
   end
 end

data/lib/masonellwood_cli_app_two/version.rb

@@ -1,3 +1,3 @@
 module MasonellwoodCliAppTwo
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/masonellwood_cli_app_two.rb

@@ -1,6 +1,8 @@
 require "nokogiri"
 require 'open-uri'
+require 'pry'
 
 require "masonellwood_cli_app_two/version"
 require_relative './masonellwood_cli_app_two/cli'
 require_relative './masonellwood_cli_app_two/state-scraper'
+require_relative './masonellwood_cli_app_two/city'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masonellwood_cli_app_two
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mason Ellwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,9 +102,12 @@ files:
 - bin/setup
 - bin/weather-channel
 - lib/masonellwood_cli_app_two.rb
+- lib/masonellwood_cli_app_two/city.rb
 - lib/masonellwood_cli_app_two/cli.rb
 - lib/masonellwood_cli_app_two/state-scraper.rb
 - lib/masonellwood_cli_app_two/version.rb
+- masonellwood_cli_app_two-0.1.0.gem
+- masonellwood_cli_app_two-0.1.1.gem
 - masonellwood_cli_app_two.gemspec
 homepage: https://github.com/MasonEllwood/masonellwood_cli_app_two
 licenses: