starcraft2 0.1.1 → 0.2.0

data/lib/starcraft2/character.rb

@@ -5,5 +5,11 @@ module Starcraft2
     def initialize(options = {})
       Utils.load(self, options)
     end
+
+    def self.build(characters)
+      characters.map do |c|
+        new(c)
+      end
+    end
   end
-end
+end

data/lib/starcraft2/client.rb

@@ -16,26 +16,22 @@ module Starcraft2
 
     def profile(options = {})
       if (args = [:character_name, :id, :realm] - options.keys).empty?
-        Profile.build(self, profile_json(options))
+        Profile.build(self, profile_data(options))
       else
         raise MissingArgumentsError, "Missing Keys: #{args.map {|i| ":#{i}"}.join(', ')}"
       end
     end
 
-    def matches(options = {})
-      Profile::Match.build(match_json(options))
-    end
-
     def achievements
-      Achievement.build(achievements_json)
+      Achievement.build(achievements_data)
     end
 
     def rewards
-      Reward.build(rewards_json)
+      Reward.build(rewards_data)
     end
 
     def ladder(id)
-      Ladder.build(ladder_json(id))
+      Ladder.build(ladder_data(id))
     end
 
     def grandmaster_ladder
@@ -48,8 +44,16 @@ module Starcraft2
 
     private
 
-    def profile_json(options)
-      get_body do
+    def matches(options = {})
+      Profile::Match.build(match_data(options))
+    end
+
+    def ladders(options = {})
+      Profile::Ladders.new(ladders_data(options))
+    end
+
+    def profile_data(options)
+      get_json do
         HTTParty.get(profile_url(options))
       end
     end
@@ -62,18 +66,28 @@ module Starcraft2
       "/api/sc2/profile/#{options[:id]}/#{options[:realm]}/#{options[:character_name]}/" + locale_param
     end
 
-    def match_json(options)
-      get_body do
+    def match_data(options)
+      get_json do
         HTTParty.get(match_url(options))
       end
     end
 
+    def ladders_data(options)
+      get_json do
+        HTTParty.get(ladders_url(options))
+      end
+    end
+
     def match_url(options)
       'https://' + host + profile_path(options) + 'matches' + locale_param
     end
 
-    def achievements_json
-      get_body do
+    def ladders_url(options)
+      'https://' + host + profile_path(options) + 'ladders' + locale_param
+    end
+
+    def achievements_data
+      get_json do
         HTTParty.get(achievements_url)
       end
     end
@@ -82,8 +96,8 @@ module Starcraft2
       'https://' + host + ACHIEVEMENTS_PATH + locale_param
     end
 
-    def rewards_json
-      get_body do
+    def rewards_data
+      get_json do
         HTTParty.get(rewards_url)
       end
     end
@@ -92,8 +106,8 @@ module Starcraft2
       'https://' + host + REWARDS_PATH + locale_param
     end
 
-    def ladder_json(id)
-      get_body do
+    def ladder_data(id)
+      get_json do
         HTTParty.get(ladder_url(id))
       end
     end
@@ -106,7 +120,7 @@ module Starcraft2
       locale.nil? ? '' : "?locale=#{locale}"
     end
 
-    def get_body
+    def get_json
       response = yield
       case response.code
         when 200

data/lib/starcraft2/loader.rb

@@ -24,4 +24,8 @@ require File.join('starcraft2', 'profile', 'rewards')
 require File.join('starcraft2', 'profile', 'achievements')
 require File.join('starcraft2', 'profile', 'points')
 require File.join('starcraft2', 'profile', 'achievement_item')
+require File.join('starcraft2', 'profile', 'ladders')
+require File.join('starcraft2', 'profile', 'detailed_season')
+require File.join('starcraft2', 'profile', 'non_rank')
+require File.join('starcraft2', 'profile', 'ladder')
 require File.join('starcraft2', 'profile')

data/lib/starcraft2/profile.rb

@@ -20,7 +20,11 @@ module Starcraft2
     end
 
     def matches
-      client.matches(:character_name => self.display_name, :id => self.id, :realm => self.realm)
+      client.send(:matches, {:character_name => self.display_name, :id => self.id, :realm => self.realm})
+    end
+
+    def ladders
+      client.send(:ladders, {:character_name => self.display_name, :id => self.id, :realm => self.realm})
     end
   end
 end

data/lib/starcraft2/profile/achievement_item.rb

@@ -7,11 +7,11 @@ module Starcraft2
         Utils.load(self, options)
       end
 
-      def self.build(achievement_item_data)
-        achievement_item_data.map do |a|
+      def self.build(achievements)
+        achievements.map do |a|
           new(a)
         end
       end
     end
   end
-end
+end

data/lib/starcraft2/profile/achievements.rb

@@ -4,8 +4,8 @@ module Starcraft2
       attr_accessor :points, :achievements
 
       def initialize(options = {})
-        Utils.load(self, options, { :points => Points }, {:achievements => AchievementItem})
+        Utils.load(self, options, {:points => Points}, {:achievements => AchievementItem})
       end
     end
   end
-end
+end

data/lib/starcraft2/profile/campaign.rb

@@ -3,9 +3,9 @@ module Starcraft2
     class Campaign
       attr_accessor :wol, :hots
 
-      def initialize(options)
+      def initialize(options = {})
         Utils.load(self, options)
       end
     end
   end
-end
+end

data/lib/starcraft2/profile/career.rb

@@ -4,9 +4,9 @@ module Starcraft2
       attr_accessor :primary_race, :league, :terran_wins, :protoss_wins, :zerg_wins,
                     :highest1v1_rank, :highest_team_rank, :season_total_games, :career_total_games
 
-      def initialize(options)
+      def initialize(options = {})
         Utils.load(self, options)
       end
     end
   end
-end
+end

data/lib/starcraft2/profile/detailed_season.rb

@@ -0,0 +1,17 @@
+module Starcraft2
+  class Profile
+    class DetailedSeason
+      attr_accessor :ladder, :characters, :non_ranked
+
+      def initialize(options = {})
+        Utils.load(self, options, {}, {:ladder => Ladder, :characters => ::Starcraft2::Character, :non_ranked => NonRank})
+      end
+
+      def self.build(detailed_season)
+        detailed_season.map do |ds|
+          new(ds)
+        end
+      end
+    end
+  end
+end

data/lib/starcraft2/profile/ladder.rb

@@ -0,0 +1,17 @@
+module Starcraft2
+  class Profile
+    class Ladder
+      attr_accessor :ladder_name, :ladder_id, :division, :rank, :league, :match_making_queue, :wins, :losses, :showcase
+
+      def initialize(options = {})
+        Utils.load(self, options)
+      end
+
+      def self.build(ladders)
+        ladders.map do |l|
+          new(l)
+        end
+      end
+    end
+  end
+end

data/lib/starcraft2/profile/ladders.rb

@@ -0,0 +1,11 @@
+module Starcraft2
+  class Profile
+    class Ladders
+      attr_accessor :current_season, :previous_season, :showcase_placement
+
+      def initialize(options = {})
+        Utils.load(self, options, {}, {:current_season => DetailedSeason, :previous_season => DetailedSeason})
+      end
+    end
+  end
+end

data/lib/starcraft2/profile/match.rb

@@ -14,4 +14,4 @@ module Starcraft2
       end
     end
   end
-end
+end

data/lib/starcraft2/profile/non_rank.rb

@@ -0,0 +1,18 @@
+module Starcraft2
+  class Profile
+    class NonRank
+      attr_accessor :mmq, :games_played
+
+      def initialize(options = {})
+        Utils.load(self, options)
+      end
+
+      def self.build(non_rank_data)
+        non_rank_data.map do |nr|
+          new(nr)
+        end
+      end
+    end
+  end
+end
+

data/lib/starcraft2/profile/points.rb

@@ -4,7 +4,7 @@ module Starcraft2
       attr_accessor :total_points, :category_points
 
       def initialize(options = {})
-        Utils.load(self, options, {:category_points => Hash })
+        Utils.load(self, options)
       end
     end
   end

data/lib/starcraft2/profile/season.rb

@@ -3,7 +3,7 @@ module Starcraft2
     class Season
       attr_accessor :season_id, :total_games_this_season, :stats
 
-      def initialize(options={})
+      def initialize(options = {})
         Utils.load(self, options, {}, {:stats => Stats})
       end
     end

data/lib/starcraft2/profile/stats.rb

@@ -7,8 +7,8 @@ module Starcraft2
         Utils.load(self, options)
       end
 
-      def self.build(stats_data)
-        stats_data.map do |s|
+      def self.build(stats)
+        stats.map do |s|
           new(s)
         end
       end

data/spec/starcraft2/achievement_spec.rb

@@ -1,13 +1,45 @@
 require 'spec_helper'
 
 describe Starcraft2::Achievement do
+  describe '.initialize' do
+    let(:achievement) { Starcraft2::Achievement.new(@options) }
+
+    before do
+      @options = {
+        'title' => 'Test Title',
+        'description' => 'Description',
+        'achievementId' => 5,
+        'categoryId' => 10,
+        'points' => 5,
+        'icon' => {'x' => 1, 'y' => 2, 'w' => 3, 'h' => 4, 'offset' => 0, 'url' => 'https://example.com'}
+      }
+    end
+
+    it 'should store attributes as underscored' do
+      achievement.title.should == 'Test Title'
+      achievement.description.should == 'Description'
+      achievement.achievement_id.should == 5
+      achievement.category_id.should == 10
+      achievement.points.should == 5
+      achievement.icon.x.should == 1
+      achievement.icon.y.should == 2
+      achievement.icon.w.should == 3
+      achievement.icon.h.should == 4
+      achievement.icon.offset.should == 0
+      achievement.icon.url.should == 'https://example.com'
+    end
+  end
+
   describe '#build' do
-    let(:achievements) { Starcraft2::Achievement.build(@achievements) }
+    let(:achievements) { Starcraft2::Achievement.build(@items) }
 
     before do
-      VCR.use_cassette('achievements') do
-        @achievements = JSON.parse(HTTParty.get('https://us.battle.net/api/sc2/data/achievements').body)
-      end
+      @items = {
+        'achievements' => [
+          {'title' => 'Test Title'},
+          {'title' => 'Another'}
+        ]
+      }
     end
 
     it 'should build an array of achievements' do
@@ -16,16 +48,16 @@ describe Starcraft2::Achievement do
         a.class.should == Starcraft2::Achievement
       end
     end
-  end
 
-  describe '.initialize' do
-    let(:achievement) { Starcraft2::Achievement.new(@options) }
+    it 'should build items using new' do
+      @items['achievements'].each do |i|
+        Starcraft2::Achievement.should_receive(:new).with(i)
+      end
 
-    before do
-      @options = {}
+      achievements
     end
 
-    it 'should import the first achievement' do
+    it 'should import the achievements from blizzard' do
       VCR.use_cassette('achievements') do
         @achievement = Starcraft2::Achievement.build(JSON.parse(HTTParty.get('https://us.battle.net/api/sc2/data/achievements').body)).first
       end
@@ -42,40 +74,5 @@ describe Starcraft2::Achievement do
       @achievement.icon.offset.should == 45
       @achievement.icon.url.should == 'http://media.blizzard.com/sc2/achievements/5-75.jpg'
     end
-
-    it 'should store the title' do
-      @options = {:title => 'Test Title'}
-      achievement.title.should == 'Test Title'
-    end
-
-    it 'should store the description' do
-      @options = {:description => 'Description'}
-      achievement.description.should == 'Description'
-    end
-
-    it 'should store the achievement id' do
-      @options = {:achievement_id => 5}
-      achievement.achievement_id.should == 5
-    end
-
-    it 'should store the category id' do
-      @options = {:category_id => 10}
-      achievement.category_id.should == 10
-    end
-
-    it 'should store the points' do
-      @options = {:points => 5}
-      achievement.points.should == 5
-    end
-
-    it 'should store the icon data' do
-      @options = {:icon => {'x' => 1, 'y' => 2, 'w' => 3, 'h' => 4, 'offset' => 0, 'url' => 'https://example.com'}}
-      achievement.icon.x.should == 1
-      achievement.icon.y.should == 2
-      achievement.icon.w.should == 3
-      achievement.icon.h.should == 4
-      achievement.icon.offset.should == 0
-      achievement.icon.url.should == 'https://example.com'
-    end
   end
 end

data/spec/starcraft2/character_spec.rb

@@ -5,37 +5,55 @@ describe Starcraft2::Character do
     let(:character) { Starcraft2::Character.new(@options) }
 
     before do
-      @options = {}
+      @options = {
+        'id' => 5,
+        'realm' => 'somewhere',
+        'displayName' => 'display me',
+        'clanName' => 'clan name',
+        'clanTag' => 'clan tag',
+        'profilePath' => '/some/path'
+      }
     end
 
-    it 'should store the id' do
-      @options = {:id => 5}
+    it 'should store attributes as underscored' do
       character.id.should == 5
-    end
-
-    it 'should store the realm' do
-      @options = {:realm => 'somewhere'}
       character.realm.should == 'somewhere'
+      character.display_name.should == 'display me'
+      character.clan_name.should == 'clan name'
+      character.clan_tag.should == 'clan tag'
+      character.profile_path.should == '/some/path'
     end
 
-    it 'should store the display_name' do
-      @options = {:display_name => 'display me'}
-      character.display_name.should == 'display me'
+    it 'should use Stracraft2::Utils.load to populate the model' do
+      Starcraft2::Utils.should_receive(:load).with(anything, @options)
+
+      character
     end
+  end
 
-    it 'should store the clan_name' do
-      @options = {:clan_name => 'clan name'}
-      character.clan_name.should == 'clan name'
+  describe '#build' do
+    let(:characters) { Starcraft2::Character.build(@items) }
+
+    before do
+      @items = [
+        {'id' => 1},
+        {'id' => 2}
+      ]
     end
 
-    it 'should store the clan_tag' do
-      @options = {:clan_tag => 'clan tag'}
-      character.clan_tag.should == 'clan tag'
+    it 'should build multiple character objects' do
+      characters.class.should == Array
+      characters.each do |s|
+        s.class.should == Starcraft2::Character
+      end
     end
 
-    it 'should store the profile_path' do
-      @options = {:profile_path => '/some/path'}
-      character.profile_path.should == '/some/path'
+    it 'should build items using new' do
+      @items.each do |i|
+        Starcraft2::Character.should_receive(:new).with(i)
+      end
+
+      characters
     end
   end
 end