botemon 0.2.4 → 0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODk1NDM4YzcwYWRkZWVmNzFmNTg0MmRhNTc1MjZkNWE4Njc5YmM5ZA==
+    MTQ0ZGE1YzRlMjNlMTY1ZTRiMDA3ZTUzY2FhMmZmOGE2N2I0N2MxMQ==
   data.tar.gz: !binary |-
-    MTg4NDUxZmFjNzg2NGY4ZmViNWMyMjEyODYyY2Q1MDYzYWFjZWQ2ZA==
+    ZDk0ODJiNWJlOGNkNWZjZTk0YjU3NjFlZmQxMDkwMGNkNTM1OTA1Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTZkYjkwOGRlYjZhNDM4MzU5MTQ1N2ExODk5MDQ0YTIyNGJkZWJlZjI2MzVi
-    OGUwNDc5MGExZDZmYTM1ZWIwMDYxNWFkYmJkZTNjYmQzOGIzYjJmOTM0M2Y3
-    ZjE3ZDAyYmVmMjkyNmFiNzNlMDBmNGYzYWE5NmQ5YmQ1MDkyODg=
+    MWY4NTY4NmJmNWE5NzU0NGVjODY0YmNhNzAzNDAxNWEzYmE1MzAzODRjNjI3
+    YTljZmRlY2I0MGZlMTQ1MzEzZTRlOThjZTAwM2U1MmI1OGU5NTFlNjcxYzMw
+    OWNjOTc0OTQwYWEzZGI2ZGQ5OWY2NjA0NGRkZjVlZDgwYjU2YTE=
   data.tar.gz: !binary |-
-    NjliN2Y0MjQyN2FlZWRkYjNmOTU0Mjc5ZTAyZmU0YzU4NTYyNjU2NjFiNjlm
-    ZDc3MzgxZjE0NDBhNDRjNzQ4YmEwMGQ1NzMwZTkwYzc0ODgwYjk3MzdiMDUy
-    NGVmZjE1MzFiMWYwYjAyYmQzZWEzYjI3MGYzNDhkYjQzMTdmNDU=
+    YjNjNjEwZTM5ODYzNzU3Y2E2M2QwNTU3MDdlODhmMDQ1ZDUzMTU4ODg1MTE4
+    ZDdkNGY2NTQ1ZmE0OTRjYWRmMWFjZTQ3YjE0NmFlMmViMjVmYjU0ZTc3NTQ0
+    ZThlM2M3ZGMwZjlmYThmZTA0YTEyMjE3OWNhYmIxNzQ0YWZmMzA=

data/bin/botemon

@@ -61,8 +61,13 @@ Cinch::Bot.new {
     if name == nil
       m.reply Format(:red, 'Pokémon not found.')
     else
-      moveset = Movedex.get name, tier
-      m.reply Format(:red, moveset ? moveset.to_s : 'Moveset not found.')
+      movesets = Movedex.get name, tier
+      if movesets != nil || movesets.any?
+        m.reply Format(:red, "--- #{movesets.first.pokemon} (#{movesets.first.tier}) ---")
+        movesets.each { |moveset| m.reply Format(:red, " -- #{moveset.name} --\n#{moveset.to_s.split("\n").map { |l| Format(:red, l) }.join("\n")}\n") }
+      else
+        m.reply Format(:red, 'Moveset not found.')
+      end
     end
   end
 

data/lib/botemon/movedex.rb

@@ -25,36 +25,65 @@ class Movedex
       return nil
     end
   end
-  
-  def self.tiers
-    ['uber', 'ou', 'bl', 'uu', 'bl2', 'ru', 'nu', 'lc', 'limbo', 'nfe']
-  end
    
   def self.get(name, tier)
-    return nil if name == nil || tier == nil || !Movedex.tiers.include?(tier.downcase)
+    return nil if name == nil || tier == nil
     
     begin
       url = URI::encode "http://www.smogon.com/bw/pokemon/#{name}/#{tier}"
       
-      moveset = Moveset.new
       smogon = Nokogiri::HTML(open(url))
     rescue
       return nil
     end
     
-    moveset.pokemon = smogon.xpath('//td[@class="header"]/h1').last.text
-    moveset.name    = smogon.xpath('//td[@class="name"]/h2').first.text
-    moveset.tier    = smogon.xpath('//table[@class="info"]/tr/td/a').last.text
-    
-    section = smogon.xpath('//table[@class="info strategyheader"]/tr')[1].children
-    moveset.item    = section[2].text.gsub(/\n/m, '').gsub(/\t/m, '').strip
-    moveset.ability = section[4].text.gsub(/\n/m, '').gsub(/\t/m, '').strip
-    moveset.nature  = section[6].text.gsub(/\n/m, '').gsub(/\t/m, '').strip
+    movesets = []
     
-    section = smogon.xpath('//table[@class="info moveset"]/tr')[1].children
-    moveset.moves   = section[0].text.strip.gsub(/\n/, '').gsub(/~/, ',').gsub(/\s\s/, '')[2..-1]
-    moveset.evs     = section[2].text.strip
+    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
+    }
     
-    return 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

data/lib/botemon/moveset.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 #--
 # Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
@@ -21,7 +22,7 @@ class Moveset
   attr_accessor :pokemon, :name, :tier, :item, :ability, :nature, :moves, :evs
   
   def to_s
-    "Name: #{pokemon}\nSet: #{name}\nTier: #{tier}\nItem: #{item}\nAbility: #{ability}\nNature: #{nature}\nMoves: #{moves}\nEVs: #{evs}"
+    "Item: #{item.join(' / ')}\nAbility: #{ability.join(' / ')}\nNature: #{nature.join(' / ')}\nMoves: #{''.tap { |s| moves.each { |move| s << move.join(' / ') + ', '}}[0..-3]}\nEVs: #{evs}"
   end
   
 end

data/lib/botemon/version.rb

@@ -20,6 +20,6 @@
 
 module Botemon
   def self.version
-    '0.2.4'
+    '0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: botemon
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: '0.3'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch