smogon 0.2.1 → 0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmQ0ZDY0NjQ5MjA3NzJiMzlhZmQ1Nzc4MzE5Yjc2MmI1ZTVjOWFiNg==
+    MWFhYzlhYmU0YTU4OGM3OTAxMWNlODg3MTFjZDk2ZTZmNTJjNDA1NQ==
   data.tar.gz: !binary |-
-    ZDA1OTkwNzFlZDM4MWZkZDYyMmU0MThmMmM0Zjg2ODI3MTFiOGJlYQ==
+    MmRlMzZmOTA3YjY4MTJkNzdjNmEwOTAxNTBjMjBjZjE1NjJlNzIwNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Njk3YjA0Y2UwY2E0MjYzZDk4Nzc4OGQ0OWJkMjYwYWI3OTllODMyMDhhMTU3
-    M2YzOGE1MzUwN2Q3MTFmMWQzZjA4ZjFjNmU2YzMwZGE1OGU0NjNjZGFmMzRi
-    M2U5YzQ3OTgwMTA3MDllNGI3OTY3MzVmYTU2NDU1NTZjZGFiNjQ=
+    YWU0MDJiMjY1ZTFjOTJhN2FiNGE1MzA5OTQ2ZjI3NmVmMzFhMWY4YzI4ZmMx
+    MzNjZTlhYTlmZTkwZGNmZDM0ZGUxZDAzMmI5MjAwYmNhNmExZDlhZTU2ZGRj
+    NTIyYTBlOWVlYWQ0NTAyZGQ0NWU2MzNmNmFjZjNiOTU5NjcxYWM=
   data.tar.gz: !binary |-
-    MWM3NmQ0MWY4ZDQ2YmViNmIxZjY4MWIzOWNhZjUxMTFiMjJmMTk1YmY4Yzk3
-    NTg4NzhlMTRmMTlmZTJmNTVjNzE4MTZlNzEyMGI0YzQ2MjE0YzE5MWRkNDMx
-    MGExMmU0Y2E0YWFiNGYyYWQxMWRhNDViYWE1YWFhNTZkZGQ4NDQ=
+    MzllMjg4MGEzNmE5Mjg5NzA3ZDYwZWIxNWUxMjMyNjMzYjJhYzM0NGQwNTA4
+    ZTgyMjg4NzkwNGVkMjJiZTk5YzU0Y2QzMzgxMjNmMzBmZDE3NGEyMDk4OThi
+    NDU0ZTNiNmI2YzFhMGVjZTFkYjVjNDY5NGE0NjFkY2E2ZmFhMDI=

data/lib/smogon.rb

@@ -21,11 +21,13 @@ require 'open-uri'
 require 'nokogiri'
 
 require 'smogon/types/pokemon'
-require 'smogon/types/moveset'
 require 'smogon/types/ability'
+require 'smogon/types/move'
+require 'smogon/types/moveset'
 
 require 'smogon/pokedex'
-require 'smogon/movedex'
 require 'smogon/abilitydex'
+require 'smogon/movedex'
+require 'smogon/movesetdex'
 
 require 'smogon/version'

data/lib/smogon/abilitydex.rb

@@ -21,7 +21,7 @@ module Smogon
   class Abilitydex 
     def self.get(name)
       begin
-        name = name.downcase.gsub!(/\s/, ?_)
+        name = name.downcase.gsub /\s/, ?_
         url = URI::encode "http://www.smogon.com/bw/abilities/#{name}"
         
         smogon = Nokogiri::HTML(open(url))
@@ -49,4 +49,4 @@ module Smogon
       return ability
     end
   end
-end
+end

data/lib/smogon/movedex.rb

@@ -19,63 +19,47 @@
 
 module Smogon
   class Movedex 
-    def self.get(name, tier)
+    def self.get(name)
       begin
-        url = URI::encode "http://www.smogon.com/bw/pokemon/#{name}/#{tier}"
+        name = name.downcase.gsub /\s/, ?_
+        url = URI::encode "http://www.smogon.com/bw/moves/#{name}"
         
         smogon = Nokogiri::HTML(open(url))
       rescue
         return nil
       end
       
-      movesets = []
+      move = Move.new
       
