battlenet-api 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a316e32b012140e2b53da8b7e7608cf794d08ed
-  data.tar.gz: dc4ecf71a16d9c6c7c9553f9b2d0814aff508656
+  metadata.gz: a1171469170368aa608c174bbfa4811ae1691f64
+  data.tar.gz: 294f0a5f031bb452b0f775c4287e5c12946fef67
 SHA512:
-  metadata.gz: b65070319198a863fd5e8110f42d6ca1e9de6d6b73f8c06cb3d9391eb7a791fc61bd752a69bf638073593fd68bdacf006b338576f1ca4b9df866a40c9a426331
-  data.tar.gz: 5029706a8cbab86b241a855100f96032b8c19a1146bd1fc0b8c10b73e6a29cf3b3505d9b4824151b6fac2471f22c2063f3d8537f4fc7f7b684d755a8d482e918
+  metadata.gz: cd7db73c41e97aebd1c7acc6dc5148a6bcc10de5ed2076122a86a2bdbbd9cabefc61393041cb99d743dcc3a2b45dcba3401271501cef6a6ea37524f2e75659e5
+  data.tar.gz: 497adf45736781823b0c623d10ef9ec7dfb2176a902cd8b345e4beecfe588d9d5149d807254555d3775c7231f2d6bd94022dda07e973d8f7c08a021c6c17b9a5

data/battlenet-api.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "httparty", "~> 0.13"
   spec.add_runtime_dependency "oauth2", "~> 1.0"
+  spec.add_runtime_dependency "addressable", "~> 2.3"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/battlenet/api.rb

@@ -6,8 +6,6 @@ require File.expand_path('../api/wow_client', __FILE__)
 require File.expand_path('../api/d3_client', __FILE__)
 require File.expand_path('../api/sc2_client', __FILE__)
 
-
-
 module Battlenet
   extend Configuration
 

data/lib/battlenet/api/client.rb

@@ -1,6 +1,7 @@
 require 'battlenet/api/version'
 require 'battlenet/api/api_response'
 require 'httparty'
+require 'addressable/uri'
 
 module Battlenet
 
@@ -30,6 +31,8 @@ module Battlenet
           'kr.api.battle.net'
         when :tw
           'tw.api.battle.net'
+        when :cn
+          'api.battlenet.com.cn'
         else
           raise "Invalid region: #{region.to_s}"
         end
@@ -37,7 +40,7 @@ module Battlenet
 
       def endpoint
           raise "Invalid Game Endpoint" if @endpoint == nil
-          @endpoint
+          Addressable::URI.encode(@endpoint)
       end
 
       def get(path, params = {})

data/lib/battlenet/api/version.rb

@@ -1,5 +1,5 @@
 module Battlenet
   module Api
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/battlenet/api/wow_client.rb

@@ -13,8 +13,6 @@ require 'battlenet/modules/wow/recipe'
 require 'battlenet/modules/wow/spell'
 require 'battlenet/modules/wow/data'
 
-#Dir[File.expand_path('../modules/wow/*.rb', __FILE__)].each{|f| require f}
-
 module Battlenet
 
   class WOWClient < Client
@@ -27,65 +25,60 @@ module Battlenet
     end
 
     def character_profile(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::CharacterProfile.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::CharacterProfile)
     end
 
     def guild_profile(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::GuildProfile.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::GuildProfile)
     end
 
     def item(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::Item.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::Item)
     end
 
     def item_set(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::ItemSet.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::ItemSet)
     end
 
     def achievement(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::Achievement.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::Achievement)
     end
 
     def auction(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::Auction.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::Auction)
     end
 
     def pvp_leaderboard(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::PVPLeaderboard.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::PVPLeaderboard)
     end
 
     def quest(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::Quest.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::Quest)
     end
 
     def realm(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::Realm.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::Realm)
     end
 
     def recipe(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::Recipe.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::Recipe)
     end
 
     def spell(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::Spell.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::Spell)
     end
 
     def data(options = {})
-      opts = options.merge({:client => self})
-      Battlenet::WOW::Data.new(opts)
+      merge_options_and_return_obj(options, Battlenet::WOW::Data)
     end
 
+    private
+
+      def merge_options_and_return_obj(options, obj)
+        opts = options.merge({:client => self})
+        obj.new(opts)
+      end
+
   end
 
 end

data/lib/battlenet/modules/wow/item.rb

@@ -3,7 +3,7 @@ module Battlenet
     class Item < Battlenet::APIResponse
 
       def initialize(options={})
-        @realm          = options.delete(:item)
+        @item          = options.delete(:item)
 
         @endpoint       = "/item/#{@item}"
 

data/lib/battlenet/modules/wow/spell.rb

@@ -3,9 +3,9 @@ module Battlenet
     class Spell < Battlenet::APIResponse
 
       def initialize(options={})
-        @realm          = options.delete(:spell)
+        @spell          = options.delete(:spell)
 
-        @endpoint       = "/item/#{@spell}"
+        @endpoint       = "/spell/#{@spell}"
 
         super(options)
       end

data/spec/battlenetapi_spec.rb

@@ -1,21 +1,17 @@
 require 'battlenet/api'
 
 describe Battlenet::Client do
-  it "should allow you to configure it for a valid region" do
-    Battlenet.configure do |config|
-      config.api_key = 'test-api'
-      config.region  = :eu
+  context "when special characters are in realm names" do
+    before do
+      Battlenet.configure do |config|
+        config.api_key = 'test-api'
+        config.region  = :eu
+      end
     end
 
-    a = Battlenet.WOWClient
-    expect(a.region).to eq(:eu)
-
-    Battlenet.configure do |config|
-      config.region = :us
+    it "should escape spaces in realm names" do
+      c = Battlenet::Client.new({domain: 'http://www.test.com', endpoint: "/emerald dream/mal'ganis"})
+      expect(c.endpoint).to eq('/emerald%20dream/mal\'ganis')
     end
-
-    b = Battlenet.WOWClient
-    expect(b.region).to eq(:us)
-    
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: battlenet-api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - goodcodeguy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Battlenet Client API