halo-api 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2946f96489461ebd8f3f73857f74cff7fe0b04dd
-  data.tar.gz: 2c09a344108386e70b3aced521c3e12cc70b73c8
+  metadata.gz: 160879805c22e91b7548e66fa7664c1967bfe792
+  data.tar.gz: 113d6084e6798d33bbac99bb238a4b18c9a38ca5
 SHA512:
-  metadata.gz: a7f748a6b1f2903c919c86119e295dabb597959f63b1e4370ac7ca8fbdb111f33ff14c7bf272ea8a74da0e2beae9ecaecd99c55f4c3febe3579de616f35d3ac1
-  data.tar.gz: 9d3770d344cfa344489f0f38738ba42a71849675fe69e4805caca6257f7edd956d2b97610b9eef4b4542caa0e7d4a34851f0f002f0ee667c5c695e046063d64a
+  metadata.gz: fcf6ec4ae19b77839ff132ffe57ace8d26ab4b534615b501a6da151965db9aad5ddfa0e6b63a14a892d8a77a4f7ea4fb8d2c965b2e1edc2b0b723c57a9d9963f
+  data.tar.gz: cea7f4dff7ece594b1616c0d23ecc9c6b900a5250ea79318913e9f4f2cd2f473031bc8a20cfb6c35cef9b92a0dc1f60ea8e9a00925153d92dcbae9f479f37a8f

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--require spec_helper

data/halo-api.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_runtime_dependency 'httparty', '~> 0.15.6'
+  spec.add_runtime_dependency 'addressable', '~> 2.5', '>= 2.5.2'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 12.0'

data/lib/halo-api.rb

@@ -3,12 +3,12 @@ require 'halo-api/configuration'
 require 'halo-api/client'
 require 'halo-api/api_response'
 
-require 'halo-api/modules/metadata/halo5_metadata_client'
-require 'halo-api/modules/metadata/halo_wars2_metadata_client'
-require 'halo-api/modules/profile/halo5_profile_client'
-require 'halo-api/modules/stats/halo5_stats_client'
-require 'halo-api/modules/stats/halo_wars2_stats_client'
-require 'halo-api/modules/ugc/halo5_ugc_client'
+require 'halo-api/clients/halo5_metadata_client'
+require 'halo-api/clients/halo_wars2_metadata_client'
+require 'halo-api/clients/halo5_profile_client'
+require 'halo-api/clients/halo5_stats_client'
+require 'halo-api/clients/halo_wars2_stats_client'
+require 'halo-api/clients/halo5_ugc_client'
 
 
 module Halo
@@ -17,32 +17,32 @@ module Halo
   class << self
     # Halo 5 Metadata Client
     def h5_metadata(options = {})
-      Halo::Metadata::Halo5MetadataClient.new(options)
+      Halo::Clients::Halo5MetadataClient.new(options)
     end
 
     # Halo Wars 2 Metadata Client
     def hw2_metadata(options = {})
-      Halo::Metadata::HaloWars2MetadataClient.new(options)
+      Halo::Clients::HaloWars2MetadataClient.new(options)
     end
 
     # Halo 5 Profile Client
     def h5_profile(options = {})
-      Halo::Profile::Halo5ProfileClient.new(options)
+      Halo::Clients::Halo5ProfileClient.new(options)
     end
 
     # Halo 5 Stats Client
     def h5_stats(options = {})
-      Halo::Stats::Halo5StatsClient.new(options)
+      Halo::Clients::Halo5StatsClient.new(options)
     end
 
     # Halo Wars 2 Stats Client
     def hw2_stats(options = {})
-      Halo::Stats::HaloWars2StatsClient.new(options)
+      Halo::Clients::HaloWars2StatsClient.new(options)
     end
 
     # Halo 5 UGC Client
     def h5_ugc(options = {})
-      Halo::Ugc::Halo5UgcClient.new(options)
+      Halo::Clients::Halo5UgcClient.new(options)
     end
   end
 

data/lib/halo-api/api_response.rb

@@ -6,7 +6,6 @@ module Halo
     def initialize(options = {})
       @data           = []
       @client         = options[:client]
-      @endpoint       = options[:client].endpoint
     end
 
     def get_data(path, options)

data/lib/halo-api/client.rb

@@ -1,6 +1,7 @@
 require 'halo-api/version'
 require 'halo-api/api_response'
 require 'httparty'
+require 'addressable/uri'
 
 
 module Halo
@@ -19,11 +20,8 @@ module Halo
       Halo::Configuration::OPTIONS.each do |key|
         send("#{key}=", options[key])
       end
-    end
 
-    def endpoint
-      raise 'Invalid API Endpoint' if @endpoint.nil?
-      @endpoint
+      self.class.base_uri "https://www.haloapi.com#{@endpoint}"
     end
 
     def get(path, params = {})
@@ -37,12 +35,10 @@ module Halo
         'Accept-Language' => @region
       }
 
-      url = "https://www.haloapi.com#{path}"
-
       options[:headers] = headers unless headers.empty?
       options[:query]   = params unless params.empty?
 
-      self.class.send(verb, url, options)
+      self.class.send(verb, Addressable::URI.encode(path), options)
     end
 
 

data/lib/halo-api/{modules/metadata → clients}/halo5_metadata_client.rb

@@ -23,9 +23,9 @@ require 'halo-api/modules/metadata/halo5/weapons'
 
 
 module Halo
-  module Metadata
+  module Clients
 
-    # Halo 5 Metadata endpoints
+    # Halo 5 Metadata Client
     class Halo5MetadataClient < Client
 
       def initialize(options = {})

data/lib/halo-api/{modules/profile → clients}/halo5_profile_client.rb

@@ -6,9 +6,9 @@ require 'halo-api/modules/profile/halo5/player_spartan_image'
 
 
 module Halo
-  module Profile
+  module Clients
 
-    # Halo 5 Profile endpoints
+    # Halo 5 Profile Client
     class Halo5ProfileClient < Client
 
       def initialize(options = {})

data/lib/halo-api/{modules/stats → clients}/halo5_stats_client.rb

@@ -20,9 +20,9 @@ require 'halo-api/modules/stats/halo5/pc_player_service_records_custom'
 
 
 module Halo
-  module Stats
+  module Clients
 
-    # Halo 5 Stats endpoints
+    # Halo 5 Stats Client
     class Halo5StatsClient < Client
 
       def initialize(options = {})

data/lib/halo-api/{modules/ugc → clients}/halo5_ugc_client.rb

@@ -7,9 +7,9 @@ require 'halo-api/modules/ugc/halo5/player_map_variants'
 
 
 module Halo
-  module Ugc
+  module Clients
 
-    # Halo 5 Ugc endpoints
+    # Halo 5 Ugc Client
     class Halo5UgcClient < Client
 
       def initialize(options = {})

data/lib/halo-api/{modules/metadata → clients}/halo_wars2_metadata_client.rb

@@ -19,13 +19,13 @@ require 'halo-api/modules/metadata/halo_wars2/techs'
 
 
 module Halo
-  module Metadata
+  module Clients
 
     # Halo Wars 2 Metadata Client
     class HaloWars2MetadataClient < Client
 
       def initialize(options = {})
-        client_settings = {endpoint: '/metadata/hw2'}
+        client_settings = { endpoint: '/metadata/hw2' }
         client_settings = client_settings.merge(options)
 
         super(client_settings)

data/lib/halo-api/{modules/stats → clients}/halo_wars2_stats_client.rb

@@ -12,7 +12,7 @@ require 'halo-api/modules/stats/halo_wars2/player_xp'
 
 
 module Halo
-  module Stats
+  module Clients
 
     # Halo Wars 2 Stats Client
     class HaloWars2StatsClient < Client

data/lib/halo-api/modules/metadata/halo5/campaign_missions.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class CampaignMissions < Halo::APIResponse
+      class CampaignMissions < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def all(options = {})
-          get_data("#{@endpoint}/campaign-missions", options)
+          get_data('/campaign-missions', options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/commendations.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class Commendations < Halo::APIResponse
+      class Commendations < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def all(options = {})
-          get_data("#{@endpoint}/commendations", options)
+          get_data('/commendations', options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/csr_designations.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class CsrDesignations < Halo::APIResponse
+      class CsrDesignations < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def all(options = {})
-          get_data("#{@endpoint}/csr-designations", options)
+          get_data('/csr-designations', options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/enemies.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class Enemies < Halo::APIResponse
+      class Enemies < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def all(options = {})
-          get_data("#{@endpoint}/enemies", options)
+          get_data('/enemies', options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/flexible_stats.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class FlexibleStats < Halo::APIResponse
+      class FlexibleStats < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def all(options = {})
-          get_data("#{@endpoint}/flexible-stats", options)
+          get_data('/flexible-stats', options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/game_base_variants.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class GameBaseVariants < Halo::APIResponse
+      class GameBaseVariants < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def all(options = {})
-          get_data("#{@endpoint}/game-base-variants", options)
+          get_data('/game-base-variants', options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/game_variant.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class GameVariant < Halo::APIResponse
+      class GameVariant < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def find(id, options = {})
-          get_data("#{@endpoint}/game-variants/#{id}", options)
+          get_data("/game-variants/#{id}", options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/impulses.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class Impulses < Halo::APIResponse
+      class Impulses < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def all(options = {})
-          get_data("#{@endpoint}/impulses", options)
+          get_data('/impulses', options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/map_variant.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class MapVariant < Halo::APIResponse
+      class MapVariant < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def find(id, options = {})
-          get_data("#{@endpoint}/map-variants/#{id}", options)
+          get_data("/map-variants/#{id}", options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/maps.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class Maps < Halo::APIResponse
+      class Maps < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def all(options = {})
-          get_data("#{@endpoint}/maps", options)
+          get_data('/maps', options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/medals.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class Medals < Halo::APIResponse
+      class Medals < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def all(options = {})
-          get_data("#{@endpoint}/medals", options)
+          get_data('/medals', options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/playlist.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class Playlist < Halo::APIResponse
+      class Playlist < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def all(options = {})
-          get_data("#{@endpoint}/playlist", options)
+          get_data('/playlist', options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/requisition.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class Requisition < Halo::APIResponse
+      class Requisition < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def find(id, options = {})
-          get_data("#{@endpoint}/requisitions/#{id}", options)
+          get_data("/requisitions/#{id}", options)
         end
 
       end

data/lib/halo-api/modules/metadata/halo5/requisition_pack.rb

@@ -1,14 +1,14 @@
 module Halo
   module Metadata
     module Halo5
-      class RequisitionPack < Halo::APIResponse
+      class RequisitionPack < APIResponse
 
         def initialize(options = {})
           super(options)
         end
 
         def find(id, options = {})
-          get_data("#{@endpoint}/requisitions/#{id}", options)
+          get_data("/requisition-packs/#{id}", options)
         end
 
       end