mojang 1.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6c44a0dac6fa4c910273329517229956c875dac6
-  data.tar.gz: e0de84e87ac781be46818e8b455a0571d1906cec
+SHA256:
+  metadata.gz: 2955c17e484341fe800541d53d9464796b9699954956cc3c834040022d541e62
+  data.tar.gz: 59d3d6cf56987bef1c0ee6fd1b85cfed18bb93c3fdabf7a1a7ef71378b8d0aae
 SHA512:
-  metadata.gz: a14c81231962006186e8bf2e0e2371bda7e9fcd84039a93fb03ed7d8ddbf62e9dcf55e53fb528e03dd14a4216f3d4525a0dff1c3f3696f5c2f7b3d29a1643caa
-  data.tar.gz: e0e9699dabdf7483be7a9e95f278544e07240a745268f090fef20a48c51e5e5de5c093958bcca372c6a5245df347efb80b419f047b8d586531ce097d3427d610
+  metadata.gz: 066bf06261ee40c316bb1cd77b92cf52ce737eb285900fdf57ea34c9d3f47babe8d8c297e671543f0767d335484ce56281bb2fe20f9717eb0c61f8a89142adee
+  data.tar.gz: 4253a83f9ceae4f18b8dc5fe1bf4ec77df0b41e622d165f295e010061907bc11dffd262ba68e827ad61f3f869ad143d80bcdcb05baa6fea4dfc6bc74b1278b85

data/lib/errors.rb

@@ -22,7 +22,7 @@ module Mojang
       end
 
       def message
-        "#{@msg} (#{@error}"
+        "#{@msg} (#{@error})"
       end
     end
   end

data/lib/mojang.rb

@@ -26,35 +26,36 @@ module Mojang
   # @param username [String] The username.
   # @param date [Date] The date to get the ID at.
   # @return [String] The username's user ID.
+  # @raise [Mojang::Errors::MojangError]
+  # @raise [Mojang::Errors::NoSuchUserError]
   def userid(username, date = nil)
-    self.profile(username, date, 'id')
-  end
-
-  # Gets the username for the given UUID at the given time.
-  # @param uuid [String] The user's UUID (see #{userid})
-  # @param date [Date] The date to get the name at.
-  # @return [String] The user's username at the given time.
-  def username(uuid, date = nil)
-    self.profile(uuid, date, 'name')
-  end
-
-  # Gets whether the given username has paid for Minecraft.
-  # @param username [String] The username to check.
-  # @return [Boolean] Whether they have paid or not.
-  def has_paid?(username)
-    params = { user: username }
-    response = Curl.get('https://minecraft.net/haspaid.jsp', params).body_str
+    profile_str = "https://api.mojang.com/users/profiles/minecraft/#{username}"
+    # If the provided date (or 0, if not provided) does not return anything, try without any date provided at all.
+    # This is necessary because for users with name history's *have* you have to provide some date (and 0 is valid),
+    # while for users who do *not* have name history, giving a date (including 0) will return 204 No Content.
+    # If it is *still* empty after both tries, then error.
+    response = Curl.get(profile_str, { at: date.to_i }).body_str
+    response = Curl.get(profile_str).body_str if response.empty?
+    fail Mojang::Errors::NoSuchUserError.new(username) if response.empty?
+    json = Oj.load(response)
+    if json.key?('error')
+      fail Mojang::Errors::MojangError.new(json['error'], json['errorMessage'])
+    end
 
-    response == 'true'
+    json['id']
   end
 
   # Gets a user's name history from their UUID.
   # @param uuid [String] The user's ID (see #{userid}).
   # @return [Hash<Symbol/Time, String>] A hash of all the names. Key is either :original, or the Time object of when
   # the name was changed. Value is always the name at that point in time.
+  # @raise [Mojang::Errors::MojangError]
   def name_history(uuid)
     response = Curl.get("https://api.mojang.com/user/profiles/#{uuid}/names").body_str
     json = Oj.load(response)
+    if json.key?('error')
+      fail Mojang::Errors::MojangError.new(json['error'], json['errorMessage'])
+    end
     ret = {}
     json.each do |hash|
       if hash.key?('changedToAt')
@@ -66,22 +67,4 @@ module Mojang
 
     ret
   end
-
-  private
-
-  # Gets the profile data.
-  # @param query [String] Either a username or an ID; they are handled in the same way.
-  # @param date [Date] The date to get at.
-  # @param return_val [String] The key in the returned hash to return.
-  # @return [String] The returned value for the return_val key.
-  def self.profile(query, date, return_val)
-    params = { at: date.to_i }
-    response = Curl.get("https://api.mojang.com/users/profiles/minecraft/#{query}", params).body_str
-    fail NoSuchUserError.new(query) if response.empty?
-    json = Oj.load(response)
-    if json.key?('error')
-      fail MojangError.new(json['error'], json['errorMessage'])
-    end
-    return json[return_val]
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mojang
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Eli Foster
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3.11'
 description: A Ruby library accessing the Mojang and Minecraft web APIs
 email: elifosterwy@gmail.com
 executables: []
@@ -52,7 +52,7 @@ licenses:
 - MIT
 metadata:
   issue_tracker: https://github.com/elifoster/mojang-rb/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,9 +67,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Mojang and Minecraft web APIs in Ruby
 test_files: []