aemo 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 284b65f74f29337015ac3c4072c3599068565538962eec46d07e2c3a5d37f1f3
-  data.tar.gz: 8c4142b329c6bc78f7a2407572d5adbf041659a90362ee5eb8c3595f7f9f41ac
+  metadata.gz: 73e691013d64da5c3cf62eece64d3ef52adef68fc6113c0ed78a0f81da9bd923
+  data.tar.gz: ea3a3a5e119dae5ca0d4c77d355bc7fa8747f9e81f93c0cecd822b0c0ee95935
 SHA512:
-  metadata.gz: fbf2afed45b613df53d4f01d1785b9e4b504859d8002fdb1180dfd4977b638eedf4e3cb6b294bd83bc6d923e12cff6474e03a571e6d012410e4ef943f9db4a52
-  data.tar.gz: 4288d1a9c8eeccc67a1020d7d86b8377080f34a89f2c3ebeb28d8b873a6ec84ba502dad650cd798cf4d87ef6d2c9bae2ef28a129b6e18a27f8e9a0fe1b157fe8
+  metadata.gz: b03eed2e8b13e18fb367b6886fa861ba21c0d6014739a1f551f3b050428df9c8a5a50797901768ea4f3db0001a75c4cb4b14800d1f566058d46d025b3c86222f
+  data.tar.gz: 7bdd428a8dd55fc73616db95eb707788c15fd3ec063b6944139eebf870b3b85a7a54ac196c678a64d5c21ab42acd0c8ab93f6185ef1337d87bfd020b91c25fd5

data/lib/aemo/nem12.rb

@@ -228,24 +228,24 @@ module AEMO
         raise ArgumentError, "Interval number #{i - 1} is not valid" if csv[i].nil? || csv[i].match(/\d+(\.\d+)?/).nil?
       end
 
-      raise ArgumentError, 'QualityMethod is not valid' unless csv[intervals_offset + 0].instance_of?(String)
-      raise ArgumentError, 'QualityMethod does not have valid length' unless [1, 3].include?(csv[intervals_offset + 0].length)
+      raise ArgumentError, 'QualityMethod is not valid' unless csv[intervals_offset].instance_of?(String)
+      raise ArgumentError, 'QualityMethod does not have valid length' unless [1, 3].include?(csv[intervals_offset].length)
 
-      unless QUALITY_FLAGS.keys.include?(csv[intervals_offset + 0][0])
+      unless QUALITY_FLAGS.keys.include?(csv[intervals_offset][0])
         raise ArgumentError,
               'QualityMethod does not have valid QualityFlag'
       end
 
-      unless %w[A N V].include?(csv[intervals_offset + 0][0])
-        raise ArgumentError, 'QualityMethod does not have valid length' unless csv[intervals_offset + 0].length == 3
+      unless %w[A N V].include?(csv[intervals_offset][0])
+        raise ArgumentError, 'QualityMethod does not have valid length' unless csv[intervals_offset].length == 3
 
-        unless METHOD_FLAGS.keys.include?(csv[intervals_offset + 0][1..2].to_i)
+        unless METHOD_FLAGS.keys.include?(csv[intervals_offset][1..2].to_i)
           raise ArgumentError,
                 'QualityMethod does not have valid MethodFlag'
         end
       end
 
-      raise ArgumentError, 'ReasonCode is not valid' if !%w[A N E].include?(csv[intervals_offset + 0][0]) && !REASON_CODES.keys.include?(csv[intervals_offset + 1].to_i)
+      raise ArgumentError, 'ReasonCode is not valid' if !%w[A N E].include?(csv[intervals_offset][0]) && !REASON_CODES.keys.include?(csv[intervals_offset + 1].to_i)
 
       if !csv[intervals_offset + 1].nil? && csv[intervals_offset + 1].to_i.zero? && !(csv[intervals_offset + 2].instance_of?(String) && !csv[intervals_offset + 2].empty?)
         raise ArgumentError,
@@ -265,7 +265,7 @@ module AEMO
       end
 
       # Deal with flags - explicitly set all flag values
-      flag = AEMO::MeterData::Flag.from_quality_method_reason_code(quality_method: csv[intervals_offset + 0], reason_code: csv[intervals_offset + 1], validate: strict)
+      flag = AEMO::MeterData::Flag.from_quality_method_reason_code(quality_method: csv[intervals_offset], reason_code: csv[intervals_offset + 1], validate: strict)
 
       # Deal with updated_at & msats_load_at
       updated_at = nil

data/lib/aemo/version.rb

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

data/lib/data/xml_to_json.rb

@@ -40,39 +40,39 @@ end
 # Now to create the DLF and TNI output JSON files for use
 @files.select { |x| ['aemo-tni.xml', 'aemo-dlf.xml'].include?(x) }
       .each do |file|
-        output_file = file.gsub('.xml', '.json')
-        output_data = {}
-        open_file = File.open(File.join(@path, file))
-        xml = Nokogiri::XML(open_file) do |c|
-          c.options = Nokogiri::XML::ParseOptions::NOBLANKS
-        end
-        open_file.close
+  output_file = file.gsub('.xml', '.json')
+  output_data = {}
+  File.open(File.join(@path, file)) do |open_file|
+    Nokogiri::XML(open_file) do |c|
+      c.options = Nokogiri::XML::ParseOptions::NOBLANKS
+    end
+  end
 
-        xml.xpath('//Row').each do |row|
-          row_children = row.children
-          code = row_children.find { |x| x.name == 'Code' }.children.first.text
-          output_data[code] ||= []
-          output_data_instance = {}
-          row_children.each do |row_child|
-            output_data_instance[row_child.name] = row_child.children.first.text
-          end
-          if file =~ /tni/
-            puts "output_data_instance: #{output_data_instance.inspect}"
-            output_data_instance[:mlf_data] = {}
-            unless @mlf_data[code].nil?
-              output_data_instance[:mlf_data] = @mlf_data[code].deep_dup
-              output_data_instance[:mlf_data][:loss_factors].reject! do |x|
-                Time.parse(output_data_instance['ToDate']) < x[:start] ||
-                  Time.parse(output_data_instance['FromDate']) >= x[:finish]
-              end
-              puts 'output_data_instance[:mlf_data][:loss_factors]: ' \
-                   "#{output_data_instance[:mlf_data][:loss_factors].inspect}"
-            end
-          elsif file =~ /dlf/
-            output_data_instance[:nsp_code] = @dlf_data[code]
-          end
-          output_data[code] << output_data_instance
+  xml.xpath('//Row').each do |row|
+    row_children = row.children
+    code = row_children.find { |x| x.name == 'Code' }.children.first.text
+    output_data[code] ||= []
+    output_data_instance = {}
+    row_children.each do |row_child|
+      output_data_instance[row_child.name] = row_child.children.first.text
+    end
+    if file =~ /tni/
+      puts "output_data_instance: #{output_data_instance.inspect}"
+      output_data_instance[:mlf_data] = {}
+      unless @mlf_data[code].nil?
+        output_data_instance[:mlf_data] = @mlf_data[code].deep_dup
+        output_data_instance[:mlf_data][:loss_factors].reject! do |x|
+          Time.parse(output_data_instance['ToDate']) < x[:start] ||
+            Time.parse(output_data_instance['FromDate']) >= x[:finish]
         end
+        puts 'output_data_instance[:mlf_data][:loss_factors]: ' \
+             "#{output_data_instance[:mlf_data][:loss_factors].inspect}"
+      end
+    elsif file =~ /dlf/
+      output_data_instance[:nsp_code] = @dlf_data[code]
+    end
+    output_data[code] << output_data_instance
+  end
 
-        File.write(File.join(@path, output_file), output_data.to_json)
+  File.write(File.join(@path, output_file), output_data.to_json)
 end

data/spec/lib/aemo/nem12_spec.rb

@@ -135,9 +135,9 @@ describe AEMO::NEM12 do
       Dir.entries(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'NEM12'))
          .reject { |f| %w[. .. .DS_Store].include?(f) }
          .each do |file|
-           described_class.parse_nem12_file(fixture(File.join('NEM12', file))).each do |nem12|
-             expect(nem12.nmi_identifier).to be_a String
-           end
+        described_class.parse_nem12_file(fixture(File.join('NEM12', file))).each do |nem12|
+          expect(nem12.nmi_identifier).to be_a String
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Joel Courtney
@@ -21,7 +21,7 @@ dependencies:
         version: 4.2.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 4.2.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,7 @@ dependencies:
         version: '1.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.19.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,7 +111,27 @@ dependencies:
         version: '1.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.19.3
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement