jabber_admin 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31b521fdd1da155402e58b436e83fcb22012648b601f543fd5e885f844fd019e
-  data.tar.gz: 9f14f04eaa52941167b0deaeb3322d1d1e947acf8ed2cc8e16cdc00dabeaa8a4
+  metadata.gz: b7ea3dd7b95b8afeaf6706f936e466bbf31df25d61509fd14d91e13aa33eddcc
+  data.tar.gz: 2d773da438776408aae7d6a50660a0e261680ddde8011f6003cf8d6684e071d2
 SHA512:
-  metadata.gz: 57e645f24f358c679b841cde89b8d8ee9fc978d5497a979ce5e87217f936af0438f9e8a75a1bcb94f9d2f195ea469fdc3be1f55137d8b20c66e5b04e0a61bf9d
-  data.tar.gz: b26205f1387f7b50c2ac30407402017f5ab70aa89d64d34905f6c2ddddb26e3d05fa48b6a49f418eb9716c20ec2ce95327e97155f6ab0be9d2c88ff930a732bf
+  metadata.gz: 797d59f99d8cffefe1d84ad6e71b213ad71f607cf96204268e149458df7ed10770c9dfc4c7c0f405ceffc93ebf8bb16b711374e81424925dc2c19fc8f10093d5
+  data.tar.gz: 74f5062778abad7992348e1cb852caf38a17f273bdfe3292dcbcbf67eb593f2da03d60b2fd647601831297a1602450a9cd66925c9def36749794b93e659bcedd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.0.1
+
+* Gracefully handle a missing vCard when a vCard field is queried (#7)
+
 ### 1.0.0
 
 * All `JabberAdmin` errors `[UnknownCommandError, CommandError, RequestError]`

data/lib/jabber_admin/commands/get_vcard.rb

@@ -53,15 +53,15 @@ module JabberAdmin
             end
           end
 
-          res = JSON.parse(callable.call(meth, check_res_body: false,
-                                               user: uid,
-                                               host: host,
-                                               **args).body)
-
-          res.is_a?(Hash) ? res['content'] : res
-        rescue JabberAdmin::CommandError => e
+          res = callable.call(meth, check_res_body: false,
+                                    user: uid, host: host, **args)
+          body = (200..299).cover?(res.code) ? JSON.parse(res.body) : nil
+          body.is_a?(Hash) ? body['content'] : body
+        rescue JabberAdmin::Error => e
           # When ejabberd tells us there was no value, it does this the hard way
           next if e.response.body.include? 'error_no_value_found_in_vcard'
+          # Same for the case when there is no vCard at all
+          next if e.response.body.include? 'error_no_vcard_found'
 
           raise e
         end

data/lib/jabber_admin/version.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
+# The gem module.
 module JabberAdmin
   # The version constant of the gem. Increase this value
   # in case of a gem release.
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   class << self
     # Returns the version of gem as a string.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jabber_admin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Henning Vogt