warframe 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78748576f24eb1184699a2140bc9fefefd272db2ca66d34368e0654915b68e3e
-  data.tar.gz: 8b5f568ff6cae893642de84e623e4e042eb533a8aba61b6f818967423b192d92
+  metadata.gz: c41bb2e150afd7f4885bf7c988a9f4b62b4a7867ec22bcb11b1b868fcd5ec68e
+  data.tar.gz: eb8aa4b8f9125a7b5fb3871f741569f0b7cd331ba007e3fa7dad39b0993c8a99
 SHA512:
-  metadata.gz: 932ca17b0a6a573edb25624b2be3c951cb1d84416c32cde4c91ac4a3cf319fb4a1579ddd076a0e2add9fe8306a018878912ea4debd45fce452fe6da94f2de8d9
-  data.tar.gz: b26454fb1d3f0e0b32c01bce42b66e79d930038018d8f5a6d9de02a2c8da036adcc6aa7e61b6226f864645ecb7e7d29130487f0653fde5b34eaa3dce2b94d04b
+  metadata.gz: 70dfc7b98ee37259ee69ad87ab3a5b8d08db227b1c999037a19e21f1d38c86bc49110f99d3a88695dd7bb27c82119bffe5c5a02a29f9916fe9a87fd20dce508e
+  data.tar.gz: f581f1e361862ae0760b73f1fadea8883a9d8f8a696db8e08a84aae7f9b3de9d51099cd40d9ab598d753a3a9b78410b4b1165b223977817e785b8dfb0b9ab540

data/CHANGELOG.md

@@ -1,26 +1,45 @@
 # Changelog
 
-## [0.4.0](https://www.github.com/WFCD/warframe-ruby/compare/v0.3.2...v0.4.0) (2022-01-02)
+### [1.0.0](https://www.gitlab.com/aj-rom/warframe-ruby/compare/v0.4.0...v1.0.0) (2022-06-1)
 
+#### Breaking Changes
 
-### Features
+- **dependencies** use require_all to load moudlar project ([72359701](https://gitlab.com/aj-rom/warframe-ruby/-/merge_requests/65/diffs?commit_id=72359701addd0f588757a4a9122e94b275c490f3))
+- **repository:** Moved to https://gitlab.com/aj-rom/warframe-ruby which in turn broke some pre-existing lings on older versions.
+- **refactor:**
+  - remove no longer used helper files ([f312f5f7](https://gitlab.com/aj-rom/warframe-ruby/-/merge_requests/65/diffs?commit_id=fef7852d7a255093fb6e2e7a1209614bd5dfa914))
+  - Remodularize 'Rest' into main module ([9d681b4b](https://gitlab.com/aj-rom/warframe-ruby/-/merge_requests/65/diffs?commit_id=9d681b4b91f53e0f06a1d0b62dd851aef56248b1))
+  - Remove unecessary client wrapper ([8956cfe6](https://gitlab.com/aj-rom/warframe-ruby/-/merge_requests/65/diffs?commit_id=8956cfe63465594a860d8df1c42fd5c899ab4a88))
 
-* **REST:** add `vallisCycle` route. ([#61](https://www.github.com/WFCD/warframe-ruby/issues/61)) ([f81577f](https://www.github.com/WFCD/warframe-ruby/commit/f81577fc6af0ec45948cfd57cc1d67de684ce03c))
+#### Features
 
-### [0.3.2](https://www.github.com/WFCD/warframe-ruby/compare/v0.3.1...v0.3.2) (2021-12-29)
+- **cache:** allow cache to be instantiated from hash ([fef7852](https://gitlab.com/aj-rom/warframe-ruby/commit/fef7852d7a255093fb6e2e7a1209614bd5dfa914))
+- **dependencies:** Update runtime dependencies ([65086ca](https://gitlab.com/aj-rom/warframe-ruby/commit/65086ca6795d4d8352adc8926bda9938ffde152a))
+- **refactor:** Remodularize 'Models' to include attributes ([e3eae5d](https://gitlab.com/aj-rom/warframe-ruby/commit/e3eae5de6cd4be7ec88643038d3d8d6a9ab49bf4))
 
+#### Bug Fixes
 
-### Bug Fixes
+- **Gem:** resolve ruby versions less than 2.5 being unable to install ([b53247c](https://gitlab.com/aj-rom/warframe-ruby/commit/b53247c23524c28a890114208a9ecd6ec22468d2))
+- **README:** update README for v1.0.0 ([c623c2a](https://gitlab.com/aj-rom/warframe-ruby/commit/c623c2aa75e73ed1becdbad01a8ce7fa770a4a9e))
 
-* **changelog:** added changelog to gemspec. [#54](https://www.github.com/WFCD/warframe-ruby/issues/54) ([0164546](https://www.github.com/WFCD/warframe-ruby/commit/01645466c75069800b2f69f1146625e5dc6f6775))
-* **dependencies:** add support for no bundler ([741aff8](https://www.github.com/WFCD/warframe-ruby/commit/741aff8c9d271c80419d1c8046aab37889443514))
-* **dependencies:** remove lock file ([86890fe](https://www.github.com/WFCD/warframe-ruby/commit/86890fec76e702db5d8ee397d875aae28299a262))
-* **docs:** fix incorrect attribute module ([cad978b](https://www.github.com/WFCD/warframe-ruby/commit/cad978bc42679e6a7240b5f6045b70e0fc157f3c))
+### [0.4.0](https://www.gitlab.com/aj-rom/warframe-ruby/compare/v0.3.2...v0.4.0) (2022-01-02)
 
-### [0.3.1](https://www.github.com/WFCD/warframe-ruby/compare/v0.3.0...v0.3.1) (2021-12-14)
+#### Features
 
+- **REST:** add `vallisCycle` route. ([#61](https://www.gitlab.com/aj-rom/warframe-ruby/issues/61)) ([f81577f](https://www.gitlab.com/aj-rom/warframe-ruby/commit/f81577fc6af0ec45948cfd57cc1d67de684ce03c))
 
-### Bug Fixes
+### [0.3.2](https://www.gitlab.com/aj-rom/warframe-ruby/compare/v0.3.1...v0.3.2) (2021-12-29)
 
-* **dependencies:** generify runtime bundler dependency ([d0bd8ad](https://www.github.com/WFCD/warframe-ruby/commit/d0bd8ad2f4096dade9175461c0c4a1c8cc2114ca))
-* **dependencies:** update thor to v1.1.0 ([2598318](https://www.github.com/WFCD/warframe-ruby/commit/2598318b351cfd07f7a691305cc1141681db598b))
+#### Bug Fixes
+
+- **changelog:** added changelog to gemspec. [#54](https://www.gitlab.com/aj-rom/warframe-ruby/issues/54) ([0164546](https://www.gitlab.com/aj-rom/warframe-ruby/commit/01645466c75069800b2f69f1146625e5dc6f6775))
+- **dependencies:** add support for no bundler ([741aff8](https://www.gitlab.com/aj-rom/warframe-ruby/commit/741aff8c9d271c80419d1c8046aab37889443514))
+- **dependencies:** remove lock file ([86890fe](https://www.gitlab.com/aj-rom/warframe-ruby/commit/86890fec76e702db5d8ee397d875aae28299a262))
+- **docs:** fix incorrect attribute module ([cad978b](https://www.gitlab.com/aj-rom/warframe-ruby/commit/cad978bc42679e6a7240b5f6045b70e0fc157f3c))
+
+### [0.3.1](https://www.gitlab.com/aj-rom/warframe-ruby/compare/v0.3.0...v0.3.1) (2021-12-14)
+
+#### Bug Fixes
+
+- **dependencies:** generify runtime bundler dependency ([d0bd8ad](https://www.gitlab.com/aj-rom/warframe-ruby/commit/d0bd8ad2f4096dade9175461c0c4a1c8cc2114ca))
+- **dependencies:** update thor to v1.1.0 ([2598318](https://www.gitlab.com/aj-rom/warframe-ruby/commit/2598318b351cfd07f7a691305cc1141681db598b))

data/README.md

@@ -1,11 +1,11 @@
 # warframe-ruby
+
 [![Supported by Warframe Community Developers](https://warframestat.us/wfcd.png)](https://github.com/WFCD/banner/blob/main/PROJECTS.md "Supported by Warframe Community Developers")
 [![Ruby Gem Version](https://badgen.net/rubygems/v/warframe)](https://rubygems.org/gems/warframe)
 [![Downloads](https://badgen.net/rubygems/dt/warframe)](https://rubygems.org/gems/warframe)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop/rubocop)
 [![Platform](https://badgen.net/rubygems/p/warframe)](https://www.ruby-lang.org/en/)
 
-
 A Ruby client for [Warframe Stat](https://warframestat.us) bringing you live modeled data from their API.
 
 ## Installation
@@ -18,81 +18,86 @@ gem 'warframe'
 
 And then execute:
 
-    $ bundle install
+```console
+bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install warframe
+```console
+gem install warframe
+```
 
 ## Usage
 
-To get started accessing live data, you must instantiate a new `Warframe::REST::Client`
+To get started accessing live data, you must instantiate a new `Warframe::Client`
+
 ```ruby
 require 'warframe'
 
-client = Warframe::REST::Client.new # => <Warframe::REST::Client platform='pc' language='en'>
+Warframe::Client.new # => <Warframe::Client platform='pc' language='en'>
+
+Warframe::Client.new(platform: 'xb1', language: 'fr') # => <Warframe::Client platform='xb1' language='fr'>
 
 # You can supply a hash to set your preferred platform or language.
 my_custom_options = { platform: 'ps4', language: 'de' }
-german_ps4 = Warframe::REST:Client.new my_custom_options # => <Warframe::REST::Client platform='ps4' language='de'>
+Warframe::Client.new my_custom_options # => <Warframe::Client platform='ps4' language='de'>
 ```
 
 This gives us access to a plethora of methods, check out the [documentation](https://rubydoc.info/gems/warframe) for more info.
-```ruby
 
-client = Warframe::REST::Client.new
+```ruby
+client = Warframe::Client.new
 client.nightwave # => <Warframe::Models::Nightwave>
 client.alerts # => [ <Warframe::Models::Alert>, <Warframe::Models::Alert> ]
 ```
 
 ## Documentation
 
-Documentation is currently provided by [rubydoc.info](https://rubydoc.info), check out the current versions documentation at https://rubydoc.info/gems/warframe.
+Documentation is currently provided by [rubydoc.info](https://rubydoc.info), check out the current versions documentation at <https://rubydoc.info/gems/warframe>.
 
 ## Development
 
+### Ruby Versions
+
+We plan to support only support *stable* Ruby versions that have yet to reach [end of life](https://endoflife.date/ruby).
+Although leave the required Ruby version to the lowest of our runtime dependencies in case anyone would like to use an older version.
+
+| Version | Tested | Status |
+| --- | --- | --- |
+| `3.1` | :white_check_mark: | :white_check_mark: |
+| `3.0` | :white_check_mark: | :white_check_mark: |
+| `2.7` | :white_check_mark: | :white_check_mark: |
+| `2.3+` | :no_entry_sign: | :white_check_mark: |
+| `2.2-` | :no_entry_sign: | :no_entry_sign: |
+
 ### Dependency Management
-After checking out the repo, run: 
 
-    $ bundle install
-    
+After checking out the repo, run:
+
+- ```bundle install```
+
 > This will install all required dependencies for this gem to run.
 
 ### Testing
+
 To check if your changes are passing tests, run:
 
-    $ thor test:rspec
+- ```bundle exec rspec```
 
 > Testing framework provided by [RSpec](https://rspec.info/).
 
 ### Linting
-To auto-correct styling offenses, run: 
 
-    $ thor style:fix
+To auto-correct styling offenses, run:
 
-> All linting is provided by [RuboCop](https://github.com/rubocop/rubocop).
+- ```bundle exec rubocop -A```
 
-### Generating New Routes / Models with Thor
-Using Thor allows us to create new routes and models via the command line, making it very simple to add new elements.
-
-For example if we wanted to add, [conclaveChallenges](https://docs.warframestat.us/#tag/Worldstate/paths/~1{platform}~1conclaveChallenges/get) we run:
-
-    $ thor generate conclaveChallenges 
-    
-    >       create  lib/warframe/models/conclave_challenge.rb
-    >       create  lib/warframe/rest/api/conclave_challenges.rb
-    >       conflict  lib/warframe/rest/api.rb
-    > Overwrite ~/warframe/lib/warframe/rest/api.rb? (enter "h" for help) [Ynaqdh] 
-    
-    $ Y
-    
-    >       force  lib/warframe/rest/api.rb
-
-This creates a blank [model](/lib/warframe/models) for the data and a [route](/lib/warframe/rest/api) with a name spaced method for it, and then adds this method to our [REST::API](/lib/warframe/rest/api). Add attributes to the corresponding model and then write associated tests.
+> All linting is provided by [RuboCop](https://github.com/rubocop/rubocop).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/aj-rom/warframe-ruby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/aj-rom/warframe-ruby/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitLab at <https://gitlab.com/aj-rom/warframe-ruby>. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://gitlab.com/aj-rom/warframe-ruby/blob/master/CODE_OF_CONDUCT.md).
 
 ## License
 

data/lib/warframe/api/alerts.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Warframe::API
+  # API endpoint for getting information on current Alerts data.
+  #
+  # {https://api.warframestat.us/pc/alerts Example Response}
+  module Alerts
+    # Gets the current Alerts data.
+    # @return [Array<[Warframe::Models::Alert]>]
+    def alerts
+      get('/alerts', Warframe::Models::Alert)
+    end
+  end
+end

data/lib/warframe/api/cambion_drift.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_rel '../models/cambion_drift'
+
+module Warframe::API
+  # API endpoint for getting information on current Cambion Drift data.
+  #
+  # {https://api.warframestat.us/pc/cambionDrift Example Response}
+  module CambionDrift
+    # Gets the current cambionDrift Data.
+    # @return Warframe::Models::CambionDrift
+    def cambion_drift
+      get('/cambionCycle', Warframe::Models::CambionDrift)
+    end
+  end
+end

data/lib/warframe/api/cetus.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_rel '../models/cetus'
+
+module Warframe::API
+  # API endpoint for getting information on current Cetus data.
+  #
+  # {https://api.warframestat.us/pc/cetusCycle Example Response}
+  module Cetus
+    # Gets the current cetusCycle Data.
+    # @return [Warframe::Models::Cetus]
+    def cetus
+      get('/cetusCycle', Warframe::Models::Cetus)
+    end
+  end
+end

data/lib/warframe/api/conclave_challenges.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_rel '../models/conclave_challenge'
+
+module Warframe::API
+  # API endpoint for getting information on current Conclave Challenge data.
+  #
+  # {https://api.warframestat.us/pc/conclaveChallenges Example Response}
+  module ConclaveChallenges
+    # Gets the current conclave challenges.
+    # @return [Array<Warframe::Models::ConclaveChallenge>]
+    def conclave_challenges
+      get('/conclaveChallenges', Warframe::Models::ConclaveChallenge)
+    end
+  end
+end

data/lib/warframe/api/global_upgrades.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_rel '../models/global_upgrade'
+
+module Warframe::API
+  # API endpoint for getting information on current Global Upgrades data.
+  #
+  # {https://api.warframestat.us/pc/globalUpgrades Example Response}
+  module GlobalUpgrades
+    # Gets the current Global Upgrades data.
+    # @return [Array<[Warframe::Models::GlobalUpgrade]>]
+    def global_upgrades
+      get('/globalUpgrades', Warframe::Models::GlobalUpgrade)
+    end
+  end
+end

data/lib/warframe/api/invasions.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_rel '../models/invasion'
+
+module Warframe::API
+  # API endpoint for getting information on current Invasions data.
+  #
+  # {https://api.warframestat.us/pc/invasions Example Response}
+  module Invasions
+    # Gets the current Invasions data.
+    # @return [Array<[Warframe::Models::Invasion]>]
+    def invasions
+      get('/invasions', Warframe::Models::Invasion)
+    end
+  end
+end

data/lib/warframe/api/news.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_rel '../models/news'
+
+module Warframe::API
+  # API endpoint for getting information from the News route.
+  #
+  # {https://api.warframestat.us/pc/news Example Response}
+  module News
+    # Gets the current news data.
+    # @return [Array<Warframe::Models::News>]
+    def news
+      get('/news', Warframe::Models::News)
+    end
+  end
+end

data/lib/warframe/api/nightwave.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_rel '../models/nightwave'
+
+module Warframe::API
+  # API endpoint for getting information from the Nightwave route.
+  #
+  # {https://api.warframestat.us/pc/nightwave Example Response}
+  module Nightwave
+    # Gets the current Nightwave Mission data.
+    # @return [Warframe::Models::Nightwave]
+    def nightwave
+      get('/nightwave', Warframe::Models::Nightwave)
+    end
+  end
+end

data/lib/warframe/api/sortie.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_rel '../models/sortie'
+
+module Warframe::API
+  # API endpoint for getting information on current Sortie data.
+  #
+  # {https://api.warframestat.us/pc/sortie Example Response}
+  module Sortie
+    # Gets the current sortie missions.
+    # @return [Array<Warframe::Models::Sortie>]
+    def sortie
+      get('/sortie', Warframe::Models::Sortie)
+    end
+  end
+end

data/lib/warframe/api/steel_path.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_rel '../models/steel_path'
+
+module Warframe::API
+  # API endpoint for getting information on current SteelPath data.
+  #
+  # {https://api.warframestat.us/pc/steelPath Example Response}
+  module SteelPath
+    # Steel Path data
+    # @return [Warframe::Models::SteelPath]
+    def steel_path
+      get('/steelPath', Warframe::Models::SteelPath)
+    end
+  end
+end

data/lib/warframe/api/syndicate_missions.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_rel '../models/syndicate_mission'
+
+module Warframe::API
+  # API endpoint for getting information on current SyndicateMission data.
+  #
+  # {https://api.warframestat.us/pc/syndicateMissions Example Response}
+  module SyndicateMissions
+    # Gets the current syndicateMissions Data.
+    # @return [Array<Warframe::Models::SyndicateMission>]
+    def syndicate_missions
+      get('/syndicateMissions', Warframe::Models::SyndicateMission)
+    end
+  end
+end

data/lib/warframe/api/vallis_cycle.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_rel '../models/vallis_cycle'
+
+module Warframe::API
+  # API endpoint for getting information on current VallisCycle data.
+  #
+  # {https://api.warframestat.us/pc/vallisCycle Example Response}
+  module VallisCycle
+    # Gets the current vallisCycle Data.
+    # @return [Warframe::Models::VallisCycle]
+    def vallis_cycle
+      get('/vallisCycle', Warframe::Models::VallisCycle)
+    end
+  end
+end

data/lib/warframe/api.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_rel 'api'
+require_rel 'models'
+
+# The API Router for getting live data.
+#
+# Attempting to have every accessible route from {https://docs.warframestat.us Warframe Stat}.
+#
+# Module names are 'routes' to this API. See {Warframe::API::Alerts Alerts} for example.
+module Warframe::API
+  include Alerts
+  include CambionDrift
+  include Cetus
+  include ConclaveChallenges
+  include GlobalUpgrades
+  include Invasions
+  include News
+  include Nightwave
+  include Sortie
+  include SteelPath
+  include SyndicateMissions
+  include VallisCycle
+end

data/lib/warframe/cache.rb

@@ -7,12 +7,12 @@ module Warframe
     EXPIRATION_TIME = 5 * 60
     attr_accessor :cache
 
-    def initialize
-      @cache = {}
+    def initialize(cache = {})
+      @cache = cache
     end
 
     def get_from_cache(key)
-      cache[key][:result]
+      cache[key][:result] if exist?(key)
     end
 
     def find_in_cache(key)

data/lib/warframe/client.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require_rel 'api'
+require_rel 'cache'
+
+module Warframe
+  # The main application Client for access live feed data.
+  #
+  # == Example Usage
+  #
+  #   client = Warframe::Client.new
+  #   client.nightwave.tag # => 'Radio Legion Intermission'
+  #
+  # == Accepted Platforms
+  #
+  #   default = 'pc'
+  #   all_platorms = [ 'pc', 'ps4', 'xb1', 'swi' ]
+  #
+  #   client = Waframe::Client.new(platform: 'ps4')
+  #   client.platform # => 'ps4'
+  #   client.language # => 'en'
+  #
+  # == Accepted Languages
+  #
+  #   default = 'en'
+  #   all_languages = [ 'de', 'es', 'en', 'fr', 'it', 'ko', 'pl', 'pt', 'ru', 'zh' ]
+  #
+  #   client = Warframe::Client.new(language: 'fr')
+  #   client.language # => 'fr'
+  #   client.platform # => 'pc'
+  #
+  # == Setting both Platform and Language
+  #
+  #   client = Warframe::Client.new(platform: 'ps4', language: 'de')
+  #   client.platform # => 'ps4'
+  #   client.language # => 'de'
+  class Client < Cache
+    include API
+
+    # The base Warframe Stat API link
+    BASE_URL = 'https://api.warframestat.us/'
+    # Default attributes
+    DEFAULT_OPTIONS = { platform: 'pc', language: 'en' }.freeze
+
+    # The Client Cache
+    attr_accessor :platform, :language
+
+    # Initialize the client.
+    #
+    # @param platform: [String] 'pc', 'ps4', 'xb1', or 'swi'
+    # @param language: [String] 'de', 'es', 'en', 'fr', 'it', 'ko', 'pl', 'pt', 'ru', or 'zh'
+    #
+    # @return [Warframe::Client] The client instance.
+    def initialize(platform: 'pc', language: 'en')
+      super({})
+      @platform = platform
+      @language = language
+    end
+
+    # @return [String] the base url and platform combined.
+    def base_url
+      "#{BASE_URL}#{platform}"
+    end
+
+    # Performs a get operation on the requested path, and returns a mapped response of the requested model.
+    # @param path [String]
+    # @param klass [Warframe::Models]
+    def get(path, klass)
+      return get_from_cache(path) if find_in_cache(path)
+
+      result = get_request(path, klass)
+      add_to_cache(path, result)
+    end
+
+    private
+
+    def get_request(path, klass)
+      url = "#{base_url}#{path}?language=#{language}"
+      begin
+        response = RestClient.get(url)
+      rescue StandardError => e
+        raise e
+      end
+
+      return_parsed(response.body, klass)
+    end
+
+    # Returns the parsed JSON response in the form of a [Warframe::Models] or an array of [Warframe::Models]
+    # @param resp [Net::HTTP.get]
+    # @return [Warframe::Models, Array<[Warframe::Models]>]
+    def return_parsed(resp, klass)
+      parsed = JSON.parse(resp)
+      return klass.from_array(parsed) if parsed.is_a?(Array)
+
+      klass.new(parsed)
+    end
+  end
+end

data/lib/warframe/models/alert.rb

@@ -1,30 +1,23 @@
 # frozen_string_literal: true
 
-require_relative './base'
-require_relative './attributes/expiry'
-require_relative './attributes/active'
-require_relative './attributes/eta'
-require_relative './attributes/reward_types'
-require_relative './attributes/start_string'
+require_rel 'base'
 
-module Warframe
-  module Models
-    # Model for Alert data.
-    # {https://api.warframestat.hub/pc/alerts /:platform/alerts}
-    class Alert < Warframe::Models::Base
-      include Warframe::Models::Attributes::Expired
-      include Warframe::Models::Attributes::Active
-      include Warframe::Models::Attributes::ETA
-      include Warframe::Models::Attributes::RewardTypes
-      include Warframe::Models::Attributes::StartString
+module Warframe::Models
+  # Model for Alert data.
+  # {https://api.warframestat.hub/pc/alerts /:platform/alerts}
+  class Alert < Base
+    include Attributes::Expired
+    include Attributes::Active
+    include Attributes::ETA
+    include Attributes::RewardTypes
+    include Attributes::StartString
 
-      # The id of the Alert.
-      # @return [String]
-      attr_reader :id
+    # The id of the Alert.
+    # @return [String]
+    attr_reader :id
 
-      # The mission data of this alert.
-      # @return [OpenStruct]
-      attr_reader :mission
-    end
+    # The mission data of this alert.
+    # @return [OpenStruct]
+    attr_reader :mission
   end
 end

data/lib/warframe/models/attributes/description.rb

@@ -1,21 +1,17 @@
 # frozen_string_literal: true
 
-module Warframe
-  module Models
-    module Attributes
-      # Includes the desc attribute
-      module Desc
-        # The description of the data requested
-        # @return [String]
-        attr_reader :desc
-      end
+module Warframe::Models::Attributes
+  # Includes the desc attribute
+  module Desc
+    # The description of the data requested
+    # @return [String]
+    attr_reader :desc
+  end
 
-      # Includes the description attribute.
-      module Description
-        # The description of the data requested.
-        # @return [String]
-        attr_reader :description
-      end
-    end
+  # Includes the description attribute.
+  module Description
+    # The description of the data requested.
+    # @return [String]
+    attr_reader :description
   end
 end

data/lib/warframe/models/attributes/eta.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-module Warframe
-  module Models
-    module Attributes
-      # Adds the eta attribute.
-      module ETA
-        # The estimated time until arrival.
-        # @return [String]
-        attr_reader :eta
-      end
-    end
+module Warframe::Models::Attributes
+  # Adds the eta attribute.
+  module ETA
+    # The estimated time until arrival.
+    # @return [String]
+    attr_reader :eta
   end
 end