clashinator 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65921cbb0680c92dd07f846e46e206ab17ec0f68
-  data.tar.gz: bed88b225cba0ca896d9ee7fbe95677acdd37e6e
+  metadata.gz: 0cc8dd0d6d06c8acd03938c6dc93abbc6f401c32
+  data.tar.gz: 45c5acd0cbd8672a6489a05134d468161f9b0966
 SHA512:
-  metadata.gz: 47d8dc49d3a41be2a919b75e95e512e9a231db640bdfc8331f59b22758630b1ac283321a38786007f1967ee4ba5a488b3aa7836af3fe5b96e6019ca03dd1c292
-  data.tar.gz: 16492e7964388f78070199d351eecb001840bf601528173c634e57869299d1d09ffdd0c4a86833c23812ee99e593c4d157ff4f5e4ca2173c620aff96db240da3
+  metadata.gz: 9233159d5dafdda8d801320b5f3b99a4b3e6bbe39d5b3628da597bfad8919f4810200c92a8df3c113075c0eb3c20d13329da3c42c4095f92910986775924a1c1
+  data.tar.gz: 3b29886b78ba65f1e09148b9073aa4cfa185bedee3dec3724df1d25b9d846bd7efa211dde1d979129e8a2e212a5ad8d32969640be5bd49799814cab4705a9eac

data/.gitignore

@@ -36,5 +36,4 @@ Gemfile.lock
 .rvmrc
 
 # hide secrets
-secrets.yml
-spec/fixtures/*.yml
+secrets.yml

data/.vscode/settings.json

@@ -0,0 +1,4 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+ "ruby.rubocop.onSave": false 
+}

data/clashinator.gemspec

@@ -28,9 +28,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "webmock", "~> 2.1", ">= 2.1.0"
-  spec.add_development_dependency "vcr", "~> 3.0", ">= 3.0.3"
+  # spec.add_development_dependency "webmock", "~> 2.1", ">= 2.1.0"
+  # spec.add_development_dependency "vcr", "~> 3.0", ">= 3.0.3"
   spec.add_development_dependency "minitest", "~> 5.9", ">= 5.9.1"
 
-  spec.add_dependency "httparty", "~> 0.14.0"
+  spec.add_dependency "faraday", "~> 0.10.0"
+  spec.add_dependency "json", "~> 2.0", ">= 2.0.2"
 end

data/config/config.yml

@@ -0,0 +1 @@
+url: 'https://api.clashofclans.com'

data/lib/clashinator.rb

@@ -1,4 +1,6 @@
-require 'httparty'
+require 'faraday'
+require 'json'
+require 'yaml'
 
 require 'clashinator/base.rb'
 require 'clashinator/array_resource.rb'

data/lib/clashinator/base.rb

@@ -4,12 +4,9 @@ require_relative 'util/underscore.rb'
 module Clashinator
   # This is the base class for the other entities
   class Base
-    include HTTParty
     include Underscorable
     extend Camelizable
 
-    base_uri 'https://api.clashofclans.com'
-
     CLASS_MAP = {
       member_list: 'Player', achievements: 'Achievement',
       troops: 'Troop', heroes: 'Hero', spells: 'Spell'
@@ -67,15 +64,7 @@ module Clashinator
       val
     end
 
-    def self.http_default_options(token)
-      {
-        headers: {
-          'Authorization' => "Bearer #{token}"
-        }
-      }
-    end
-
-    def self.prepare_options(token, query_options = {})
+    def self.prepare_options(query_options = {})
       # new hash to store camelcased attributes, to make it work
       # with the official API
       new_query_options = {}
@@ -85,10 +74,7 @@ module Clashinator
         new_query_options[name.to_sym] = val
       end
 
-      # duplicate http_default_options to add new_query_options
-      http_default_options(token).dup.merge(query: new_query_options)
+      new_query_options
     end
-
-    private_class_method :http_default_options
   end
 end

data/lib/clashinator/clan.rb

@@ -5,60 +5,57 @@ module Clashinator
       super(attrs)
     end
 
-    def self.clan_info(token, clan_tag)
+    def self.clan_info(http, clan_tag)
       clan_tag.gsub!('#', '%23')
-      new_options = prepare_options(token)
-      response = get(
-        "/v1/clans/#{clan_tag}",
-        new_options
+      response = http.get(
+        "/v1/clans/#{clan_tag}"
       )
+      parsed = JSON.parse(response.body)
 
-      return new(response.parsed_response) if response.ok?
-      raise response['reason'] unless response.ok?
+      return new(parsed) if response.success?
+      raise parsed['reason'] unless response.success?
     end
 
-    def self.search_clans(token, options)
-      new_options = prepare_options(token, options)
-      # TODO: options[:name] should be at least 3 chars long
-      response = get('/v1/clans', new_options)
+    def self.search_clans(http, options)
+      new_options = prepare_options(options)
+      response = http.get('/v1/clans', new_options)
+      parsed = JSON.parse(response.body)
 
-      if response.ok?
+      if response.success?
         return Clashinator::ArrayResource.new(
-          Clashinator::Clan,
-          response.parsed_response['items'],
-          response.parsed_response['paging']
+          Clashinator::Clan, parsed['items'], parsed['paging']
         )
       end
-      raise response['message'] unless response.ok?
+
+      raise parsed['message'] unless response.success?
     end
 
-    def self.list_clan_members(token, clan_tag, options = {})
-      new_options = prepare_options(token, options)
+    def self.list_clan_members(http, clan_tag, options = {})
+      new_options = prepare_options(options)
       clan_tag.gsub!('#', '%23')
-      response = get("/v1/clans/#{clan_tag}/members", new_options)
-
-      if response.ok?
+      response = http.get("/v1/clans/#{clan_tag}/members", new_options)
+      parsed = JSON.parse(response.body)
+      if response.success?
         return Clashinator::ArrayResource.new(
-          Clashinator::Player, response.parsed_response['items'],
-          response.parsed_response['paging']
+          Clashinator::Player, parsed['items'], parsed['paging']
         )
       end
-      raise response['message'] unless response.ok?
+      raise parsed['message'] unless response.success?
     end
 
-    def self.clan_war_log(token, clan_tag, options = {})
+    def self.clan_war_log(http, clan_tag, options = {})
       # response.code will be 403 if clan war log is set to private
-      new_options = prepare_options(token, options)
+      new_options = prepare_options(options)
       clan_tag.gsub!('#', '%23')
-      response = get("/v1/clans/#{clan_tag}/warlog", new_options)
+      response = http.get("/v1/clans/#{clan_tag}/warlog", new_options)
+      parsed = JSON.parse(response.body)
 
-      if response.ok?
+      if response.success?
         return Clashinator::ArrayResource.new(
-          Clashinator::Warlog, response.parsed_response['items'],
-          response.parsed_response['paging']
+          Clashinator::Warlog, parsed['items'], parsed['paging']
         )
       end
-      raise response['reason'] unless response.ok?
+      raise parsed['reason'] unless response.success?
     end
   end
 end

data/lib/clashinator/client.rb

@@ -3,76 +3,82 @@ module Clashinator
   # interface of http methods
   # available for the client itself
   class Client
-    attr_reader :token
+    attr_reader :token, :uri, :headers
 
     def initialize(token)
       @token = token
+      @uri = YAML.load_file('config/config.yml')['url']
+      @headers = { 'Authorization' => "Bearer #{@token}" }
+      @conn = Faraday.new(
+        url: @uri,
+        headers: @headers
+      )
     end
 
     # client class methods
 
     def search_clans(options)
-      Clashinator::Clan.search_clans(@token, options)
+      Clashinator::Clan.search_clans(@conn, @token, options)
     end
 
     def clan_info(tag)
-      Clashinator::Clan.clan_info(@token, tag)
+      Clashinator::Clan.clan_info(@conn, @token, tag)
     end
 
     def list_clan_members(tag, options = {})
-      Clashinator::Clan.list_clan_members(@token, tag, options)
+      Clashinator::Clan.list_clan_members(@conn, @token, tag, options)
     end
 
     def clan_war_log(tag, options = {})
-      Clashinator::Clan.clan_war_log(@token, tag, options)
+      Clashinator::Clan.clan_war_log(@conn, @token, tag, options)
     end
 
     # location class methods
 
     def list_locations(options = {})
-      Clashinator::Location.list_locations(@token, options)
+      Clashinator::Location.list_locations(@conn, @token, options)
     end
 
     def location_info(location_id)
-      Clashinator::Location.location_info(@token, location_id)
+      Clashinator::Location.location_info(@conn, @token, location_id)
     end
 
     def location_clan_rankings(location_id, options = {})
       Clashinator::Locaton.location_clan_rankings(
-        @token, location_id, options
+        @conn, @token, location_id, options
       )
     end
 
     def location_player_rankings(player_tag, options = {})
       Clashinator::Location.location_player_rankings(
-        @token, player_tag, options
+        @conn, @token, player_tag, options
       )
     end
 
     # league class methods
 
     def list_leagues(options = {})
-      Clashinator::League.list_leagues(@token, options)
+      Clashinator::League.list_leagues(@conn, @token, options)
     end
 
     def league_info(league_id)
-      Clashinator::League.league_info(@token, league_id)
+      Clashinator::League.league_info(@conn, @token, league_id)
     end
 
     def league_seasons(league_id, options = {})
-      Clashinator::League.league_seasons(@token, league_id, options)
+      Clashinator::League.league_seasons(@conn, @token, league_id, options)
     end
 
     def league_season_rankings(league_id, season_id, options = {})
       Clashinator::League.league_season_rankings(
-        @token, league_id, season_id, options
+        @conn, @token, league_id, season_id, options
       )
     end
 
     # player class methods
 
     def player_info(tag)
-      Clashinator::Player.player_info(@token, tag)
+      Clashinator::Player.player_info(@conn, @token, tag)
     end
   end
 end

data/lib/clashinator/league.rb

@@ -5,58 +5,59 @@ module Clashinator
       super(attrs)
     end
 
-    def self.list_leagues(token, options = {})
-      new_options = prepare_options(token, options)
-      response = get('/v1/leagues', new_options)
+    def self.list_leagues(http, options = {})
+      new_options = prepare_options(options)
+      response = http.get('/v1/leagues', new_options)
+      parsed = JSON.parse(response.body)
 
-      if response.ok?
+      if response.success?
         return Clashinator::ArrayResource.new(
-          Clashinator::League, response.parsed_response['items'],
-          response.parsed_response['paging']
+          Clashinator::League, parsed['items'], parsed['paging']
         )
       end
-      raise response['message'] unless response.ok?
+      raise parsed['message'] unless response.success?
     end
 
-    def self.league_info(token, league_id)
-      new_options = prepare_options(token)
-      response = get("/v1/leagues/#{league_id}", new_options)
+    def self.league_info(http, league_id)
+      response = http.get("/v1/leagues/#{league_id}")
+      parsed = JSON.parse(response.body)
 
-      return new(response.parsed_response) if response.ok?
-      raise response['message'] unless response.ok?
+      return new(parsed) if response.success?
+      raise parsed['message'] unless response.success?
     end
 
-    def self.league_seasons(token, league_id, options = {})
-      new_options = prepare_options(token, options)
-      response = get("/v1/leagues/#{league_id}/seasons", new_options)
+    def self.league_seasons(http, league_id, options = {})
+      new_options = prepare_options(options)
+      response = http.get("/v1/leagues/#{league_id}/seasons", new_options)
+      parsed = JSON.parse(response.body)
 
-      if response.ok?
+      if response.success?
         return Clashinator::ArrayResource.new(
-          Clashinator::Season, response.parsed_response['items'],
-          response.parsed_response['paging']
+          Clashinator::Season, parsed['items'], parsed['paging']
         )
       end
-      raise response['reason'] unless response.ok?
+      raise parsed['reason'] unless response.success?
     end
 
-    def self.league_season_rankings(token, league_id, season_id, options = {})
+    def self.league_season_rankings(http, league_id, season_id, options = {})
       # only available for legend_league
       response = prepare_response_season_rankings(
-        league_id, season_id, token, options
+        league_id, season_id, http, options
       )
-      if response.ok?
+      parsed = JSON.parse(response.body)
+
+      if response.success?
         return Clashinator::ArrayResource.new(
-          Clashinator::PlayerRanking, response.parsed_response['items'],
-          response.parsed_response['paging']
+          Clashinator::PlayerRanking, parsed['items'], parsed['paging']
         )
       end
-      raise response['reason'] unless response.ok?
+      raise parsed['reason'] unless response.success?
     end
 
-    def self.prepare_response_season_rankings(league_id, season_id, token, options)
-      get(
+    def self.prepare_response_season_rankings(league_id, season_id, http, options)
+      http.get(
         "/v1/leagues/#{league_id}/seasons/#{season_id}",
-        prepare_options(token, options)
+        prepare_options(options)
       )
     end
 

data/lib/clashinator/location.rb

@@ -5,51 +5,51 @@ module Clashinator
       super(attrs)
     end
 
-    def self.list_locations(token, options = {})
-      new_options = prepare_options(token, options)
-      response = get('/v1/locations', new_options)
+    def self.list_locations(http, options = {})
+      new_options = prepare_options(options)
+      response = http.get('/v1/locations', new_options)
+      parsed = JSON.parse(response.body)
 
-      if response.ok?
+      if response.success?
         return Clashinator::ArrayResource.new(
-          Clashinator::Location, response.parsed_response['items'],
-          response.parsed_response['paging']
+          Clashinator::Location, parsed['items'], parsed['paging']
         )
       end
-      raise response['message'] unless response.ok?
+      raise parsed['message'] unless response.success?
     end
 
-    def self.location_info(token, location_id)
-      new_options = prepare_options(token)
-      response = get("/v1/locations/#{location_id}", new_options)
+    def self.location_info(http, location_id)
+      response = http.get("/v1/locations/#{location_id}")
+      parsed = JSON.parse(response.body)
 
-      return new(response.parsed_response) if response.ok?
-      raise response['message'] unless response.ok?
+      return new(parsed) if response.success?
+      raise parsed['message'] unless response.success?
     end
 
-    def self.location_clan_rankings(token, location_id, options = {})
-      new_options = prepare_options(token, options)
-      response = get("/v1/locations/#{location_id}/rankings/clans", new_options)
+    def self.location_clan_rankings(http, location_id, options = {})
+      new_options = prepare_options(options)
+      response = http.get("/v1/locations/#{location_id}/rankings/clans", new_options)
+      parsed = JSON.parse(response.body)
 
-      if response.ok?
+      if response.success?
         return Clashinator::ArrayResource.new(
-          Clashinator::ClanRanking, response.parsed_response['items'],
-          response.parsed_response['paging']
+          Clashinator::ClanRanking, parsed['items'], parsed['paging']
         )
       end
-      raise response['reason'] unless response.ok?
+      raise parsed['reason'] unless response.success?
     end
 
-    def self.location_player_rankings(token, location_id, options = {})
-      response = get(
+    def self.location_player_rankings(http, location_id, options = {})
+      response = http.get(
         "/v1/locations/#{location_id}/rankings/players",
-        prepare_options(token, options)
+        prepare_options(options)
       )
+      parsed = JSON.parse(response.body)
 
       return Clashinator::ArrayResource.new(
-        Clashinator::PlayerRanking, response.parsed_response['items'],
-        response.parsed_response['paging']
-      ) if response.ok?
-      raise response['reason'] unless response.ok?
+        Clashinator::PlayerRanking, parsed['items'], parsed['paging']
+      ) if response.success?
+      raise parsed['reason'] unless response.success?
     end
   end
 end

data/lib/clashinator/player.rb

@@ -5,13 +5,13 @@ module Clashinator
       super(attrs)
     end
 
-    def self.player_info(token, player_tag)
+    def self.player_info(http, player_tag)
       player_tag.gsub!('#', '%23')
-      new_options = prepare_options(token)
-      response = get("/v1/players/#{player_tag}", new_options)
+      response = http.get("/v1/players/#{player_tag}")
+      parsed = JSON.parse(response.body)
 
-      return new(response.parsed_response) if response.ok?
-      raise response['reason'] unless response.ok?
+      return new(parsed) if response.success?
+      raise parsed['reason'] unless response.success?
     end
   end
 end

data/lib/clashinator/version.rb

@@ -1,3 +1,3 @@
 module Clashinator
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clashinator
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Leonardo Cabeza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,79 +39,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '5.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 5.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '5.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 5.9.1
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.3
-  type: :development
+        version: 0.10.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.9.1
-  type: :development
+        version: 2.0.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.9.1
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 2.0.2
 description: 
 email:
 - info@leonardocabeza.com
@@ -120,6 +100,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -129,6 +110,7 @@ files:
 - bin/console
 - bin/setup
 - clashinator.gemspec
+- config/config.yml
 - config/secrets.sample.yml
 - lib/clashinator.rb
 - lib/clashinator/achievement.rb