pokemoves-cli 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 732a8a1db9efc35c555d6588a28345acf413bdcb0be669dbcd6be9214029a5a1
-  data.tar.gz: a364a2d42b880891dbddd5f09216d22e123ee963e4f90325213dec0eb03d70f0
+  metadata.gz: cb8cb7108327718cdb80a49954b547282c2590b999398e33d22767a76aab9956
+  data.tar.gz: 03077af2c10f6cb231417002d5d9c9dc514f35327cc66b7878893e06351bc28b
 SHA512:
-  metadata.gz: 6c04dcacf11cf91b75b4532b4b8cbe52badcab43eed1a899820020046f2f563bc69f65e277863b2b48988a3dd2d8db3c8e4f774bfb7ffcc5a87c0f32b6272879
-  data.tar.gz: f7799aa935a3ca46686efa9586557d7b0eb2e94d70ccdd0573426aff5f4075cf067748e7ab602e91a48bdde12bb143d8dd271c875e1f415a3471b8a1739d8189
+  metadata.gz: 83475f7b57df6097d9616451b67d44a9a019c1306ffa804a62a0ca56282eb10dcd7c16e4ddfc51481f9348dfd5a8915f335bc764e9e83b21b806db634ec878d3
+  data.tar.gz: 44624204c1f2c53f05f812d97790949175f0a3456cb97e4aa5a90a5c68c02520b98a69ad8bbd45bc21d4f24ea3d2006cde46c56012b0f624c8a1250d851dd3a7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pokemoves-cli (1.0.7)
+    pokemoves-cli (1.0.8)
       httparty
 
 GEM

data/README.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Pokemoves-cli
 
 Pokemoves allows you to easily check which moves pokemon can learn, as well as which pokemon can learn a specific move. You can also check a move's given type.

data/lib/move.rb

@@ -2,15 +2,23 @@ require_relative "scraper.rb"
 require_relative "pokemon.rb"
 
 class Move
-  attr_reader :name, :type
+  attr_reader :name, :pretty_name
   @@all = []
   
   def initialize(name)
     @name = name
-    @type = Scraper.get_move_by_name(name)["type"]["name"]
+    @pretty_name = name.split("-").collect{|word| word.capitalize}.join(" ")
+    
     @@all << self
   end
   
+  def type
+    if @type == nil
+      @type = Scraper.get_move_by_name(name)["type"]["name"]
+    end
+    @type
+  end
+  
   def self.all
     @@all
   end
@@ -22,4 +30,8 @@ class Move
     end
     return nil
   end
+  
+  def self.find_or_create_by_pretty_name(pretty_name)
+    self.find_or_create_by_name(pretty_name.split(" ").collect{|word| word.downcase}.join("-"))
+  end
 end

data/lib/pokemon.rb

@@ -11,11 +11,11 @@ class Pokemon
   end
   
   def get_moves
-    moves = Scraper.get_pokemon_by_name(@name)["moves"].collect{|move_hash| move_hash["move"]["name"]}
+    moves = Scraper.get_pokemon_by_name(@name)["moves"].collect{|move_hash| Move.new(move_hash["move"]["name"])}
   end
   
-  def can_learn_move?(move_name)
-    self.get_moves.include?(move_name)
+  def can_learn_move?(move)
+    self.get_moves.collect{|m| m.name}.include?(move.name)
   end
   
   def self.all

data/lib/pokemoves.rb

@@ -24,7 +24,7 @@ require "pokemoves/cli/version"
           gets
           counter = 1
           current_pokemon.get_moves.each{|move|
-            puts "#{counter}. #{move.split("-").collect{|word| word.capitalize}.join(" ")}"
+            puts "#{counter}. #{move.pretty_name}"
           counter += 1
           }
           puts "Enter the number of the move you'd like to know the type of."
@@ -32,8 +32,8 @@ require "pokemoves/cli/version"
           num = gets.to_i
           until num <= 0
             if(num <= current_pokemon.get_moves.size)
-              current_move = Move.find_or_create_by_name(current_pokemon.get_moves[num - 1])
-              puts "The move #{current_move.name.capitalize} is a #{current_move.type} type move."
+              current_move = Move.find_or_create_by_name(current_pokemon.get_moves[num - 1].name)
+              puts "The move #{current_move.pretty_name} is a #{current_move.type} type move."
             else
               puts "That number is not in the list of moves."
             end
@@ -45,13 +45,13 @@ require "pokemoves/cli/version"
         elsif input == 2
           puts "Enter the name of a move!"
           move_name = gets.chomp
-          until Move.find_or_create_by_name(move_name.split(" ").collect{|word| word.downcase}.join("-")) != nil
+          until Move.find_or_create_by_pretty_name(move_name) != nil
             puts "It doesn't look like we have that move stored."
             puts "Try a different one."
             move_name = gets.chomp
           end
-          current_move = Move.find_or_create_by_name(move_name.split(" ").collect{|word| word.downcase}.join("-"))
-          puts "Enter the name of a pokemon to see if they can learn #{current_move.name.split("-").collect{|word|  word.capitalize}.join(" ")}"
+          current_move = Move.find_or_create_by_pretty_name(move_name)
+          puts "Enter the name of a pokemon to see if they can learn #{current_move.pretty_name}"
           pokemon_name = gets.chomp
           until Pokemon.find_or_create_by_name(pokemon_name.downcase) != nil
             puts "It doesn't look like we have that pokemon stored."
@@ -60,12 +60,12 @@ require "pokemoves/cli/version"
           end
           until pokemon_name == "exit"
             current_pokemon = Pokemon.find_or_create_by_name(pokemon_name.downcase)
-            if current_pokemon.can_learn_move?(current_move.name)
-              puts "It looks like #{current_pokemon.name.capitalize} can learn #{current_move.name.split("-").collect{|word| word.capitalize}.join(" ")}."
+            if current_pokemon.can_learn_move?(current_move)
+              puts "It looks like #{current_pokemon.name.capitalize} can learn #{current_move.pretty_name}."
             else
-              puts "It looks like #{current_pokemon.name.capitalize} can't learn #{current_move.name.split("-").collect{|word| word.capitalize}.join(" ")}."
+              puts "It looks like #{current_pokemon.name.capitalize} can't learn #{current_move.pretty_name}."
             end
-            puts "Enter the name of another pokemon to see if they can learn #{current_move.name.split("-").collect{|word| word.capitalize}.join(" ")}."
+            puts "Enter the name of another pokemon to see if they can learn #{current_move.pretty_name}."
             puts "Enter \"exit\" to continue to the main menu."
             pokemon_name = gets.chomp
             until Pokemon.find_or_create_by_name(pokemon_name.downcase) != nil || pokemon_name == "exit"

data/lib/pokemoves/cli/version.rb

@@ -1,5 +1,5 @@
 module Pokemoves
   module Cli
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pokemoves-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - "'Andrew Ribas'"