-      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
-        
-        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/'
-        }
-        
-        movesets << moveset
-      }
+      move.name        = smogon.xpath('//div[@id="content_wrapper"]/h1').first.text
+      move._name       = name
       
-      i = 0
-      smogon.xpath('//table[@class="info moveset"]').each { |s|
-        moveset = movesets[i]
-        
-        continue = false
-        s.xpath('.//td')[0].text.each_line { |a|
-          a = a.gsub(/\n?/, '').strip
-          if a == ?~
-            continue = false
-          elsif a == ?/
-            continue = true
-          elsif a.empty?
+      move.description = ''.tap { |d|
+        h2 = 0
+        ul = 0
+        smogon.xpath('//div[@id="content_wrapper"]').children.each { |c|
+          if c.name == 'h2'
+            h2 += 1
             next
-          elsif a != ?~ && a != ?/
-            if continue
-              moveset.moves.last << a
-            else
-              (moveset.moves ||= []) << [a]
-            end
-            continue = false
           end
+          if c.name == 'ul'
+            ul += 1
+            next
+          end
+          break if ul >= 2
+          d << c.text if h2 == 1 && !c.text.strip.empty?
         }
-        
-        moveset.evs = s.xpath('.//td').last.text.strip
-        
-        movesets[i] = moveset
-        i += 1
       }
-     
-      return movesets
+      
+      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
+      return move
     end
   end
-end
+end

data/lib/smogon/movesetdex.rb

@@ -0,0 +1,81 @@
+#--
+# 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 Movesetdex 
+    def self.get(name, tier)
+      begin
+        url = URI::encode "http://www.smogon.com/bw/pokemon/#{name}/#{tier}"
+        
+        smogon = Nokogiri::HTML(open(url))
+      rescue
+        return nil
+      end
+      
+      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
+        
+        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/'
+        }
+        
+        movesets << moveset
+      }
+      
+      i = 0
+      smogon.xpath('//table[@class="info moveset"]').each { |s|
+        moveset = movesets[i]
+        
+        continue = false
+        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
+            else
+              (moveset.moves ||= []) << [a]
+            end
+            continue = false
+          end
+        }
+        
+        moveset.evs = s.xpath('.//td').last.text.strip
+        
+        movesets[i] = moveset
+        i += 1
+      }
+     
+      return movesets
+    end
+  end
+end

data/lib/smogon/{moveset.rb → types/move.rb}

@@ -1,4 +1,3 @@
-#encoding: utf-8
 #--
 # Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
@@ -19,12 +18,15 @@
 #++
 
 module Smogon
-  class Moveset
-    attr_accessor :pokemon, :name, :tier, :item, :ability, :nature, :moves, :evs
+  class Move
+    attr_accessor :name, :_name, :description, :type, :power, :accuracy, :pp, :priority, :damage, :target
     
     def to_s
-      "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}"
+      "Name: #{name}\nDescription: #{description}\nType: #{type}\nPower: #{power}\nAccuracy: #{accuracy}\nPP: #{pp}\nPriority: #{priority}\nDamage: #{damage}\nTarget: #{target}"
     end
     
+    def url
+      "http://www.smogon.com/bw/moves/#{_name}"
+    end
   end
 end

data/lib/smogon/version.rb

@@ -19,6 +19,6 @@
 
 module Smogon
   def self.version
-    '0.2.1'
+    '0.3'
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smogon
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,7 +24,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: API written in Ruby to get Pokémon infos and movesets from Smogon.
+description: API written in Ruby to get (poké|ability|move|moveset)dex from Smogon.
 email: webmaster@giovannicapuano.net
 executables: []
 extensions: []
@@ -32,10 +32,11 @@ extra_rdoc_files: []
 files:
 - lib/smogon/abilitydex.rb
 - lib/smogon/movedex.rb
-- lib/smogon/moveset.rb
+- lib/smogon/movesetdex.rb
 - lib/smogon/pokedex.rb
 - lib/smogon/pokemon.rb
 - lib/smogon/types/ability.rb
+- lib/smogon/types/move.rb
 - lib/smogon/types/moveset.rb
 - lib/smogon/types/pokemon.rb
 - lib/smogon/version.rb