wow_community_api 0.0.6 → 0.0.7

data/lib/wow_community_api/battle_net.rb

@@ -1,14 +1,18 @@
 module WowCommunityApi
   class BattleNet
     include HTTParty
+    
+    # TODO: make this configurable?
+    DEFAULT_REGION = Regions::US
   
     def self.region(name)
       self.base_uri "#{name}.battle.net/api/wow"
     end
-    base_uri region(Regions::US)
+    base_uri region(DEFAULT_REGION)
     
     def self.get(path, options = {})
-      super(URI.encode(path), options).to_ostruct
+      results = super(URI.encode(path), options)
+      results.to_ostruct if results.response.code == "200"
     end
 
   end

data/lib/wow_community_api/character.rb

@@ -1,7 +1,7 @@
 module WowCommunityApi
   class Character < BattleNet
     def self.find_by_realm_and_name(realm, name, *field)
-      fields = { :fields => field.join(",") } if field.size > 0
+      fields = { :fields => field.join(",") } unless field.empty?
       get("/character/#{realm}/#{name}", :query => fields)
     end
   end

data/lib/wow_community_api/guild.rb

@@ -1,7 +1,7 @@
 module WowCommunityApi
   class Guild < BattleNet
     def self.find_by_realm_and_name(realm, name, *field)
-      fields = { :fields => field.join(",") } if field.size > 0
+      fields = { :fields => field.join(",") } unless field.empty?
       get("/guild/#{realm}/#{name}", :query => fields)
     end
   end

data/lib/wow_community_api/realm.rb

@@ -1,11 +1,11 @@
 module WowCommunityApi
   class Realm < BattleNet
     def self.find_by_name(*name)
-      names = { :realms => name.join(",") } if name.size > 0
+      names = { :realms => name.join(",") } unless name.empty?
       results = get("/realm/status", :query => names)
       (name.size == 1) ? results.realms.first : results.realms
     end
-    
+
     def self.find_all()
       find_by_name
     end

data/lib/wow_community_api/version.rb

@@ -1,3 +1,3 @@
 module WowCommunityApi
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/battle_net_spec.rb

@@ -2,11 +2,29 @@ require 'spec_helper'
 
 describe BattleNet do
   describe "#region" do
+    before(:each) { BattleNet.region(Regions::US) }
+    
     it "sets the base uri to a region" do
       BattleNet.region(Regions::US).should == "http://us.battle.net/api/wow"
       BattleNet.region(Regions::EU).should == "http://eu.battle.net/api/wow"
       BattleNet.region(Regions::KR).should == "http://kr.battle.net/api/wow"
       BattleNet.region(Regions::TW).should == "http://tw.battle.net/api/wow"
     end
+    
+    it "defaults to US region" do
+      BattleNet::DEFAULT_REGION.should == Regions::US
+    end
+    
+    it "returns nil for 404 not found error" do
+      stub_error 'http://us.battle.net/api/wow/xyz', 404
+
+      BattleNet.get("/xyz").should be_nil
+    end
+    
+    it "returns nil for 500 server error" do
+      stub_error 'http://us.battle.net/api/wow/guild/arygos/xyz', 500
+
+      BattleNet.get("/guild/arygos/xyz").should be_nil
+    end
   end
 end

data/spec/fixtures/error.json

@@ -0,0 +1 @@
+{"status":"nok", "reason": "An error message."}

data/spec/spec_helper.rb

@@ -7,3 +7,8 @@ def stub_json(uri, filename)
   body = open("spec/fixtures/#{filename}")
   stub_request(:get, uri).to_return(:body => body, :headers => { 'Content-Type' => 'application/json' })
 end
+
+def stub_error(uri, status)
+  body = open("spec/fixtures/error.json")
+  stub_request(:get, uri).to_return(:body => body, :status => status)
+end

metadata

@@ -2,7 +2,7 @@
 name: wow_community_api
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - eddie cianci
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 Z
+date: 2011-07-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -86,6 +86,7 @@ files:
 - spec/fixtures/character-doe.json
 - spec/fixtures/character-guild.json
 - spec/fixtures/character.json
+- spec/fixtures/error.json
 - spec/fixtures/guild-all-fields.json
 - spec/fixtures/guild-dmc.json
 - spec/fixtures/guild-members.json
@@ -132,6 +133,7 @@ test_files:
 - spec/fixtures/character-doe.json
 - spec/fixtures/character-guild.json
 - spec/fixtures/character.json
+- spec/fixtures/error.json
 - spec/fixtures/guild-all-fields.json
 - spec/fixtures/guild-dmc.json
 - spec/fixtures/guild-members.json