vnstat-ruby 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0cf928d4d16436fc18a665373fa4450ca3bfc1e
-  data.tar.gz: b01ff0e91b89a45f2ea72520715de1da30981d67
+  metadata.gz: 2214aef1d2fed1c199eb30e62fd0947193fb6f18
+  data.tar.gz: b5115aacbd68d2199faaec3bd2d7463ac10aaf97
 SHA512:
-  metadata.gz: 4c871bb0d162d3cd890d37da503fca411b6f3c45e1fab3eb540267fa35a4743f3dee9ba912c9d3aefb6f79f56e6ef21009aed34d17ab20b90655fc36429ad138
-  data.tar.gz: e80dc395530309fe51602b74b4e15f4e15f6cf20a3cf99c0d28700cf19bf85d53aed11a297b59fea1698429a98e0723e309b0bb4edb5a7a93fe799cdce5e3d7b
+  metadata.gz: 33bc77a79debce5a520715e4676daea648f96cf5f2c8c2f977f1b2369dc2f85492bb19a7ddf6de88c00465cdc1f940fe8a082a24f5bdd756fbf8a070382a3947
+  data.tar.gz: 6fe044b316ac36c11654846e22c0fe94ac349f79eed7fd486461718632f00b42bdc1d1f3e292c1c024db82f246a51c6c94e1e8aeea28dbec41d01ad967d0d641

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vnstat-ruby (3.0.5)
+    vnstat-ruby (3.0.6)
       nokogiri (~> 1.10, >= 1.10.4)
       systemcall (~> 1.0, >= 1.0.2)
 

data/README.md

@@ -173,4 +173,4 @@ interface.tops[1].bytes_received # => 1024000
 
 ### Copyright
 
-Copyright (c) 2015-2017 Tobias Casper. See LICENSE.txt for further details.
+Copyright (c) 2015-2020 Tobias Casper. See LICENSE.txt for further details.

data/lib/vnstat/document.rb

@@ -48,7 +48,10 @@ module Vnstat
     #
     # @return [String]
     def version
-      data.xpath('vnstat').attr('version').text
+      attr = data.xpath('vnstat').attr('version')
+      raise 'Unable to determine version' if attr.nil?
+
+      attr.text
     end
 
     ##
@@ -56,7 +59,10 @@ module Vnstat
     #
     # @return [String]
     def xml_version
-      data.xpath('vnstat').attr('xmlversion').text
+      attr = data.xpath('vnstat').attr('xmlversion')
+      raise 'Unable to determine XML version' if attr.nil?
+
+      attr.text
     end
   end
 end

data/lib/vnstat/interface_collection.rb

@@ -98,9 +98,10 @@ module Vnstat
 
     def interfaces_hash
       @interfaces_hash ||= begin
+        id_attr = xml_version == '2' ? :name : :id
         elements = data.xpath('//interface')
         elements.each_with_object({}) do |node, hash|
-          id = node[:id]
+          id = node[id_attr]
           hash[id] = Interface.new(id, data)
         end
       end

data/lib/vnstat/parser.rb

@@ -33,7 +33,7 @@ module Vnstat
     # Extracts the date and time from the given XML element.
     #
     # @param [Nokogiri::XML::Element] element The XML element.
-    # @return [DateTime]
+    # @return [Time]
     def extract_datetime_from_xml_element(element)
       date = extract_date_from_xml_element(element)
       hour = element.xpath('time/hour').text.to_i

data/lib/vnstat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vnstat
-  VERSION = '3.0.5'
+  VERSION = '3.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vnstat-ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Tobias Casper
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri