lolbase 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c5b69ef5bed39cda2abb25d0e963288727858f8a
-  data.tar.gz: e15c0be707b1fec1bfeddeaf6d1ee9a4950e0bc2
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2FiZjU1Yzg4OTRmZWQ2NzYzODVjODViMTBlMDlkMzRmODM0MThiYQ==
+  data.tar.gz: !binary |-
+    OWI5NjUyYzRlYzEyNmI3MmY3YTVjNzM5ZTliZjljMzEwYmNmODE1MQ==
 SHA512:
-  metadata.gz: 0297f5dd95ed99c5450e07a45b81e3124264c27574c68f609c3f5a6156db5a96d869821bfac96c4520a94d6eb11935cef558721970cb162b2fa2b9a66feb0981
-  data.tar.gz: 01e5f3b76bb4514e8967a98c6af4899242480a13f968fa671c8e70bd9aaddc0eaae9fa02adce817b5720bdb15012764386807f27254fccea44a8f6fde220148d
+  metadata.gz: !binary |-
+    YWNlNzA3MTgwNzNkNDJmNmE4NDUyNDJkMjM4OGIzNzU2YzBmOTMxMTRjODM5
+    N2RmYTk2MjY1ZGI2MzhiYWEwZTU5ZjIwN2QwMTYwYTRlMDU0ZDk3NTFhOTQy
+    ZWRmM2FmZWE4Y2QzYzJkNjgzZDdhZjNlMzgxNjEyMWM5YzI5NmI=
+  data.tar.gz: !binary |-
+    ZmFhNjJjOGZiYmE1Zjc4Mzg5OTkzMThkNDYyZjlkNDk5NGUxM2VmMTE5MzNh
+    YTFjNTVmYjFlZDJkM2ViZjhiYzM0MDVkYjQ1ZTBmN2FmNDRkYmI1ODRhNjY1
+    ODVlMTUyYzIwYTUyMzFjNzZkOTU4ZjRmYWRhZGQxMGI4Yjg1NDQ=

data/.travis.yml

@@ -1,7 +1,15 @@
-language: ruby
-
-rvm:
-  - 1.9.3
-  - 2.0.0
-
-script: bundle exec rspec spec
+language: ruby
+
+rvm:
+- 1.9.3
+- 2.0.0
+
+script: bundle exec rspec spec
+
+deploy:
+  provider: rubygems
+  api_key:
+    secure: dkuO+YOJo2ylm/ipkCdz/OVENYo/B1e6ai44sKBleKYEbkxwRifh/jEaXcA8KKwhmcVVcQEoodUZD0lKdzcEdi5YMyzoGqdLeSwsSslNaMvbsYKH0C3h1WQlh2fHL3rRyrUhEQ+V9BxXbjWvPUa9OQUrHW/jP4TZ4yVO1yNskl8=
+  gem: lolbase
+  on:
+    repo: Illianthe/lolbase

data/lib/lolbase/connection.rb

@@ -37,10 +37,12 @@ module LoLBase
     end
 
     def summoner_by_name(name, region = LoLBase.config.default_region)
+      raise InvalidArgumentError if !name.is_a?(String)
       Summoner.new({ name: name, region: region }, self)
     end
 
     def summoner_by_id(id, region = LoLBase.config.default_region)
+      raise InvalidArgumentError if !id.is_a?(Integer)
       Summoner.new({ id: id, region: region }, self)
     end
 

data/lib/lolbase/data/champion.rb

@@ -12,6 +12,8 @@ module LoLBase
     end
 
     def find(criteria = {})
+      raise InvalidArgumentError if criteria.class != Hash
+
       if criteria[:id]
         return @champions.select { |champ| champ.id == criteria[:id] }.first
       elsif criteria[:name]

data/lib/lolbase/data/stats.rb

@@ -14,19 +14,26 @@ module LoLBase
     end
 
     def summary(season = LoLBase.config.current_season)
-      response = @connection.get(
-        "/api/lol/#{@summoner.region}/v#{LoLBase.config.version_stats}/stats/by-summoner/#{@summoner.id}/summary",
-        { query: { season: "SEASON#{season}" } }
-      )
-      SummaryStats.new response
+      fetch_stats(:summary, season)
     end
 
     def ranked(season = LoLBase.config.current_season)
+      fetch_stats(:ranked, season)
+    end
+
+  private
+
+    def fetch_stats(type, season)
       response = @connection.get(
-        "/api/lol/#{@summoner.region}/v#{LoLBase.config.version_stats}/stats/by-summoner/#{@summoner.id}/ranked",
+        "/api/lol/#{@summoner.region}/v#{LoLBase.config.version_stats}/stats/by-summoner/#{@summoner.id}/#{type}",
         { query: { season: "SEASON#{season}" } }
       )
-      RankedStats.new response
+
+      if type == :summary
+        return SummaryStats.new response
+      elsif type == :ranked
+        return RankedStats.new response
+      end
     end
   end
 
@@ -52,6 +59,7 @@ module LoLBase
     end
 
     def find(criteria = {})
+      raise InvalidArgumentError if criteria.class != Hash
       if criteria[:name]
         return @parsed_data.select { |item| item.name == criteria[:name] }.first
       end
@@ -102,6 +110,7 @@ module LoLBase
     end
 
     def find(criteria = {})
+      raise InvalidArgumentError if criteria.class != Hash
       if criteria[:champion_id]
         return @parsed_data.select { |item| item.id == criteria[:champion_id] }.first
       end

data/lib/lolbase/error.rb

@@ -1,4 +1,7 @@
 module LoLBase
   class LoLBaseError < StandardError
   end
+
+  class InvalidArgumentError < LoLBaseError
+  end
 end

data/lib/lolbase/version.rb

@@ -1,3 +1,3 @@
 module LoLBase
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/champion_data_spec.rb

@@ -33,4 +33,8 @@ describe LoLBase::Champion do
     f2p = @connection.champions.find(free_to_play: true)
     expect(f2p.count).to eq(10)
   end
+
+  it "should throw an error when trying to find a champion with invalid parameters" do
+    expect { @connection.champions.find("free") }.to raise_error(LoLBase::InvalidArgumentError)
+  end
 end

data/spec/spec_helper.rb

@@ -4,18 +4,26 @@ require "lolbase"
 RSpec.configure do |config|
   config.before(:each) do
     stub_info = [
+      # Summoner lookup
       {
         file: File.read(File.expand_path("../json/summoner/1.2/summoner.json", __FILE__)),
         url: "https://prod.api.pvp.net/api/lol/na/v1.2/summoner/by-name/illianthe?api_key=random-key"
       },
+      {
+        file: File.read(File.expand_path("../json/summoner/1.2/summoner.json", __FILE__)),
+        url: "https://prod.api.pvp.net/api/lol/na/v1.2/summoner/19578577?api_key=random-key"
+      },
+      # Summary stats
       {
         file: File.read(File.expand_path("../json/stats/1.2/summary_s3.json", __FILE__)),
         url: "https://prod.api.pvp.net/api/lol/na/v1.2/stats/by-summoner/19578577/summary?api_key=random-key&season=SEASON3"
       },
+      # Ranked stats
       {
         file: File.read(File.expand_path("../json/stats/1.2/ranked_s3.json", __FILE__)),
         url: "https://prod.api.pvp.net/api/lol/na/v1.2/stats/by-summoner/19578577/ranked?api_key=random-key&season=SEASON3"
       },
+      # Champion lookup
       {
         file: File.read(File.expand_path("../json/champion/1.1/champions.json", __FILE__)),
         url: "https://prod.api.pvp.net/api/lol/na/v1.1/champion?api_key=random-key"

data/spec/stats_data_spec.rb

@@ -38,4 +38,12 @@ describe LoLBase::Stats do
     overall = @illianthe.stats.ranked.overall
     expect(overall["totalDamageTaken"]).to eq(583858)
   end
+
+  it "should throw an error when trying to filter stats with an invalid parameter" do
+    ranked = @illianthe.stats.ranked
+    expect { ranked.find("Criteria") }.to raise_error(LoLBase::InvalidArgumentError)
+
+    summary = @illianthe.stats.summary
+    expect { summary.find("Blah") }.to raise_error(LoLBase::InvalidArgumentError)
+  end
 end

data/spec/summoner_data_spec.rb

@@ -19,6 +19,10 @@ describe LoLBase::Summoner do
     expect(@illianthe.profile_icon.id).to eq(539)
   end
 
+  it "should allow for summoner lookups by ID" do
+    summoner = @connection.summoner(19578577)
+  end
+
   context "Stats" do
     it "should return a generic Stats object when called without arguments" do
       expect(@illianthe.stats.class).to eq(LoLBase::Stats)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolbase
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Regan Chan
@@ -28,56 +28,56 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A basic Ruby wrapper for the League of Legends API.
@@ -122,17 +122,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A basic Ruby wrapper for the League of Legends API.
@@ -146,4 +146,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/stats_data_spec.rb
 - spec/summoner_data_spec.rb
-has_rdoc: