morpheus-cli 3.4.1.1 → 3.4.1.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 85a8eae139abcd5b680608c7316af97006dd0445
4
- data.tar.gz: 6f49e6037ac110032a8e35ac0923e01f4b1666c9
3
+ metadata.gz: efb715b7f77375167099ebac68e98850cfa8986f
4
+ data.tar.gz: 254eeeccb861eb78b9ef53e8fb8ce40c7bcfea32
5
5
  SHA512:
6
- metadata.gz: c9ce121ef8455783c9d74bd2405b63fdb321db8ec9938a9767f13400d49c37cf75ee47939127a5755e690d7e90808b394435d84fbf7869386c1c3d4b02eddbbf
7
- data.tar.gz: 1a0ee4756032f37ce30dcbd5dbfb67ec3b201ec9b84a9b985999305cedeb5acd825810b6a6a60a7fe70fad717ff44e827574d64e1cc6f2f2425fca0463f2874e
6
+ metadata.gz: 5733564843f2afa6e9d464c542425583973676a5f32b7b6efe34a2f92a5f8292a6246575f1d5bc4834bf06cfbb39c9d7aed73342757aa38eb32cc631f8c08422
7
+ data.tar.gz: a34905dff786cd7024ecfb4cf00c76f847bf7ccdd322cba36b06d0487af062bec2071db98688029c13f37ad9291c7533b65a7c8c36c1b313b6e0edb1048203ee
@@ -1,6 +1,6 @@
1
1
 
2
2
  module Morpheus
3
3
  module Cli
4
- VERSION = "3.4.1.1"
4
+ VERSION = "3.4.1.2"
5
5
  end
6
6
  end
@@ -171,7 +171,14 @@ def get_object_value(data, key)
171
171
  end
172
172
  end
173
173
  else
174
- value = data[key] || data[key.to_sym]
174
+ # value = data.key?(key) ? data[key] : data[key.to_sym]
175
+ if data.respond_to?("key?")
176
+ if data.key?(key.to_s)
177
+ value = data[key.to_s]
178
+ elsif data.key?(key.to_sym)
179
+ value = data[key.to_sym]
180
+ end
181
+ end
175
182
  end
176
183
  return value
177
184
  end
@@ -222,16 +229,16 @@ def filter_data(data, include_fields=nil, exclude_fields=nil)
222
229
  cur_filtered_data = my_data
223
230
  namespaces.each_with_index do |ns, index|
224
231
  if index != namespaces.length - 1
225
- if cur_data
226
- cur_data = cur_data[ns] || cur_data[ns.to_sym]
232
+ if cur_data && cur_data.respond_to?("key?")
233
+ cur_data = cur_data.key?(ns) ? cur_data[ns] : cur_data[ns.to_sym]
227
234
  else
228
235
  cur_data = nil
229
236
  end
230
237
  cur_filtered_data[ns] ||= {}
231
238
  cur_filtered_data = cur_filtered_data[ns]
232
239
  else
233
- if cur_data.respond_to?("[]")
234
- cur_filtered_data[ns] = cur_data[ns] || cur_data[ns.to_sym]
240
+ if cur_data && cur_data.respond_to?("key?")
241
+ cur_filtered_data[ns] = cur_data.key?(ns) ? cur_data[ns] : cur_data[ns.to_sym]
235
242
  else
236
243
  cur_filtered_data[ns] = nil
237
244
  end
@@ -240,7 +247,7 @@ def filter_data(data, include_fields=nil, exclude_fields=nil)
240
247
  end
241
248
  else
242
249
  #my_data[field] = data[field] || data[field.to_sym]
243
- my_data[field_label] = data[field_key] || data[field_key.to_sym]
250
+ my_data[field_label] = data.key?(field_key) ? data[field_key] : data[field_key.to_sym]
244
251
  end
245
252
  end
246
253
  return my_data
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: morpheus-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.4.1.1
4
+ version: 3.4.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Estes