smogon 0.4.3 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 637f13e09752cb9e1a94d1120a0191404586b3e5
-  data.tar.gz: ebbf2f272f1a687912b5d46519dd6dbb6f917101
+  metadata.gz: 3bd0731542bdbe9f388f16b573287396022ec427
+  data.tar.gz: 0c7a8cf702effe4365ec2fda7efbc826d2785a17
 SHA512:
-  metadata.gz: a0daccd1ae4c63b3c570626fb5bdce82a8f744c238d3878db8b8db9a8fd68d88a67bd1f6091313f8e8b557f15e2661bcefae201071052d1db979ae9290a6a1af
-  data.tar.gz: 6e7d8df40918a700702138dd017645066192e0cf3f58dff8429546cde3fdd708b15e9a925a28d070b668e79d4502623cb8e3f1030cd759f41592c6460b32891e
+  metadata.gz: d3ccb31e36294882007c0e733fe4b4e3bf2bab717b3e4371a70d9b27282c062f006ddaaccfa9fdbdf47903e351eb70ee3aefeb441e1674e580d77d70e76fc9c9
+  data.tar.gz: 7c9a7cc677e1a3f3656e24897806c48f22ac75dc7f9f0bd2d34f0a008a24669559ab8193b6841c3e7ba164a8246e546f4af7b3cc56ae027ce3574e8df203c8bb

data/lib/smogon/abilitydex.rb

@@ -21,38 +21,35 @@ 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))
+        name   = name.downcase.gsub /\s/, ?_
+        url    = URI::encode "http://www.smogon.com/bw/abilities/#{name}"
+        smogon = Nokogiri::HTML open(url)
       rescue
         return nil
       end
       
-      ability = Ability.new
-      
-      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?
+      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?
+          }
         }
       }
-      
-      return ability
     end
   end
 end

data/lib/smogon/itemdex.rb

@@ -21,38 +21,35 @@ 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))
+        name   = name.downcase.gsub /\s/, ?_
+        url    = URI::encode "http://www.smogon.com/bw/items/#{name}"
+        smogon = Nokogiri::HTML open(url)
       rescue
         return nil
       end
       
-      item = Item.new
-      
-      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?
+      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?
+          }
         }
       }
-      
-      return item
     end
   end
 end

data/lib/smogon/movedex.rb

@@ -21,50 +21,48 @@ 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))
+        name   = name.downcase.gsub /\s/, ?_
+        url    = URI::encode "http://www.smogon.com/bw/moves/#{name}"
+        smogon = Nokogiri::HTML open(url)
       rescue
         return nil
       end
       
-      move = Move.new
-      
-      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?
+      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
       }
-      
-      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

data/lib/smogon/movesetdex.rb

@@ -21,68 +21,65 @@ module Smogon
   class Movesetdex 
     def self.get(name, tier, metagame)
       begin
-        url = URI::encode "http://www.smogon.com/#{metagame}/pokemon/#{name}/#{tier}"
-        
+        url    = URI::encode "http://www.smogon.com/#{metagame}/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
-        
-        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
-            else
-              moveset.moves << [a]
-            end
-            continue = false
+      [].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
         }
         
-        moveset.evs = s.xpath('.//td').last.text.strip if metagame != 'rb' && metagame != 'gs'
-        
-        movesets[i] = moveset
-        i += 1
+        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
+              else
+                moveset.moves << [a]
+              end
+              continue = false
+            end
+          }
+          
+          moveset.evs = s.xpath('.//td').last.text.strip if metagame != 'rb' && metagame != 'gs'
+          
+          movesets[i] = moveset
+          i += 1
+        }
       }
-     
-      return movesets
     end
   end
 end

data/lib/smogon/pokedex.rb

@@ -24,41 +24,40 @@ module Smogon
         url       = URI::encode "http://www.smogon.com/bw/pokemon/#{name}"
         moves_url = URI::encode "http://www.smogon.com/bw/pokemon/#{name}/moves"
 
-        pokemon = Pokemon.new
-        smogon  = Nokogiri::HTML open(url)
-        moves   = Nokogiri::HTML open(moves_url)
+        smogon  = Nokogiri::HTML open url
+        moves   = Nokogiri::HTML open moves_url
       rescue
         return nil
       end
-      
-      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
-      }
 
-      return pokemon
+      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

data/lib/smogon/types/ability.rb

@@ -22,11 +22,11 @@ module Smogon
     attr_accessor :name, :_name, :description
     
     def to_s
-      "Name: #{name}\nDescription: #{description}"
+      "Name: #{@name}\nDescription: #{@description}"
     end
     
     def url
-      "http://www.smogon.com/bw/abilities/#{_name}"
+      "http://www.smogon.com/bw/abilities/#{@_name}"
     end
   end
 end

data/lib/smogon/types/moveset.rb

@@ -32,6 +32,5 @@ module Smogon
     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}"
     end
-    
   end
 end

data/lib/smogon/types/pokemon.rb

@@ -22,18 +22,18 @@ module Smogon
     attr_accessor :name, :_name, :types, :tier, :abilities, :base_stats, :moves
     
     def to_s
-      "Name: #{name}\nAbility: #{abilities.join(', ')}\nType: #{types.join(?/)}\nTier: #{tier}\nBase stats: #{base_stats.join(?/)}\nMoves: #{moves.join(', ')}"
+      "Name: #{@name}\nAbility: #{@abilities.join(', ')}\nType: #{@types.join(?/)}\nTier: #{@tier}\nBase stats: #{@base_stats.join(?/)}\nMoves: #{@moves.join(', ')}"
     end
     
     def url
-      "http://www.smogon.com/bw/pokemon/#{_name}"
+      "http://www.smogon.com/bw/pokemon/#{@_name}"
     end
     
     def self.id2name(id)
       begin
-        return Nokogiri::HTML(open("http://www.marriland.com/pokedex/#{id}")).xpath('//div[@class="overview"]/h2')[0].text
+        Nokogiri::HTML(open("http://www.marriland.com/pokedex/#{id}")).xpath('//div[@class="overview"]/h2')[0].text
       rescue
-        return nil
+        nil
       end
     end
   end

data/lib/smogon/version.rb

@@ -19,6 +19,6 @@
 
 module Smogon
   def self.version
-    '0.4.3'
+    '0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smogon
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: '0.5'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri