warframe 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fbb7e4ec10b0e0025f2a7270e2c29dd709999cba7658aaea54a21fd3be00947
-  data.tar.gz: 0477ac222872fc1409b196c25b570264b1a828fedf72590e9edf75bceca63464
+  metadata.gz: b716fffff85670e6edf2b10c1eedca0814d4cd1b99e5689c095722cf16285a9d
+  data.tar.gz: f310cf2ebae9b6692a0450010a2bb35175aa52fb10fe3b47a55fc124b77b3891
 SHA512:
-  metadata.gz: 3365b0ea6f6d4d24a5504a9ae3d9245b2dd7fe4aa25a9a8975fd3e93c82fd3e3401aa56968fa5590c3873f3ca0097748d62b8764b2d4f100aa2db8a2d37a501f
-  data.tar.gz: 140f505cae2155b0666d8335734818ed46a9becf42eafe77e6034dcb47d3f07311b6989e69bcd788764021855331030385225589792b655db6391e7dd43c68b2
+  metadata.gz: c364ec3740bfe9754d4e132a9307e4b42223497d5d6686faff4e6bd7672a005786dd3fec881079e428908d538153a9bc079e282c3274ed086aa97becdf81bb8b
+  data.tar.gz: 0c9edf81d881ed08d0b8bbb222d965b8f8daa5c8d36f89c7d57b7383a64c647d325b39cf5bfb01db890d42384ff11445aa6b2cd8edd98cc11190e8b2ff6a07e7

data/.yardopts

@@ -1,4 +1,4 @@
---no-private
---protected
--
+--no-private
+--protected
+-
 README.md

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+
+### [0.3.2](https://www.github.com/WFCD/warframe-ruby/compare/v0.3.1...v0.3.2) (2021-12-29)
+
+
+### Bug Fixes
+
+* **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.3.1](https://www.github.com/WFCD/warframe-ruby/compare/v0.3.0...v0.3.1) (2021-12-14)
+
+
+### Bug Fixes
+
+* **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))

data/README.md

