spotify_rec 1.1 → 1.2

data/lib/rec.rb

@@ -1,11 +1,42 @@
-class Rec
+# frozen_string_literal: true
 
+class Rec
   def initialize(user)
     @user_list = user.mylist
     @user = user
     @tracks = []
     @artists = []
     @genres = []
+    @prompt = TTY::Prompt.new
+  end
+
+  def amount_of_suggestions
+    system('clear')
+    too_many_items if @user_list.length > 5
+    puts '》  RECOMMENDATIONS  《'
+    amount = @prompt.ask('How many recommendations would you like to generate?'.colorize(:light_green)) do |q|
+      q.in '1-10'
+      q.messages[:range?] = 'Number must be between 1 and 10'
+    end
+    recommend(amount.to_i)
+  end
+
+  def too_many_items
+    puts "Uh oh! You don't have any items in your list yet, so we can't generate any".colorize(:light_red)
+    puts 'recommendations. Please add some before doing this!'.colorize(:light_red)
+    @prompt.keypress('Press any key to return to the previous menu..')
+    menu = Menu.new(@user)
+    menu.display_menu
+  end
+
+  def recommend(num)
+    system('clear')
+    recommendations = recommendations_generate(num)
+    cleaned_recs = recommendations.tracks.map { |t| "#{t.name} by #{t.artists[0].name}" }
+    puts '》  RECOMMENDATIONS  《'.colorize(:light_green)
+    puts 'Select the recommendations you want to add to your playlist!'
+    selections = @prompt.multi_select('Hit enter with none selected to skip.', cleaned_recs)
+    clean_recommendations(selections)
   end
 
   def sort_my_list
@@ -13,62 +44,43 @@ class Rec
     @artists.clear
     @genres.clear
     @user_list.each do |item|
-      @tracks << item["id"] if item["type"] == "track"
-      @artists << item["id"] if item["type"] == "artist"
-      @genres << item["name"].downcase if item["type"] == "genre"
+      @tracks << item['id'] if item['type'] == 'track'
+      @artists << item['id'] if item['type'] == 'artist'
+      @genres << item['name'].downcase if item['type'] == 'genre'
     end
   end
 
-  def update_file
-    updated_data = Login.load_data.each { |user| user["playlist"] = @user.playlist if user["id"] == @user.uid.to_s }
-    File.open(userdata,"w") do |f|
-      f.puts JSON.pretty_generate(updated_data)
-    end
-    puts "Sweet! Your list has been updated!".colorize(:light_green)
-    $prompt.keypress("Press any key to return to the previous menu..")
-    menu = Menu.new(@user)
-    menu.menu_router
+  def recommendations_generate(num)
+    sort_my_list
+    RSpotify::Recommendations.generate(limit: num, seed_artists: @artists, seed_genres: @genres, seed_tracks: @tracks)
   end
 
   def clean_recommendations(selections)
     selections.each do |track|
-      details = track.split(" by ")
+      details = track.split(' by ')
       song = RSpotify::Track.search("#{details[0]} #{details[1]}", limit: 1).first
-      song_details = {
-        "name" => song.name,
-        "id" => song.id,
-        "artist" => song.artists[0].name }
-      @user.playlist << song_details
+      song_details(song)
     end
     update_file
   end
 
-  def recommend(num)
-    system("clear")
-    sort_my_list
-    recommendations = RSpotify::Recommendations.generate(limit: num, seed_artists: @artists, seed_genres: @genres, seed_tracks: @tracks)
-    cleaned_recs = recommendations.tracks.map { |t| "#{t.name} by #{t.artists[0].name}" }
-    puts "》  RECOMMENDATIONS  《".colorize(:light_green)
-    puts "Select the recommendations you want to add to your playlist!"
-    selections = $prompt.multi_select("Hit enter with none selected to skip.", cleaned_recs)
-    clean_recommendations(selections)
+  def song_details(song)
+    song_details = {
+      'name' => song.name,
+      'id' => song.id,
+      'artist' => song.artists[0].name
+    }
+    @user.playlist << song_details
   end
 
