bnet_api 0.1.5 → 1.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjEwNzFmMzlkNTRhZDAwMzYwMjU3MTI4NmNlYmM2OTg2YTBmMDAyZg==
-  data.tar.gz: !binary |-
-    Njg1Y2JiNmJmMmU2ODk5ZjNkZmZjYmVkODk1ZGI5MzM3MzljNGJjZg==
+SHA1:
+  metadata.gz: dce6fc4f722c71738fe977fc830d67a77534995b
+  data.tar.gz: 21ee936c8e7595326a34b1c8fdbe934e2a031a73
 SHA512:
-  metadata.gz: !binary |-
-    Y2VhNzgzZDcyODk3YWY2NGRhNDQ4ZDBkNmI4MTg5MjYyNTE2MGJmZWFmN2Uw
-    OGY0OTdkN2Y0NjkwZmI4ZmJjNjgzMTg3ZTBjMzIxZDZmMGY3OGY5NDZhZmE1
-    OWRmZmQ4MjhiNDI5MTYzOTAxMmUxNDA5NzRjNWFkMjJjYmJiNjI=
-  data.tar.gz: !binary |-
-    Y2IzYTM4MjRjYjM0MmM2ODlkMWM5M2ZhNWI4NmY0YzE5NjM4OTU3Mjc0NzY0
-    ZGJmMjFjMGM2ODBkZjU5ZjM4NDI4NzhhMTY5MDk4NjI2MTViZjhmYmZkN2Qw
-    Y2VmMjY0MmQ2Y2EwY2U3NzczZWEyYjgzYjUxYjczMDU4ODY4Nzc=
+  metadata.gz: 3d8b900eecc6e9cc6521930fecd0f74d02bbdf6fe22430d52060d4ed5421eb3243892b5886761ceeac9144f893574541d6b45cd18c0076b5f8164fa7755a3640
+  data.tar.gz: 28ded9244f9c293c406af90d696797c3ee8c322147b7bc34567644a20e4af88586186e1c2f68282a777b301746e45e1b94411fc4a5b2d571c18e74eeefa6ddca

data/.travis.yml

@@ -1,10 +1,8 @@
 language: ruby
 
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
-  - jruby-19mode
   - jruby-head
   - rbx-2
   - ruby-head

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.0.2
+
+* Removed development dependencies from gemspec
+
+# 1.0.1
+
+* Added required ruby version to gemspec
+
+# 1.0.0
+
+* Require Ruby >= 2.0.0
+* Updated old WoW Battlepet APIs to use new Pet APIs
+
 # 0.1.4
 
 * Added Starcraft II APIs

data/Gemfile

@@ -5,7 +5,7 @@ gem 'rake'
 group :test do
   gem 'coveralls'
   gem 'simplecov'
-  gem 'rspec', '>= 2.14'
+  gem 'rspec', '>= 3.5'
 end
 
 gemspec

data/LICENSE.md

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Tom Connolly
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+The MIT License (MIT)
+
+Copyright (c) 2014 Tom Connolly
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

data/README.md

@@ -12,6 +12,10 @@ A Ruby wrapper for the Battle.net API.
 
 	gem install bnet_api
 
+## Requirements
+
+* Ruby 2.0.0 or higher
+
 ## Configuration
 
 You need to set at least the Battle.net API key in the configuration, either in the code or in an initializer.

data/Rakefile

@@ -1,6 +1,6 @@
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-
-task test: :spec
-
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task test: :spec
+
 task default: [:spec]

data/bnet_api.gemspec

@@ -1,25 +1,24 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'bnet_api/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "bnet_api"
-  spec.version       = BnetApi::VERSION
-  spec.authors       = ["Tom Connolly"]
-  spec.email         = ["tconnolly1991@gmail.com"]
-  spec.summary       = %q{Ruby wrapper for the Battle.net web API.}
-  spec.description   = %q{Ruby wrapper for the Battle.net web API. For more info visit https://dev.battle.net}
-  spec.homepage      = "https://github.com/tconnolly/bnetapi"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency 'httparty', '0.13.3'
-
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rspec'
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'bnet_api/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "bnet_api"
+  spec.version       = BnetApi::VERSION
+  spec.authors       = ["Tom Connolly"]
+  spec.email         = ["tconnolly1991@gmail.com"]
+  spec.summary       = %q{Ruby wrapper for the Battle.net web API.}
+  spec.description   = %q{Ruby wrapper for the Battle.net web API. For more info visit https://dev.battle.net}
+  spec.homepage      = "https://github.com/tconnolly/bnetapi"
+  spec.license       = "MIT"
+  
+  spec.required_ruby_version = '>= 2.0.0'
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'httparty', '0.14.0'
 end

data/lib/bnet_api/version.rb

@@ -1,3 +1,3 @@
 module BnetApi
-	VERSION = '0.1.5'
+	VERSION = '1.0.2'
 end

data/lib/bnet_api/wow.rb

@@ -21,43 +21,6 @@ module BnetApi
       BnetApi.make_request("/wow/auction/data/#{realm}")
     end
 
-    # Retrieves the battlepet ability with the specified ID.
-    #
-    # @param id [Integer] The ID of the ability.
-    # @return [Hash] A hash containing the ability data.
-    def battlepet_ability(id)
-      BnetApi.make_request("/wow/battlePet/ability/#{id}")
-    end
-
-    # Retrieves the battlepet species with the specified ID.
-    #
-    # @param id [Integer] The ID of the species.
-    # @return [Hash] A hash containing the species data.
-    def battlepet_species(id)
-      BnetApi.make_request("/wow/battlePet/species/#{id}")
-    end
-
-    # Retrieves the stats for the battlepet with the specified ID.
-    #
-    # @param species_id [Integer] The ID of the battlepet species.
-    # @param options [Hash] Any additional options.
-    # @option options [Integer] :level The level of the species.
-    # @option options [Integer] :breedId The ID of the breed.
-    # @option options [Integer] :qualityId The quality of the battlepet.
-    # @return [Hash] A hash containing the battlepet stats data.
-    def battlepet_stats(species_id, options = {})
-      level = options[:level] || 1
-      breedId = options[:breedId] || 3
-      qualityId = options[:qualityId] || 1
-
-      BnetApi.make_request_with_params("/wow/battlePet/stats/#{species_id}",
-        { 
-          level: level, 
-          breedId: breedId, 
-          qualityId: qualityId }
-      )
-    end
-
     # Retrieves the challenge mode leaderboard for the specified realm.
     #
     # @param realm [String] The realm to retrieve the leaderboard for.
@@ -114,6 +77,50 @@ module BnetApi
       end
       BnetApi.make_request("/wow/guild/#{URI.escape(realm)}/#{URI.escape(name)}", optional_fields)
     end
+    
+    # Retrieves a list of all battle and vanity pets.
+    #
+    # @return [Hash] A hash containing a list of pets.
+    def pet_master_list
+      BnetApi.make_request("/wow/pet/")
+    end
+    
+    # Retrieves the pet ability with the specified ID.
+    #
+    # @param id [Integer] The ID of the ability.
+    # @return [Hash] A hash containing the ability data.
+    def pet_ability(id)
+      BnetApi.make_request("/wow/pet/ability/#{id}")
+    end
+
+    # Retrieves the pet species with the specified ID.
+    #
+    # @param id [Integer] The ID of the species.
+    # @return [Hash] A hash containing the species data.
+    def pet_species(id)
+      BnetApi.make_request("/wow/pet/species/#{id}")
+    end
+
+    # Retrieves the stats for the pet with the specified ID.
+    #
+    # @param species_id [Integer] The ID of the pet species.
+    # @param options [Hash] Any additional options.
+    # @option options [Integer] :level The level of the species.
+    # @option options [Integer] :breedId The ID of the breed.
+    # @option options [Integer] :qualityId The quality of the pet.
+    # @return [Hash] A hash containing the pet stats data.
+    def pet_stats(species_id, options = {})
+      level = options[:level] || 1
+      breedId = options[:breedId] || 3
+      qualityId = options[:qualityId] || 1
+
+      BnetApi.make_request_with_params("/wow/pet/stats/#{species_id}",
+        { 
+          level: level, 
+          breedId: breedId, 
+          qualityId: qualityId }
+      )
+    end
 
     # Retrieves the PvP leaderboard for the specified bracket.
     #

data/spec/bnet_api/bnet_api_spec.rb

@@ -1,18 +1,18 @@
-require 'spec_helper'
-
-describe BnetApi do
-
-  before :each do
-    BnetApi.configure do |config|
-      config.api_key = ENV['BNET_API_KEY']
-      config.api_secret = ENV['BNET_API_SECRET']
-    end
-  end
-
-  it "sets up the configuration" do
-    expect(BnetApi.config.region).to eq(:eu)
-    expect(BnetApi.config.locale).to eq(:en_GB)
-    expect(BnetApi.config.api_key).to eq(ENV['BNET_API_KEY'])
-    expect(BnetApi.config.api_secret).to eq(ENV['BNET_API_SECRET'])
-  end
+require 'spec_helper'
+
+describe BnetApi do
+
+  before :each do
+    BnetApi.configure do |config|
+      config.api_key = ENV['BNET_API_KEY']
+      config.api_secret = ENV['BNET_API_SECRET']
+    end
+  end
+
+  it "sets up the configuration" do
+    expect(BnetApi.config.region).to eq(:eu)
+    expect(BnetApi.config.locale).to eq(:en_GB)
+    expect(BnetApi.config.api_key).to eq(ENV['BNET_API_KEY'])
+    expect(BnetApi.config.api_secret).to eq(ENV['BNET_API_SECRET'])
+  end
 end

data/spec/bnet_api/d3_spec.rb

@@ -1,92 +1,92 @@
-require 'spec_helper'
-
-describe BnetApi::D3 do
-
-  before :each do
-    BnetApi.configure do |config|
-      config.api_key = ENV['BNET_API_KEY']
-      config.api_secret = ENV['BNET_API_SECRET']
-    end
-  end
-
-  it "gets a career profile from the API" do
-    profile = BnetApi::D3.career_profile('Ragwolf#2851')
-
-    expect(profile['battleTag']).to eq 'Ragwolf#2851'
-    expect(profile['heroes']).not_to be_nil
-  end
-
-  it "gets a hero profile from the API" do
-    profile = BnetApi::D3.hero_profile('Ragwolf#2851', 47516365)
-
-    expect(profile['name']).to eq 'Ragwolf'
-    expect(profile['class']).to eq 'demon-hunter'
-    expect(profile['skills']).not_to be_nil
-  end
-
-  it "gets the data for an item from the API" do
-    item = BnetApi::D3.item_data('Co4BCJbokeUHEgcIBBV_-U5dHcj6vKAdjs3dnR2dB5UkHSCd5AQd6XAvux3DDZzlIgsIARW1RAMAGAogJjCLAjjqA0AASBNQEFgEYOwEaisKDAgAEMPSgK2BgIDAEhIbCJ7JnZUJEgcIBBUVn9irMIsCOABAAVgEkAEBpQEgneQErQFmIwZQuAHSiJmSBcABBhj-5ffUC1AAWAI')
-
-    expect(item['id']).to eq 'Helm_208'
-    expect(item['name']).to eq 'Prime Shelter'
-    expect(item['icon']).to eq 'helm_208_demonhunter_male'
-    expect(item['displayColor']).to eq 'yellow'
-  end
-
-  it "gets the data for the templar follower from the API" do
-    follower = BnetApi::D3.follower_data('templar')
-
-    expect(follower['slug']).to eq 'templar'
-    expect(follower['name']).to eq 'Templar'
-    expect(follower['realName']).to eq 'd3.follower.templar.realName'
-    expect(follower['portrait']).to eq 'templar'
-    expect(follower['skills']).not_to be_nil
-  end
-
-  it "gets the data for the enchantress follower from the API" do
-    follower = BnetApi::D3.follower_data('enchantress')
-
-    expect(follower['slug']).to eq 'enchantress'
-    expect(follower['name']).to eq 'Enchantress'
-    expect(follower['realName']).to eq 'd3.follower.enchantress.realName'
-    expect(follower['portrait']).to eq 'enchantress'
-    expect(follower['skills']).not_to be_nil
-  end
-
-  it "gets the data for the scoundrel follower from the API" do
-    follower = BnetApi::D3.follower_data('scoundrel')
-
-    expect(follower['slug']).to eq 'scoundrel'
-    expect(follower['name']).to eq 'Scoundrel'
-    expect(follower['realName']).to eq 'd3.follower.scoundrel.realName'
-    expect(follower['portrait']).to eq 'scoundrel'
-    expect(follower['skills']).not_to be_nil
-  end
-
-  it "gets the data for the blacksmith artisan from the API" do
-    artisan = BnetApi::D3.artisan_data('blacksmith')
-
-    expect(artisan['slug']).to eq 'blacksmith'
-    expect(artisan['name']).to eq 'Blacksmith'
-    expect(artisan['portrait']).to eq 'pt_blacksmith'
-    expect(artisan['training']).not_to be_nil
-  end
-
-  it "gets the data for the jeweler artisan from the API" do
-    artisan = BnetApi::D3.artisan_data('jeweler')
-
-    expect(artisan['slug']).to eq 'jeweler'
-    expect(artisan['name']).to eq 'Jeweler'
-    expect(artisan['portrait']).to eq 'pt_jeweler'
-    expect(artisan['training']).not_to be_nil
-  end
-
-  it "gets the data for the mystic artisan from the API" do
-    artisan = BnetApi::D3.artisan_data('mystic')
-
-    expect(artisan['slug']).to eq 'mystic'
-    expect(artisan['name']).to eq 'Mystic'
-    expect(artisan['portrait']).to eq 'pt_mystic'
-    expect(artisan['training']).not_to be_nil
-  end
+require 'spec_helper'
+
+describe BnetApi::D3 do
+
+  before :each do
+    BnetApi.configure do |config|
+      config.api_key = ENV['BNET_API_KEY']
+      config.api_secret = ENV['BNET_API_SECRET']
+    end
+  end
+
+  it "gets a career profile from the API" do
+    profile = BnetApi::D3.career_profile('Ragwolf#2851')
+
+    expect(profile['battleTag']).to eq 'Ragwolf#2851'
+    expect(profile['heroes']).not_to be_nil
+  end
+
+  it "gets a hero profile from the API" do
+    profile = BnetApi::D3.hero_profile('Ragwolf#2851', 47516365)
+
+    expect(profile['name']).to eq 'Ragwolf'
+    expect(profile['class']).to eq 'demon-hunter'
+    expect(profile['skills']).not_to be_nil
+  end
+
+  it "gets the data for an item from the API" do
+    item = BnetApi::D3.item_data('Co4BCJbokeUHEgcIBBV_-U5dHcj6vKAdjs3dnR2dB5UkHSCd5AQd6XAvux3DDZzlIgsIARW1RAMAGAogJjCLAjjqA0AASBNQEFgEYOwEaisKDAgAEMPSgK2BgIDAEhIbCJ7JnZUJEgcIBBUVn9irMIsCOABAAVgEkAEBpQEgneQErQFmIwZQuAHSiJmSBcABBhj-5ffUC1AAWAI')
+
+    expect(item['id']).to eq 'Helm_208'
+    expect(item['name']).to eq 'Prime Shelter'
+    expect(item['icon']).to eq 'helm_208_demonhunter_male'
+    expect(item['displayColor']).to eq 'yellow'
+  end
+
+  it "gets the data for the templar follower from the API" do
+    follower = BnetApi::D3.follower_data('templar')
+
+    expect(follower['slug']).to eq 'templar'
+    expect(follower['name']).to eq 'Templar'
+    expect(follower['realName']).to eq 'd3.follower.templar.realName'
+    expect(follower['portrait']).to eq 'templar'
+    expect(follower['skills']).not_to be_nil
+  end
+
+  it "gets the data for the enchantress follower from the API" do
+    follower = BnetApi::D3.follower_data('enchantress')
+
+    expect(follower['slug']).to eq 'enchantress'
+    expect(follower['name']).to eq 'Enchantress'
+    expect(follower['realName']).to eq 'd3.follower.enchantress.realName'
+    expect(follower['portrait']).to eq 'enchantress'
+    expect(follower['skills']).not_to be_nil
+  end
+
+  it "gets the data for the scoundrel follower from the API" do
+    follower = BnetApi::D3.follower_data('scoundrel')
+
+    expect(follower['slug']).to eq 'scoundrel'
+    expect(follower['name']).to eq 'Scoundrel'
+    expect(follower['realName']).to eq 'd3.follower.scoundrel.realName'
+    expect(follower['portrait']).to eq 'scoundrel'
+    expect(follower['skills']).not_to be_nil
+  end
+
+  it "gets the data for the blacksmith artisan from the API" do
+    artisan = BnetApi::D3.artisan_data('blacksmith')
+
+    expect(artisan['slug']).to eq 'blacksmith'
+    expect(artisan['name']).to eq 'Blacksmith'
+    expect(artisan['portrait']).to eq 'pt_blacksmith'
+    expect(artisan['training']).not_to be_nil
+  end
+
+  it "gets the data for the jeweler artisan from the API" do
+    artisan = BnetApi::D3.artisan_data('jeweler')
+
+    expect(artisan['slug']).to eq 'jeweler'
+    expect(artisan['name']).to eq 'Jeweler'
+    expect(artisan['portrait']).to eq 'pt_jeweler'
+    expect(artisan['training']).not_to be_nil
+  end
+
+  it "gets the data for the mystic artisan from the API" do
+    artisan = BnetApi::D3.artisan_data('mystic')
+
+    expect(artisan['slug']).to eq 'mystic'
+    expect(artisan['name']).to eq 'Mystic'
+    expect(artisan['portrait']).to eq 'pt_mystic'
+    expect(artisan['training']).not_to be_nil
+  end
 end