rshighscores 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c3fb91c10bab6b714839776d3c8c425d59ad2fa
-  data.tar.gz: f2d47f6a1cc8b731ec416bfdeab69111b3bcb7fc
+  metadata.gz: 65715b1d02915366ec42ac21a14426e2af3dc4e2
+  data.tar.gz: 045218ae68c4899ad5885dc2d9b1cdd0093ebb80
 SHA512:
-  metadata.gz: 6610d92a3acf36c1b0bf51f190d1ccfe423bcabaab11d80a8d6b13b265ed0006cfc5da28dde6d460d7834435431d388353adb3144991a827982cf4a8b942bac8
-  data.tar.gz: 39b637cb3057ab22a2ed0de7fb68be13d009dd48ffce723565100989535279649b51fcd9fe05aac12a90b84ff3da8bf0ad47abf4c288488eccce4da5f9ee496c
+  metadata.gz: 94bdf04ea1cbc42499029f6315f0413435af5b05bfd4304d6fc5b7c8a7a65db74d9f6921be90394c22ad0f4e221387cbfa1c3bdc62f0535bcd5259d2dd2e41a9
+  data.tar.gz: 77265f8db8e0aff161ff466fd32de31eaad7f9975b3eb504c7155556dd3349f5794fa409850bb5a407e8b988a9acb2b7b2eb114f5a4e37e9b751b827519294cc

data/lib/rshighscores.rb

@@ -1,9 +1,9 @@
-%w(player stats oldschool).each do |dep|
+%w(stats player oldschool).each do |dep|
   require "rshighscores/#{dep}"
 end
 
 module RsHighscores
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end
 
 module OSRS

data/lib/rshighscores/oldschool.rb

@@ -1,53 +1,15 @@
 module RsHighscores
   module OldSchool
-    class Player < RsHighscores::Player
-      def fetch_highscores
-        f = open("http://services.runescape.com/m=hiscore_oldschool/index_lite.ws?player=" + @name, "User-Agent" => "Ruby/RsHighscoresGrabber")
-        
-        @raw_stats = f.readlines.map &:chomp # readlines preserves newlines??
-        @stats = RsHighscores::OldSchool::Stats.new @raw_stats
-      end
-    end
-
     class Stats < RsHighscores::Stats
-      Skills = %w(Overall Attack Defence Strength
-                  Hitpoints Ranged Prayer Magic
-                  Cooking Woodcutting Fletching Fishing
-                  Firemaking Crafting Smithing Mining
-                  Herblore Agility Thieving Slayer
-                  Farming Runecrafting Hunter Construction)
+      Skills = RsHighscores::Stats::Skills.take(24)
 
       ExpectedStatCount = 39
-      ActualStatCount = 23
-
-      def validate_raw_stats
-        raise "incorrect input length" unless @raw_stats.length == ExpectedStatCount
-      end
-
-      def parse_stats
-      validate_raw_stats
-
-      @stats = []
-      @raw_stats.take(ActualStatCount).each do |line|
-        raise "malformed raw stats" unless line =~ /\d+,\d+,\d+/
-        stat = line.split(",").map(&:to_i)
-
-        class << stat
-          def method_missing name, *args
-            case name
-            when :rank
-              return self[0]
-            when :level
-              return self[1]
-            when :xp
-              return self[2]
-            end
-          end
-        end
-
-        @stats << stat
-      end
+      ActualStatCount = 24
     end
+
+    class Player < RsHighscores::Player
+      LookupUrl = "http://services.runescape.com/m=hiscore_oldschool/index_lite.ws?player="
+      StatClass = RsHighscores::OldSchool::Stats
     end
   end
 end

data/lib/rshighscores/player.rb

@@ -2,6 +2,9 @@ require 'open-uri'
 
 module RsHighscores
   class Player
+    LookupUrl = "http://hiscore.runescape.com/index_lite.ws?player="
+    StatClass = RsHighscores::Stats
+
     attr_reader :name, :raw_stats, :stats
 
     def initialize name, force = :no_force
@@ -21,10 +24,10 @@ module RsHighscores
     end
 
     def fetch_highscores
-      f = open("http://hiscore.runescape.com/index_lite.ws?player=" + @name, "User-Agent" => "Ruby/RsHighscoresGrabber")
+      f = open(self.class::LookupUrl + @name, "User-Agent" => "Ruby/RsHighscoresGrabber")
       
       @raw_stats = f.readlines.map &:chomp # readlines preserves newlines??
-      @stats = RsHighscores::Stats.new @raw_stats
+      @stats = self.class::StatClass.new @raw_stats
     end
   end
 end

data/lib/rshighscores/stats.rb

@@ -20,14 +20,14 @@ module RsHighscores
     end
 
     def validate_raw_stats
-      raise "incorrect input length" unless @raw_stats.length == ExpectedStatCount
+      raise "incorrect input length" unless @raw_stats.length == self.class::ExpectedStatCount
     end
 
     def parse_stats
       validate_raw_stats
 
       @stats = []
-      @raw_stats.take(ActualStatCount).each do |line|
+      @raw_stats.take(self.class::ActualStatCount).each do |line|
         raise "malformed raw stats" unless line =~ /\d+,\d+,\d+/
         stat = line.split(",").map(&:to_i)
 
@@ -50,9 +50,9 @@ module RsHighscores
 
     def [] skill
       skill = skill.to_s.capitalize
-      raise "non-existant skill lookup" unless Skills.index(skill)
+      raise "non-existant skill lookup" unless self.class::Skills.index(skill)
 
-      stats[Skills.index(skill)]
+      stats[self.class::Skills.index(skill)]
     end
 
     def method_missing name, *args

data/rshighscores.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["sam@26th-zerk.co.uk"]
   spec.description   = %q{Easy to use gem for downloading and parsing Runescape highscores} 
   spec.summary       = %q{RS Highscore Parser}
-  spec.homepage      = "https://github.com/sambooo/OSRSGrabber"
+  spec.homepage      = "https://github.com/sambooo/RsHighscores"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/spec/oldschool_spec.rb

@@ -21,5 +21,20 @@ describe RsHighscores::OldSchool::Player do
                                       Herblore Agility Thieving Slayer
                                       Farming Runecrafting Hunter Construction))
     end
+
+    it "individual skill lookup" do
+      @stats.stats.each do |stat|
+        stat.should be_a(Array)
+        stat.each do |elem|
+          elem.should be_a(Numeric)
+        end
+      end
+    end
+
+    it "named stat lookup" do
+      OSRS::Stats::Skills.each do |skill|
+        @stats.send(skill.to_sym).should be_a(Array)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rshighscores
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Sam Broughton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,7 @@ files:
 - spec/oldschool_spec.rb
 - spec/player_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/sambooo/OSRSGrabber
+homepage: https://github.com/sambooo/RsHighscores
 licenses:
 - MIT
 metadata: {}