openhab-scripting 4.11.2 → 4.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19cbbdcb66b30a84771b0f5d326d9a4a93aebdace2d56d8bb6fb69c256d0826e
-  data.tar.gz: bda4faa411f2fd7364f52e881e4c493329228060542d9f57de8a52b8cf3e6f92
+  metadata.gz: 5277fc6afcbe8ae48365fc8a0d867ccd678dfb89e098e3ced9dde91231a19de5
+  data.tar.gz: c7f1dbde6e49b58dcc9e12857d8b3898c8f0b6be556e5170539217197eec4bcb
 SHA512:
-  metadata.gz: f8eb6381c66788636e3a6f5e3fd98aab72a6a88919de848d3332a59cb1e94f4091cfbea6c2d6b0eb4fe81dc94c7cd4014e8d3ef5846a51658429922a883979a9
-  data.tar.gz: 7fc88a1936533792a385475b397deea0c9b7a67d5ef450ec502e0e39a7faa25528bafe30cf4946b407e3f4865fa883f9bdb71912bac7b88f2d411655749cbdba
+  metadata.gz: 2fde0980ddcc145964165c59a53a7020386c6be95c44b5abb8ecf7e075b2c72d374a6d10b8030bb8ca3b0644f0addf61fbd1d48b22e47f0c2fd42bccbfa3ed0b
+  data.tar.gz: dc05be4ab897a1fa6c5a827b9ec46a8aad579eb3e1c27c34cb0089b32bf72eaf86008181c90b667418561e29b7c392ee3238f8ca332a0457c30fa654653ac85b

data/lib/openhab/dsl/rules/automation_rule.rb

@@ -279,7 +279,7 @@ module OpenHAB
         # Loggging inflates method length
         def check_guards(event:)
           if @guard.should_run? event
-            now = TimeOfDay::TimeOfDay.now
+            now = Time.now
             return true if @between.cover? now
 
             logger.trace("Skipped execution of rule '#{name}' because the current time #{now} "\

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.2'
+  VERSION = '4.13.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.11.2
+  version: 4.13.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-06 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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