Added type and ability data to species model

4 files changed, 30 insertions, 3 deletions

@@ -0,0 +1,7 @@
+module Pokeviewer
+  class Ability < ApplicationRecord
+    validates :name, presence: true, uniqueness: true
+
+    validates :description, presence: true
+  end
+end
@@ -10,10 +10,12 @@ module Pokeviewer
     validates :pp, presence: true,
       numericality: { greater_than_or_equal_to: 1, only_integer: true }
 
-    validates :move_type, presence: true
-    enumerize :move_type, in: [:normal, :fighting, :flying, :poison, :ground,
+    TYPES = [:normal, :fighting, :flying, :poison, :ground,
       :rock, :bug, :ghost, :steel, :mystery, :fire, :water, :grass, :electric,
-      :psychic, :ice, :dragon, :dark], predicates: true
+      :psychic, :ice, :dragon, :dark]
+
+    validates :move_type, presence: true
+    enumerize :move_type, in: TYPES, predicates: true
 
     validates :rs_description, presence: true
     validates :frlg_description, presence: true
@@ -200,6 +200,14 @@ module Pokeviewer
       "pokeviewer/items/#{Pokemon.pokeball.values.find_index(pokeball) + 1}.png"
     end
 
+    def ability
+      if second_ability
+        species.ability_2
+      else
+        species.ability_1
+      end
+    end
+
     private
 
       def set_uuid
@@ -1,7 +1,17 @@
 module Pokeviewer
   class Species < ApplicationRecord
+    extend Enumerize
+
     has_many :pokemon, dependent: :restrict_with_exception
 
     validates :name, presence: true, uniqueness: true
+
+    validates :type_1, presence: true
+
+    enumerize :type_1, in: Move::TYPES
+    enumerize :type_2, in: Move::TYPES
+
+    belongs_to :ability_1, class_name: "Ability"
+    belongs_to :ability_2, class_name: "Ability", optional: true
   end
 end