dd-api 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90e17ce70d04772a693a0c07a48d388232c6ae65
-  data.tar.gz: 019f39e11e645dcd9db27955cc463436e312aa44
+  metadata.gz: efffa731ad2269881d39200b2a6269db74ffcd85
+  data.tar.gz: 7f9b3111db304c082b24a5f6f098e028e365fe14
 SHA512:
-  metadata.gz: a4133d57925590edf37d1d1747a8729a17250ecc32031e8fc267e829a48f66ed91c89cc7fea8f54d10eff3c7008ac84af0b6e07912b3e08b1e6a7e8856c43cc0
-  data.tar.gz: b693f6ec6d1dae3a934602312b728a0fd2a6180d87cc4df0f1a8fd388cdcf9f16e16e0c71970757f027cfd1d209d29179f8b1619a20b86e5ef951240881c0ab2
+  metadata.gz: aa655517ae308836abf67e8dd494b0eed9ec1ee17ad199d2bbd410dc85b8f5936f0b15dc1ec78ca89b643e01ef738e79039dca0d85cc5b447fecb107121d5cba
+  data.tar.gz: a4f2efc08aa1e6f12ba3a9e17ba411afc2f09e44fef56c0b08c001964232964355068cbca51334ff25d9dfe35daf0801e77abe40dea423b10b401a69e3d2fc47

data/lib/dd-api/api.rb

@@ -3,51 +3,71 @@ require 'rest-client'
 require 'dd-api/errors'
 
 # List of methods representing endpoints in Discord Dungeons's API
-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
+module DDAPI::API
+  # The base URL of the Discord Dungeons REST API.
+  APIBASE = 'http://api.discorddungeons.me'.freeze
+
+  # The base URL of the Discord Dungeons Alternate Resources.
+  RESBASE = 'https://res.discorddungeons.me/images'.freeze
+
+  module_function
+
+  # @return [String] the currently used API base URL.
+  def api_base
+    APIBASE
+  end
+
+  # @return [String] the currently used resource base URL.
+  def res_base
+    RESBASE
+  end
+
+  # Make an item image URL from the item image
+  def image_url(image)
+    "#{res_base}/#{image}"
+  end
+  # Make an item image URL from the item image
+  def guild_icon_url(icon)
+    "#{res_base}/twemoji/"+icon.gsub(/\u0026#x/, "").gsub(/[;]/, "").gsub(/\u0026amp/, "-").downcase+".png"
+  end
+
+  def rget(endpoint, api_key, user_agent)
+    JSON.parse(RestClient.get("#{api_base}/"+endpoint, :'X-Api-Key' => api_key, :'User-Agent' => user_agent))
+  end
+
+  def get(endpoint, app)
+    JSON.parse(RestClient.get("#{api_base}/"+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_item(app, id)
+    get('item/'+id, app)['data']
+  end
+
+  def get_guild_item(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_guild_items(app)
+    get('all/gitems', app)['data']
   end
 end

data/lib/dd-api/classes.rb

@@ -131,6 +131,9 @@ module DDAPI
     # @return [String] The icon of the guild.
     attr_accessor :icon
 
+    # @return [String] The icon image URL to the guild's icon.
+    attr_accessor :image
+
     # @return [Array<String>] Array of icons the guild has bought.
     attr_accessor :icons
 
@@ -142,7 +145,8 @@ module DDAPI
 
     def initialize(data, app)
       @data = data
-      gdata = data['guild']
+      # gdata = data['guild']
+      gdata = data
       @name = data['name']
       @open = data['open']
       @level = gdata['level']
@@ -151,6 +155,7 @@ module DDAPI
       @kills = @data['slain']
       @deaths = @data['deaths']
       @icon = HTMLEntities.new.decode(gdata['icon'])
+      @icon_url = API.guild_icon_url(gdata['icon'])
       @icons = gdata['icons'].map {|icon| HTMLEntities.new.decode(icon) }
       @id = data['id']
       @members = gdata['members']
@@ -188,7 +193,7 @@ module DDAPI
     attr_accessor :description
     alias_method :desc, :description
 
-    # @return [String] The image URL to the item.
+    # @return [String] The image URL to the item. `nil` if there is no image.
     attr_accessor :image
 
     # @return [Integer] The level of the item.
@@ -212,7 +217,7 @@ module DDAPI
       @level = data['level']
       @description = data['desc']
       @type = data['type']
-      @image = API.image_url(data['image'])
+      @image = data['image'].nil? ? nil : API.image_url(data['image'])
       #@id = data['id']
       @prefix = data['prefix']
       @prefix = data['plural']
@@ -246,7 +251,7 @@ module DDAPI
     attr_accessor :description
     alias_method :desc, :description
 
-    # @return [String] The image URL to the item.
+    # @return [String, nil] The image URL to the item. `nil` if there is no image.
     attr_accessor :image
 
     # @return [Integer] The level of the item.
@@ -260,7 +265,7 @@ module DDAPI
       @name = data['name']
       @level = data['level']
       @description = data['desc']
-      @image = API.image_url(data['image'])
+      @image = data['image'].nil? ? nil : API.image_url(data['image'])
       #@id = data['id']
       @prefix = data['prefix']
       @prefix = data['plural']

data/lib/dd-api/init.rb

@@ -19,8 +19,8 @@ module DDAPI
       API.all_items(self).values.map { |item| Item.new(item, self) }
     end
 
-    def gitems
-      API.all_gitems(self).values.map { |gitem| GuildItem.new(gitem, self) }
+    def guild_items
+      API.all_guild_items(self).values.map { |gitem| GuildItem.new(gitem, self) }
     end
 
     def user(id)
@@ -30,5 +30,13 @@ module DDAPI
     def guild(id)
       Guild.new(API.get_guild(self, id), self)
     end
+
+    def item(id)
+      Item.new(API.get_item(self, id), self)
+    end
+
+    def guild_item(id)
+      Item.new(API.get_guild_item(self, id), self)
+    end
   end
 end

data/lib/dd-api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dd-api
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Snazzah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler