openhab-scripting 4.12.0 → 4.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0be6996bb905e740d8a0079a6f034aedcbef564c9c9030a8657397f64dcf0dd
-  data.tar.gz: 7b3d11531d71763653c98c0251afe71213a1bec3ec8f75263f1de2459199eca0
+  metadata.gz: 2d2593c004c5de826f8b1d010fd4594e6b32911ad6291b2973f192bf7e7d2383
+  data.tar.gz: fbd14e4e0a1ae6622a6fa868dc2b5a006cbd2094c22922e36f95743f97683f9a
 SHA512:
-  metadata.gz: 0dd11328b02bfa076b9c7c3fbc4a084fd4b54939e6b3df8e7510484b37116d25820f308f30bbfd53621f6c57758057e323384c6933da72bd5769204c6f81dcf2
-  data.tar.gz: db3700f40ce86ea77e03a5560104e4e78e937b2e1b5cca177a595fbd01aca215cb4659517274433c3dffb09e8f668e6d7e6839782bdcc31380a4c530f3beef1f
+  metadata.gz: 7035a6b5621606d072680ac7057ef69a1f60a78ea674a4ef5fea16307b8fe6fd2578da0c925b9b2243d84101e9e3505f0a944c69c7f32884ccc0e29d093d7d0a
+  data.tar.gz: 26758d8a9a8d14754364cbbf1e012e522cbc7d85f9506d7290e21deb675b985c00439ce1bdefacefbd6c43d7904b2a019b243fc9d5c241b62825493659d114d7

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.12.0'
+  VERSION = '4.13.2'
 end

metadata

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