aemo 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e034dcfeaf28060aa39be81b16e66a689ba571d7c5394f668665b2a9a2f0d0bf
-  data.tar.gz: aaaeef50ee4cdbf78d33b4ce992ac8aa268e03e4ad33d272c4e2e7d784a54db2
+  metadata.gz: 7aa903b03da21b8850f3edf73e22e95365c5cca0d586dd26be1af6572edf08c4
+  data.tar.gz: '0628f6ad1e3fededf28d5c09e838654836a5e2b0d6860106e0fcd536cbcab114'
 SHA512:
-  metadata.gz: 5fca44605b1d54f5199bfd8ba8e078703c74a9fb5c62628f1a9570508b64f2057187955842dadc764d7bc0d03c5851657ded9820fa79ee8ac962036377de3729
-  data.tar.gz: e0af286ab7bef3952a4159c0765389bdba82669b8f7c43c3fd03a4fdfff184e5480f0aad2f26d1850675ee94958e66cc36af94a5352e6929decb8555b39d5f73
+  metadata.gz: d4ed45a247e81eb2c1c9c5f094267104eeaf8eab63d746efb72ffeb1e2c052f406d5df6109d23e3cf9b4c4f4730799e253dce59fc6178058872e314422b782f9
+  data.tar.gz: ed624dc27652b135c2c7bdfabab86d25c231857542ddd16b12947d976ab10a3ef86f0155341c664c00fe8ef9714cd4f15b4c42c0730ffa68b8f7d0d3af692e9c

data/lib/aemo/market.rb

@@ -51,7 +51,7 @@ module AEMO
         end
 
         required_data.select do |values|
-          values.datetime >= start && values.datetime <= finish
+          values.datetime.between?(start, finish)
         end
       end
 

data/lib/aemo/nem12/quality_method.rb

@@ -17,16 +17,24 @@ module AEMO
       11 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Check', description: '' },
       12 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Calculated', description: '' },
       13 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'SCADA', description: '' },
-      14 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Like Day', description: '' },
-      15 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Average Like Day', description: '' },
-      16 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Agreed', description: '' },
+      14 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Retrospective Like Day', description: 'Updated v7.8' },
+      15 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Retrospective Average Like Day', description: 'Updated v7.8' },
+      16 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Agreed', description: '[OBSOLETE] v7.8' },
       17 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Linear', description: '' },
       18 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Alternate', description: '' },
       19 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Zero', description: '' },
-      20 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Churn Correction (Like Day)',
-              description: '' },
+      20 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Prospective Like Day',
+              description: 'Updated v7.8' },
       21 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Five-minute No Historical Data',
-              description: '' },
+              description: 'Added v7.8' },
+      22 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Prospective Ave Like Day',
+              description: 'Added v7.8' },
+      23 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Previous Year',
+              description: 'Added v7.8' },
+      24 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Data Scaling',
+              description: 'Added v7.8' },
+      25 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'ADL',
+              description: 'Added v7.8' },
       51 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Previous Year', description: '' },
       52 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Previous Read', description: '' },
       53 => { type: %w[SUB], installation_type: 5, short_descriptor: 'Revision', description: '' },

data/lib/aemo/nmi.rb

@@ -309,8 +309,7 @@ module AEMO
       raise 'Invalid date' unless [DateTime, ::Time].include?(datetime.class)
 
       possible_values = DLF_CODES[@dlf].select do |x|
-        ::Time.parse(x['FromDate']) <= datetime &&
-          ::Time.parse(x['ToDate']) >= datetime
+        datetime.between?(::Time.parse(x['FromDate']), ::Time.parse(x['ToDate']))
       end
       if possible_values.empty?
         nil
@@ -351,12 +350,12 @@ module AEMO
       raise 'Invalid date' unless [DateTime, ::Time].include?(datetime.class)
 
       possible_values = TNI_CODES[@tni].select do |x|
-        ::Time.parse(x['FromDate']) <= datetime && datetime <= ::Time.parse(x['ToDate'])
+        datetime.between?(::Time.parse(x['FromDate']), ::Time.parse(x['ToDate']))
       end
       return nil if possible_values.empty?
 
       possible_values = possible_values.first['mlf_data']['loss_factors'].select do |x|
-        ::Time.parse(x['start']) <= datetime && datetime <= ::Time.parse(x['finish'])
+        datetime.between?(::Time.parse(x['start']), ::Time.parse(x['finish']))
       end
       return nil if possible_values.empty?
 

data/lib/aemo/version.rb

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

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Joel Courtney
 - Stuart Auld
 - Neil Parikh
 - Olivier Nsabimana
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -117,16 +116,22 @@ dependencies:
   name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.3
 description: Gem providing functionality for the Australian Energy Market Operator
   data.Supports NMIs, NEM12, MSATS Web Services and more
 email:
@@ -300,7 +305,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -315,8 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.1
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Gem providing functionality for the Australian Energy Market Operator data
 test_files: []