battlerite 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 582d85872b524d4fff8c3cbd74010f4cb9828fb2
-  data.tar.gz: '0382244b51c915dcf39f99ab0227fd99971776b9'
+  metadata.gz: 8247cf7160956fa03ac8e8c05c3a4cdc0eca2c06
+  data.tar.gz: e8080bc6dbdf10f6695edf9aed86ffef6ee084e8
 SHA512:
-  metadata.gz: 81092aa2b6da933b92b8f2e6cee6eff8a9892583b062c433561be4ecbe83da1b97e8e429932f02156167248ebdfbbd531ad2c2cd545eb0ac14d9dbd8000ad881
-  data.tar.gz: 8aa08afde2924bc364393595afb6d2ebad5ff518b46f7902dbcfb0e1bd4631408204d697c57e03a063949944f2b741f10859031e659153410db76470baa0d285
+  metadata.gz: ae148a6c1f8bb97c2fc72537c43b2d41536f4c27e2738230133fb371dca5eb865de0bb6dbaa1d47bf6feaa70ff2b288c4a9d7df19d12e855a434d62d1cebeaa0
+  data.tar.gz: 9b92b6de1502f64f8981c12970b915954f842d646c7fc5773d74917b14feba706e86a911d48603d39312638faf4c4a816cdf93318bbe3443cc949d2d6167a853

data/lib/battlerite.rb

@@ -11,6 +11,11 @@ module Battlerite
     Instance.new
   end
 
+  def self.visualize models
+    models = [models] unless models.respond_to? :to_ary
+    puts models.map { |model| model.to_s_tree }
+  end
+
   class Instance
 
     attr_reader :api
@@ -20,9 +25,7 @@ module Battlerite
 
       @api.public_methods(false).each do |method|
         define_singleton_method method do |*args|
-          puts "sending #{method} with #{args}"
           result = @api.send(method, *args)
-          puts "result: #{result}"
           Muncher.munch @api.send(method, *args)
         end
       end

data/lib/battlerite/api.rb

@@ -1,4 +1,4 @@
-
+require_relative "errors"
 
 module Battlerite
   class Api
@@ -15,13 +15,35 @@ module Battlerite
     def get_matches opt={}
       uri = URI(uris[:matches])
       a = uri.query.nil? ? [] : URI.decode_www_form(uri.query)
+      a << ["page[offset]", opt[:page_offset] || 0]
+      a << ["page[limit]", opt[:page_limit] || 5]
+      a << ["sort", opt[:sort] || "createdAt"]
+      a << ["filter[createdAt-start]", opt[:created_at_start] || (Time.now - (28 * 60 * 60 * 24))]
+      a << ["filter[createdAt-end]", opt[:created_at_end] || (Time.now)]
+      a << ["filter[gameMode]", opt[:game_mode]] if opt[:game_mode]
+      a << ["filter[playerIds]", opt[:player_ids]] if opt[:player_ids]
+      if opt[:player_names]
+        raise NotImplementedError, "Battlerite API 1.0 has not implemented player data yet. Check http://battlerite-docs.readthedocs.io for more information."
+      end
+      if opt[:team_names]
+        raise NotImplementedError, "Battlerite API 1.0 has not implemented team data yet. Check http://battlerite-docs.readthedocs.io for more information."
+      end
+      #a << ["filter[playerNames]", opt[:player_names]] if opt[:player_names]
+      #a << ["filter[teamNames]", opt[:team_names]] if opt[:team_names]
+      uri.query = URI.encode_www_form(a)
+      get uri
+    end
+
+    def get_matches_options opt
+      a = []
       a << ["page[offset]", opt[:offset] || 0]
       a << ["page[limit]", opt[:limit] || 5]
       a << ["sort", opt[:sort] || "createdAt"]
+      a << ["filter[createdAt-start]", opt[:start_date] || (Time.now - (28 * 60 * 60 * 24))]
+      a << ["filter[createdAt-end]", opt[:end_date] || (Time.now - (28 * 60 * 60 * 24))]
       a << ["filter[gameMode]", opt[:game_mode]] if opt[:game_mode]
       a << ["filter[teamNames]", opt[:team_names]] if opt[:team_names]
-      uri.query = URI.encode_www_form(a)
-      get uri
+      a
     end
 
     def get_match id
@@ -53,6 +75,7 @@ module Battlerite
         http.request(req)
       end
 
+      raise Battlerite::UnauthorizedError.new(res) if res.code.to_i == 401
       raise Battlerite::ApiError.new(res) if res.code.to_i >= 400
 
       JSON.parse(res.body)

data/lib/battlerite/errors.rb

@@ -8,6 +8,11 @@ module Battlerite
     def initialize data, msg="Two or more records exist with the same ID."
       @id = data[:id]
       @records = data[:records]
+      @message = msg
+    end
+
+    def message
+      @message
     end
 
   end
@@ -16,10 +21,24 @@ module Battlerite
 
     attr_reader :res
 
-    def initialize res, msg="Error received from Battlerite API"
+    def initialize res
       @res = res
     end
 
+    def message
+      "Error code #{@res.code} received from Battlerite API. Response body: #{@res.body}"
+    end
+
   end
 
+  class UnauthorizedError < ApiError
+
+    def message
+      "Unauthorized (#{@res.code}) error from Battlerite API. Did you set ENV[\"BATTLERITE_API_KEY\"]?"
+    end
+
+  end
+
+
 end
+

data/lib/battlerite/model.rb

@@ -1,7 +1,62 @@
 module Battlerite
 
   class Battlerite::Model
-    attr_reader :id
+
+    @@dig = true
+
+    def self.enable_dynamic_dig enabled
+      @@dig = enabled
+    end
+
+    def self.alias_attribute new, old
+      @aliases ||= {}
+      @aliases[new] = old
+    end
+    
+    def self.aliases
+      @aliases ||= {}
+    end
+
+    attr_reader :id, :relationships, :blob
+
+    def initialize params
+      @relationships = params.delete :relationships
+      @blob = params.delete :blob
+
+      params.each { |k, v| self.instance_variable_set :"@#{k}", v }
+
+      @relationships.each { |k, v| self.define_singleton_method(k.to_sym) { v } }
+
+      self.class.aliases.each { |new, old| self.define_singleton_method(new.to_sym) { |*args, &block| self.public_send(old, *args, &block) } }
+    end
+
+    def method_missing method, *args, &block
+      return dig(method, *args, &block) unless dig_path(method).empty? || @@dig == false
+      super(method, *args, &block)
+    end
+
+    def respond_to? method, *args, &block
+      return !dig_path(method).empty? || super(method, *args, &block) if @@dig
+      return super(method, *args, &block)
+    end
+
+    def method(method)
+      if !dig_path(method).empty? && @@dig
+        super(:dig)
+      else
+        super(method)
+      end
+    end
+
+    def dig_path(method)
+      return [self] if @relationships.keys.include?(method)
+      return [self] if self.class.aliases.keys.include?(method)
+      return @relationships.values.map { |v| v.map { |i| i.dig_path(method) } }.compact.flatten
+    end
+
+    def dig(method, *args, &block)
+      dig_path(method).map { |v| v.public_send(method, *args, &block) }.flatten
+    end
 
     def to_s
       "#{self.class.name.split("::").last}: #{id[0,5]}..."
@@ -15,6 +70,7 @@ module Battlerite
 
   end
 
-  Dir[File.join(File.dirname(__FILE__), "models", "*.rb")].each { |file| require file }
 
 end
+
+Dir[File.join(File.dirname(__FILE__), "models", "*.rb")].each { |file| require file }

data/lib/battlerite/models/asset.rb

@@ -9,15 +9,11 @@ module Battlerite
         created: Time.parse(asset["attributes"]["createdAt"]),
         description: asset["attributes"]["description"],
         name: asset["attributes"]["name"],
+        relationships: relationships,
         blob: blob,
       )
     end
 
-    def initialize params
-      params.each { |k, v| self.instance_variable_set :"@#{k}", v }
-    end
-
   end
 
-
 end

data/lib/battlerite/models/match.rb

@@ -21,12 +21,6 @@ module Battlerite
       )
     end
 
-
-    def initialize params
-      params.each { |k, v| self.instance_variable_set :"@#{k}", v }
-    end
-
   end
 
-
 end

data/lib/battlerite/models/participant.rb

@@ -1,46 +1,41 @@
 module Battlerite
 
-class Participant < Battlerite::Model
+  class Participant < Battlerite::Model
+
+    attr_reader :actor, :ability_uses, :attachment, :damage_done, :damage_received, :deaths, :disables_done, :disables_received, :emote, :energy_gained, :energy_used, :healing_done, :healing_received 
+    attr_reader :kills, :mount, :outfit, :score, :side, :time_alive, :user_id, :relationships, :blob
+    alias_attribute :players, :player
+
+    def self.munch participant, relationships, blob
+      attr = participant["attributes"]
+      stats = attr["stats"]
+      p = self.new(
+        id: participant["id"],
+        actor: attr["actor"],
+        ability_uses: stats["abilityUses"],
+        attachment: stats["attachment"],
+        damage_done: stats["damageDone"],
+        damage_received: stats["damageReceived"],
+        deaths: stats["deaths"],
+        disables_done: stats["disablesDone"],
+        disables_received: stats["disablesReceived"],
+        emote: stats["emote"],
+        energy_gained: stats["energyGained"],
+        energy_used: stats["energyUsed"],
+        healing_done: stats["healingDone"],
+        healing_received: stats["healingReceived"],
+        kills: stats["kills"],
+        mount: stats["mount"],
+        outfit: stats["outfit"],
+        score: stats["score"],
+        side: stats["side"],
+        time_alive: stats["timeAlive"],
+        user_id: stats["userID"],
+        relationships: relationships,
+        blob: blob,
+      )
+    end
 
-  attr_reader :actor, :ability_uses, :attachment, :damage_done, :damage_received, :deaths, :disables_done, :disables_received, :emote, :energy_gained, :energy_used, :healing_done, :healing_received 
-  attr_reader :kills, :mount, :outfit, :score, :side, :time_alive, :user_id, :relationships, :blob
-
-  def self.munch participant, relationships, blob
-    attr = participant["attributes"]
-    stats = attr["stats"]
-    p = self.new(
-      id: participant["id"],
-      actor: attr["actor"],
-      ability_uses: stats["abilityUses"],
-      attachment: stats["attachment"],
-      damage_done: stats["damageDone"],
-      damage_received: stats["damageReceived"],
-      deaths: stats["deaths"],
-      disables_done: stats["disablesDone"],
-      disables_received: stats["disablesReceived"],
-      emote: stats["emote"],
-      energy_gained: stats["energyGained"],
-      energy_used: stats["energyUsed"],
-      healing_done: stats["healingDone"],
-      healing_received: stats["healingReceived"],
-      kills: stats["kills"],
-      mount: stats["mount"],
-      outfit: stats["outfit"],
-      score: stats["score"],
-      side: stats["side"],
-      time_alive: stats["timeAlive"],
-      user_id: stats["userID"],
-      relationships: relationships,
-      blob: blob,
-    )
-  end
-
-  def initialize params
-    params.each { |k, v| self.instance_variable_set :"@#{k}", v }
   end
 
 end
-
-
-
-end

data/lib/battlerite/models/player.rb

@@ -22,10 +22,6 @@ module Battlerite
       raise NotImplementedError, "Battlerite API 1.0 has not implemented player data yet. Check http://battlerite-docs.readthedocs.io for more information."
     end
 
-    def initialize params
-      params.each { |k, v| self.instance_variable_set :"@#{k}", v }
-    end
-
   end
 
 end

data/lib/battlerite/models/roster.rb

@@ -15,11 +15,6 @@ module Battlerite
       )
     end
 
-    def initialize params
-      params.each { |k, v| self.instance_variable_set :"@#{k}", v }
-    end
-
   end
 
-
 end

data/lib/battlerite/models/round.rb

@@ -10,14 +10,11 @@ module Battlerite
         duration: round["attributes"]["duration"],
         ordinal: round["attributes"]["ordinal"],
         winning_team: round["attributes"]["stats"]["winningTeam"],
+        relationships: relationships,
+        blob: blob,
       )
     end
 
-    def initialize params
-      params.each { |k, v| self.instance_variable_set :"@#{k}", v }
-    end
-
   end
 
-
 end

data/lib/battlerite/muncher.rb

@@ -6,7 +6,6 @@ module Battlerite
     def self.munch blob
       data = blob["data"].respond_to?(:to_ary) ?  blob["data"] : [blob["data"]]
       data.each_with_object([]) do |datum, results|
-        #results << self.public_send(:"munch_#{datum["type"].downcase}", datum, blob)
         results << self.munch_agnostic(datum, blob)
       end
     end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: battlerite
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - eiko kokuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies: []
-description: API wrapper for Battlerite
+description: API wrapper for Battlerite, with convenient but flexible wrapper Models.
 email: kokumeiko@gmail.com
 executables: []
 extensions: []
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: API wrapper for Battlerite