openhab-scripting 3.4.3 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9de0c3d111dc483c93a2338e5f76b4593c7c14765a9fd7de06088668b54258c2
-  data.tar.gz: 5947a40d76a62377f7c447251ecd058c453ca5432f0a94e192e7099e68c59b7e
+  metadata.gz: b658ce46fd8c6b42e10fa6b84401a94e30edfd8b80604a7d61bb2e951841e090
+  data.tar.gz: 81b519605e1d6681e3857a513e8bb6a3a9029c14d2800a6418dc766632dce4c8
 SHA512:
-  metadata.gz: b6922b2367a0fb9a6f0091ad6538cf8e03a83bf4a613c764528895c432c290f2819a65ece81bb4bc166c18b8e962559bb0fd33526a43d4ae96c2d08a83200e33
-  data.tar.gz: fc9c9c10d35a896cc6643fe6dd33aab04cdffc74fb4005ced6beaa2392254bcfcc89b9c03d1d39c1827a08548e89adef16c4bb6da21fd131c8775a8df3433785
+  metadata.gz: 660e0548fa2f81c2e0f9975a1ce75fc39b48d8918ce64c93b79f9b5f6cbb738e11f9a227021f582b08d59c940882b25e429e3fca32f68272a97a41561fac257e
+  data.tar.gz: 38e028af8fe9abffb589ad0e022f56d58090064c212257df6de50e66ede18e3d14d7d48880570c1f4860259319d4944d8d093f7caccea0db1b229a108a0f853c

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

@@ -41,6 +41,7 @@ module OpenHAB
             logger.trace("Creating delegate for (#{method}) to #{item}) for #{self.class}")
             def_delegator item, method
           end
+          define_method(:oh_item) { instance_variable_get(item) }
         end
 
         #

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

@@ -23,8 +23,8 @@ module OpenHAB
 
         java_import org.openhab.core.library.types.DecimalType
         java_import org.openhab.core.library.types.QuantityType
-        java_import 'tec.uom.se.format.SimpleUnitFormat'
-        java_import 'tec.uom.se.AbstractUnit'
+        java_import org.openhab.core.types.util.UnitUtils
+        java_import org.openhab.core.library.unit.Units
 
         item_type Java::OrgOpenhabCoreLibraryItems::NumberItem
 
@@ -93,7 +93,7 @@ module OpenHAB
         # @return [OpenHAB::DSL::Types::Quantity] NumberItem converted to supplied Unit
         #
         def |(other)
-          other = SimpleUnitFormat.instance.unitFor(other) if other.is_a? String
+          other = UnitUtils.parse_unit(other) if other.is_a? String
 
           if dimension
             to_qt | other
@@ -111,7 +111,7 @@ module OpenHAB
           if dimension
             Quantity.new(@number_item.get_state_as(QuantityType))
           else
-            Quantity.new(QuantityType.new(to_d.to_java, AbstractUnit::ONE))
+            Quantity.new(QuantityType.new(to_d.to_java, Units::ONE))
           end
         end
 

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

@@ -33,7 +33,7 @@ module OpenHAB
           #
           #
           def command(command)
-            command = command.to_java.strip_trailing_zeros if command.is_a? BigDecimal
+            command = command.to_java.strip_trailing_zeros.to_plain_string if command.is_a? BigDecimal
             logger.trace "Sending Command #{command} to #{id}"
             BusEvent.sendCommand(self, command.to_s)
           end
@@ -47,6 +47,7 @@ module OpenHAB
           #
           #
           def update(update)
+            update = update.to_java.strip_trailing_zeros.to_plain_string if update.is_a? BigDecimal
             logger.trace "Sending Update #{update} to #{id}"
             BusEvent.postUpdate(self, update.to_s)
           end

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

@@ -10,6 +10,7 @@ module OpenHAB
       #
       module Types
         java_import Java::OrgOpenhabCoreLibraryTypes::DecimalType
+        java_import org.openhab.core.types.util.UnitUtils
 
         #
         # MonkeyPatching Decimal Type
@@ -72,7 +73,7 @@ module OpenHAB
           # @return [OpenHAB::Core::DSL::Types::Quantity] NumberItem converted to supplied Unit
           #
           def |(other)
-            other = SimpleUnitFormat.instance.unitFor(other) if other.is_a? String
+            other = UnitUtils.parse_unit(other) if other.is_a? String
             Quantity.new(QuantityType.new(to_big_decimal, other))
           end
 

data/lib/openhab/dsl/states.rb

@@ -48,7 +48,8 @@ module OpenHAB
       # @return [StateStorage] item states
       #
       def store_states(*items)
-        states = StateStorage.new(BusEvent.storeStates(*items.flatten).to_h)
+        items = items.flatten.map { |item| item.respond_to?(:oh_item) ? item.oh_item : item }
+        states = StateStorage.new(BusEvent.storeStates(*items).to_h)
         if block_given?
           yield
           states.restore

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

@@ -23,8 +23,8 @@ module OpenHAB
 
         java_import org.openhab.core.library.types.QuantityType
         java_import org.openhab.core.library.types.DecimalType
-        java_import 'tec.uom.se.format.SimpleUnitFormat'
-        java_import 'tec.uom.se.AbstractUnit'
+        java_import org.openhab.core.types.util.UnitUtils
+        java_import org.openhab.core.library.unit.Units
 
         # @return [Hash] Mapping of operation symbols to BigDecimal methods
         OPERATIONS = {
@@ -48,7 +48,7 @@ module OpenHAB
           @quantity = case quantity
                       when String then QuantityType.new(quantity)
                       when QuantityType then quantity
-                      when NumberItem, Numeric then QuantityType.new(quantity.to_d.to_java, AbstractUnit::ONE)
+                      when NumberItem, Numeric then QuantityType.new(quantity.to_d.to_java, Units::ONE)
                       else raise ArgumentError, "Unexpected type #{quantity.class} provided to Quantity initializer"
                       end
           super()
@@ -62,7 +62,7 @@ module OpenHAB
         # @return [Quantity] This quantity converted to another unit
         #
         def |(other)
-          other = SimpleUnitFormat.instance.unitFor(other) if other.is_a? String
+          other = UnitUtils.parse_unit(other) if other.is_a? String
 
           Quantity.new(quantity.to_unit(other))
         end
@@ -164,7 +164,7 @@ module OpenHAB
         # @return [String] Representing details about the quantity object
         #
         def inspect
-          if @quantity.unit == AbstractUnit::ONE
+          if @quantity.unit == Units::ONE
             "unit=#{@quantity.unit}, value=#{@quantity.to_string}"
           else
             @quantity.to_string
@@ -198,7 +198,7 @@ module OpenHAB
         # @return [Boolean] True if the quantity should be unitzed based on the unit and operation, false otherwise
         #
         def unitize?(quantity, operation)
-          !(quantity.unit == AbstractUnit::ONE && DIMENSIONLESS_NON_UNITIZED_OPERATIONS.include?(operation))
+          !(quantity.unit == Units::ONE && DIMENSIONLESS_NON_UNITIZED_OPERATIONS.include?(operation))
         end
 
         #
@@ -214,7 +214,7 @@ module OpenHAB
           case quantity.unit
           when unit
             quantity
-          when AbstractUnit::ONE
+          when Units::ONE
             convert_unit_from_dimensionless(quantity, unit)
           else
             convert_unit_from_dimensioned(quantity, unit)
@@ -263,7 +263,12 @@ module OpenHAB
         def unitize(quantity_a, quantity_b, operation = nil)
           logger.trace("Unitizing (#{quantity_a}) and (#{quantity_b})")
           quantity_a, quantity_b = [quantity_a, quantity_b].map do |qt|
-            unitize?(qt, operation) ? convert_unit(qt) : qt
+            unitize?(qt, operation) ? convert_unit(qt) : qt.to_big_decimal
+          end
+
+          # Make sure the operation is called on the QuantityType
+          if quantity_a.is_a?(Java::JavaMath::BigDecimal) && quantity_b.is_a?(QuantityType) && operation == '*'
+            quantity_a, quantity_b = [quantity_b, quantity_a]
           end
           return yield quantity_a, quantity_b if block_given?
 

data/lib/openhab/dsl/units.rb

@@ -10,6 +10,7 @@ end
 
 Object.send(:remove_const, :QuantityType)
 java_import org.openhab.core.library.types.QuantityType
+java_import org.openhab.core.types.util.UnitUtils
 
 module OpenHAB
   module DSL
@@ -17,8 +18,6 @@ module OpenHAB
     # Provides support for interacting with OpenHAB Units of Measurement
     #
     module Units
-      java_import 'tec.uom.se.format.SimpleUnitFormat'
-
       #
       # Sets a thread local variable to the supplied unit such that classes operating inside the block
       # can perform automatic conversions to the supplied unit for NumberItems
@@ -28,7 +27,7 @@ module OpenHAB
       #
       #
       def unit(unit)
-        unit = SimpleUnitFormat.instance.unitFor(unit) if unit.is_a? String
+        unit = UnitUtils.parse_unit(unit) if unit.is_a? String
         Thread.current.thread_variable_set(:unit, unit)
         yield
       ensure

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.6.3
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler