clashinator 0.2 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f952c87643b9fda960895499fa69677637a18820
-  data.tar.gz: 0ddb384307d5bca6c4a207f8a3466cbe5dd2627c
+  metadata.gz: ed4851e0beea8740bebd70663cb2bbedf1a89ab8
+  data.tar.gz: a831cbf6903981ae591e0509d1dca692d0fa341c
 SHA512:
-  metadata.gz: 8695eb545d87f26eb93b1ac6ee627e0bcfd71d1529d12897ba9f5911a334f71fd0bc6cc3635f6f9d7923083f9918e38ecde2e6cb5461effd10eecb5764b53e9d
-  data.tar.gz: 0e0075d75f12d543e52d2b8f2eb09e35f7e641f43a8001362baa65a90d7bac5fec04b4939d7b47fae87712adc6722a6f0a87280a79733d91f8880fd9f3d6024f
+  metadata.gz: 3bfbc1ab8d0057c15277dcd373580505d360df36db1914d9d28b66ebffa14b7b2ba75394b18aa6f1566f7dea50188430d2c0efbdc40f2d2a817a2bd7c7cf3d03
+  data.tar.gz: 2b840f99c50a0e4dbb403a6f12b7535ebe65d27586d4b484fcd550ecc06ff483d55711a8b2daae4968117f58033348e05772d49581a1823ce1d27ddd2cdf827a

data/.gitignore

@@ -28,9 +28,13 @@ build/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+Gemfile.lock
+.ruby-version
+.ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+# hide secrets
+secrets.yml
+spec/fixtures/*.yml

data/README.md

@@ -1,6 +1,8 @@
 # Clashinator
 
-Ruby wrapper for the Clash of Clans API
+Ruby wrapper for the Clash of Clans API, based on the v1 version
+
+Note: These docs were updated for the new tagged version 1.0
 
 ## Installation
 
@@ -27,32 +29,37 @@ With your access token, retrieve a client instance with it.
 
 `client = Clashinator::Client.new('YOUR TOKEN')`
 
-To retrieve objects(for now JSON data), you can perform this actions, defined in the Clash of Clans API docs:
+All query options can be passed as underscored variables instead of
+camelcased, query options available are at: [https://developer.clashofclans.com](https://developer.clashofclans.com)
+
+There are several types of objects you can retrieve:
 
 ```ruby
-client.find_clan({name: 'onehive', minMembers: 25})
+clans = client.search_clans(name: 'vzlan warriors', min_members: 25)
+
+clan = client.clan_info('#VQ2QUJG')
 
-client.get_clan_info({clan_tag: '#2U2CYPQ8'})
+players = client.list_clan_members('#VQ2QUJG')
 
-client.list_clan_members({clan_tag: '#2U2CYPQ8'})
+war_log = client.clan_war_log('#VQ2QUJG')
 
-client.list_war_log({clan_tag: '#2U2CYPQ8'})
+locations = client.list_locations
 
-client.list_locations()
+location = client.location_info(32000254)
 
-client.get_location_info({location_id: 32000254})
+clan_rankings = client.location_clan_rankings(32000254)
 
-client.get_clan_ranking_for_location({location_id: 32000254})
+player_rankings = client.location_player_rankings(32000254)
 
-client.get_player_ranking_for_location({location_id: 32000254})
+leagues = client.list_leagues
 
-client.list_leagues()
+league = client.league_info(29000022)
 
-client.get_league({league_id: 29000022})
+seasons = client.league_seasons(29000022)
 
-client.get_league_seasons({league_id: 29000022})
+player_rankings = client.league_season_rankings(29000022, '2015-10')
 
-client.get_league_season_rankings({league_id: 29000022, season_id: '2016-04'})
+player = client.player_info('#QOCRLV90')
 ```
 
 ## Development
@@ -61,10 +68,14 @@ After checking out the repo, run `bin/setup` to install dependencies. You can al
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-## Contributing
+Create a new file called `secrets.yml` in the config folder with the contents of `config/secrets.sample.yml`
+Then, you'll need to generate an access token in Clash of Clans developer page at:
+[https://developer.clashofclans.com](https://developer.clashofclans.com)
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/leocabeza/clashinator. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+## Contributing
 
+Bug reports and pull requests are welcome on GitHub at https://github.com/leocabeza/clash-api. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Remember to add a test for each new feature you add, and before submitting a pull request, check that all tests are passing by running: `rake`
 
 ## License
 

data/Rakefile

@@ -1,2 +1,9 @@
-require "bundler/gem_tasks"
-task :default => :spec
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.test_files = FileList['spec/lib/*_spec.rb']
+  t.verbose = true
+end
+
+task default: :test

data/clashinator.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["info@leonardocabeza.com"]
 
   spec.summary       = %q{Ruby wrapper for the Clash of Clans API}
-  spec.homepage      = "https://github.com/leocabeza/clash_of_clans"
+  spec.homepage      = "https://github.com/leocabeza/clash-api"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
@@ -28,6 +28,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_dependency "faraday", "~> 0.9.2"
-  spec.add_dependency "faraday_middleware", "~> 0.10"
+  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"
 end

data/config/secrets.sample.yml

@@ -0,0 +1 @@
+token_test: 'PUT_TEST_TOKEN_HERE'

data/lib/clashinator.rb

@@ -1,10 +1,20 @@
-require 'faraday'
-require 'faraday_middleware'
+require 'httparty'
 
-require "clashinator/version"
-require "clashinator/client.rb"
-require "clashinator/exceptions.rb"
-
-module Clashinator
-  #
-end
+require 'clashinator/base.rb'
+require 'clashinator/array_resource.rb'
+require 'clashinator/army.rb'
+require 'clashinator/season.rb'
+require 'clashinator/clan_ranking.rb'
+require 'clashinator/player_ranking.rb'
+require 'clashinator/achievement.rb'
+require 'clashinator/troop.rb'
+require 'clashinator/hero.rb'
+require 'clashinator/spell.rb'
+require 'clashinator/warlog.rb'
+require 'clashinator/badge_url.rb'
+require 'clashinator/league.rb'
+require 'clashinator/location.rb'
+require 'clashinator/player.rb'
+require 'clashinator/clan.rb'
+require 'clashinator/version.rb'
+require 'clashinator/client.rb'

data/lib/clashinator/achievement.rb

@@ -0,0 +1,16 @@
+module Clashinator
+  # This class represents the achievement model
+  # through the player model
+  class Achievement
+    attr_accessor :name, :stars, :value, :target, :info, :completion_info
+
+    def initialize(attributes)
+      @name = attributes['name']
+      @stars = attributes['stars']
+      @value = attributes['value']
+      @target = attributes['target']
+      @info = attributes['info']
+      @completion_info = attributes['completion_info']
+    end
+  end
+end

data/lib/clashinator/army.rb

@@ -0,0 +1,13 @@
+module Clashinator
+  # This class represents the army model
+  # through the player model
+  class Army
+    attr_accessor :name, :level, :max_level
+
+    def initialize(attributes)
+      @name = attributes['name']
+      @level = attributes['level']
+      @max_level = attributes['maxLevel']
+    end
+  end
+end

data/lib/clashinator/array_resource.rb

@@ -0,0 +1,43 @@
+module Clashinator
+  # This class represents the array resource model
+  # This is only for array-based responses
+  # that contains an items attribute and
+  # a paging attribute
+  class ArrayResource
+    attr_accessor :items, :paging, :model
+
+    def initialize(model, items, paging = {})
+      # if after and before are equal, it means it's end of pagination
+      @model = model
+      @items = as_array_of_model(items)
+      @paging = Clashinator::ArrayResource::Cursor.new(
+        paging['cursors']['after'],
+        paging['cursors']['before']
+      ) if paging.key?('cursors')
+    end
+
+    private def as_array_of_model(array)
+      new_array = []
+
+      array.each do |arr|
+        new_array.push(@model.new(arr)) if @model.class == Class
+      end
+
+      new_array
+    end
+
+    # This class represent the cursor model
+    # that contains an after & before attribute
+    # for properly paging array resources
+    class Cursor
+      attr_accessor :after, :before
+
+      def initialize(after, before)
+        # can't be both specified
+        # at the same time
+        @after = after
+        @before = before
+      end
+    end
+  end
+end

data/lib/clashinator/badge_url.rb

@@ -0,0 +1,13 @@
+module Clashinator
+  # This class represents the BadgeUrl model
+  class BadgeUrl
+    attr_accessor :tiny, :small, :medium, :large
+
+    def initialize(attributes)
+      @tiny = attributes['tiny']
+      @small = attributes['small']
+      @medium = attributes['medium']
+      @large = attributes['large']
+    end
+  end
+end

data/lib/clashinator/base.rb

@@ -0,0 +1,94 @@
+require_relative 'util/camelcase.rb'
+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'
+    }.freeze
+    OBJECT_MAP = {
+      opponent: 'Clan', league: 'League',
+      location: 'Location', badge_urls: 'BadgeUrl',
+      icon_urls: 'BadgeUrl', clan: 'Clan'
+    }.freeze
+
+    def initialize(attrs)
+      attrs.each do |name, val|
+        lower_camel_cased = to_underscore(name)
+        (class << self; self; end).send(:attr_reader, lower_camel_cased.to_sym)
+        val = verify_hash_that_are_objects(lower_camel_cased.to_sym, val)
+        val = verify_array_of_classes(lower_camel_cased.to_sym, val)
+        instance_variable_set "@#{lower_camel_cased}", val
+      end
+    end
+
+    def verify_hash_that_are_objects(lower_camel_cased, val)
+      if OBJECT_MAP.key? lower_camel_cased
+        class_name = 'Clashinator::' \
+          "#{OBJECT_MAP[lower_camel_cased]}"
+        val = Object
+              .const_get(class_name)
+              .new(val)
+      end
+
+      val
+    end
+
+    def verify_array_of_classes(lower_camel_cased, val)
+      key_found = CLASS_MAP.key?(lower_camel_cased)
+      val = get_array_resource(lower_camel_cased, val) if key_found
+
+      val
+    end
+
+    private def get_array_resource(lower_camel_cased, val)
+      class_name = "Clashinator::#{CLASS_MAP[lower_camel_cased]}"
+      model = Object.const_get(class_name)
+      # this condition is for paging structures
+      # for instance Clan.search_clans
+      if val.is_a? Array
+        val = Clashinator::ArrayResource.new(model, val)
+      # this other condition is for array based structures with no paging
+      # for instance member_list of Clan.clan_info 'member_list' attribute
+      elsif val.is_a?(Hash) && val.key?(:items) && val.key?(:paging)
+        val = Clashinator::ArrayResource.new(
+          model, val['items'], val['paging']
+        )
+      end
+
+      val
+    end
+
+    def self.http_default_options(token)
+      {
+        headers: {
+          'Authorization' => "Bearer #{token}"
+        }
+      }
+    end
+
+    def self.prepare_options(token, query_options = {})
+      # new hash to store camelcased attributes, to make it work
+      # with the official API
+      new_query_options = {}
+      query_options.each do |name, val|
+        name = to_camel_case(name.to_s)
+        val.gsub!('#', '%23') if val.class == String
+        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)
+    end
+
+    private_class_method :http_default_options
+  end
+end

data/lib/clashinator/clan.rb

@@ -0,0 +1,64 @@
+module Clashinator
+  # This class represents the clan model
+  class Clan < Base
+    def initialize(attrs)
+      super(attrs)
+    end
+
+    def self.clan_info(token, clan_tag)
+      clan_tag.gsub!('#', '%23')
+      new_options = prepare_options(token)
+      response = get(
+        "/v1/clans/#{clan_tag}",
+        new_options
+      )
+
+      return new(response.parsed_response) if response.ok?
+      raise response['reason'] unless response.ok?
+    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)
+
+      if response.ok?
+        return Clashinator::ArrayResource.new(
+          Clashinator::Clan,
+          response.parsed_response['items'],
+          response.parsed_response['paging']
+        )
+      end
+      raise response['message'] unless response.ok?
+    end
+
+    def self.list_clan_members(token, clan_tag, options = {})
+      new_options = prepare_options(token, options)
+      clan_tag.gsub!('#', '%23')
+      response = get("/v1/clans/#{clan_tag}/members", new_options)
+
+      if response.ok?
+        return Clashinator::ArrayResource.new(
+          Clashinator::Player, response.parsed_response['items'],
+          response.parsed_response['paging']
+        )
+      end
+      raise response['message'] unless response.ok?
+    end
+
+    def self.clan_war_log(token, clan_tag, options = {})
+      # response.code will be 403 if clan war log is set to private
+      new_options = prepare_options(token, options)
+      clan_tag.gsub!('#', '%23')
+      response = get("/v1/clans/#{clan_tag}/warlog", new_options)
+
+      if response.ok?
+        return Clashinator::ArrayResource.new(
+          Clashinator::Warlog, response.parsed_response['items'],
+          response.parsed_response['paging']
+        )
+      end
+      raise response['reason'] unless response.ok?
+    end
+  end
+end

data/lib/clashinator/clan_ranking.rb

@@ -0,0 +1,8 @@
+module Clashinator
+  # This class represents the Clan Ranking model
+  class ClanRanking < Base
+    def initialize(attrs)
+      super(attrs)
+    end
+  end
+end

data/lib/clashinator/client.rb

@@ -1,89 +1,78 @@
 module Clashinator
+  # Client class that acts as
+  # interface of http methods
+  # available for the client itself
   class Client
-    CLASH_OF_CLANS_API = 'https://api.clashofclans.com'
-    ENDPOINTS = {
-      find_clan: '/v1/clans',
-      get_clan_info: '/v1/clans/{clan_tag}',
-      list_clan_members: '/v1/clans/{clan_tag}/members',
-      list_war_log: '/v1/clans/{clan_tag}/warlog',
-      list_locations: '/v1/locations',
-      get_location_info: '/v1/locations/{location_id}',
-      get_clan_ranking_for_location: '/v1/locations/{location_id}/rankings/clans',
-      get_player_ranking_for_location: '/v1/locations/{location_id}/rankings/players',
-      list_leagues: '/v1/leagues',
-      get_league: '/v1/leagues/{league_id}',
-      get_league_seasons: '/v1/leagues/{league_id}/seasons',
-      get_league_season_rankings: '/v1/leagues/{league_id}/seasons/{season_id}'
-    }
-
     attr_reader :token
 
     def initialize(token)
       @token = token
     end
 
-    def method_missing(method_name, *args, &block)
-      ENDPOINTS.include?(method_name) ? call(method_name, *args) : super
+    # client class methods
+
+    def search_clans(options)
+      Clashinator::Clan.search_clans(@token, options)
     end
 
-    def respond_to_missing?(*args)
-      ENDPOINTS.include?(args[0]) || super
+    def clan_info(tag)
+      Clashinator::Clan.clan_info(@token, tag)
+    end
+
+    def list_clan_members(tag, options = {})
+      Clashinator::Clan.list_clan_members(@token, tag, options)
+    end
+
+    def clan_war_log(tag, options = {})
+      Clashinator::Clan.clan_war_log(@token, tag, options)
+    end
+
+    # location class methods
+
+    def list_locations(options = {})
+      Clashinator::Location.list_locations(@token, options)
     end
 
-    def call(method_name, params = {})
-      connection_params = build_connection_params(method_name, params)
-      response = connection.get(
-        connection_params[:url],
-        connection_params[:query_params].empty? ? {} : connection_params[:query_params]
+    def location_info(location_id)
+      Clashinator::Location.location_info(@token, location_id)
+    end
+
+    def location_clan_rankings(location_id, options = {})
+      Clashinator::Locaton.location_clan_rankings(
+        @token, location_id, options
+      )
+    end
+
+    def location_player_rankings(player_tag, options = {})
+      Clashinator::Location.location_player_rankings(
+        @token, player_tag, options
       )
-      if response.success?
-        JSON.parse(response.body.to_json)
-      else
-        raise Exceptions::ResponseError.new(response),
-          'Clash of clans API has returned the error.'
-      end
     end
 
-    private
-
-    def build_connection_params(method_name, params)
-      url = get_url(method_name)
-      query_params = ''
-      if has_path_param(url)
-        params.each do |key, value|
-          url.gsub!("{#{key}}", CGI::escape(value.to_s))
-        end
-        url.gsub!(/\/{\w+}/, '')
-      else
-        query_params = params
-      end
-      {url: url, query_params: query_params}
+    # league class methods
+
+    def list_leagues(options = {})
+      Clashinator::League.list_leagues(@token, options)
     end
 
-    def get_url(method_name)
-      ENDPOINTS[method_name].clone
+    def league_info(league_id)
+      Clashinator::League.league_info(@token, league_id)
     end
 
-    def has_path_param(url)
-      has_path_param = /{\w+}/ =~ url
-      !has_path_param.nil? 
+    def league_seasons(league_id, options = {})
+      Clashinator::League.league_seasons(@token, league_id, options)
     end
 
-    def connection
-      @conn ||= Faraday.new(connection_options) do |faraday|
-        faraday.adapter Faraday.default_adapter
-        faraday.response :json#logger
-      end
+    def league_season_rankings(league_id, season_id, options = {})
+      Clashinator::League.league_season_rankings(
+        @token, league_id, season_id, options
+      )
     end
 
-    def connection_options
-      {
-        url: CLASH_OF_CLANS_API,
-        headers: {
-          content_type: 'application/json',
-          authorization: "Bearer #{token}"
-        }
-      }
+    # player class methods
+
+    def player_info(tag)
+      Clashinator::Player.player_info(@token, tag)
     end
   end
 end

data/lib/clashinator/hero.rb

@@ -0,0 +1,9 @@
+module Clashinator
+  # This class represents the hero model
+  # through the player model
+  class Hero < Army
+    def initialize(attributes)
+      super(attributes)
+    end
+  end
+end

data/lib/clashinator/league.rb

@@ -0,0 +1,65 @@
+module Clashinator
+  # This class represents the league model
+  class League < Base
+    def initialize(attrs)
+      super(attrs)
+    end
+
+    def self.list_leagues(token, options = {})
+      new_options = prepare_options(token, options)
+      response = get('/v1/leagues', new_options)
+
+      if response.ok?
+        return Clashinator::ArrayResource.new(
+          Clashinator::League, response.parsed_response['items'],
+          response.parsed_response['paging']
+        )
+      end
+      raise response['message'] unless response.ok?
+    end
+
+    def self.league_info(token, league_id)
+      new_options = prepare_options(token)
+      response = get("/v1/leagues/#{league_id}", new_options)
+
+      return new(response.parsed_response) if response.ok?
+      raise response['message'] unless response.ok?
+    end
+
+    def self.league_seasons(token, league_id, options = {})
+      new_options = prepare_options(token, options)
+      response = get("/v1/leagues/#{league_id}/seasons", new_options)
+
+      if response.ok?
+        return Clashinator::ArrayResource.new(
+          Clashinator::Season, response.parsed_response['items'],
+          response.parsed_response['paging']
+        )
+      end
+      raise response['reason'] unless response.ok?
+    end
+
+    def self.league_season_rankings(token, league_id, season_id, options = {})
+      # only available for legend_league
+      response = prepare_response_season_rankings(
+        league_id, season_id, token, options
+      )
+      if response.ok?
+        return Clashinator::ArrayResource.new(
+          Clashinator::PlayerRanking, response.parsed_response['items'],
+          response.parsed_response['paging']
+        )
+      end
+      raise response['reason'] unless response.ok?
+    end
+
+    def self.prepare_response_season_rankings(league_id, season_id, token, options)
+      get(
+        "/v1/leagues/#{league_id}/seasons/#{season_id}",
+        prepare_options(token, options)
+      )
+    end
+
+    private_class_method :prepare_response_season_rankings
+  end
+end

data/lib/clashinator/location.rb

@@ -0,0 +1,55 @@
+module Clashinator
+  # This class represents the location model
+  class Location < Base
+    def initialize(attrs)
+      super(attrs)
+    end
+
+    def self.list_locations(token, options = {})
+      new_options = prepare_options(token, options)
+      response = get('/v1/locations', new_options)
+
+      if response.ok?
+        return Clashinator::ArrayResource.new(
+          Clashinator::Location, response.parsed_response['items'],
+          response.parsed_response['paging']
+        )
+      end
+      raise response['message'] unless response.ok?
+    end
+
+    def self.location_info(token, location_id)
+      new_options = prepare_options(token)
+      response = get("/v1/locations/#{location_id}", new_options)
+
+      return new(response.parsed_response) if response.ok?
+      raise response['message'] unless response.ok?
+    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)
+
+      if response.ok?
+        return Clashinator::ArrayResource.new(
+          Clashinator::ClanRanking, response.parsed_response['items'],
+          response.parsed_response['paging']
+        )
+      end
+      raise response['reason'] unless response.ok?
+    end
+
+    def self.location_player_rankings(token, location_id, options = {})
+      response = get(
+        "/v1/locations/#{location_id}/rankings/players",
+        prepare_options(token, options)
+      )
+
+      return Clashinator::ArrayResource.new(
+        Clashinator::PlayerRanking, response.parsed_response['items'],
+        response.parsed_response['paging']
+      ) if response.ok?
+      raise response['reason'] unless response.ok?
+    end
+  end
+end

data/lib/clashinator/player.rb

@@ -0,0 +1,17 @@
+module Clashinator
+  # This class represents the player model
+  class Player < Base
+    def initialize(attrs)
+      super(attrs)
+    end
+
+    def self.player_info(token, player_tag)
+      player_tag.gsub!('#', '%23')
+      new_options = prepare_options(token)
+      response = get("/v1/players/#{player_tag}", new_options)
+
+      return new(response.parsed_response) if response.ok?
+      raise response['reason'] unless response.ok?
+    end
+  end
+end

data/lib/clashinator/player_ranking.rb

@@ -0,0 +1,8 @@
+module Clashinator
+  # This class represents the Clan Ranking model
+  class PlayerRanking < Base
+    def initialize(attrs)
+      super(attrs)
+    end
+  end
+end

data/lib/clashinator/season.rb

@@ -0,0 +1,11 @@
+module Clashinator
+  # This class represents the league model through the
+  # league model
+  class Season
+    attr_accessor :id
+
+    def initialize(id)
+      @id = id
+    end
+  end
+end

data/lib/clashinator/spell.rb

@@ -0,0 +1,9 @@
+module Clashinator
+  # This class represents the spell model
+  # through the player model
+  class Spell < Army
+    def initialize(attributes)
+      super(attributes)
+    end
+  end
+end

data/lib/clashinator/troop.rb

@@ -0,0 +1,9 @@
+module Clashinator
+  # This class represents the troop model
+  # through the player model
+  class Troop < Army
+    def initialize(attributes)
+      super(attributes)
+    end
+  end
+end

data/lib/clashinator/util/camelcase.rb

@@ -0,0 +1,8 @@
+# module to convert underscore to camel-case
+module Camelizable
+  def to_camel_case(name)
+    name.split('_').inject([]) do |buffer, e|
+      buffer.push(buffer.empty? ? e : e.capitalize)
+    end.join
+  end
+end

data/lib/clashinator/util/underscore.rb

@@ -0,0 +1,12 @@
+# module to convert camelcase to underscore
+module Underscorable
+  def to_underscore(name)
+    modified_word = name.dup
+    modified_word.gsub!(/::/, '/')
+    modified_word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+    modified_word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+    modified_word.tr!('-', '_')
+    modified_word.downcase!
+    modified_word
+  end
+end

data/lib/clashinator/version.rb

@@ -1,3 +1,3 @@
 module Clashinator
-  VERSION = "0.2"
+  VERSION = '1.0'.freeze
 end

data/lib/clashinator/warlog.rb

@@ -0,0 +1,8 @@
+module Clashinator
+  # This class represents the Warlog model
+  class Warlog < Base
+    def initialize(attrs)
+      super(attrs)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clashinator
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '1.0'
 platform: ruby
 authors:
 - Leonardo Cabeza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,33 +39,79 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :runtime
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.9.1
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.0
 description: 
 email:
 - info@leonardocabeza.com
@@ -76,7 +122,6 @@ files:
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - LICENSE.txt
 - README.md
@@ -84,13 +129,29 @@ files:
 - bin/console
 - bin/setup
 - clashinator.gemspec
+- config/secrets.sample.yml
 - lib/clashinator.rb
+- lib/clashinator/achievement.rb
+- lib/clashinator/army.rb
+- lib/clashinator/array_resource.rb
+- lib/clashinator/badge_url.rb
+- lib/clashinator/base.rb
+- lib/clashinator/clan.rb
+- lib/clashinator/clan_ranking.rb
 - lib/clashinator/client.rb
-- lib/clashinator/exceptions.rb
-- lib/clashinator/exceptions/base.rb
-- lib/clashinator/exceptions/response_error.rb
+- lib/clashinator/hero.rb
+- lib/clashinator/league.rb
+- lib/clashinator/location.rb
+- lib/clashinator/player.rb
+- lib/clashinator/player_ranking.rb
+- lib/clashinator/season.rb
+- lib/clashinator/spell.rb
+- lib/clashinator/troop.rb
+- lib/clashinator/util/camelcase.rb
+- lib/clashinator/util/underscore.rb
 - lib/clashinator/version.rb
-homepage: https://github.com/leocabeza/clash_of_clans
+- lib/clashinator/warlog.rb
+homepage: https://github.com/leocabeza/clash-api
 licenses:
 - MIT
 metadata:

data/Gemfile.lock

@@ -1,27 +0,0 @@
-PATH
-  remote: .
-  specs:
-    clashinator (0.1.2)
-      faraday (~> 0.9.2)
-      faraday_middleware (~> 0.10)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    multipart-post (2.0.0)
-    rake (10.5.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.11)
-  clashinator!
-  rake (~> 10.0)
-
-BUNDLED WITH
-   1.11.2

data/lib/clashinator/exceptions.rb

@@ -1,2 +0,0 @@
-require 'clashinator/exceptions/base'
-require 'clashinator/exceptions/response_error'

data/lib/clashinator/exceptions/base.rb

@@ -1,5 +0,0 @@
-module Clashinator
-  module Exceptions
-    class Base < StandardError; end
-  end
-end

data/lib/clashinator/exceptions/response_error.rb

@@ -1,30 +0,0 @@
-module Clashinator
-  module Exceptions
-    class ResponseError < Base
-      attr_reader :response
-
-      def initialize(response)
-        @response = response
-      end
-
-      def to_s
-        super +
-          format(' (%s)', data.map { |k, v| %(#{k}: "#{v}") }.join(', '))
-      end
-
-      def error_code
-        data[:error_code] || data['error_code']
-      end
-
-      private
-
-      def data
-        @data ||= begin
-          JSON.parse(response.body)
-        rescue JSON::ParserError
-          { error_code: response.status, reason: response.body.reason }
-        end
-      end
-    end
-  end
-  end