openhab-scripting 4.38.0 → 4.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 249167484484abf9fb6c7128e5e697fd4e1d767576ad52b22005ee473d52776e
-  data.tar.gz: 6825c83f1cdd668882c3409c0cc828c69e259e553ba736eb9291a0ec1370c57d
+  metadata.gz: 1fb1294914e9c3e343bef8f0c1aaca327dbaa5875d446ec3e507edc1f390c9c9
+  data.tar.gz: be121541f849f733505c6180557f88fdd98869d89e0a593c6fc48db0e7e6daf5
 SHA512:
-  metadata.gz: 7d8c8f1f4aab62fecedbe0b8e6693f263e3a21c2ddbb188e5f16cffaf59643d1ffc27c71bb1c14cd256f1852ab6187890c4289791d862ef8e6dcfb1e8f06d096
-  data.tar.gz: ed683ceab7adbcdfb6882409f8c52fac4e06b15c23662f108488cc192594f21d13d1614b4e645f9c00dec94739321d931fa2c7cfcb1c78ebc6157882c0cdaff3
+  metadata.gz: e6af3e7152dd02c9d98dea19f9bcaa4f474a20daac090941c1121705d177afec2498a2704462645d51b6e4e055efda1f0431702c0f7c6f126718b7994ef6baad
+  data.tar.gz: f9af8246710e44dc86719d10ba2577003293640e1c11885c054da9d23d0be8746e1103151c173672ddfab96ae218f5d717318ab72d628a194f7a243647ea885d

data/lib/openhab/dsl/items/ensure.rb

@@ -99,7 +99,6 @@ module OpenHAB
     module Items
       GenericItem.prepend(OpenHAB::DSL::Ensure::GenericItem)
       GroupItem::GroupMembers.include(OpenHAB::DSL::Ensure::Ensurable)
-      Enumerable.include(OpenHAB::DSL::Ensure::Ensurable)
     end
   end
 end

data/lib/openhab/dsl/items/semantics/enumerable.rb

@@ -32,6 +32,11 @@ module Enumerable
     each { |i| i.update(state) }
   end
 
+  # Returns the group members the elements
+  def members
+    select { |e| e.respond_to? :members }.flat_map(&:members)
+  end
+
   # @!method refresh
   #   Send the +REFRESH+ command to every item in the collection
 
@@ -76,4 +81,11 @@ module Enumerable
 
   # @!method previous
   #   Send the +PREVIOUS+ command to every item in the collection
+
+  # @!visibility private
+  # can't use `include`, because Enumerable has already been included
+  # in other classes
+  def ensure
+    OpenHAB::DSL::Ensure::GenericItemDelegate.new(self)
+  end
 end

data/lib/openhab/dsl/items/semantics.rb

@@ -148,8 +148,8 @@ module OpenHAB
       # @example Search a Thermostat item for is setpoints
       #   eFamilyThermostat.points(Semantics::Control, Semantics::Temperature)
       #   # => [FamilyThermostat_HeatingSetpoint, FamilyThermostat_CoolingSetpoint]
-      # @example Given a A/V receiver's input item, search for it's power item
-      #   FamilyReceiver_Input.points(Semantics::Switch) # => FamilyReceiver_Switch
+      # @example Given a A/V receiver's input item, search for its power item
+      #   FamilyReceiver_Input.points(Semantics::Switch) # => [FamilyReceiver_Switch]
       #
       # @param [Class] point_or_property_types
       #   Pass 1 or 2 classes that are sub-classes of [Point] or [Property].
@@ -199,7 +199,7 @@ module Enumerable
   # Returns a new array of items that are semantics points (optionally of a given type)
   #
   # @example Get all the power switch items for every equipment in a room
-  #   lGreatRoom.equipments.flat_map(&:members).points(Semantics::Switch)
+  #   lGreatRoom.equipments.points(Semantics::Switch)
   def points(*point_or_property_types) # rubocop:disable Metrics
     unless (0..2).cover?(point_or_property_types.length)
       raise ArgumentError, "wrong number of arguments (given #{point_or_property_types.length}, expected 0..2)"
@@ -214,13 +214,27 @@ module Enumerable
       raise ArgumentError, 'point_or_property_types cannot both be a subclass of Point or Property'
     end
 
-    select do |point|
-      next unless point.point?
-
+    filter_with_members(&:point?)
+      .select do |point|
       point_or_property_types.all? do |tag|
         (tag < OpenHAB::DSL::Semantics::Point && point.point_type&.<=(tag)) ||
           (tag < OpenHAB::DSL::Semantics::Property && point.property_type&.<=(tag))
       end
     end
   end
+
+  #
+  # Select the elements where the given block returns true.
+  # If the block returns false but the element is a GroupItem with members,
+  # merge its members into the result and filter them using the same block
+  #
+  # @param [Block] &block A block that returns true for the elements and members to be included in the result
+  #
+  # @return [Array] The resulting array
+  #
+  # !@visibility private
+  def filter_with_members(&block)
+    selected, others = partition(&block)
+    others.members.select(&block).concat(selected)
+  end
 end

data/lib/openhab/version.rb

@@ -5,5 +5,5 @@
 #
 module OpenHAB
   # @return [String] Version of OpenHAB helper libraries
-  VERSION = '4.38.0'
+  VERSION = '4.39.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.38.0
+  version: 4.39.0
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-15 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler