matterhorn_whymper 1.7.0 → 1.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njk1NzdhNmE5NjdiNjBmNWY4ZGY4ODk0NjUyM2UxYWNjZjdjNzMyMw==
+    OTlkZDU4YmUzMDM0ZWZiMDY5MjcxNWQwZjg3YWVkNTM1YzE4YzJhOQ==
   data.tar.gz: !binary |-
-    NDU1ZDcxZTc5ZjYxMTk2MWU5ZGYxMjc3NzU0YjBkNDJkOGQ4ODQyMA==
+    ZGVjOTcyYTUxNGNmMTU3NTM1YmI0ODkwMjU0ZDExN2U5ZmYyNDYzMw==
 SHA512:
   metadata.gz: !binary |-
-    OGQ1M2ZjMWZjMDY1MWFhMTc2Y2RhMTJhMmQ5OGJkNjhiMjhmNzllZmZhNzZj
-    MDRkNGNiZDU4ZjlkNDM5YWNhNzBkZTUzY2Q2ZTYyNWRhNzQyOTJmODAzYjYy
-    NjliYzQwNjZlODgwOWU4ZDVmMWY0MTRkOTk1MTQzMWQ4MWMxYzc=
+    ZmNlOGIxZjRmMzgzZjhlYTg4OTc2NjI5ZmM5NWJmNDQ5ZTkxNzU5M2E3M2Mw
+    N2I1NTgwMjg2ODBkMDJiMmY4Yjg3ZDZhN2FmNGZlNmYzNGFhNGI2ZmMxNGVh
+    MzYzN2RiMDc0ZWQyZWQxYTNmYWM2Mzk0ODgyNzE1NGU0NmUwYzI=
   data.tar.gz: !binary |-
-    MmNiMThhOTg3MmUzNzcyMmY2ZjU5MTBhMzUyODlkNWExNWMwNjUxOGYxZTcz
-    ODZjZDViNWIzY2Q2M2YwYzdjMjI0M2UyY2QwNzVkM2JmNmRkZjU1NTI2YTBm
-    MmMxZjkxZjZhOGVmNTIyY2M5MzY0NjYzNTQyZmI3MTMwZmFmMTU=
+    M2VjZmNiODY5ODZlYjU1NDdiNDUzNzk1YzBiMzNjMmQ2MGE2ODRhYzYxMWVj
+    Y2E1YzdmNWY3NGQzNDVjMjFhNmE1NzhiOGQwZWJmNTZmODIxYjE3YzlmYzFm
+    NmMzNDczMzg0MjQxY2RhMDM3YTYxMmUwNTM4NjUwODBmNTY5NDQ=

data/lib/matterhorn/endpoint/group.rb

@@ -131,11 +131,18 @@ class Matterhorn::Endpoint::Group < Matterhorn::Endpoint
   
 
   def filter_groups(respons_hash)
-    unless respons_hash['groups']['group'].kind_of?(Array)
-      respons_hash['groups']['group'] = [ respons_hash['groups']['group'] ]
-    end
     groups = { 'groups' => { 'group' => [] } }
-    respons_hash['groups']['group'].each do |group_hash|
+    return groups    if respons_hash.nil? ||
+                        !respons_hash.kind_of?(Hash) ||
+                        respons_hash['groups'].nil?
+    groups_hash = respons_hash['groups']
+    return groups    if groups_hash.nil? ||
+                        !groups_hash.kind_of?(Hash) ||
+                        groups_hash['group'].nil?
+    unless groups_hash['group'].kind_of?(Array)
+      groups_hash['group'] = [ groups_hash['group'] ]
+    end
+    groups_hash['group'].each do |group_hash|
       next unless group_hash.kind_of?(Hash)
       groups['groups']['group'] << {
         'id' => group_hash['id'],

data/lib/matterhorn/endpoint/user.rb

@@ -141,11 +141,19 @@ class Matterhorn::Endpoint::User < Matterhorn::Endpoint
   
 
   def filter_users(respons_hash)
-    unless respons_hash['users']['user'].kind_of?(Array)
-      respons_hash['users']['user'] = [ respons_hash['users']['user'] ]
+    users = { 'users' => { 'user' => [] } }
+    return users    if respons_hash.nil? ||
+                       !respons_hash.kind_of?(Hash) ||
+                       respons_hash['users'].nil?
+    users_hash = respons_hash['users']
+    return users    if users_hash.nil? ||
+                       !users_hash.kind_of?(Hash) ||
+                       users_hash['user'].nil?
+    unless users_hash['user'].kind_of?(Array)
+      users_hash['user'] = [ users_hash['user'] ]
     end
     users = { 'users' => { 'user' => [] } }
-    respons_hash['users']['user'].each do |user_hash|
+    users_hash['user'].each do |user_hash|
       next unless user_hash.kind_of?(Hash)
       users['users']['user'] << filter_user(user_hash)
     end

data/lib/matterhorn_whymper/version.rb

@@ -5,7 +5,7 @@ module MatterhornWhymper
 
   # -------------------------------------------------------------------------- const definitions ---
 
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 
 
 end # -------------------------------------------------------------------- end MatterhornWhymper ---

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matterhorn_whymper
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Daniel Fritschi