starcraft2 0.0.9 → 0.0.10

data/lib/starcraft2/achievement.rb

@@ -3,9 +3,7 @@ module Starcraft2
     attr_accessor :title, :description, :achievement_id, :category_id, :points, :icon
 
     def initialize(options = {})
-      options.each do |k,v|
-        self.send(:"#{StringUtils.underscore(k.to_s)}=", v)
-      end
+      Utils.load(self, options, {:icon => Icon})
     end
 
     def self.build(achievements_json)

data/lib/starcraft2/character.rb

@@ -3,9 +3,7 @@ module Starcraft2
     attr_accessor :id, :realm, :display_name, :clan_name, :clan_tag, :profile_path
 
     def initialize(options = {})
-      options.each do |k,v|
-        self.send(:"#{StringUtils.underscore(k.to_s)}=", v)
-      end
+      Utils.load(self, options)
     end
   end
 end

data/lib/starcraft2/client.rb

@@ -15,15 +15,15 @@ module Starcraft2
     end
 
     def achievements
-      Achievement.build(achievements_data)
+      Achievement.build(achievements_json)
     end
 
     def rewards
-      Reward.build(rewards_data)
+      Reward.build(rewards_json)
     end
 
     def ladder(id)
-      Ladder.build(ladder_data(id))
+      Ladder.build(ladder_json(id))
     end
 
     def grandmaster_ladder
@@ -36,32 +36,32 @@ module Starcraft2
 
     private
 
-    def achievements_data
+    def achievements_json
       HTTParty.get(achievements_url).body
     end
 
     def achievements_url
-      'http://' + host + ACHIEVEMENTS_PATH + locale_param
+      'https://' + host + ACHIEVEMENTS_PATH + locale_param
     end
 
-    def rewards_data
+    def rewards_json
       HTTParty.get(rewards_url).body
     end
 
     def rewards_url
-      'http://' + host + REWARDS_PATH + locale_param
+      'https://' + host + REWARDS_PATH + locale_param
     end
 
-    def ladder_data(id)
+    def ladder_json(id)
       HTTParty.get(ladder_url(id)).body
     end
 
     def ladder_url(id)
-      'http://' + host + LADDER_PATH + id.to_s + locale_param
+      'https://' + host + LADDER_PATH + id.to_s + locale_param
     end
 
     def locale_param
       locale.nil? ? '' : "?locale=#{locale}"
     end
   end
-end
+end

data/lib/starcraft2/icon.rb

@@ -0,0 +1,9 @@
+module Starcraft2
+  class Icon
+    attr_accessor :x, :y, :w, :h, :offset, :url
+
+    def initialize(options = {})
+      Utils.load(self, options)
+    end
+  end
+end

data/lib/starcraft2/loader.rb

@@ -1,7 +1,9 @@
+require 'ostruct'
 require 'httparty'
 require 'json'
 
-require File.join('starcraft2', 'string_utils')
+require File.join('starcraft2', 'utils')
+require File.join('starcraft2', 'icon')
 require File.join('starcraft2', 'client')
 require File.join('starcraft2', 'achievement')
 require File.join('starcraft2', 'reward')

data/lib/starcraft2/member.rb

@@ -4,10 +4,7 @@ module Starcraft2
     :losses, :highest_rank, :previous_rank, :favorite_race_p1, :favorite_race_p2, :favorite_race_p3, :favorite_race_p4
 
     def initialize(options = {})
-      options.each do |k,v|
-        v = Starcraft2::Character.new(v) if k.to_sym == :character
-        self.send(:"#{StringUtils.underscore(k.to_s)}=", v)
-      end
+      Utils.load(self, options, {:character => Character})
     end
   end
 end

data/lib/starcraft2/reward.rb

@@ -3,9 +3,7 @@ module Starcraft2
     attr_accessor :title, :id, :icon, :achievement_id
 
     def initialize(options = {})
-      options.each do |k,v|
-        self.send(:"#{StringUtils.underscore(k.to_s)}=", v)
-      end
+      Utils.load(self, options, {:icon => Icon})
     end
 
     def self.build(rewards_json)

data/lib/starcraft2/utils.rb

@@ -0,0 +1,21 @@
+module Starcraft2
+  class Utils
+    def self.underscore(string)
+      word = string.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+      word.tr!('-', '_')
+      word.downcase!
+      word
+    end
+
+    def self.load(klass, options, class_map = {})
+      options.each do |k, v|
+        v = class_map[k.to_sym].new(v) if class_map.keys.include?(k.to_sym)
+
+        klass.send(:"#{self.underscore(k.to_s)}=", v)
+      end
+    end
+  end
+end

data/spec/starcraft2/achievement_spec.rb

@@ -6,7 +6,7 @@ describe Starcraft2::Achievement do
 
     before do
       VCR.use_cassette('achievements') do
-        @achievements_json = HTTParty.get('http://us.battle.net/api/sc2/data/achievements').body
+        @achievements_json = HTTParty.get('https://us.battle.net/api/sc2/data/achievements').body
       end
     end
 
@@ -27,7 +27,7 @@ describe Starcraft2::Achievement do
 
     it 'should import the first achievement' do
       VCR.use_cassette('achievements') do
-        @achievement = Starcraft2::Achievement.build(HTTParty.get('http://us.battle.net/api/sc2/data/achievements').body).first
+        @achievement = Starcraft2::Achievement.build(HTTParty.get('https://us.battle.net/api/sc2/data/achievements').body).first
       end
 
       @achievement.title.should == 'FFA Destroyer'
@@ -35,7 +35,12 @@ describe Starcraft2::Achievement do
       @achievement.achievement_id.should == 91475320766632
       @achievement.category_id.should == 4325391
       @achievement.points.should == 10
-      @achievement.icon.should == {'x' => 0, 'y' => -375, 'w' => 75, 'h' => 75, 'offset' => 45, 'url' => 'http://media.blizzard.com/sc2/achievements/5-75.jpg'}
+      @achievement.icon.x.should == 0
+      @achievement.icon.y.should == -375
+      @achievement.icon.w.should == 75
+      @achievement.icon.h.should == 75
+      @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
@@ -64,8 +69,13 @@ describe Starcraft2::Achievement do
     end
 
     it 'should store the icon data' do
-      @options = {:icon => {'x' => 1, 'y' => 2, 'w' => 3, 'h' => 4, 'offset' => 0, 'url' => 'http://example.com'}}
-      achievement.icon.should == {'x' => 1, 'y' => 2, 'w' => 3, 'h' => 4, 'offset' => 0, 'url' => 'http://example.com'}
+      @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/client_spec.rb

@@ -106,9 +106,9 @@ describe Starcraft2::Client do
       member.character.clan_tag == ''
       member.character.profile_path == '/profile/2778732/1/lIlIlIlIlIlI/'
 
-      member.points.should == 2362.0
-      member.wins.should == 250
-      member.losses.should == 101
+      member.points.should == 2374.0
+      member.wins.should == 253
+      member.losses.should == 102
       member.join_timestamp.should == 1373859935
       member.highest_rank.should == 1
       member.previous_rank.should == 1

data/spec/starcraft2/icon_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Starcraft2::Icon do
+  describe '.initialize' do
+    let(:icon) { Starcraft2::Icon.new(@options) }
+
+    before do
+      @options = {}
+    end
+
+    it 'should store x' do
+      @options = {:x => 5}
+      icon.x.should == 5
+    end
+
+    it 'should store y' do
+      @options = {:y => 6}
+      icon.y.should == 6
+    end
+
+    it 'should store w' do
+      @options = {:w => 7}
+      icon.w.should == 7
+    end
+
+    it 'should store h' do
+      @options = {:h => 8}
+      icon.h.should == 8
+    end
+
+    it 'should store the offset' do
+      @options = {:offset => 0}
+      icon.offset.should == 0
+    end
+
+    it 'should store the url' do
+      @options = {:url => 'https://example.com'}
+      icon.url.should == 'https://example.com'
+    end
+  end
+end

data/spec/starcraft2/ladder_spec.rb

@@ -8,7 +8,7 @@ describe Starcraft2::Ladder do
 
     before do
       VCR.use_cassette("ladder_#{id}") do
-        @raw_ladder_data = HTTParty.get("http://us.battle.net/api/sc2/ladder/#{id}").body
+        @raw_ladder_data = HTTParty.get("https://us.battle.net/api/sc2/ladder/#{id}").body
       end
     end
 

data/spec/starcraft2/reward_spec.rb

@@ -6,7 +6,7 @@ describe Starcraft2::Reward do
 
     before do
       VCR.use_cassette('rewards') do
-        @raw_reward_data = HTTParty.get('http://us.battle.net/api/sc2/data/rewards').body
+        @raw_reward_data = HTTParty.get('https://us.battle.net/api/sc2/data/rewards').body
       end
     end
 
@@ -27,12 +27,17 @@ describe Starcraft2::Reward do
 
     it 'should import the first reward' do
       VCR.use_cassette('rewards') do
-        @reward = Starcraft2::Reward.build(HTTParty.get('http://us.battle.net/api/sc2/data/rewards').body).first
+        @reward = Starcraft2::Reward.build(HTTParty.get('https://us.battle.net/api/sc2/data/rewards').body).first
       end
 
       @reward.title.should == 'Kachinsky'
       @reward.id.should == 2951153716
-      @reward.icon.should == {'x' => 0, 'y' => 0, 'w' => 90, 'h' => 90, 'offset' => 0, 'url' => 'http://media.blizzard.com/sc2/portraits/0-90.jpg'}
+      @reward.icon.x.should == 0
+      @reward.icon.y.should == 0
+      @reward.icon.w.should == 90
+      @reward.icon.h.should == 90
+      @reward.icon.offset.should == 0
+      @reward.icon.url.should == 'http://media.blizzard.com/sc2/portraits/0-90.jpg'
       @reward.achievement_id.should == 0
     end
 
@@ -47,8 +52,13 @@ describe Starcraft2::Reward do
     end
 
     it 'should store the icon data' do
-      @options = {:icon => {'x' => 1, 'y' => 2, 'w' => 3, 'h' => 4, 'offset' => 0, 'url' => 'http://example.com'}}
-      reward.icon.should == {'x' => 1, 'y' => 2, 'w' => 3, 'h' => 4, 'offset' => 0, 'url' => 'http://example.com'}
+      @options = {:icon => {'x' => 1, 'y' => 2, 'w' => 3, 'h' => 4, 'offset' => 0, 'url' => 'https://example.com'}}
+      reward.icon.x.should == 1
+      reward.icon.y.should == 2
+      reward.icon.w.should == 3
+      reward.icon.h.should == 4
+      reward.icon.offset.should == 0
+      reward.icon.url.should == 'https://example.com'
     end
 
     it 'should store the achievement id' do

data/spec/starcraft2/utils_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Starcraft2::Utils do
+  describe '#underscore' do
+    it 'should underscore a string' do
+      Starcraft2::Utils.underscore('FooBar').should == 'foo_bar'
+    end
+  end
+
+  describe '#load' do
+    it 'should load attributes in a class' do
+      icon = Starcraft2::Icon.new()
+      icon.x.should == nil
+      icon.y.should == nil
+      Starcraft2::Utils.load(icon, {:x => 2, :y => 3})
+      icon.x.should == 2
+      icon.y.should == 3
+    end
+
+    it 'should allow a key to initialize another class' do
+      member = Starcraft2::Member.new()
+      Starcraft2::Utils.load(member, {:points => 10, :character => {:display_name => 'steve'}}, {:character => Starcraft2::Character})
+      member.points.should == 10
+      member.character.class.should == Starcraft2::Character
+      member.character.display_name.should == 'steve'
+    end
+  end
+end

data/starcraft2.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.name          = "starcraft2"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.9"
+  gem.version       = "0.0.10"
 
   gem.add_development_dependency 'rspec', '~> 2.6.0'
   gem.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: starcraft2
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Josh Ellithorpe
@@ -134,19 +134,21 @@ files:
 - lib/starcraft2/achievement.rb
 - lib/starcraft2/character.rb
 - lib/starcraft2/client.rb
+- lib/starcraft2/icon.rb
 - lib/starcraft2/ladder.rb
 - lib/starcraft2/loader.rb
 - lib/starcraft2/member.rb
 - lib/starcraft2/reward.rb
-- lib/starcraft2/string_utils.rb
+- lib/starcraft2/utils.rb
 - spec/spec_helper.rb
 - spec/starcraft2/achievement_spec.rb
 - spec/starcraft2/character_spec.rb
 - spec/starcraft2/client_spec.rb
+- spec/starcraft2/icon_spec.rb
 - spec/starcraft2/ladder_spec.rb
 - spec/starcraft2/member_spec.rb
 - spec/starcraft2/reward_spec.rb
-- spec/starcraft2/string_utils_spec.rb
+- spec/starcraft2/utils_spec.rb
 - starcraft2.gemspec
 homepage: ''
 licenses: []

data/lib/starcraft2/string_utils.rb

@@ -1,11 +0,0 @@
-class StringUtils
-  def self.underscore(string)
-    word = string.dup
-    word.gsub!(/::/, '/')
-    word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-    word.tr!('-', '_')
-    word.downcase!
-    word
-  end
-end

data/spec/starcraft2/string_utils_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe StringUtils do
-  describe '#underscore' do
-    it 'should underscore a string' do
-      StringUtils.underscore('FooBar').should == 'foo_bar'
-    end
-  end
-end