-  def amount_of_suggestions
-    system("clear")
-    if @user_list.length <= 0
-      puts "Uh oh! You don't have any items in your list yet, so we can't generate any recommendations. Please add some before doing this!".colorize(:light_red)
-      $prompt.keypress("Press any key to return to the previous menu..")
-      menu = Menu.new(@user)
-      menu.display_menu
-    end
-    puts "》  RECOMMENDATIONS  《"
-    amount = $prompt.ask("How many recommendations would you like to generate?".colorize(:light_green)) do |q|
-      q.in '1-10'
-      q.messages[:range?] = "Number must be between 1 and 10"
+  def update_file
+    updated_data = Login.load_data.each { |user| user['playlist'] = @user.playlist if user['id'] == @user.uid.to_s }
+    File.open(userdata, 'w') do |f|
+      f.puts JSON.pretty_generate(updated_data)
     end
-    recommend(amount.to_i)
+    puts 'Sweet! Your list has been updated!'.colorize(:light_green)
+    @prompt.keypress('Press any key to return to the previous menu..')
+    menu = Menu.new(@user)
+    menu.menu_router
   end
-
-
-end
+end

data/lib/user.rb

@@ -1,69 +1,89 @@
-class User
-
-  attr_reader :username, :password, :uid
-  attr_accessor :playlist, :mylist
-
-  def initialize(username, password, uid, playlist=[], mylist=[])
-    @username = username
-    @password = password
-    @playlist = playlist
-    @uid = uid
-    @mylist = mylist
-  end
-
-  def details
-    puts "Username: #{@username.colorize(:light_green)}"
-    puts "Password: #{@password.colorize(:light_green)}"
-    puts "User ID: #{@uid.to_s.colorize(:light_green)}"
-    $prompt.keypress("Press any key to continue..")
-    menu = Menu.new(Login::user)
-    menu.account_details
-  end
-
-  def change_username(new_name)
-    updated_data = Login.load_data.each { |user| user["username"] = new_name if user["id"] == Login::user.uid.to_s }
-    File.open((Login::userdata),"w") do |f|
-      f.puts JSON.pretty_generate(updated_data)
-    end
-    @username = new_name
-    puts "Success! Your new username is #{Login::user.username}".colorize(:light_green)
-    $prompt.keypress("Press any key to continue..")
-    menu = Menu.new(Login::user)
-    menu.account_details
-  end
-
-  def change_password(new_password)
-    updated_data = Login.load_data.each { |user| user["password"] = new_password if user["id"] == Login::user.uid.to_s }
-    File.open((Login::userdata),"w") do |f|
-      f.puts JSON.pretty_generate(updated_data)
-    end
-    @password = new_password
-    puts "Success! Your password has been changed.".colorize(:light_green)
-    $prompt.keypress("Press any key to continue..")
-    menu = Menu.new(Login::user)
-    menu.account_details
-  end
-
-  def delete_from_file
-    updated_data = []
-    Login.load_data.each { |user| updated_data << user unless user["id"] == Login::user.uid.to_s }
-    File.open((Login::userdata),"w") do |f|
-      f.puts JSON.pretty_generate(updated_data)
-    end
-    puts "Your account has been deleted. The program will now exit.".colorize(:light_red)
-    $prompt.keypress("Press any key to continue..")
-    exit
-  end
-  
-
-  def delete_account
-    puts "Woah there! Deleting your account is serious business, and cannot be undone.".colorize(:light_red)
-    selection = $prompt.yes?("Are you sure you want to delete your account?").colorize(:light_red)
-    unless selection
-      menu = Menu.new(Login::user)
-    else
-      delete_from_file
-    end
-  end
-
-end
+# frozen_string_literal: true
+
+# An instance of User should be made for everyone who logs in or signs up
+class User
+  attr_reader :username, :password, :uid
+  attr_accessor :playlist, :mylist
+
+  def initialize(username, password, uid, playlist = [], mylist = [])
+    @username = username
+    @password = password
+    @playlist = playlist
+    @uid = uid
+    @mylist = mylist
+    @prompt = TTY::Prompt.new
+  end
+
+  def details
+    puts "Username: #{@username.colorize(:light_green)}"
+    puts "Password: #{@password.colorize(:light_green)}"
+    puts "User ID: #{@uid.to_s.colorize(:light_green)}"
+    @prompt.keypress('Press any key to continue..')
+    menu = Menu.new(Login.user)
+    menu.account_details
+  end
+
+  # Change Username section
+
+  def change_username(new_name)
+    update_username(new_name)
+    @username = new_name
+    puts "Success! Your new username is #{Login.user.username}".colorize(:light_green)
+    @prompt.keypress('Press any key to continue..')
+    menu = Menu.new(Login.user)
+    menu.account_details
+  end
+
+  def update_username(new_name)
+    updated_data = Login.load_data.each do |user|
+      user['username'] = new_name if user['id'] == Login.user.uid.to_s
+    end
+    File.open(Login.userdata, 'w') do |f|
+      f.puts JSON.pretty_generate(updated_data)
+    end
+  end
+
+  # Change password section
+
+  def change_password(new_password)
+    update_password(new_password)
+    @password = new_password
+    puts 'Success! Your password has been changed.'.colorize(:light_green)
+    @prompt.keypress('Press any key to continue..')
+    menu = Menu.new(Login.user)
+    menu.account_details
+  end
+
+  def update_password(new_password)
+    updated_data = Login.load_data.each do |user|
+      user['password'] = new_password if user['id'] == Login.user.uid.to_s
+    end
+    File.open(Login.userdata, 'w') do |f|
+      f.puts JSON.pretty_generate(updated_data)
+    end
+  end
+
+  # Delete account section
+
+  def delete_account
+    puts 'Woah there! Deleting your account is serious business, and cannot be undone.'.colorize(:light_red)
+    selection = @prompt.yes?('Are you sure you want to delete your account?'.colorize(:light_red))
+    if selection
+      delete_from_file
+    else
+      menu = Menu.new(Login.user)
+      menu.account_details
+    end
+  end
+
+  def delete_from_file
+    updated_data = []
+    Login.load_data.each { |user| updated_data << user unless user['id'] == Login.user.uid.to_s }
+    File.open(Login.userdata, 'w') do |f|
+      f.puts JSON.pretty_generate(updated_data)
+    end
+    puts 'Your account has been deleted. The program will now exit.'.colorize(:light_red)
+    @prompt.keypress('Press any key to continue..')
+    exit
+  end
+end

data/public/users.json

@@ -1,13 +1 @@
-[
-  {
-    "id": "1",
-    "username": "benahale",
-    "password": "Tsurani7",
-    "playlist": [
-
-    ],
-    "mylist": [
-
-    ]
-  }
-]
+[]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spotify_rec
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Ben Ahale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -23,7 +23,6 @@ files:
 - lib/my_list.rb
 - lib/playlist.rb
 - lib/rec.rb
-- lib/run.rb
 - lib/user.rb
 - public/users.json
 homepage: 
@@ -38,7 +37,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/run.rb

@@ -1,47 +0,0 @@
-require 'rspotify'
-require 'optparse'
-require 'json'
-require 'tty-prompt'
-require 'terminal-table'
-require 'colorize'
-require_relative 'user'
-require_relative 'playlist'
-require_relative 'login'
-require_relative 'rec'
-require_relative 'menu'
-require_relative 'my_list'
-include Login
-
-RSpotify.authenticate("712ff89a218a4e6dbe1f169e06f949b9", "e9e0517f405b4a01a1be8823126459b7")
-$prompt = TTY::Prompt.new
-
-VERSION = 1.0
-
-ARGV << '--run' if ARGV.empty?
-
-options = {}
-parser = OptionParser.new do |opts|
-    opts.banner = "Welcome to Spotify Recommendations! Usage: spotifyrec [options]".colorize(:light_green)
-
-    opts.on("-v", "--version", "Display the version") do
-        puts "Spotify Recommendations version #{VERSION}".colorize(:light_green)
-    end
-
-    opts.on("-h", "--help", "Display the help message") do
-        puts opts
-        exit
-    end
-
-    opts.on("-qGENRE", "--quick=GENRE", "Generate a quick recommendation with the chosen genre") do |genre|
-        recommendations = RSpotify::Recommendations.generate(limit: 5, seed_genres: [genre])
-        cleaned_recs = recommendations.tracks.map { |t| "#{t.name} by #{t.artists[0].name}" }
-        puts "》  RECOMMENDATIONS  《".colorize(:light_green)
-        cleaned_recs.each { |track| puts track }
-    end
-
-    opts.on("-r", "--run", "Run the application") do
-        Login::login
-    end
-end
-
-parser.parse!