botemon 0.3 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTQ0ZGE1YzRlMjNlMTY1ZTRiMDA3ZTUzY2FhMmZmOGE2N2I0N2MxMQ==
+    ZjdjMjU4Y2VjNGRkMDlkY2Y2ZTNjNDIyNDNlMjRjZmJhODMxYzFjMg==
   data.tar.gz: !binary |-
-    ZDk0ODJiNWJlOGNkNWZjZTk0YjU3NjFlZmQxMDkwMGNkNTM1OTA1Mg==
+    NmMzMTQyNzlhNWRlZjM5MTg0YTlhOWFlZTc4OWRmY2I5MTYwYjAwOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWY4NTY4NmJmNWE5NzU0NGVjODY0YmNhNzAzNDAxNWEzYmE1MzAzODRjNjI3
-    YTljZmRlY2I0MGZlMTQ1MzEzZTRlOThjZTAwM2U1MmI1OGU5NTFlNjcxYzMw
-    OWNjOTc0OTQwYWEzZGI2ZGQ5OWY2NjA0NGRkZjVlZDgwYjU2YTE=
+    YTA5YWE3MDg4YjA5YTM5YTZlZDc2YmVmMzI1MGI2MmZmMTBlMGExYTUzM2Zi
+    ZTExYTFiZmZhMjA2MDg5NDU2MDRhYmI5NWJiNDI2MGE0Zjc4NTNmNzc3Mjc1
+    MjQ2NWZkYzc4NmEwMWE0ODRmMTY0NzBhNWIwMTE2YTczOGZjZWI=
   data.tar.gz: !binary |-
-    YjNjNjEwZTM5ODYzNzU3Y2E2M2QwNTU3MDdlODhmMDQ1ZDUzMTU4ODg1MTE4
-    ZDdkNGY2NTQ1ZmE0OTRjYWRmMWFjZTQ3YjE0NmFlMmViMjVmYjU0ZTc3NTQ0
-    ZThlM2M3ZGMwZjlmYThmZTA0YTEyMjE3OWNhYmIxNzQ0YWZmMzA=
+    YTY3NWIyNTFkM2M2M2IwOGMxMWYxMDIzNDhhNDhmYTJmNmQ4NTE5NGQ2Mjg2
+    OTkxN2Y5NmEzZWVmM2QwMTZhOTBhODdjYjQ5ODQwZWY2MTQzYzhiZWQzMTI5
+    NDgzOGQ2MGIwMzQ1MDA0OWU0OWRiNDRiNjY3YWE5MDZlMDFkM2I=

data/lib/botemon.rb

@@ -17,21 +17,20 @@
 # along with Botémon.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'cinch'
-require 'cinch/plugins/login'
-
 require 'open-uri'
 require 'nokogiri'
 require 'sanitize'
 require 'json'
 
+require 'cinch'
+require 'cinch/plugins/login'
+require 'smogon'
+
 require 'botemon/string'
-require 'botemon/pokemon'
+require 'botemon/smogon/pokemon'
+require 'botemon/smogon/moveset'
 require 'botemon/storage'
 require 'botemon/pokedex'
-
-require 'botemon/moveset'
 require 'botemon/movedex'
 
-
 require 'botemon/version'

data/lib/botemon/movedex.rb

@@ -19,71 +19,15 @@
 
 class Movedex 
   def self.id2name(id)
-    begin
-      return Nokogiri::HTML(open("http://pokemondb.net/pokedex/#{id}")).xpath('//div[@class="navbar"]/h1')[0].text
+    return begin
+      Nokogiri::HTML(open("http://pokemondb.net/pokedex/#{id}")).xpath('//div[@class="navbar"]/h1')[0].text
     rescue
-      return nil
+      nil
     end
   end
    
   def self.get(name, tier)
     return nil if name == nil || tier == nil
-    
-    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
+    return Smogon::Movedex.get name, tier
   end
 end

data/lib/botemon/pokedex.rb

@@ -28,42 +28,14 @@ class Pokedex
    
   def self.get(name, storage)
     return nil if name == nil
-    return storage.get(name) if storage.is_cached? name
     
-    begin
-      url = URI::encode "http://www.smogon.com/bw/pokemon/#{name}"
-      
-      pokemon = Pokemon.new
-      smogon = Nokogiri::HTML(open(url))
-    rescue
-      return nil
+    if storage.is_cached?(name)
+      return storage.get name
+    else
+      pokemon = Smogon::Pokedex.get name
+      storage.add pokemon
+      storage.save
+      return pokemon
     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 ability :(
-    end
-    
-    smogon.xpath('//td[@class="bar"]').each { |base_stat|
-      (pokemon.base_stats ||= []) << base_stat.text.strip
-    }
-    
-    storage.add pokemon
-    storage.save
-    return pokemon
   end
 end

data/lib/botemon/{moveset.rb → smogon/moveset.rb}

@@ -1,4 +1,3 @@
-#encoding: utf-8
 #--
 # Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
@@ -18,11 +17,13 @@
 # along with Botémon.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-class Moveset
-  attr_accessor :pokemon, :name, :tier, :item, :ability, :nature, :moves, :evs
-  
-  def to_s
-    "Item: #{item.join(' / ')}\nAbility: #{ability.join(' / ')}\nNature: #{nature.join(' / ')}\nMoves: #{''.tap { |s| moves.each { |move| s << move.join(' / ') + ', '}}[0..-3]}\nEVs: #{evs}"
+module Smogon
+  class Moveset
+    attr_accessor :pokemon, :name, :tier, :item, :ability, :nature, :moves, :evs
+    
+    def to_s
+      "Item: #{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/botemon/smogon/pokemon.rb

@@ -0,0 +1,53 @@
+#--
+# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
+#
+# This file is part of Botémon.
+#
+# Botémon 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.
+#
+# Botémon 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 Botémon.  If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module Smogon
+  class Pokemon
+    attr_accessor :name, :_name, :types, :tier, :abilities, :base_stats
+    
+    def to_s
+      "Name: #{name}\nAbility: #{abilities.join(', ')}\nType: #{types.join(?/)}\nTier: #{tier}\nBase stats: #{base_stats.join(?/)}"
+    end
+    
+    def clues
+      "Ability: #{abilities.join(', ')}\nType: #{types.join(?/)}\nTier: #{tier}\nBase stats: #{base_stats.join(?/)}"
+    end
+    
+    def self.to_pokemon(ary)
+      return Pokemon.new.tap { |pokemon|
+        pokemon.name       = ary['name']
+        pokemon._name      = ary['_name']
+        pokemon.types      = ary['types']
+        pokemon.tier       = ary['tier']
+        pokemon.abilities  = ary['abilities']
+        pokemon.base_stats = ary['base_stats']
+      }
+    end
+    
+    def to_ary
+      { 'name'       => name,
+        '_name'      => _name,
+        'types'      => types,
+        'tier'       => tier,
+        'abilities'  => abilities,
+        'base_stats' => base_stats
+      }
+    end
+  end
+end

data/lib/botemon/storage.rb

@@ -23,7 +23,7 @@ class Storage
   def initialize(file)
     @file = file
     @db = [].tap { |db|
-      (File.exists?(file) ? JSON.load(File.read(file)) : []).each { |p| db << Pokemon.to_pokemon(p) }
+      (File.exists?(file) ? JSON.load(File.read(file)) : []).each { |p| db << Smogon::Pokemon.to_pokemon(p) }
     }
   end
   

data/lib/botemon/version.rb

@@ -1,25 +1,24 @@
-#encoding: utf-8
 #--
 # Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
 #
-# This file is part of BOTémon.
+# This file is part of Botémon.
 #
-# BOTémon is free software: you can redistribute it and/or modify
+# Botémon 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.
 #
-# BOTémon is distributed in the hope that it will be useful,
+# Botémon 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 BOTémon.  If not, see <http://www.gnu.org/licenses/>.
+# along with Botémon.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
 module Botemon
   def self.version
-    '0.3'
+    '0.3.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: botemon
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.2
 platform: ruby
 authors:
 - Giovanni Capuano
@@ -11,7 +11,7 @@ cert_chain: []
 date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cinch
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cinch-login
+  name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: cinch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sanitize
+  name: cinch-login
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: smogon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -74,9 +88,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/botemon/movedex.rb
-- lib/botemon/moveset.rb
 - lib/botemon/pokedex.rb
-- lib/botemon/pokemon.rb
+- lib/botemon/smogon/moveset.rb
+- lib/botemon/smogon/pokemon.rb
 - lib/botemon/storage.rb
 - lib/botemon/string.rb
 - lib/botemon/version.rb

data/lib/botemon/pokemon.rb

@@ -1,51 +0,0 @@
-#--
-# Copyright(C) 2013 Giovanni Capuano <webmaster@giovannicapuano.net>
-#
-# This file is part of Botémon.
-#
-# Botémon 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.
-#
-# Botémon 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 Botémon.  If not, see <http://www.gnu.org/licenses/>.
-#++
-
-class Pokemon
-  attr_accessor :name, :_name, :types, :tier, :abilities, :base_stats
-  
-  def to_s
-    "Name: #{name}\nAbility: #{abilities.join(', ')}\nType: #{types.join(?/)}\nTier: #{tier}\nBase stats: #{base_stats.join(?/)}"
-  end
-  
-  def clues
-    "Ability: #{abilities.join(', ')}\nType: #{types.join(?/)}\nTier: #{tier}\nBase stats: #{base_stats.join(?/)}"
-  end
-  
-  def self.to_pokemon(ary)
-    pokemon = Pokemon.new
-    pokemon.name       = ary['name']
-    pokemon._name      = ary['_name']
-    pokemon.types      = ary['types']
-    pokemon.tier       = ary['tier']
-    pokemon.abilities  = ary['abilities']
-    pokemon.base_stats = ary['base_stats']
-    return pokemon
-  end
-  
-  def to_ary
-    { 'name'       => name,
-      '_name'      => _name,
-      'types'      => types,
-      'tier'       => tier,
-      'abilities'  => abilities,
-      'base_stats' => base_stats
-    }
-  end
-end