ufc_schedule 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe747062cec79954cc7de7d4a079306665f9d5878b439f05f48ccb1a14689ecc
-  data.tar.gz: a5f1913b3a1aceb3f28facf938083108395f1fc7db9c21225d19ef68f230dfd0
+  metadata.gz: af4f2f2548cb16fdd983eaf5fe3f688db2b49ab739bb80850be82f8627c65a69
+  data.tar.gz: cc24f1e462ab3fd42d747099248fc0e019c3fa9e8fd6b0743b861ddf5132da66
 SHA512:
-  metadata.gz: ff0df8aec50836bd98e344f4fa2df3198beab8b6340433c6f49e1c39cf2bf42c734d73ce3968fc5c564cac1314bfb5b1f2421e3b466cc6e6075aed95bf04f52c
-  data.tar.gz: 9337e8102234695de2a381d56577c4dd658e74fb30db60c6eb2169b989f0a4e5af7838c37ceb8904b856e68e798826c640786401e7e8f407f537d782511fcdeb
+  metadata.gz: 0de3885e07bf6a09f9e01c0f6219a6c3e6b93f7bdca219d52a6a19952e0a6bd33e9a40b3c9409f03623bd74076dd419c71c0d8ef7ad73648cfeda054889f622d
+  data.tar.gz: aaa004d6a53f4eacceff9f0177ea6ef470c5c8a481190bf976eb34ab22c31801b6f864c94198d3dd5869beed7ec80a0310776e8580882bb1d439ba36d01a6dcb

data/lib/api.rb

@@ -11,7 +11,9 @@ class Concerns::API
   def self.scrape_fights(array_of_events)
     #for each event id this will scrape event data iterate through the fights and create EventFight objects for each fight on the event and associate those fights to an event
     #binding.pry
+    self.reset_data #resets fight.all for back funtionality
     array_of_events.each do |event|
+      event.clear_fights #resets events.event_fights array
 
       doc = Nokogiri::HTML(open("http://ufc-data-api.ufc.com/api/v1/us/events/#{event.id}"))
 
@@ -38,4 +40,7 @@ class Concerns::API
     end
   end
 
+  def self.reset_data
+    Concerns::EventFight.clear
+  end
 end

data/lib/command_line_interface.rb

@@ -9,7 +9,7 @@ extend Concerns::SharedCLIMethods
 
   def greeting
     #greets the user and makes a call to the UFC API to request schedule data
-    puts "Hello fight fan, welcome to your UFC gem! To view a list of upcoming UFC events enter '1'. To exit this gem at any time, enter 'exit'."
+    puts "Hello fight fan, welcome to your UFC gem! To view a list of upcoming UFC events enter '1'. To exit this gem at any time, enter 'exit'. To go back to the previous menu, enter 'back'."
     puts ""
     Concerns::API.get_categories
   end
@@ -18,15 +18,15 @@ extend Concerns::SharedCLIMethods
     #Takes user input and returns schedule if input == "1"
     input = nil
 
-    while input != "exit"
-      input = gets.strip
-      if input == "1"
-        list_schedule
-        #breaks the loop so person only has to type 'exit' once to leave the program
-        break
-      elsif input != "exit" && input != "1"
-        invalid_command_response
-      end
+    input = gets.strip
+    if input == "1"
+      list_schedule
+    elsif input == "exit"
+      goodbye
+      exit
+    else
+      invalid_command_response
+      choose_to_view_schedule
     end
   end
 
@@ -42,25 +42,26 @@ extend Concerns::SharedCLIMethods
   def choose_fight_card
     #Scrapes all the fights from all of the events listed on the schedule and creates fight objects related to each event. Allows user to choose an event, if valid, it will list fights for that event
     Concerns::API.scrape_fights(Concerns::Events.all)
-
-    input = nil
-
-    while input != "exit"
     input = gets.strip
-      if input.to_i > 0 && input.to_i <= Concerns::Events.all.size
+
+      if input.to_i.between?(1, Concerns::Events.all.size)
         list_fights(input.to_i)
-     else
+      elsif input == "back"
+        list_schedule
+      elsif input == "exit"
+        exit
+      else
         invalid_command_response
+        choose_fight_card
       end
-    end
   end
 
   def list_fights(input)
     #finds an event and lists the fights on that event and calls the choose_fight function
     find_event = Concerns::Events.all[input - 1]
 
-      find_event.event_fights.each_with_index do |fight, index|
-        puts "#{index +1 }. #{fight.red_name} vs. #{fight.blue_name} - #{fight.red_weight}"
+    find_event.event_fights.each_with_index do |fight, index|
+      puts "#{index + 1}. #{fight.red_name} vs. #{fight.blue_name} - #{fight.red_weight}"
     end
     choose_fight(find_event)
   end
@@ -68,25 +69,27 @@ extend Concerns::SharedCLIMethods
   def choose_fight(event)
     #Allows user to choose a specific fight and pulls stats on fighters in that fight
     puts ""
-    puts "To see stats of the fighters, enter the number of their corresponding fight"
+    puts "To see stats of the fighters, enter the number of their corresponding fight, or enter 'back' to go back to the schedule"
 
-    input = nil
-    while input != "exit"
-      input = gets.strip
-
-      if input.to_i <= event.event_fights.count
-        specific_fight = event.event_fights[input.to_i - 1]
-        puts "Name:   #{specific_fight.red_name}  #{specific_fight.blue_name}"
-        puts "Record: #{specific_fight.red_record}  #{specific_fight.blue_record}"
-        puts "Height: #{specific_fight.red_height}    #{specific_fight.blue_height}"
-        puts "Weight: #{specific_fight.red_weight}  #{specific_fight.blue_weight}"
-        break
-
-      elsif input.to_i <= 0 || input.to_i > event.event_fights.count 
-        invalid_command_response
-        choose_fight(event)
-        break
-      end
+    input = gets.strip
+    #14.between?(10,20) # true
+
+    if input.to_i.between?(1, event.event_fights.count)
+      specific_fight = event.event_fights[input.to_i - 1]
+      puts "Name:   #{specific_fight.red_name}  #{specific_fight.blue_name}"
+      puts "Record: #{specific_fight.red_record}  #{specific_fight.blue_record}"
+      puts "Height: #{specific_fight.red_height}    #{specific_fight.blue_height}"
+      puts "Weight: #{specific_fight.red_weight}  #{specific_fight.blue_weight}"
+
+      choose_fight(event)
+    elsif input == "exit"
+      goodbye
+      exit
+    elsif input == "back"
+      list_schedule
+    else
+      invalid_command_response
+      choose_fight(event)
     end
   end
 

data/lib/event_fight.rb

@@ -16,4 +16,8 @@ class Concerns::EventFight
     @@all
   end
 
+  def self.clear
+    @@all.clear
+  end
+
 end

data/lib/events.rb

@@ -50,4 +50,12 @@ class Concerns::Events
     Time.parse(event.date).strftime("%B %d, %Y")
   end
 
+  def self.clear
+    self.all.clear
+  end
+
+  def clear_fights
+    @event_fights.clear
+  end
+
 end

data/lib/ufc_schedule/version.rb

@@ -1,3 +1,3 @@
 module UfcSchedule
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ufc_schedule
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joe Quattrone
@@ -137,6 +137,7 @@ files:
 - lib/shared_methods/shared_cli_methods.rb
 - lib/ufc_schedule.rb
 - lib/ufc_schedule/version.rb
+- ufc_schedule-0.1.2.gem
 - ufc_schedule.gemspec
 homepage: https://github.com/JoeQuattroneufc_schedule
 licenses: