smogon 0.5.2 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b4c544fa43ec9787e19713b37837aed880f5558
-  data.tar.gz: 9631e14e37748d286c838dbaf81b37090403bc9e
+  metadata.gz: c3754f037f47ef782ff02f217455d16921b0de26
+  data.tar.gz: 03fdf4ba26140f321937bb4885292ef256f16273
 SHA512:
-  metadata.gz: 1948345687b6bc977edab359e3c4dd354a9b57fb5e0cba1740d03f5d8c6069e66bfedca0c0c81133c81a914696daab3e43e4cf94d5323d076b90a543fe761873
-  data.tar.gz: 45f665797cabd6a038fdea25d064f9b46520e510cb38e7c3d67344cbed65eb83b6a339d327e24db4010b5191bec96995e4cdb15cecb44597070f8ac292bae057
+  metadata.gz: bbf87bf7c1aa0be1729cf392d2f3786d01ea585a70ab61d84430e0b9487acc5f007e82b2f0859ac536f370804d07533644e9d893fc24417abd35d207daa2e167
+  data.tar.gz: fc7aa690a33d408ceffd08c1c07cf01b776a18741673da6346b9a37ea084f9ba30f9085bbb1c8a4989fbea3f9a1a084540fd5179c3aceb9fbaa6e118cdc14834

data/lib/smogon.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Smogon-API.
 #
@@ -18,7 +18,10 @@
 #++
 
 require 'open-uri'
-require 'nokogiri'
+require 'json'
+
+require 'smogon/api'
+require 'smogon/naturedex'
 
 require 'smogon/types/pokemon'
 require 'smogon/types/ability'
@@ -32,4 +35,4 @@ require 'smogon/itemdex'
 require 'smogon/movedex'
 require 'smogon/movesetdex'
 
-require 'smogon/version'
+require 'smogon/version'

data/lib/smogon/abilitydex.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Smogon-API.
 #
@@ -18,38 +18,27 @@
 #++
 
 module Smogon
-  class Abilitydex 
-    def self.get(name)
-      begin
-        name   = name.downcase.gsub /\s/, ?_
-        url    = URI::encode "http://www.smogon.com/bw/abilities/#{name}"
-        smogon = Nokogiri::HTML open(url)
-      rescue
-        return nil
+  class Abilitydex
+    def self.get(name, fields = nil)
+      incapsulate = fields == nil
+
+      fields ||= [
+        'name',
+        'alias',
+        'description'
+      ]
+
+      response = API.request 'ability', name, fields
+      return nil      if response.is_a?(String) || response.empty? || response.first.empty?
+      return response if not incapsulate
+
+      response = response.first
+
+      Ability.new.tap do |ability|
+        ability.name        = response['name'       ]
+        ability._name       = response['alias'      ]
+        ability.description = response['description']
       end
-      
-      Ability.new.tap { |ability|        
-        s = smogon.xpath('//div[@id="content_wrapper"]')[0]
-        ability.name  = s.xpath('.//h1').first.text
-        ability._name = name
-        
-        ability.description = ''.tap { |d|
-          h2 = 0
-          ul = 0
-          s.children.each { |c|
-            if c.name == 'h2'
-              h2 += 1
-              next
-            end
-            if c.name == 'ul'
-              ul += 1
-              next
-            end
-            break if ul >= 2
-            d << c.text if h2 == 1 && !c.text.strip.empty?
-          }
-        }
-      }
     end
   end
 end

data/lib/smogon/api.rb

@@ -0,0 +1,53 @@
+#--
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
+#
+# This file is part of Smogon-API.
+#
+# Smogon-API is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Smogon-API is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Smogon-API.  If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module Smogon
+  class API
+    METAGAME = 'xy'
+    ENDPOINT = 'http://www.smogon.com/dex/api/query?q='
+
+    class << self
+      def request(what, name, fields)
+        query = {
+          what => { 'gen' => METAGAME, 'alias' => aliasize(name) },
+          '$'  => fields
+        }
+
+        query = JSON.generate(query)
+        query = URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+        response = JSON.parse open("#{ENDPOINT}#{query}").read
+        response['status'] == 'success' ? response['result'] : response['message']
+      end
+
+      def using_metagame(metagame, &block)
+        default_metagame = METAGAME.dup
+        METAGAME.replace aliasize(metagame)
+        instance_eval(&block).tap do
+          METAGAME.replace default_metagame
+        end
+      end
+
+    private
+
+      def aliasize(string)
+        string.downcase.gsub(' ', '_').gsub(/[^a-z_]/i, '')
+      end
+    end
+  end
+end

data/lib/smogon/itemdex.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Smogon-API.
 #
@@ -18,38 +18,27 @@
 #++
 
 module Smogon
-  class Itemdex 
-    def self.get(name)
-      begin
-        name   = name.downcase.gsub /\s/, ?_
-        url    = URI::encode "http://www.smogon.com/bw/items/#{name}"
-        smogon = Nokogiri::HTML open(url)
-      rescue
-        return nil
+  class Itemdex
+    def self.get(name, fields = nil)
+      incapsulate = fields == nil
+
+      fields ||= [
+        'name',
+        'alias',
+        'description'
+      ]
+
+      response = API.request 'item', name, fields
+      return nil      if response.is_a?(String) || response.empty? || response.first.empty?
+      return response if not incapsulate
+
+      response = response.first
+
+      Item.new.tap do |item|
+        item.name        = response['name'       ]
+        item._name       = response['alias'      ]
+        item.description = response['description']
       end
-      
-      Item.new.tap { |item|
-        s = smogon.xpath('//div[@id="content_wrapper"]')[0]
-        item.name  = s.xpath('.//h1').first.text
-        item._name = name
-        
-        item.description = ''.tap { |d|
-          h2 = 0
-          ul = 0
-          s.children.each { |c|
-            if c.name == 'h2'
-              h2 += 1
-              next
-            end
-            if c.name == 'ul'
-              ul += 1
-              next
-            end
-            break if ul >= 2
-            d << c.text if h2 == 1 && !c.text.strip.empty?
-          }
-        }
-      }
     end
   end
 end

data/lib/smogon/movedex.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Smogon-API.
 #
@@ -18,51 +18,35 @@
 #++
 
 module Smogon
-  class Movedex 
-    def self.get(name)
-      begin
-        name   = name.downcase.gsub /\s/, ?_
-        url    = URI::encode "http://www.smogon.com/bw/moves/#{name}"
-        smogon = Nokogiri::HTML open(url)
-      rescue
-        return nil
+  class Movedex
+    def self.get(name, fields = nil)
+      incapsulate = fields == nil
+
+      fields ||= [
+        'name',
+        'alias',
+        'description',
+        'power',
+        'accuracy',
+        'pp',
+        'type' => ['name'],
+      ]
+
+      response = API.request 'move', name, fields
+      return nil      if response.is_a?(String) || response.empty? || response.first.empty?
+      return response if not incapsulate
+
+      response = response.first
+
+      Move.new.tap do |move|
+        move.name        = response['name'       ]
+        move._name       = response['alias'      ]
+        move.description = response['description']
+        move.type        = response['type'       ].values.join(' / ')
+        move.power       = response['power'      ]
+        move.accuracy    = response['accuracy'   ]
+        move.pp          = response['pp'         ]
       end
-      
-      Move.new.tap { |move|      
-        move.name  = smogon.xpath('//div[@id="content_wrapper"]/h1').first.text
-        move._name = name
-        
-        move.description = ''.tap { |d|
-          h2 = 0
-          ul = 0
-          dl = 0
-          smogon.xpath('//div[@id="content_wrapper"]').children.each { |c|
-            if c.name == 'h2'
-              h2 += 1
-              next
-            end
-            if c.name == 'ul'
-              ul += 1
-              next
-            end
-            if c.name == 'dl'
-              dl += 1
-              next
-            end
-            break if ul >= 2 || dl >= 2
-            d << c.text if h2 == 1 && !c.text.strip.empty?
-          }
-        }
-        
-        info = smogon.xpath('//table[@class="info"]/tr')[1].xpath('.//td')
-        move.type     = info[0].text
-        move.power    = info[1].text
-        move.accuracy = info[2].text
-        move.pp       = info[3].text
-        move.priority = info[4].text
-        move.damage   = info[5].text.strip
-        move.target   = info[6].text.strip
-      }
     end
   end
 end

data/lib/smogon/movesetdex.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Smogon-API.
 #
@@ -18,68 +18,66 @@
 #++
 
 module Smogon
-  class Movesetdex 
-    def self.get(name, tier, metagame)
-      begin
-        url    = URI::encode "http://www.smogon.com/#{metagame}/pokemon/#{name}/#{tier}"
-        smogon = Nokogiri::HTML(open(url))
-      rescue
-        return nil
+  class Movesetdex
+    def self.get(name, tier = nil, metagame = nil, fields = nil)
+      incapsulate = fields == nil
+
+      fields ||= [
+        'name',
+        'movesets' => [
+          'name',
+          { 'tags'      => %w(shorthand) },
+          { 'items'     => %w(name)      },
+          { 'abilities' => %w(name)      },
+          { 'natures'   => %w(hp patk pdef spatk spdef spe) },
+          { 'moveslots' => [ 'slot', { 'move' => %(name) } ] },
+          { 'evconfigs' => %w(hp patk pdef spatk spdef spe) }
+        ]
+      ]
+
+      response = if metagame
+        API.using_metagame(metagame) do
+          API.request 'pokemon', name, fields
+        end
+      else
+        API.request 'pokemon', name, fields
       end
-      
-      [].tap { |movesets|
-        smogon.xpath('//table[@class="info strategyheader"]').each { |s|
-          moveset = Moveset.new
-          
-          moveset.pokemon = smogon.xpath('//tr/td[@class="header"]/h1').last.text
-          moveset.name    = s.xpath('tr')[1].xpath('td[@class="name"]/h2').first.text
-          moveset.tier    = smogon.xpath('//div[@id="content_wrapper"]/ul/li/strong').last.text
-          
-          if metagame == 'gs'
-            s.xpath('.//a').each { |a|
-              moveset.item    << a.text if a['href'].include? '/items/'
-            }
-          elsif metagame != 'rb'
-            s.xpath('.//a').each { |a|
-              moveset.item    << a.text if a['href'].include? '/items/'
-              moveset.ability << a.text if a['href'].include? '/abilities/'
-              moveset.nature  << a.text if a['href'].include? '/natures/'
-            }
-          end
-          
-          movesets << moveset
-        }
-        
-        i = 0
-        xpath = metagame == 'rb' ? '//td[@class="rbymoves"]' : '//table[@class="info moveset"]'
-        smogon.xpath(xpath).each { |s|
-          moveset = movesets[i]
-          
-          continue = false
-          (metagame == 'rb' ? s : s.xpath('.//td')[0]).text.each_line { |a|
-            a = a.gsub(/\n?/, '').strip
-            if a == ?~
-              continue = false
-            elsif a == ?/
-              continue = true
-            elsif a.empty?
-              next
-            elsif a != ?~ && a != ?/
-              if continue
-                moveset.moves.last << a
+      return nil      if response.is_a?(String) || response.empty? || response.first.empty?
+      return response if not incapsulate
+
+      response = response.first
+
+      results = [].tap do |movesets|
+        response['movesets'].each do |movesetdex|
+          movesets << Moveset.new.tap do |moveset|
+            moveset.pokemon = response['name']
+            moveset.name    = movesetdex['name']
+            moveset.tier    = movesetdex['tags'][0]['shorthand']
+            moveset.item    = movesetdex['items'].collect(&:values).flatten
+            moveset.ability = movesetdex['abilities'].collect(&:values).flatten
+            moveset.nature = movesetdex['natures'].map { |nature| Naturedex.get(nature) }
+
+            moveset.moves = []
+            movesetdex['moveslots'].each do |moveslot|
+              slot = moveslot['slot'] - 1
+
+              if moveset.moves[slot]
+                moveset.moves[slot] << moveslot['move_name']
               else
-                moveset.moves << [a]
+                moveset.moves << [ moveslot['move_name'] ]
               end
-              continue = false
             end
-          }
-          
-          moveset.evs = s.xpath('.//td').last.text.strip if metagame != 'rb' && metagame != 'gs'
-          
-          movesets[i] = moveset
-          i += 1
-        }
-      }
+
+            moveset.evs = [].tap do |evs|
+              ['hp', 'patk', 'pdef', 'spatk', 'spdef', 'spe'].each do |stat|
+                evs << movesetdex['evconfigs'].first[stat]
+              end
+            end.join ' / '
+          end
+        end
+      end
+
+      tier ? results.reject { |moveset| moveset.tier.downcase != tier.downcase } : results
     end
   end
 end

data/lib/smogon/naturedex.rb

@@ -0,0 +1,260 @@
+#--
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
+#
+# This file is part of Smogon-API.
+#
+# Smogon-API is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Smogon-API is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Smogon-API.  If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module Smogon
+  class Naturedex
+    NATURES = [
+      {
+        hp: 1.0,
+        patk: 1.1,
+        pdef: 1.0,
+        spatk: 0.9,
+        spdef: 1.0,
+        spe: 1.0,
+        name: 'Adamant'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.0,
+        spatk: 1.0,
+        spdef: 1.0,
+        spe: 1.0,
+        name: 'Bashful'
+      },
+      {
+        hp: 1.0,
+        patk: 0.9,
+        pdef: 1.1,
+        spatk: 1.0,
+        spdef: 1.0,
+        spe: 1.0,
+        name: 'Bold'
+      },
+      {
+        hp: 1.0,
+        patk: 1.1,
+        pdef: 1.0,
+        spatk: 1.0,
+        spdef: 1.0,
+        spe: 0.9,
+        name: 'Brave'
+      },
+      {
+        hp: 1.0,
+        patk: 0.9,
+        pdef: 1.0,
+        spatk: 1.0,
+        spdef: 1.1,
+        spe: 1.0,
+        name: 'Calm'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.0,
+        spatk: 0.9,
+        spdef: 1.1,
+        spe: 1.0,
+        name: 'Careful'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.0,
+        spatk: 1.0,
+        spdef: 1.0,
+        spe: 1.0,
+        name: 'Docile'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 0.9,
+        spatk: 1.0,
+        spdef: 1.1,
+        spe: 1.0,
+        name: 'Gentle'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.0,
+        spatk: 1.0,
+        spdef: 1.0,
+        spe: 1.0,
+        name: 'Hardy'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 0.9,
+        spatk: 1.0,
+        spdef: 1.0,
+        spe: 1.1,
+        name: 'Hasty'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.1,
+        spatk: 0.9,
+        spdef: 1.0,
+        spe: 1.0,
+        name: 'Impish'
+      },
+      {
+        hp: 1,
+        patk: 1,
+        pdef: 1,
+        spatk: 0.9,
+        spdef: 1,
+        spe: 1.1,
+        name: 'Jolly'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.1,
+        spatk: 1.0,
+        spdef: 0.9,
+        spe: 1.0,
+        name: 'Lax'
+      },
+      {
+        hp: 1.0,
+        patk: 1.1,
+        pdef: 0.9,
+        spatk: 1.0,
+        spdef: 1.0,
+        spe: 1.0,
+        name: 'Lonely'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 0.9,
+        spatk: 1.1,
+        spdef: 1.0,
+        spe: 1.0,
+        name: 'Mild'
+      },
+      {
+        hp: 1.0,
+        patk: 0.9,
+        pdef: 1.0,
+        spatk: 1.1,
+        spdef: 1.0,
+        spe: 1.0,
+        name: 'Modest'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.0,
+        spatk: 1.0,
+        spdef: 0.9,
+        spe: 1.1,
+        name: 'Naive'
+      },
+      {
+        hp: 1.0,
+        patk: 1.1,
+        pdef: 1.0,
+        spatk: 1.0,
+        spdef: 0.9,
+        spe: 1.0,
+        name: 'Naughty'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.0,
+        spatk: 1.1,
+        spdef: 1.0,
+        spe: 0.9,
+        name: 'Quiet'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.0,
+        spatk: 1.0,
+        spdef: 1.0,
+        spe: 1.0,
+        name: 'Quirky'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.0,
+        spatk: 1.1,
+        spdef: 0.9,
+        spe: 1.0,
+        name: 'Rash'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.1,
+        spatk: 1.0,
+        spdef: 1.0,
+        spe: 0.9,
+        name: 'Relaxed'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.0,
+        spatk: 1.0,
+        spdef: 1.1,
+        spe: 0.9,
+        name: 'Sassy'
+      },
+      {
+        hp: 1.0,
+        patk: 1.0,
+        pdef: 1.0,
+        spatk: 1.0,
+        spdef: 1.0,
+        spe: 1.0,
+        name: 'Serious'
+      },
+      {
+        hp: 1.0,
+        patk: 0.9,
+        pdef: 1.0,
+        spatk: 1.0,
+        spdef: 1.0,
+        spe: 1.1,
+        name: 'Timid'
+      }
+    ]
+
+    def self.get(hash)
+      NATURES.each do |nature|
+        boost = nature.dup
+        boost.delete :name
+        return nature[:name] if hash == boost || hash == Hash[boost.map { |(k, v)| [k.to_s, v] }]
+      end
+
+      nil
+    end
+  end
+end

data/lib/smogon/pokedex.rb

@@ -1,63 +1,62 @@
-#--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
-#
-# This file is part of Smogon-API.
-#
-# Smogon-API is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Smogon-API is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Smogon-API.  If not, see <http://www.gnu.org/licenses/>.
-#++
-
-module Smogon
-  class Pokedex
-    def self.get(name)    
-      begin
-        url       = URI::encode "http://www.smogon.com/bw/pokemon/#{name}"
-        moves_url = URI::encode "http://www.smogon.com/bw/pokemon/#{name}/moves"
-
-        smogon  = Nokogiri::HTML open url
-        moves   = Nokogiri::HTML open moves_url
-      rescue
-        return nil
-      end
-
-      Pokemon.new.tap { |pokemon|
-        pokemon.name  = smogon.xpath('//td[@class="header"]/h1').last.text
-        pokemon._name = pokemon.name.downcase
-        
-        smogon.xpath('//table[@class="info"]/tr/td/a')[0..-2].each { |type|
-          (pokemon.types      ||= []) << type.text
-        }
-        
-        pokemon.tier = smogon.xpath('//table[@class="info"]/tr/td/a').last.text
-        
-        smogon.xpath('//td[@class="ability"]/dl/dt/a').each { |ability|
-          (pokemon.abilities  ||= []) << ability.text
-        }
-        
-        begin
-          (pokemon.abilities  ||= []) << smogon.xpath('//td[@class="ability"]/dl/dt/em/a').first.text
-        rescue
-          # No dream world abilities :(
-        end
-        
-        smogon.xpath('//td[@class="bar"]').each { |base_stat|
-          (pokemon.base_stats ||= []) << base_stat.text.strip
-        }
-        
-        moves.xpath('//table[starts-with(@id, "move_list")]/tbody/tr').each { |tr|
-          (pokemon.moves      ||= []) << tr.xpath('.//td')[0].text.strip
-        }
-      }
-    end
-  end
-end
+#--
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
+#
+# This file is part of Smogon-API.
+#
+# Smogon-API is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Smogon-API is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Smogon-API.  If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module Smogon
+  class Pokedex
+    def self.get(name, fields = nil)
+      incapsulate = fields == nil
+
+      fields ||= [
+        'name',
+        'alias',
+        'alts' => [
+          { 'types'     => %w(name)      },
+          { 'tags'      => %w(shorthand) },
+          { 'abilities' => %w(name)      },
+          'hp', 'patk', 'pdef', 'spatk', 'spdef', 'spe'
+        ],
+        'moves' => ['name']
+      ]
+
+      response = API.request 'pokemon', name, fields
+      return nil      if response.is_a?(String) || response.empty? || response.first.empty?
+      return response if not incapsulate
+
+      response = response.first
+      pokedex  = response['alts'][0]
+
+      Pokemon.new.tap do |pokemon|
+        pokemon.name  = response['name']
+        pokemon._name = response['alias']
+
+        pokemon.types     = pokedex['types'].collect(&:values).flatten
+        pokemon.tier      = pokedex['tags'][0]['shorthand']
+        pokemon.abilities = pokedex['abilities'].collect(&:values).flatten
+
+        pokemon.base_stats = [].tap do |base_stats|
+          ['hp', 'patk', 'pdef', 'spatk', 'spdef', 'spe'].each do |stat|
+            base_stats << pokedex[stat]
+          end
+        end
+
+        pokemon.moves = response['moves'].collect(&:values).flatten
+      end
+    end
+  end
+end

data/lib/smogon/types/ability.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Smogon-API.
 #
@@ -20,13 +20,13 @@
 module Smogon
   class Ability
     attr_accessor :name, :_name, :description
-    
+
     def to_s
       "Name: #{@name}\nDescription: #{@description}"
     end
-    
+
     def url
-      "http://www.smogon.com/bw/abilities/#{@_name}"
+      "http://www.smogon.com/dex/#{API::METAGAME}/abilities/#{@_name}"
     end
   end
-end
+end

data/lib/smogon/types/item.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Smogon-API.
 #
@@ -20,13 +20,13 @@
 module Smogon
   class Item
     attr_accessor :name, :_name, :description
-    
+
     def to_s
       "Name: #{@name}\nDescription: #{@description}"
     end
-    
+
     def url
-      "http://www.smogon.com/bw/items/#{@_name}"
+      "http://www.smogon.com/dex/#{API::METAGAME}/items/#{@_name}"
     end
   end
-end
+end

data/lib/smogon/types/move.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Smogon-API.
 #
@@ -19,14 +19,18 @@
 
 module Smogon
   class Move
-    attr_accessor :name, :_name, :description, :type, :power, :accuracy, :pp, :priority, :damage, :target
-    
+    attr_accessor :name, :_name, :description, :type, :power, :accuracy, :pp
+
     def to_s
-      "Name: #{@name}\nDescription: #{@description}\nType: #{@type}\nPower: #{@power}\nAccuracy: #{@accuracy}\nPP: #{@pp}\nPriority: #{@priority}\nDamage: #{@damage}\nTarget: #{@target}"
+      "Name: #{@name}\nDescription: #{@description}\nType: #{@type}\nPower: #{@power}\nAccuracy: #{@accuracy}\nPP: #{@pp}"
     end
-    
+
     def url
-      "http://www.smogon.com/bw/moves/#{@_name}"
+      "http://www.smogon.com/dex/#{API::METAGAME}/moves/#{@_name}"
+    end
+
+    %i(priority damage target).each do |m|
+      define_method(m) { '' }
     end
   end
-end
+end

data/lib/smogon/types/moveset.rb

@@ -1,6 +1,6 @@
 #encoding: utf-8
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Smogon-API.
 #
@@ -21,7 +21,7 @@
 module Smogon
   class Moveset
     attr_accessor :pokemon, :name, :tier, :item, :ability, :nature, :moves, :evs
-    
+
     def initialize
       @item    = []
       @ability = []
@@ -33,4 +33,4 @@ module Smogon
       "Pokémon: #{@pokemon}\nSet: #{@name}\nItem: #{@item.join(' / ')}\nAbility: #{@ability.join(' / ')}\nNature: #{@nature.join(' / ')}\nMoves: #{''.tap { |s| @moves.each { |move| s << move.join(' / ') + ', '}}[0..-3]}\nEVs: #{@evs}"
     end
   end
-end
+end

data/lib/smogon/types/pokemon.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Smogon-API.
 #
@@ -26,7 +26,7 @@ module Smogon
     end
     
     def url
-      "http://www.smogon.com/bw/pokemon/#{@_name}"
+      "http://www.smogon.com/dex/#{API::METAGAME}/pokemon/#{@_name}"
     end
     
     def self.id2name(id)

data/lib/smogon/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+# Copyright(C) 2015 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
 # This file is part of Smogon-API.
 #
@@ -18,7 +18,5 @@
 #++
 
 module Smogon
-  def self.version
-    '0.5.2'
-  end
+  VERSION = '0.6'
 end

data/spec/abilitydex.rb

@@ -0,0 +1,12 @@
+#! /usr/bin/env ruby
+require 'smogon'
+
+describe 'Abilitydex' do
+  it 'returns infos about the given ability' do
+    ability = Smogon::Abilitydex.get 'Synchronize'
+
+    expect(ability.name).to eq('Synchronize')
+    expect(ability.description.length).to be > 10
+    expect(ability.to_s.length).to be > 10
+  end
+end

data/spec/itemdex.rb

@@ -0,0 +1,12 @@
+#! /usr/bin/env ruby
+require 'smogon'
+
+describe 'Itemdex' do
+  it 'returns infos about the given item' do
+    item = Smogon::Itemdex.get 'Leftovers'
+
+    expect(item.name).to eq('Leftovers')
+    expect(item.description.length).to be > 10
+    expect(item.to_s.length).to be > 10
+  end
+end

data/spec/movedex.rb

@@ -0,0 +1,13 @@
+#! /usr/bin/env ruby
+require 'smogon'
+
+describe 'Movedex' do
+  it 'returns infos about the given move' do
+    move = Smogon::Movedex.get 'Extreme Speed'
+
+    expect(move.name).to eq('Extreme Speed')
+    expect(move.type).to eq('Normal')
+    expect(move.pp).to   be 5
+    expect(move.to_s.length).to be > 10
+  end
+end

data/spec/movesetdex.rb

@@ -0,0 +1,13 @@
+#! /usr/bin/env ruby
+require 'smogon'
+
+describe 'Movesetdex' do
+  it 'returns the moveset of given Pokémon and metagame' do
+    movesets = Smogon::Movesetdex.get 'Abomasnow', 'UU', 'bw'
+
+    expect(movesets.length).to be > 0
+    expect(movesets.to_s.length).to be > 10
+    expect(movesets.first.nature.include?('Lonely')).to be_truthy
+    expect(movesets.select { |moveset| moveset.tier != 'UU' }.length).to be 0
+  end
+end

data/spec/pokedex.rb

@@ -0,0 +1,13 @@
+#! /usr/bin/env ruby
+require 'smogon'
+
+describe 'Pokedex' do
+  it 'returns the requested Pokémon' do
+    pokemon = Smogon::Pokedex.get 'Blaziken'
+
+    expect(pokemon.name).to            eq('Blaziken')
+    expect(pokemon.base_stats.last).to be 80
+    expect(pokemon.moves.length).to    be > 10
+    expect(pokemon.to_s.length).to     be > 10
+  end
+end

metadata

@@ -1,67 +1,70 @@
 --- !ruby/object:Gem::Specification
 name: smogon
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: '0.6'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: API to get (Poké|Ability|Item|Move|Moveset)dex from Smogon
+        version: '3.1'
+description: APIs wrapper to get (Poké|Ability|Item|Move|Moveset)dex data from Smogon
 email: webmaster@giovannicapuano.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/smogon.rb
 - lib/smogon/abilitydex.rb
+- lib/smogon/api.rb
 - lib/smogon/itemdex.rb
 - lib/smogon/movedex.rb
 - lib/smogon/movesetdex.rb
+- lib/smogon/naturedex.rb
 - lib/smogon/pokedex.rb
 - lib/smogon/types/ability.rb
 - lib/smogon/types/item.rb
@@ -69,8 +72,11 @@ files:
 - lib/smogon/types/moveset.rb
 - lib/smogon/types/pokemon.rb
 - lib/smogon/version.rb
-- lib/smogon.rb
-- spec/smogon_spec.rb
+- spec/abilitydex.rb
+- spec/itemdex.rb
+- spec/movedex.rb
+- spec/movesetdex.rb
+- spec/pokedex.rb
 homepage: http://www.giovannicapuano.net
 licenses:
 - GPL-3
@@ -91,9 +97,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: API for Smogon.
+summary: APIs wrapper to get data from Smogon.
 test_files:
-- spec/smogon_spec.rb
+- spec/abilitydex.rb
+- spec/itemdex.rb
+- spec/movedex.rb
+- spec/movesetdex.rb
+- spec/pokedex.rb

data/spec/smogon_spec.rb

@@ -1,41 +0,0 @@
-#! /usr/bin/env ruby
-require 'smogon'
-
-describe 'Smogon' do
-  it 'returns the requested Pokémon' do
-    pokemon = Smogon::Pokedex.get  'Blaziken'
-    pokemon.name.should            eql('Blaziken')
-    pokemon.base_stats.last.should eql('80')
-    pokemon.moves.any?.should      be_true
-  end
-
-  it 'search the given ability' do
-    ability = Smogon::Abilitydex.get 'Synchronize'
-    ability.name.should              eql('Synchronize')
-  end
-
-  it 'returns the given item' do
-    item = Smogon::Itemdex.get 'Leftovers'
-    item.name.should           eql('Leftovers')
-  end
-
-  it 'returns the given move' do
-    move = Smogon::Movedex.get 'Reflect'
-    move.name.should           eql('Reflect')
-    move.type.should           eql('Psychic')
-    move.pp.should             eql('20')
-  end
-
-  it 'returns the moveset of the given Pokémon and metagame' do
-    moveset = Smogon::Movesetdex.get                'Blaziken', 'uber', 'bw'
-    moveset.any?.should                             be_true
-    moveset.first.nature.include?('Jolly').should   be_true
-  end
-
-  it 'returns the name of the Pokémon relative to the given ID' do
-    Smogon::Pokemon.id2name(111).should eql('Rhyhorn')
-    moveset = Smogon::Movesetdex.get                'Blaziken', 'uber', 'bw'
-    moveset.any?.should                             be_true
-    moveset.first.nature.include?('Jolly').should   be_true
-  end
-end