aemo 0.1.41 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 119c2b42b2afe3058b3601efb0afa0fad4324490
-  data.tar.gz: fbe58c540e711ac4b2e4d72f600974fb75c330a3
+  metadata.gz: 1bfb05a015a896492b4189fe74eba44bffd7de6c
+  data.tar.gz: f40e7e6b3f8208dd8626aa4eb2d528a3ca9924ae
 SHA512:
-  metadata.gz: 2937b2efc24957e9db6fa8eea55e3f06dc851923a557bec9fae3e357211382ce0fd5306897a38cea3d016cf079446a478f1318acd3b32b98f7cede303d730cd8
-  data.tar.gz: d19a35efd609e07aec6e2c310ec670b79747d3a072000b7184a3ffa03f68723aa10f3ec37c2066a5ffbfebe163092be0bbb1be6eb5704b71149f51a63cce8803
+  metadata.gz: 05cc47530528e759f77651407239550d45fa5cb36f24063a323750deb65cf3e9b084298867e6f5163bc470b1c273ba8b7f998aac35b164ae8a3d2d8290333c6d
+  data.tar.gz: f61f7405327ee846ea8a0b4806cb9e131e96b9b5ad8a889312999e36cdc0aea4c4857e249fa54839a00b33301158b510a0b3242c352936386fc0b2699334efb5

data/lib/aemo/nem12.rb

@@ -270,7 +270,6 @@ module AEMO
     @interval_data    = []
     @interval_events  = []
 
-    attr_accessor :nmi, :file_contents
     attr_reader   :data_details, :interval_data, :interval_events
     attr_accessor :file_contents, :header, :nmi_data_details, :nmi
 
@@ -280,7 +279,7 @@ module AEMO
       @data_details     = []
       @interval_data    = []
       @interval_events  = []
-      options.keys.each do |key|
+      options.each_key do |key|
         send 'key=', options[key]
       end
     end
@@ -321,18 +320,24 @@ module AEMO
 
       raise ArgumentError, 'RecordIndicator is not 200'     if csv[0] != '200'
       raise ArgumentError, 'NMI is not valid'               unless AEMO::NMI.valid_nmi?(csv[1])
-      raise ArgumentError, 'NMIConfiguration is not valid'  if csv[2].match(/.{1,240}/).nil?
+      if csv[2].nil? || csv[2].match(/.{1,240}/).nil?
+        raise ArgumentError, 'NMIConfiguration is not valid'
+      end
       if !csv[3].nil? && csv[3].match(/.{1,10}/).nil?
         raise ArgumentError, 'RegisterID is not valid'
       end
-      raise ArgumentError, 'NMISuffix is not valid' if csv[4].match(/[A-HJ-NP-Z][1-9A-HJ-NP-Z]/).nil?
+      if csv[4].nil? || csv[4].match(/[A-HJ-NP-Z][1-9A-HJ-NP-Z]/).nil?
+        raise ArgumentError, 'NMISuffix is not valid'
+      end
       if !csv[5].nil? && !csv[5].empty? && !csv[5].match(/^\s*$/)
         raise ArgumentError, 'MDMDataStreamIdentifier is not valid' if csv[5].match(/[A-Z0-9]{2}/).nil?
       end
       if !csv[6].nil? && !csv[6].empty? && !csv[6].match(/^\s*$/)
         raise ArgumentError, 'MeterSerialNumber is not valid' if csv[6].match(/[A-Z0-9]{2}/).nil?
       end
-      raise ArgumentError, 'UOM is not valid'               if csv[7].upcase.match(/[A-Z0-9]{2}/).nil?
+      if csv[7].nil? || csv[7].upcase.match(/[A-Z0-9]{2}/).nil?
+        raise ArgumentError, 'UOM is not valid'
+      end
       raise ArgumentError, 'UOM is not valid'               unless UOM.keys.map(&:upcase).include?(csv[7].upcase)
       raise ArgumentError, 'IntervalLength is not valid'    unless %w[1 5 10 15 30].include?(csv[8])
       # raise ArgumentError, 'NextScheduledReadDate is not valid' if csv[9].match(/\d{8}/).nil? || csv[9] != Time.parse('#{csv[9]}').strftime('%Y%m%d')

data/lib/aemo/version.rb

@@ -24,7 +24,7 @@
 # @author Joel Courtney <euphemize@gmail.com>
 module AEMO
   # aemo version
-  VERSION = '0.1.41'.freeze
+  VERSION = '0.1.42'
 
   # aemo version split amongst different revisions
   MAJOR_VERSION, MINOR_VERSION, REVISION = VERSION.split('.').map(&:to_i)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.42
 platform: ruby
 authors:
 - Joel Courtney
@@ -16,22 +16,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +95,7 @@ dependencies:
         version: 4.2.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,7 +105,7 @@ dependencies:
         version: 4.2.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement