battlenet-api 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d94d64ac8a17ab60791a9866ce0a6931da5fa830
-  data.tar.gz: 276fb263625a13ee0bc8e817de74764ed343f18f
+SHA256:
+  metadata.gz: c3ffc4db9dbc65f708fc5e0dafee49ed147af9147399b0d78ad5c48c881a3b6a
+  data.tar.gz: f904105696582f327eb828e65974ada0e28ef4c91075f059710c2bf7bb82cd24
 SHA512:
-  metadata.gz: e8d39c4264f3b883cd17594bbdba711ce268191c714c97c47e925fb3e55d97077f76494f9eaca6fdad343c0f66396ef19374edf792a4e49a8541703dc5c701de
-  data.tar.gz: 6d2bb6ea3f5b49229c396daa233d30855fcd0c3aef22e5fd7757331a0eed4844817a2d59e3245170aa25a5aa29403502b6278d17c2acceb3f9ea595aecf3601d
+  metadata.gz: 34a21c7d05f4676a8256c1ec9e037d71719db80f646b0d1753a5e6b42ad94b72232b7c61dd0b984091c1f88d2f0b3087ea1b0f2e3c983add0a274886269d581d
+  data.tar.gz: 8445140089e4890358b0cb9a9332da4434f001fc4a5580277697dc0cd2b70376f991af76a8dc70c2381a8141062bdfd8459d367221bf45a4ffdb22c25dbad82b

data/lib/battlenet/api/client.rb

@@ -4,62 +4,62 @@ require 'httparty'
 require 'addressable/uri'
 
 module Battlenet
+  class Client
+    attr_accessor *Configuration::OPTIONS_KEYS
 
-    class Client
-      include HTTParty
+    def initialize(options={})
+      options = Battlenet.options.merge(options)
 
-      attr_accessor *Configuration::OPTIONS_KEYS
-
-      def initialize(options={})
-        options = Battlenet.options.merge(options)
-
-        Configuration::OPTIONS_KEYS.each do |key|
-          send("#{key}=", options[key])
-        end
-        self.class.base_uri "https://#{domain}#{endpoint}"
+      Configuration::OPTIONS_KEYS.each do |key|
+        send("#{key}=", options[key])
       end
+    end
 
-      def domain
-        domain = case @region
-        when :us
-          'us.api.battle.net'
-        when :eu
-          'eu.api.battle.net'
-        when :kr
-          'kr.api.battle.net'
-        when :tw
-          'tw.api.battle.net'
-        when :cn
-          'api.battlenet.com.cn'
-        else
-          raise "Invalid region: #{region.to_s}"
-        end
-      end
+    def base_uri
+      "https://#{domain}#{endpoint}"
+    end
 
-      def endpoint
-          raise "Invalid Game Endpoint" if @endpoint == nil
-          @endpoint
+    def domain
+      domain = case @region
+      when :us
+        'us.api.battle.net'
+      when :eu
+        'eu.api.battle.net'
+      when :kr
+        'kr.api.battle.net'
+      when :tw
+        'tw.api.battle.net'
+      when :cn
+        'api.battlenet.com.cn'
+      else
+        raise "Invalid region: #{region.to_s}"
       end
+    end
 
-      def get(path, params = {})
-        make_request :get, path, params
-      end
+    def endpoint
+      raise "Invalid Game Endpoint" if @endpoint == nil
+      @endpoint
+    end
 
-      def make_request(verb, path, params = {})
-        options = {}
-        headers = {}
+    def get(path, params = {})
+      make_request :get, path, params
+    end
 
-        options[:headers] = headers unless headers.empty?
-        options[:query]   = params unless params.empty?
+    def make_request(verb, path, params = {})
+      options = {}
+      headers = {}
 
-        if @api_key
-          options[:query] ||= {}
-          options[:query].merge!({ :apikey => @api_key })
-        end
+      options[:headers] = headers unless headers.empty?
+      options[:query]   = params unless params.empty?
 
-        response = self.class.send(verb, Addressable::URI.encode(path), options)
+      if @api_key
+        options[:query] ||= {}
+        options[:query].merge!({ :apikey => @api_key })
       end
 
-    end
+      encoded_path = Addressable::URI.encode(path)
 
+      response = HTTParty.send(verb, "#{base_uri}#{encoded_path}" , options)
+    end
+  end
 end

data/lib/battlenet/api/configuration.rb

@@ -4,12 +4,14 @@ module Battlenet
     OPTIONS_KEYS = [
       :api_key,
       :region,
+      :locale,
       :endpoint
     ].freeze
 
     DEFAULT_API_KEY  = nil
     DEFAULT_ENDPOINT = nil
     DEFAULT_REGION   = :us
+    DEFAULT_LOCALE   = :en_US
 
     attr_accessor *OPTIONS_KEYS
 

data/lib/battlenet/api/version.rb

@@ -1,5 +1,5 @@
 module Battlenet
   module Api
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/spec/client_spec.rb

@@ -1,13 +1,14 @@
 require 'spec_helper'
 
 describe Battlenet::Client do
+  it 'is expected not to override API url when creating multiple clients' do
+    eu_client = Battlenet::Client.new(api_key: 'api_key', region: :eu, endpoint: '/wow')
+    expect(eu_client.base_uri).to eq 'https://eu.api.battle.net/wow'
 
-  before do
-    Battlenet.configure do |config|
-      config.api_key = ENV['BATTLENET_API_KEY']
-      config.region  = :us
-    end
-    @client = Battlenet::Client.new
+    us_client = Battlenet::Client.new(api_key: 'api_key', region: :us, endpoint: '/wow')
+    expect(us_client.base_uri).to eq 'https://us.api.battle.net/wow'
+
+    expect(eu_client.base_uri).to eq 'https://eu.api.battle.net/wow'
   end
 
   # it "should translate foreign characters for URLS (whispä)" do
@@ -17,5 +18,4 @@ describe Battlenet::Client do
   # it "should translate spaces accurately for URLS (emerald dream)" do
   #   character = @client.character({:realm => 'emerald dream', :character_name => 'pftpft'})
   # end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: battlenet-api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - goodcodeguy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Battlenet Client API