openhab-scripting 4.11.1 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3264a393d9e32d434336802a9dcfd97f2d296b1f54cb3060650fd29ab7103b91
-  data.tar.gz: 786046dd908aaa43250b374947b01dcbfb7455eb72105b504bb29e0cffe48545
+  metadata.gz: 6f8fbc8b811541d42b4409776ee2debc6681bfbf17d725e68b3090a31b7ab3ae
+  data.tar.gz: 621ae3605cd46036106b12cf64dc6eb200d7bdcd6cbd5e10cd512bc52f98f5b0
 SHA512:
-  metadata.gz: d7c4684def0b1c2dd97d9bce9f191bcfb58c5e3bf07313916d240385dc0d891f987b30d92c38f27578e432e10c8318e2167dd92942f6b6d426e77e1d7c3f2be4
-  data.tar.gz: '058b81f95f7d86e8cf35a30f8576679c49fab4181a1f7e1634f9d5997cb45a6f96c4cf35efc00627d954d4a71c2626bd4a82df527c0233685fd9c2e52061f6f6'
+  metadata.gz: c73ffba5f0d95ba2cf622659b9f2bb52e1e3a033c7ef4f52f04beff29abfdea86f79f4b1f9aa08dd6bc2c9478f0adad3942866c0cb556df6fd6164d18f19f389
+  data.tar.gz: f4f04af30d25bd46fe5625240d218f9fa610172a03d1e26d0ac0feda4efc54a8b17a403ed0b533bf2bfef79b0eaace7eb2fac7ca9ae48c88741f4a54cce39f66

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

@@ -29,7 +29,7 @@ module OpenHAB
 
           def initialize(metadata: nil, key: nil, value: nil, config: nil)
             @metadata = metadata || Metadata.new(key || MetadataKey.new('', ''), value&.to_s, config)
-            super(to_ruby(@metadata&.configuration))
+            super(MetadataItem.to_ruby(@metadata&.configuration))
           end
 
           #
@@ -86,8 +86,6 @@ module OpenHAB
             [@metadata&.value, @metadata&.configuration || {}]
           end
 
-          private
-
           #
           # Recursively convert the supplied Hash object into a Ruby Hash and recreate the keys and values
           #
@@ -95,7 +93,7 @@ module OpenHAB
           #
           # @return [Hash] The converted hash
           #
-          def to_ruby_hash(hash)
+          def self.to_ruby_hash(hash)
             return unless hash.respond_to? :each_with_object
 
             hash.each_with_object({}) { |(key, value), ruby_hash| ruby_hash[to_ruby(key)] = to_ruby(value) }
@@ -108,14 +106,14 @@ module OpenHAB
           #
           # @return [Array] The converted array
           #
-          def to_ruby_array(array)
+          def self.to_ruby_array(array)
             return unless array.respond_to? :each_with_object
 
             array.each_with_object([]) { |value, ruby_array| ruby_array << to_ruby(value) }
           end
 
           # Convert the given object to Ruby equivalent
-          def to_ruby(value)
+          def self.to_ruby(value)
             case value
             when Hash, Java::JavaUtil::Map then to_ruby_hash(value)
             when Array, Java::JavaUtil::List then to_ruby_array(value)
@@ -188,7 +186,9 @@ module OpenHAB
             return unless block_given?
 
             NamespaceAccessor.registry.getAll.each do |meta|
-              yield meta.uID.namespace, meta.value, meta.configuration if meta.uID.itemName == @item_name
+              if meta.uID.itemName == @item_name
+                yield meta.uID.namespace, MetadataItem.to_ruby(meta.value), MetadataItem.to_ruby(meta.configuration)
+              end
             end
           end
 

data/lib/openhab/dsl/types/percent_type.rb

@@ -64,6 +64,32 @@ module OpenHAB
         def to_s
           "#{to_string}%"
         end
+
+        #
+        # Scale the value to a particular range
+        #
+        # @param range [Range] the range as a numeric
+        # @return [Numeric] the value as a percentage of the range
+        #
+        def scale(range) # rubocop:disable Metrics/AbcSize
+          unless range.is_a?(Range) && range.min.is_a?(Numeric) && range.max.is_a?(Numeric)
+            raise ArgumentError, 'range must be a Range of Numerics'
+          end
+
+          result = (to_d * (range.max - range.min) / 100) + range.min
+          case range.max
+          when Integer then result.round
+          when Float then result.to_f
+          else result
+          end
+        end
+
+        # scale the value to fit in a single byte
+        #
+        # @return [Integer] an integer in the range 0-255
+        def to_byte
+          scale(0..255)
+        end
       end
     end
   end

data/lib/openhab/dsl/types/quantity_type.rb

@@ -50,6 +50,9 @@ module OpenHAB
         def <=>(other) # rubocop:disable Metrics
           logger.trace("(#{self.class}) #{self} <=> #{other} (#{other.class})")
           if other.is_a?(self.class)
+            return unitize(other.unit).compare_to(other) if unit == ONE
+            return compare_to(other.unitize(unit)) if other.unit == ONE
+
             compare_to(other)
           elsif other.is_a?(Items::NumericItem) ||
                 (other.is_a?(Items::GroupItem) && other.base_item.is_a?(NumericItem))

data/lib/openhab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.11.1
+  version: 4.13.0
 platform: ruby
 authors:
 - Brian O'Connell
@@ -152,15 +152,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: JRuby Helper Libraries for OpenHAB Scripting