dd-api 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 735af5fcc3da32f5a0e0c5b87f45253e70aa279f
-  data.tar.gz: 57e945702c70f0fdd10f8d2e01a62c4508d5c4d2
+  metadata.gz: 90e17ce70d04772a693a0c07a48d388232c6ae65
+  data.tar.gz: 019f39e11e645dcd9db27955cc463436e312aa44
 SHA512:
-  metadata.gz: e5dd4938aec1ff0fda3cf046ad69c57650bd64f36de54d556ed17f147ca4da6b03bbec253aa7e18ae17858a046cda7e6dc0ffc820ea3009a6b4d7a262c3db75b
-  data.tar.gz: 094fb4ce8bed631a638cde92639216fdb1fc7e5d2ca2312f80bcb9fd027f5c81312353f55f5ea499587c25934f876207c1844e7b2578aa213197dcf61db7b4af
+  metadata.gz: a4133d57925590edf37d1d1747a8729a17250ecc32031e8fc267e829a48f66ed91c89cc7fea8f54d10eff3c7008ac84af0b6e07912b3e08b1e6a7e8856c43cc0
+  data.tar.gz: b693f6ec6d1dae3a934602312b728a0fd2a6180d87cc4df0f1a8fd388cdcf9f16e16e0c71970757f027cfd1d209d29179f8b1619a20b86e5ef951240881c0ab2

data/lib/dd-api/api.rb

@@ -3,49 +3,51 @@ require 'rest-client'
 require 'dd-api/errors'
 
 # List of methods representing endpoints in Discord Dungeons's API
-module DDAPI::API
-  # Make an item image URL from the item image
-  def item_url(image)
-    "https://res.discorddungeons.me/images/#{image}"
-  end
-
-  def rget(endpoint, api_key, user_agent)
-    JSON.parse(RestClient.get("http://api.discorddungeons.me/#{endpoint}", :'X-Api-Key' => api_key, :'User-Agent' => user_agent))
-  end
-
-  def get(endpoint, app)
-    JSON.parse(RestClient.get("http://api.discorddungeons.me/#{endpoint}", :'X-Api-Key' => app.api_key, :'User-Agent' => app.user_agent))
-  end
-
-  def get_user(app, id)
-    get('user/'+id.to_s, app)['user']
-  end
-
-  def get_guild(app, id)
-    get('guild/'+id, app)['data']
-  end
-
-  def get_items(app, id)
-    get('item/'+id, app)['data']
-  end
-
-  def get_gitems(app, id)
-    get('gitem/'+id, app)['data']
-  end
-
-  def all_guilds(app)
-    get('all/guilds', app)['data']
-  end
-
-  def all_users(app)
-    get('all/users', app)['data']
-  end
-
-  def all_items(app)
-    get('all/items', app)['data']
-  end
-
-  def all_gitems(app)
-    get('all/gitems', app)['data']
+module DDAPI
+  module API
+    # Make an item image URL from the item image
+    def self.item_url(image)
+      "https://res.discorddungeons.me/images/"+image
+    end
+
+    def self.rget(endpoint, api_key, user_agent)
+      JSON.parse(RestClient.get("http://api.discorddungeons.me/"+endpoint, :'X-Api-Key' => api_key, :'User-Agent' => user_agent))
+    end
+
+    def self.get(endpoint, app)
+      JSON.parse(RestClient.get("http://api.discorddungeons.me/"+endpoint, :'X-Api-Key' => app.api_key, :'User-Agent' => app.user_agent))
+    end
+
+    def self.get_user(app, id)
+      get('user/'+id.to_s, app)['user']
+    end
+
+    def self.get_guild(app, id)
+      get('guild/'+id, app)['data']
+    end
+
+    def self.get_items(app, id)
+      get('item/'+id, app)['data']
+    end
+
+    def self.get_gitems(app, id)
+      get('gitem/'+id, app)['data']
+    end
+
+    def self.all_guilds(app)
+      get('all/guilds', app)['data']
+    end
+
+    def self.all_users(app)
+      get('all/users', app)['data']
+    end
+
+    def self.all_items(app)
+      get('all/items', app)['data']
+    end
+
+    def self.all_gitems(app)
+      get('all/gitems', app)['data']
+    end
   end
 end

data/lib/dd-api/classes.rb

@@ -1,7 +1,6 @@
 require 'json'
 require 'htmlentities'
 
-require 'dd-api/api'
 require 'dd-api/init'
 
 # Objects essential to DRPG
@@ -47,7 +46,6 @@ module DDAPI
 
     # @return [Integer] The level at that time, of the user.
     attr_accessor :level
-    alias_method :lvl, :level
 
     # @return [Integer] How much maximun health that user has
     attr_accessor :max_hp
@@ -104,30 +102,63 @@ module DDAPI
     attr_accessor :description
     alias_method :desc, :description
 
+    # @return [true, false] Whether the guild is open.
+    attr_accessor :open
+
     # @return [Integer] The amount gold in the guild.
     attr_accessor :gold
 
+    # @return [Integer] The combined deaths by the guild members.
+    attr_accessor :deaths
+    alias_method :frags, :deaths
+
+    # @return [Integer] The combined enemies slain by the guild members.
+    attr_accessor :kills
+    alias_method :slain, :kills
+
+    # @return [Integer] The maximum amount of people that can be in the guild.
+    attr_accessor :max
+
     # @return [Integer] The level of the guild.
     attr_accessor :level
-    alias_method :lvl, :level
 
     # @return [Integer] The ID of the guild.
     attr_accessor :id
 
-    # @return [true, false] The icon of the guild.
+    # @return [Integer] The level requirement of the guild.
+    attr_accessor :level_requirement
+
+    # @return [String] The icon of the guild.
     attr_accessor :icon
 
+    # @return [Array<String>] Array of icons the guild has bought.
+    attr_accessor :icons
+
+    # @return [String, nil] The Discord Role ID of the guild. `nil` if there is no role.
+    attr_accessor :role
+
+    # @return [String, nil] The Discord Channel ID of the guild. `nil` if there is no channel.
+    attr_accessor :channel
+
     def initialize(data, app)
       @data = data
-      @gdata = data['guild']
+      gdata = data['guild']
       @name = data['name']
+      @open = data['open']
       @level = gdata['level']
       @description = gdata['desc']
       @gold = gdata['gold']
+      @kills = @data['slain']
+      @deaths = @data['deaths']
       @icon = HTMLEntities.new.decode(gdata['icon'])
+      @icons = gdata['icons'].map {|icon| HTMLEntities.new.decode(icon) }
       @id = data['id']
       @members = gdata['members']
+      @level_requirement = gdata['levelreq']
+      @max = gdata['max']
       @owner = @app.user(gdata['owner'])
+      @role = gdata['role'].empty? ? nil : gdata['role']
+      @channel = gdata['channel'].empty? ? nil : gdata['channel']
       @app = app
     end
 
@@ -162,7 +193,6 @@ module DDAPI
 
     # @return [Integer] The level of the item.
     attr_accessor :level
-    alias_method :lvl, :level
 
     # @return [Integer] The ID of the item.
     # attr_accessor :id
@@ -199,7 +229,7 @@ module DDAPI
     end
   end
   # Represents a DRPG guild item.
-  class Item
+  class GuildItem
     # @return [String] The name of the item.
     attr_accessor :name
 
@@ -221,7 +251,6 @@ module DDAPI
 
     # @return [Integer] The level of the item.
     attr_accessor :level
-    alias_method :lvl, :level
 
     # @return [Integer] The ID of the item.
     # attr_accessor :id
@@ -241,7 +270,7 @@ module DDAPI
 
     # The inspect method is overwritten to give more useful output
     def inspect
-      "#<DDAPI::Item name=#{@name} id=#{@id} level=#{@level}>"
+      "#<DDAPI::GuildItem name=#{@name} id=#{@id} level=#{@level}>"
     end
   end
 end

data/lib/dd-api/version.rb

@@ -1,3 +1,3 @@
 module DDAPI
-  VERSION = '0.0.2'
+  VERSION = '0.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dd-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Snazzah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,7 +93,7 @@ files:
 - lib/dd-api/errors.rb
 - lib/dd-api/init.rb
 - lib/dd-api/version.rb
-homepage: http://api.discorddungeons.me/docs/
+homepage: https://github.com/DiscordDungeons/api/tree/ruby
 licenses:
 - MIT
 metadata: {}