alula-ruby 2.16.1 → 2.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3bf8e3477ce10c3045fe47f7bee7a445749338a08c22e49eec2ff49cb83e5b7
-  data.tar.gz: de5f43338748af6a94922dcbb0eb9dd73bc3565cacbbce1a17f314906c9e97e0
+  metadata.gz: 476f5357c56b6b27930fb4fb2ac5018af21137c09cc38727cd6da09d791c827b
+  data.tar.gz: b5811b8a468f084e932d327989d5c470d2fcd0a49c205eaa7c1f32e044b8dfb3
 SHA512:
-  metadata.gz: f6af1c562cce55dc4b361bb3ee2c36200b41e592302c50fbb935d5cd318c4db9aae3903631e8c48b4827016283b1497a437089aca4a17cc63756fc76a3f20402
-  data.tar.gz: 5edda7ca58669ea7343659ffd21474841def738f544e04d3597c133c4409db33fb914aa79b0edd5e4bce7f2170bad8a8aa72ab80943f7cc32584e5d7ffbe0a1f
+  metadata.gz: 2d56635fc3bb86fb2e98642536293b55f1464beb6b777583fc10535d47536d043b69bc7aa2b6c49b4ec8dacc00d11b7fa3a8797efc3be353c534ca670c3a642c
+  data.tar.gz: 117a78e58825a0a2324f3af35f70f36a5bb8e888e113db8645e8e80015ba005c26ba29629c876a1f996ded186e1052adcae97fb10fe6c5112139543d06b886ad

data/VERSION.md

@@ -2,6 +2,7 @@
 
 | Version | Date        | Description                                                                 |
 | ------- | ------------| --------------------------------------------------------------------------- |
+| v2.16.2 | 2025-06-26  | Rename DCP fields, fix primitive arrays |
 | v2.16.1 | 2025-06-24  | Remove byebug usages |
 | v2.16.0 | 2025-06-18  | Add API config template and all DCP entities |
 | v2.15.1 | 2025-07-19  | Rename DCP-synchronizable fields to conform to the schema |

data/lib/alula/dcp/resource_state.rb

@@ -79,17 +79,26 @@ module Alula
                 if opts[:use].superclass == Alula::Dcp::ObjectField
                   opts[:use].new({}, field_name, value)
                 elsif respond_to?(:device_id)
-                  opts[:use].new(device_id, value['index'], value)
+                  opts[:use].new(device_id, value)
                 else
-                  opts[:use].new(nil, nil, value)
+                  opts[:use].new(nil, value)
                 end
               elsif opts[:type] == :array && opts[:of]
-                # Array of objects, each object is a new instance of the use class
-                value.each_with_object([]) do |item, collector|
-                  if item.is_a?(Hash) && item['index']
-                    collector << opts[:of].new(device_id, item['index'], item)
-                  else
-                    collector << opts[:of].new(device_id, nil, item)
+                if primitive_use?(opts[:of])
+                  # Array of primitives, e.g. :boolean, :number, :string
+                  value.map do |item|
+                    if opts[:of] == :boolean
+                      [true, 'true', 1, '1'].include? item
+                    elsif opts[:of] == :number
+                      item.to_i
+                    else
+                      item
+                    end
+                  end
+                else
+                  # Array of objects, each object is a new instance of the use class
+                  value.each_with_object([]) do |item, collector|
+                    collector << opts[:of].new(device_id, item)
                   end
                 end
               elsif opts[:type] == :boolean
@@ -136,6 +145,10 @@ module Alula
       def primitive?(resource)
         resource.class.get_fields[:primitive]
       end
+
+      def primitive_use?(opts_of)
+        %i[boolean number string].include?(opts_of)
+      end
     end
 
     class StagedState < ResourceState

data/lib/alula/resources/dcp/config/panel_options/reportable_event_types_partitions.rb

@@ -19,9 +19,9 @@ module Alula
               type: :boolean
         field :restorals,
               type: :boolean
-        field :zone_trouble_cr,
+        field :zone_trouble_c_r,
               type: :boolean
-        field :partition_trouble_cr,
+        field :partition_trouble_c_r,
               type: :boolean
         field :opening_and_closing,
               type: :boolean

data/lib/alula/resources/dcp/config/panel_options/reportable_event_types_system.rb

@@ -14,9 +14,9 @@ module Alula
 
           resource_name 'config/panelOptions/reportableEventTypesSystem'
 
-          field :system_trouble_cr,
+          field :system_trouble_c_r,
                 type: :boolean
-          field :system_power_trouble_cr,
+          field :system_power_trouble_c_r,
                 type: :boolean
           field :misc_events,
                 type: :boolean

data/lib/alula/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Alula
-  VERSION = '2.16.1'
+  VERSION = '2.16.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alula-ruby
 version: !ruby/object:Gem::Version
-  version: 2.16.1
+  version: 2.16.2
 platform: ruby
 authors:
 - Titus Johnson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-24 00:00:00.000000000 Z
+date: 2025-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty