openhab-scripting 4.30.0 → 4.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4e5de50bc22188eb5350aa71f00738703afab2e75703c9f5c2f4ffce54c49dc
-  data.tar.gz: e42484957fcea08aaf5d397af1ec5012b5595bd893eacca7bbc2db3149a1707b
+  metadata.gz: 10d0c23c8f73defd79189dd05ec00cd3ce3aa301b87f6c7c8dbcfef3a73071d1
+  data.tar.gz: 45699ef1e370be135a4237eae154739f3375a95a9e5921ab97d1a51eb0ae87d4
 SHA512:
-  metadata.gz: af5435c5804d2a58f1e8cf84647ee1813c80c958e9b1c3c6794d6879adeebd71ac6955454ad424522916375d7314719312b561d7b2a718ad43b48e76edd2801c
-  data.tar.gz: 2f3e46d17e305d1169980fdf2aa5ae8f5673e4730d73d2d10dbb445582642086522d3ab43e9bae5a411637ec1e787d465431423fb307a04ed09178be5953c25a
+  metadata.gz: 1e711ed86c556564fb8265781893567ce842b4a920979825a9fda79a329855535745e30f9f95c2c2015e6b4caf38e303b616c665634bb55e144662f67f5a12a4
+  data.tar.gz: 7aa7ccb682c525857d0a9f39296c902f3b0396d7b19de5d76f5d06783daeb316be3f039f0c898301af69545849410a73be8b7261340154568062d71b6f30681b

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

@@ -10,8 +10,8 @@ module OpenHAB
       DateTimeType = org.openhab.core.library.types.DateTimeType
       java_import java.time.ZonedDateTime # This is needed for the addon prior to ruby_class fix (OH 3.2.0)
 
-      # global alias
-      ::DateTimeType = DateTimeType
+      # global alias - required for jrubyscripting addon <= OH3.2.0
+      ::DateTimeType = DateTimeType if ::DateTimeType.is_a?(Java::JavaLang::Class)
 
       # @deprecated
       # Backwards-compatible alias

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

@@ -8,8 +8,8 @@ module OpenHAB
     module Types
       HSBType = org.openhab.core.library.types.HSBType
 
-      # global alias
-      ::HSBType = HSBType
+      # global alias - required for jrubyscripting addon <= OH3.2.0
+      ::HSBType = HSBType if ::HSBType.is_a?(Java::JavaLang::Class)
 
       # Adds methods to core OpenHAB HSBType to make it more natural in Ruby
       class HSBType < PercentType

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

@@ -7,8 +7,8 @@ module OpenHAB
     module Types
       PercentType = org.openhab.core.library.types.PercentType
 
-      # global alias
-      ::PercentType = PercentType
+      # global alias - required for jrubyscripting addon <= OH3.2.0
+      ::PercentType = PercentType if ::PercentType.is_a?(Java::JavaLang::Class)
 
       # Adds methods to core OpenHAB PercentType to make it more natural in Ruby
       class PercentType < DecimalType

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

@@ -5,9 +5,9 @@ module OpenHAB
     module Types
       PointType = org.openhab.core.library.types.PointType
 
-      # global scope
+      # global scope - required for jrubyscripting addon <= OH3.2.0
       # @!visibility private
-      ::PointType = PointType
+      ::PointType = PointType if ::PointType.is_a?(Java::JavaLang::Class)
 
       # Adds methods to core OpenHAB PointType to make it more natural in Ruby
       class PointType

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

@@ -7,8 +7,8 @@ module OpenHAB
     module Types
       QuantityType = org.openhab.core.library.types.QuantityType
 
-      # global alias
-      ::QuantityType = QuantityType
+      # global alias - required for jrubyscripting addon <= OH3.2.0
+      ::QuantityType = QuantityType if ::QuantityType.is_a?(Java::JavaLang::Class)
 
       # @deprecated
       # Backwards-compatible alias
@@ -20,8 +20,8 @@ module OpenHAB
         include NumericType
 
         # private alias
-        ONE = org.openhab.core.library.unit.Units::ONE
-        private_constant :ONE
+        ONE_UNIT = org.openhab.core.library.unit.Units::ONE
+        private_constant :ONE_UNIT
 
         #
         # Convert this quantity into a another unit
@@ -46,8 +46,8 @@ 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
+            return unitize(other.unit).compare_to(other) if unit == ONE_UNIT
+            return compare_to(other.unitize(unit)) if other.unit == ONE_UNIT
 
             compare_to(other)
           elsif other.is_a?(Items::NumericItem) ||
@@ -88,7 +88,7 @@ module OpenHAB
           elsif other.is_a?(Type)
             [other, as(other.class)]
           elsif other.respond_to?(:to_d)
-            [QuantityType.new(other.to_d.to_java, ONE), self]
+            [QuantityType.new(other.to_d.to_java, ONE_UNIT), self]
           elsif other.is_a?(String)
             [QuantityType.new(other), self]
           end
@@ -215,7 +215,7 @@ module OpenHAB
           logger.trace("Converting #{self} to #{other_unit}")
 
           case unit
-          when ONE
+          when ONE_UNIT
             QuantityType.new(to_big_decimal, other_unit)
           when other_unit
             self
@@ -224,10 +224,10 @@ module OpenHAB
           end
         end
 
-        # if unit is +ONE+, return a plain Java BigDecimal
+        # if unit is +ONE_UNIT+, return a plain Java BigDecimal
         # @!visibility private
         def deunitize
-          return to_big_decimal if unit == ONE
+          return to_big_decimal if unit == ONE_UNIT
 
           self
         end

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.30.0
+  version: 4.30.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler