zenoss_client 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0604c70eea29dc67d7083fb3521bf52ff3a1adff59160791b8756b06cca753c4
-  data.tar.gz: 385c6c6b898364bb88a16832db0846dbaf594ade55859131e6cd08b3c30b6cf6
+  metadata.gz: 49a04e901616b01c8d358d4241b504ba162a39f9f12156c44d1f33377b64d037
+  data.tar.gz: b83e1398a83a7db53dec85b29f6b5662c7c9264fe02dc8b81fedfb37b7c3fb16
 SHA512:
-  metadata.gz: 1102a72533a0ca09895d70a9468af7a5766c90f418e63c8bd9fa6616a7f9a4487fb0342d01b3768e2177b8f934755068de39c044d9dbbe50f6e3128c4683fa74
-  data.tar.gz: 5f34aa8d4ce4f292640d6460abfea740aa16857d560e8976468e5f416c72eb5f0910788b49ceffd4e8853135bcad3de3d39c6afc29601b63ed0635ef9016c3bf
+  metadata.gz: 1204abb1c334da5add5fe006153715580be6f8194ac41a0b715113f34493ccf259a44c00a362719f62ee761057e8e6eb5b694651fbb43ef7dce4d2ef0a83eeb0
+  data.tar.gz: b1f1e0d54beda78f3cd28319829f0a2773e7e3dacff8034a99ee2ad8a4f7de24e738b3ad3daf851096dceb0da1f5dd6ca8533fa372ad5cd2f7d36f5a06ed3e44

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/lib/zenoss/events/event.rb

@@ -28,8 +28,20 @@ module Zenoss
       def initialize(zenoss,zhash)
         @zenoss = zenoss
         super zhash
-        self.firstTime = DateTime.parse(self.firstTime) if self.firstTime
-        self.lastTime  = DateTime.parse(self.lastTime) if self.lastTime
+        self.firstTime &&= convert_time(self.firstTime)
+        self.lastTime &&= convert_time(self.lastTime)
+      end
+
+      # Converts a string or float to a Time object
+      # Zenoss version 4 emits the time format as a string
+      # Zenoss version 6 emits the time as a float
+      # @return[Time]
+      def convert_time(time)
+        if time.is_a?(String)
+          Time.parse(time)
+        else
+          Time.at(time)
+        end
       end
 
       def detail(history = false)

data/test/zenoss_client_test.rb

@@ -137,3 +137,58 @@ describe Zenoss do
     end
   end
 end
+
+describe Zenoss::Events::Event do
+  it 'initializes an object with times as strings' do
+    @zenoss = Zenoss
+    firstTime = Time.new(2018, 10, 3, 1, 0, 0)
+    lastTime = Time.new(2018, 10, 3, 3, 0, 0)
+    zhash = {
+      firstTime: firstTime.to_s,
+      lastTime: lastTime.to_s
+    }
+    event = Zenoss::Events::Event.new(@zenoss, zhash)
+    event.must_be_kind_of Zenoss::Events::Event
+    event.firstTime.must_be_kind_of Time
+    event.lastTime.must_be_kind_of Time
+  end
+
+  it 'intializes an object with times as unix time' do
+    @zenoss = Zenoss
+    firstTime = Time.new(2018, 10, 3, 2, 0, 0)
+    lastTime = Time.new(2018, 10, 3, 5, 0, 0)
+    zhash = {
+      firstTime: firstTime.to_f,
+      lastTime: lastTime.to_f
+    }
+    event = Zenoss::Events::Event.new(@zenoss, zhash)
+    event.must_be_kind_of Zenoss::Events::Event
+    event.firstTime.class.must_equal Time
+    event.firstTime.must_be_kind_of Time
+    event.lastTime.must_be_kind_of Time
+  end
+
+  it 'intializes an object with times set to nil' do
+    @zenoss = Zenoss
+    zhash = {
+      firstTime: nil,
+      lastTime: nil
+    }
+    event = Zenoss::Events::Event.new(@zenoss, zhash)
+    event.must_be_kind_of Zenoss::Events::Event
+    assert_nil event.firstTime
+    assert_nil event.lastTime
+  end
+
+  it 'intializes an object with times set to false' do
+    @zenoss = Zenoss
+    zhash = {
+      firstTime: false,
+      lastTime: false
+    }
+    event = Zenoss::Events::Event.new(@zenoss, zhash)
+    event.must_be_kind_of Zenoss::Events::Event
+    event.firstTime.must_equal false
+    event.lastTime.must_equal false
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenoss_client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Dan Wanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-18 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient