starcraft2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08741dd794e9bd5b5ac4e64c4de0c8fd4263e31f
-  data.tar.gz: 5954f75fcb88aa8a941ab80a8915632b4c7655c0
+  metadata.gz: ae4ebd851c581a60a04334ee02445b8f53d0f8a6
+  data.tar.gz: 86579b56eedd10f2ba72309c6b52d13dc9aa0a9d
 SHA512:
-  metadata.gz: aee87b02d3d1234b818007df6f15161ab3af7cf5542258adf9896f3c5cf34051c284ae58071ed5e74fec3f5cf1a4c458b52aff19bbbbf58586d9a51d87a46b91
-  data.tar.gz: 65b2b8b08b4539b5c6a7cdac0b92dab59c280129e84913536ed27a7471840f71a1b6234e539c02d3a696c0fff5a2d5571b4521f15fa95ca620ff445d4732f5e1
+  metadata.gz: eed2a2067825ae0df56f0029512cff259839b9e941520d6ceeede9af6c412d036c0203f3a656bf296a539d39e61a8e521f353ec078a2e939163d72ef4548d30c
+  data.tar.gz: 9ddac4a3333d6bd492555122c064b33b3afe1c50d7f1baa3ec9bd56f10fc16541c113bf064317cf1da7098cca087ff0142b97fdba4994cefc669bee5b48cad05

data/lib/starcraft2/achievement.rb

@@ -6,8 +6,7 @@ module Starcraft2
       Utils.load(self, options, {:icon => Icon})
     end
 
-    def self.build(achievements_json)
-      data = JSON.parse(achievements_json)
+    def self.build(data)
       data['achievements'].map do |achievement|
         new(achievement)
       end

data/lib/starcraft2/client.rb

@@ -42,14 +42,16 @@ module Starcraft2
       ladder('grandmaster')
     end
 
-    def previous_grandmaster_ladder
+    def last_grandmaster_ladder
       ladder('grandmaster/last')
     end
 
     private
 
     def profile_json(options)
-      HTTParty.get(profile_url(options)).body
+      get_body do
+        HTTParty.get(profile_url(options))
+      end
     end
 
     def profile_url(options)
@@ -61,7 +63,9 @@ module Starcraft2
     end
 
     def match_json(options)
-      HTTParty.get(match_url(options)).body
+      get_body do
+        HTTParty.get(match_url(options))
+      end
     end
 
     def match_url(options)
@@ -69,7 +73,9 @@ module Starcraft2
     end
 
     def achievements_json
-      HTTParty.get(achievements_url).body
+      get_body do
+        HTTParty.get(achievements_url)
+      end
     end
 
     def achievements_url
@@ -77,7 +83,9 @@ module Starcraft2
     end
 
     def rewards_json
-      HTTParty.get(rewards_url).body
+      get_body do
+        HTTParty.get(rewards_url)
+      end
     end
 
     def rewards_url
@@ -85,7 +93,9 @@ module Starcraft2
     end
 
     def ladder_json(id)
-      HTTParty.get(ladder_url(id)).body
+      get_body do
+        HTTParty.get(ladder_url(id))
+      end
     end
 
     def ladder_url(id)
@@ -95,5 +105,27 @@ module Starcraft2
     def locale_param
       locale.nil? ? '' : "?locale=#{locale}"
     end
+
+    def get_body
+      response = yield
+      case response.code
+        when 200
+          body = JSON.parse(response.body)
+          case body['code']
+            when 200
+              body
+            when 404
+              raise Starcraft2::NotFoundError, body['message'] || body['reason']
+            when 500
+              raise Starcraft2::ApiError, body['message'] || body['reason']
+            else
+              body
+          end
+        when 404
+          raise Starcraft2::NotFoundError, 'Record not found.'
+        when 500
+          raise Starcraft2::ApiError, 'An API error occurred.'
+      end
+    end
   end
 end

data/lib/starcraft2/errors/api_error.rb

@@ -0,0 +1,4 @@
+module Starcraft2
+  class ApiError < StandardError
+  end
+end

data/lib/starcraft2/errors/not_found_error.rb

@@ -0,0 +1,4 @@
+module Starcraft2
+  class NotFoundError < StandardError
+  end
+end

data/lib/starcraft2/ladder.rb

@@ -1,7 +1,6 @@
 module Starcraft2
   class Ladder
-    def self.build(ladder_json)
-      data = JSON.parse(ladder_json)
+    def self.build(data)
       data['ladderMembers'].map do |member|
         Member.new(member)
       end

data/lib/starcraft2/loader.rb

@@ -3,6 +3,8 @@ require 'httparty'
 require 'json'
 
 require File.join('starcraft2', 'errors', 'missing_arguments_error')
+require File.join('starcraft2', 'errors', 'api_error')
+require File.join('starcraft2', 'errors', 'not_found_error')
 require File.join('starcraft2', 'utils')
 require File.join('starcraft2', 'icon')
 require File.join('starcraft2', 'client')

data/lib/starcraft2/profile/match.rb

@@ -7,8 +7,7 @@ module Starcraft2
         Utils.load(self, options)
       end
 
-      def self.build(match_json)
-        data = JSON.parse(match_json)
+      def self.build(data)
         data['matches'].map do |m|
           new(m)
         end

data/lib/starcraft2/profile.rb

@@ -15,9 +15,8 @@ module Starcraft2
       })
     end
 
-    def self.build(client, profile_json)
-      profile = JSON.parse(profile_json)
-      new(profile.merge!(:client => client))
+    def self.build(client, data)
+      new(data.merge!(:client => client))
     end
 
     def matches

data/lib/starcraft2/reward.rb

@@ -6,8 +6,7 @@ module Starcraft2
       Utils.load(self, options, {:icon => Icon})
     end
 
-    def self.build(rewards_json)
-      data = JSON.parse(rewards_json)
+    def self.build(data)
       data['portraits'].map do |reward|
         new(reward)
       end

data/spec/starcraft2/achievement_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe Starcraft2::Achievement do
   describe '#build' do
-    let(:achievements) { Starcraft2::Achievement.build(@achievements_json) }
+    let(:achievements) { Starcraft2::Achievement.build(@achievements) }
 
     before do
       VCR.use_cassette('achievements') do
-        @achievements_json = HTTParty.get('https://us.battle.net/api/sc2/data/achievements').body
+        @achievements = JSON.parse(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('https://us.battle.net/api/sc2/data/achievements').body).first
+        @achievement = Starcraft2::Achievement.build(JSON.parse(HTTParty.get('https://us.battle.net/api/sc2/data/achievements').body)).first
       end
 
       @achievement.title.should == 'FFA Destroyer'

data/spec/starcraft2/client_spec.rb

@@ -52,10 +52,6 @@ describe Starcraft2::Client do
     end
   end
 
-  VCR.use_cassette("profile_#{999000}") do
-    @profile_json = HTTParty.get('https://us.battle.net/api/sc2/profile/999000/1/DayNine/').body
-  end
-
   describe '.achievements' do
     it 'should return an array of achievements' do
       VCR.use_cassette('achievements') do

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("https://us.battle.net/api/sc2/ladder/#{id}").body
+        @raw_ladder_data = JSON.parse(HTTParty.get("https://us.battle.net/api/sc2/ladder/#{id}").body)
       end
     end
 

data/spec/starcraft2/profile_spec.rb

@@ -5,11 +5,11 @@ describe Starcraft2::Profile do
   let(:profile) { Starcraft2::Profile.new(@options) }
 
   describe '#build' do
-    let(:profile) { Starcraft2::Profile.build(client, @profile_json) }
+    let(:profile) { Starcraft2::Profile.build(client, @profile) }
 
     before do
       VCR.use_cassette("profile_999000") do
-        @profile_json = HTTParty.get('https://us.battle.net/api/sc2/profile/999000/1/DayNine/').body
+        @profile = JSON.parse(HTTParty.get('https://us.battle.net/api/sc2/profile/999000/1/DayNine/').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('https://us.battle.net/api/sc2/data/rewards').body
+        @raw_reward_data = JSON.parse(HTTParty.get('https://us.battle.net/api/sc2/data/rewards').body)
       end
     end
 
@@ -27,7 +27,7 @@ describe Starcraft2::Reward do
 
     it 'should import the first reward' do
       VCR.use_cassette('rewards') do
-        @reward = Starcraft2::Reward.build(HTTParty.get('https://us.battle.net/api/sc2/data/rewards').body).first
+        @reward = Starcraft2::Reward.build(JSON.parse(HTTParty.get('https://us.battle.net/api/sc2/data/rewards').body)).first
       end
 
       @reward.title.should == 'Kachinsky'

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.1.0"
+  gem.version       = "0.1.1"
 
   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.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Josh Ellithorpe
@@ -136,7 +136,9 @@ files:
 - lib/starcraft2/achievement.rb
 - lib/starcraft2/character.rb
 - lib/starcraft2/client.rb
+- lib/starcraft2/errors/api_error.rb
 - lib/starcraft2/errors/missing_arguments_error.rb
+- lib/starcraft2/errors/not_found_error.rb
 - lib/starcraft2/icon.rb
 - lib/starcraft2/ladder.rb
 - lib/starcraft2/loader.rb