openhab-scripting 4.0.1 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4028b9fda2ff3ffa7005f730d7b876e136cf4c3dacc66f0f8950077c4a8f5ab9
-  data.tar.gz: dc819dea7d3f573299934da843ddadc597f98f59165426e6c88e321a1fd93200
+  metadata.gz: a66939406a04523ae992c37d0ec6c4d83ca5334e156d4211e883dd51085a282f
+  data.tar.gz: f93569799fdd9c01e3d678619655484f799d7a9c3dcab43222cc49e8051cc8cd
 SHA512:
-  metadata.gz: 2839736ff1c0d15c6622e679e7ada29d6f34afe5bae7d9fa375ebe34e809b14eb0f54b447d95ff7548b3f97786f0c7f6f979cd8ce796fa84bdbb1b60312a7e73
-  data.tar.gz: 45b0ca416f63b8971fdd4f7ee7d86c449ac44b0d0acdf6a1ce6955d604c04bf12788900a180fde7ec49d9fafe8aa5a5b6a8d4271cc5a72ab4440ddbe9e7a2b8a
+  metadata.gz: 13c9f58823377f3297613a43803fbf6474e7b5d8a4225e42688485cdb15b147ca0116b10115dcb643a1fbdb6fadbb34fe34b038cd396e2fdc23ebfc6ea840354
+  data.tar.gz: b7969f401abb258512607c5b635e6e972c58217200c787a8a18ebeaad25cd866388db888185b3b1939dbdd617e0647011919e9557ecd6698aeafcdae6329cbfa

data/lib/openhab/dsl/group.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
-require 'delegate'
-require 'forwardable'
+require 'java'
+require 'singleton'
+
 require 'openhab/core/entity_lookup'
 require 'openhab/dsl/items/group_item'
+require 'openhab/dsl/lazy_array'
 
 module OpenHAB
   module DSL
@@ -14,16 +16,27 @@ module OpenHAB
       #
       # Provide access to groups as a set
       #
-      class Groups < SimpleDelegator
+      class Groups
+        include LazyArray
+        include Singleton
+
         #
         # Get a OpenHAB Group by name
         # @param [String] name of the group to retrieve
         #
         # @return [Set] of OpenHAB Groups
         #
-        def[](name)
-          group = OpenHAB::Core::EntityLookup.lookup_item(name)
-          group.is_a?(OpenHAB::DSL::Items::GroupItem) ? group : nil
+        def [](name)
+          group = Core::EntityLookup.lookup_item(name)
+          group.is_a?(Items::GroupItem) ? group : nil
+        end
+        alias include? []
+        alias key? include?
+
+        # explicit conversion to array
+        def to_a
+          items = $ir.items.grep(org.openhab.core.items.GroupItem) # rubocop:disable Style/GlobalVars
+          Core::EntityLookup.decorate_items(items)
         end
       end
 
@@ -33,9 +46,7 @@ module OpenHAB
       # @return [Set] of OpenHAB Groups
       #
       def groups
-        # rubocop: disable Style/GlobalVars
-        Groups.new(OpenHAB::Core::EntityLookup.decorate_items($ir.items.grep(Java::OrgOpenhabCoreItems::GroupItem)))
-        # rubocop: enable Style/GlobalVars
+        Groups.instance
       end
     end
   end

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

@@ -3,9 +3,11 @@
 require 'delegate'
 require 'forwardable'
 require 'java'
+
+require 'openhab/core/entity_lookup'
 require 'openhab/dsl/items/item_command'
 require 'openhab/dsl/items/item_delegate'
-require 'openhab/core/entity_lookup'
+require 'openhab/dsl/lazy_array'
 
 module OpenHAB
   module DSL
@@ -14,7 +16,7 @@ module OpenHAB
       # Class for indicating to triggers that a group trigger should be used
       #
       class GroupMembers
-        include Enumerable
+        include LazyArray
 
         attr_reader :group
 
@@ -27,22 +29,10 @@ module OpenHAB
           @group = group_item
         end
 
-        # Calls the given block once for each group member, passing that
-        # item as a parameter. Returns self.
-        #
-        # If no block is given, an Enumerator is returned.
-        def each(&block)
-          to_a.each(&block)
-          self
-        end
-
         # explicit conversion to array
-        # more efficient than letting Enumerable do it
         def to_a
           OpenHAB::Core::EntityLookup.decorate_items(group.members.to_a)
         end
-        # implicitly convertible to array
-        alias to_ary to_a
       end
 
       #

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

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 require 'java'
-require 'openhab/core/entity_lookup'
 require 'singleton'
 
+require 'openhab/core/entity_lookup'
+require 'openhab/dsl/lazy_array'
+
 module OpenHAB
   module DSL
     #
@@ -14,7 +16,7 @@ module OpenHAB
       # Delegates to underlying set of all OpenHAB Items, provides convenience methods
       #
       class Items
-        include Enumerable
+        include LazyArray
         include Singleton
 
         # Fetches the named item from the the ItemRegistry
@@ -32,27 +34,13 @@ module OpenHAB
         def include?(name)
           !$ir.getItems(name).empty? # rubocop: disable Style/GlobalVars
         end
-        alias key? include?
-
-        # Calls the given block once for each Item, passing that Item as a
-        # parameter. Returns self.
-        #
-        # If no block is given, an Enumerator is returned.
-        def each(&block)
-          # ideally we would do this lazily, but until ruby 2.7
-          # there's no #eager method to convert back to a non-lazy
-          # enumerator
-          to_a.each(&block)
-        end
+        alias key? []
 
         # explicit conversion to array
-        # more efficient than letting Enumerable do it
         def to_a
-          items = $ir.items.grep_v(Java::OrgOpenhabCoreItems::GroupItem) # rubocop:disable Style/GlobalVars
+          items = $ir.items.grep_v(org.openhab.core.items.GroupItem) # rubocop:disable Style/GlobalVars
           OpenHAB::Core::EntityLookup.decorate_items(items)
         end
-        # implicitly convertible to array
-        alias to_ary to_a
       end
 
       # Fetches all non-group items from the item registry

data/lib/openhab/dsl/lazy_array.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  module DSL
+    # common base class for array-like collections that have lookup
+    # methods to avoid instantiating the elements if you only use
+    # the lookup method
+    #
+    # your class should implement to_a
+    #
+    module LazyArray
+      include Enumerable
+
+      # Calls the given block once for each Thing, passing that Thing as a
+      # parameter. Returns self.
+      #
+      # If no block is given, an Enumerator is returned.
+      def each(&block)
+        to_a.each(&block)
+        self
+      end
+
+      # implicitly convertible to array
+      def to_ary
+        to_a
+      end
+
+      # delegate any other methods to the actual array
+      # exclude mutating methods though
+      def method_missing(method, *args, &block)
+        return to_a.send(method, *args, &block) if method[-1] != '!' && Array.instance_methods.include?(method)
+
+        super
+      end
+
+      # advertise that methods exist that would be delegated to Array
+      def respond_to_missing?(method, include_private = false)
+        return true if method[-1] != '!' && Array.instance_methods.include?(method.to_sym)
+
+        super
+      end
+    end
+  end
+end

data/lib/openhab/dsl/monkey_patch/types/decimal_type.rb

@@ -16,6 +16,11 @@ module OpenHAB
         # MonkeyPatching Decimal Type
         #
         class DecimalType
+          extend Forwardable
+
+          delegate %i[to_d zero?] => :to_big_decimal
+          delegate %i[positive? negative?] => :to_d
+
           #
           # @param [Object] other object to compare to
           #

data/lib/openhab/dsl/things.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require 'delegate'
 require 'java'
+require 'singleton'
+
 require 'openhab/log/logger'
 require 'openhab/dsl/actions'
-require 'delegate'
-require 'singleton'
+require 'openhab/dsl/lazy_array'
 
 module OpenHAB
   module DSL
@@ -78,44 +80,26 @@ module OpenHAB
       # Wraps all Things in a delegator to underlying set and provides lookup method
       #
       class Things
-        java_import org.openhab.core.thing.ThingUID
-
-        include Enumerable
+        include LazyArray
         include Singleton
 
         # Gets a specific thing by name in the format binding_id:type_id:thing_id
         # @return Thing specified by name or nil if name does not exist in thing registry
         def [](uid)
-          thing_uid = ThingUID.new(*uid.split(':'))
+          thing_uid = org.openhab.core.thing.ThingUID.new(*uid.split(':'))
           thing = $things.get(thing_uid) # rubocop: disable Style/GlobalVars
           return unless thing
 
           logger.trace("Retrieved Thing(#{thing}) from registry for uid: #{uid}")
           Thing.new(thing)
         end
-
         alias include? []
         alias key? []
 
-        # Calls the given block once for each Thing, passing that Thing as a
-        # parameter. Returns self.
-        #
-        # If no block is given, an Enumerator is returned.
-        def each(&block)
-          # ideally we would do this lazily, but until ruby 2.7
-          # there's no #eager method to convert back to a non-lazy
-          # enumerator
-          to_a.each(&block)
-          self
-        end
-
         # explicit conversion to array
-        # more efficient than letting Enumerable do it
         def to_a
           $things.getAll.map { |thing| Thing.new(thing) } # rubocop: disable Style/GlobalVars
         end
-        # implicitly convertible to array
-        alias to_ary to_a
       end
 
       #

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.3
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - lib/openhab/dsl/items/player_item.rb
 - lib/openhab/dsl/items/rollershutter_item.rb
 - lib/openhab/dsl/items/string_item.rb
+- lib/openhab/dsl/lazy_array.rb
 - lib/openhab/dsl/monkey_patch/actions/actions.rb
 - lib/openhab/dsl/monkey_patch/actions/script_thing_actions.rb
 - lib/openhab/dsl/monkey_patch/events/events.rb