openhab-scripting 3.4.1 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc9b053a3ac139909642f0e790a231dbd4e0b370a94836b740af22283f60315
-  data.tar.gz: 9debccaf47bdf3d8b4c80e05d861d3e43f658f22ad569a9f60acf7a214bc0f37
+  metadata.gz: 7f22a9381b70e7ea6075cb06cf2ba5e576068e7b71235e3d1693747e8aba2048
+  data.tar.gz: e5b2f533163f3e4de0b9b45ac55e64bd61d70be991a44a17b0fbfdf09b13297a
 SHA512:
-  metadata.gz: f04e70a4126f41f204b803617e757d66fe8e03f50543cc0a7a5c6c046b3567178f32d6cc6b97fbd9f0b0ca8b90c8c1fceb75b855bfe5565d4b8b7c8732e2efb8
-  data.tar.gz: 5b2092565032d2431b488250d6dc442178ecab80642f86495f56f2f199f5b05cae2f48a78b53dea118043f96c174811a0705af5596b26c9b784d315cd0bb720d
+  metadata.gz: ded957fa16cf005bb2e5182a544cd85ee1e52765834dc427530000fe2939e443a5a25df610674b7f3f195123b51be0539fc9d821a3b92c0fa3775efc27908afa
+  data.tar.gz: e0e20addfadad2c22b7af3e999aee3ce2817bb0a7d0a42fdf16521f1a7e6d5d8730c578826f7879fe0e0b34394e7fc6b942eddfd0cc77aa64bd239b9792f5a91

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

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

@@ -30,7 +30,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(@metadata&.configuration)
+              super(to_ruby(@metadata&.configuration))
             end
 
             #
@@ -85,6 +85,44 @@ module OpenHAB
             def to_a
               [@metadata&.value, @metadata&.configuration || {}]
             end
+
+            private
+
+            #
+            # Recursively convert the supplied Hash object into a Ruby Hash and recreate the keys and values
+            #
+            # @param [Hash] Hash to convert
+            #
+            # @return [Hash] The converted hash
+            #
+            def 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) }
+            end
+
+            #
+            # Recursively convert the supplied array to a Ruby array and recreate all String values
+            #
+            # @param [Object] array to convert
+            #
+            # @return [Array] The converted array
+            #
+            def 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)
+              case value
+              when Hash, Java::JavaUtil::Map then to_ruby_hash(value)
+              when Array, Java::JavaUtil::List then to_ruby_array(value)
+              when String then String.new(value)
+              else value
+              end
+            end
           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.1'
+  VERSION = '3.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.6.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-02 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: JRuby Helper Libraries for OpenHAB Scripting