@@ -1,97 +1,99 @@
-# warframe-ruby
-[![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
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'warframe'
-```
-
-And then execute:
-
-    $ bundle install
-
-Or install it yourself as:
-
-    $ gem install warframe
-
-## Usage
-
-To get started accessing live data, you must instantiate a new `Warframe::REST::Client`
-```ruby
-require 'warframe'
-
-client = Warframe::REST::Client.new # => <Warframe::REST::Client platform='pc' language='en'>
-
-# 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'>
-```
-
-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
-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.
-
-## Development
-
-### Dependency Management
-After checking out the repo, run `bundle install` to install required dependencies. 
-
-### Testing
-To check if your changes are passing tests, run:
-
-    $ rake test
-
-> Testing framework provided by [RSpec](https://rspec.info/).
-
-### Linting
-To auto-correct styling offenses, run: 
-
-    $ rake lint
-
-> All linting is provided by [RuboCop](https://github.com/rubocop/rubocop).
-
-### 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 C:/Users/ajrom/RubymineProjects/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 run:
-
-    $ rake test
-    
-To ensure the new model is able to be created and accessed correctly, feel free to create more tests in the [spec directory](/spec/models).
-
-## 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).
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+# 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
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'warframe'
+```
+
+And then execute:
+
+    $ bundle install
+
+Or install it yourself as:
+
+    $ gem install warframe
+
+## Usage
+
+To get started accessing live data, you must instantiate a new `Warframe::REST::Client`
+```ruby
+require 'warframe'
+
+client = Warframe::REST::Client.new # => <Warframe::REST::Client platform='pc' language='en'>
+
+# 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'>
+```
+
+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
+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.
+
+## Development
+
+### Dependency Management
+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
+
+> Testing framework provided by [RSpec](https://rspec.info/).
+
+### Linting
+To auto-correct styling offenses, run: 
+
+    $ thor style:fix
+
+> All linting is provided by [RuboCop](https://github.com/rubocop/rubocop).
+
+### 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.
+
+## 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).
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/warframe/cache.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Warframe
+  # @private
+  class Cache
+    # Expiration time in seconds
+    EXPIRATION_TIME = 5 * 60
+    attr_accessor :cache
+
+    def initialize
+      @cache = {}
+    end
+
+    def get_from_cache(key)
+      cache[key][:result]
+    end
+
+    def find_in_cache(key)
+      cache[key][:result] if exist?(key) && !expired?(key)
+    end
+
+    def add_to_cache(key, val, time = EXPIRATION_TIME)
+      cache[key] = { time: Time.now.to_i + time, result: val }
+      val
+    end
+
+    private
+
+    def exist?(key)
+      !cache[key].nil?
+    end
+
+    def expired?(key)
+      cache[key][:time] - Time.now.to_i <= 0
+    end
+  end
+end

data/lib/warframe/client_wrapper.rb

@@ -1,37 +1,39 @@
-# frozen_string_literal: true
-
-module Warframe
-  # @abstract
-  # @private
-  # Wraps the {Warframe::REST::Client REST::Client} with necessary variables and methods.
-  #
-  # This class should < not be used > for interacting with the API.
-  class ClientWrapper
-    # The base Warframe Stat API link
-    BASE_URL = 'https://api.warframestat.us/'
-    # Default attributes
-    DEFAULT_OPTIONS = { platform: 'pc', language: 'en' }.freeze
-    attr_accessor :platform, :language
-
-    # Initialize the Wrapper for {Warframe::REST::Client REST::Client}
-    #
-    # @param options [Hash] merges with {DEFAULT_OPTIONS}
-    #
-    # See {Warframe::REST::Client REST::Client} for all accepted languages, platforms, and examples.
-    #
-    # This class is ABSTRACT and should not be instantiated outside of {Warframe::REST::Client REST::Client}.
-    # @return [Warframe::ClientWrapper]
-    def initialize(options = {})
-      DEFAULT_OPTIONS.merge(options).each { |k, v| instance_variable_set "@#{k}", v }
-
-      yield self if block_given?
-    end
-
-    # @return [String] the base url and platform combined.
-    def base_url
-      BASE_URL + platform
-    end
-
-    # might need to manipulate user_agent
-  end
-end
+# frozen_string_literal: true
+
+require_relative 'cache'
+
+module Warframe
+  # @abstract
+  # @private
+  # Wraps the {Warframe::REST::Client REST::Client} with necessary variables and methods.
+  #
+  # This class should < not be used > for interacting with the API.
+  class ClientWrapper < Warframe::Cache
+    # 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 Wrapper for {Warframe::REST::Client REST::Client}
+    #
+    # @param options [Hash] merges with {DEFAULT_OPTIONS}
+    #
+    # See {Warframe::REST::Client REST::Client} for all accepted languages, platforms, and examples.
+    #
+    # This class is ABSTRACT and should not be instantiated outside of {Warframe::REST::Client REST::Client}.
+    # @return [Warframe::ClientWrapper]
+    def initialize(options = {})
+      super()
+      DEFAULT_OPTIONS.merge(options).each { |k, v| instance_variable_set "@#{k}", v }
+      yield self if block_given?
+    end
+
+    # @return [String] the base url and platform combined.
+    def base_url
+      BASE_URL + platform
+    end
+  end
+end

data/lib/warframe/models/alert.rb

@@ -1,29 +1,30 @@
-# 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'
-
-module Warframe
-  module Models
-    # Model for World State 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
-
-      # The id of the Alert.
-      # @return [String]
-      attr_reader :id
-
-      # The mission data of this alert.
-      # @return [OpenStruct]
-      attr_reader :mission
-    end
-  end
-end
+# 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'
+
+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
+
+      # The id of the Alert.
+      # @return [String]
+      attr_reader :id
+
+      # The mission data of this alert.
+      # @return [OpenStruct]
+      attr_reader :mission
+    end
+  end
+end

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

@@ -1,31 +1,31 @@
-# frozen_string_literal: true
-
-module Warframe
-  module Models
-    module Attributes
-      # Includes the active? attribute.
-      module Active
-        # Whether or not the event is active.
-        # @return [Boolean]
-        attr_reader :active
-        alias active? active
-      end
-
-      # Includes the activation date as an attribute.
-      module Activation
-        # The time the event was activated.
-        # @return [String]
-        attr_reader :activation
-      end
-
-      # For models that require both {Warframe::Models::Common::Active Common::Active}
-      # and {Warframe::Models::Common::Activation Common::Activation}
-      #
-      # Includes both the active? and activation methods.
-      module ActiveBoth
-        include Activation
-        include Active
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Warframe
+  module Models
+    module Attributes
+      # Includes the active? attribute.
+      module Active
+        # Whether or not the event is active.
+        # @return [Boolean]
+        attr_reader :active
+        alias active? active
+      end
+
+      # Includes the activation date as an attribute.
+      module Activation
+        # The time the event was activated.
+        # @return [String]
+        attr_reader :activation
+      end
+
+      # For models that require both {Warframe::Models::Attributes::Active Attributes::Active}
+      # and {Warframe::Models::Attributes::Activation Attributes::Activation}
+      #
+      # Includes both the active? and activation methods.
+      module ActiveBoth
+        include Activation
+        include Active
+      end
+    end
+  end
+end

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

@@ -1,21 +1,21 @@
-# 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
-
-      # Includes the description attribute.
-      module Description
-        # The description of the data requested.
-        # @return [String]
-        attr_reader :description
-      end
-    end
-  end
-end
+# 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
+
+      # Includes the description attribute.
+      module Description
+        # The description of the data requested.
+        # @return [String]
+        attr_reader :description
+      end
+    end
+  end
+end

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

@@ -1,14 +1,14 @@
-# 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
-  end
-end
+# 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
+  end
+end

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

@@ -1,30 +1,30 @@
-# frozen_string_literal: true
-
-module Warframe
-  module Models
-    # Common Attributes between models.
-    module Attributes
-      # Includes the expiry attribute.
-      module Expiry
-        # When the event will expire.
-        # @return [String]
-        attr_reader :expiry
-      end
-
-      # Adds a boolean attribute expired? to see whether or not the even has expired.
-      module Expired
-        # Whether or not the event has expired.
-        # @return [Boolean]
-        attr_reader :expired
-        alias expired? expired
-      end
-
-      # Adds the {Warframe::Models::Attributes::Expiry Attributes::Expiry} &
-      # {Warframe::Models::Attributes::Expired Attributes::Expired} attributes.
-      module Expiration
-        include Expiry
-        include Expired
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Warframe
+  module Models
+    # Common Attributes between models.
+    module Attributes
+      # Includes the expiry attribute.
+      module Expiry
+        # When the event will expire.
+        # @return [String]
+        attr_reader :expiry
+      end
+
+      # Adds a boolean attribute expired? to see whether or not the even has expired.
+      module Expired
+        # Whether or not the event has expired.
+        # @return [Boolean]
+        attr_reader :expired
+        alias expired? expired
+      end
+
+      # Adds the {Warframe::Models::Attributes::Expiry Attributes::Expiry} &
+      # {Warframe::Models::Attributes::Expired Attributes::Expired} attributes.
+      module Expiration
+        include Expiry
+        include Expired
+      end
+    end
+  end
+end

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

@@ -1,14 +1,14 @@
-# frozen_string_literal: true
-
-module Warframe
-  module Models
-    module Attributes
-      # Unique data response ID.
-      module ID
-        # The unique ID of the event.
-        # @return [String]
-        attr_reader :id
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Warframe
+  module Models
+    module Attributes
+      # Unique data response ID.
+      module ID
+        # The unique ID of the event.
+        # @return [String]
+        attr_reader :id
+      end
+    end
+  end
+end