openhab-scripting 3.3.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01e9ddbd43a59fec9db3fa391d42cacb0cd1a03c7d116e995815df940847b28b
-  data.tar.gz: ef98bb992444788122499056470c2fde3fbfbdb6659a72228df0f2c46bd8cecb
+  metadata.gz: 0cfe54bca7a28404b0011b2b3686d0617558a4567fe620f847bb14497e9d1604
+  data.tar.gz: b8716022904648f8d0898d7866de3b7091e5890b8e5c3ccd53ea192467116d6b
 SHA512:
-  metadata.gz: 4499127b7c667c3290eb3d106624649ff04eff597eb95668c868bcaf5236f99a9149adf4b74e4750e2d092bc5cd7c3cc8b56b6470968f34c6324985b8bec7472
-  data.tar.gz: 93a18bda44e472326eb5952d089f5a8eb1f221bc566c861c9abee4cce08c21b5a8d29aa5168b05c5c54c3e61e613e1834ff01c39f18f57dcc2efc8d4c9eacbb5
+  metadata.gz: 1a8256023fc3a4504d7ee410c5bba1b784bb197736c5dd84a07e2fd6a289062e905503e04c88c2302138eb561bb82ac0566315f4d75bca417f88818dc57f0326
+  data.tar.gz: 4e4f81238fd24e824a3c255d9f96b2ad0d386efb9d663639ef7c085a89692eb5f3d68698caa5ebc8137050586bf5d8ad721f3d72925e4e0ab3fcedef1ce1ba5a

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

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'base64'
+require 'pathname'
 require 'net/http'
 require 'java'
-require 'mimemagic'
+require 'marcel'
 require 'openhab/dsl/items/item_command'
 require 'openhab/dsl/items/item_delegate'
 
@@ -57,7 +58,7 @@ module OpenHAB
         #
         def update_from_file(file, mime_type: nil)
           file_data = IO.binread(file)
-          mime_type ||= (MimeMagic.by_path(file) || MimeMagic.by_magic(file_data))&.type
+          mime_type ||= Marcel::MimeType.for(Pathname.new(file)) || Marcel::MimeType.for(file_data)
           update_from_bytes(file_data, mime_type: mime_type)
         end
 
@@ -130,7 +131,7 @@ module OpenHAB
         #
         def detect_mime_from_bytes(bytes:)
           logger.trace('Detecting mime type from file image contents')
-          MimeMagic.by_magic(bytes)&.type
+          Marcel::MimeType.for(bytes)
         end
       end
     end

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/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/rules/triggers/cron.rb

@@ -30,11 +30,8 @@ module OpenHAB
             dow: '?'
           }
         end
-        # Rubocop check is disabled because YARD cannot process the method if placed in front of
-        #   the method definition
-        # rubocop:disable Style/AccessModifierDeclarations
+
         module_function :cron_expression_map
-        # rubocop:enable Style/AccessModifierDeclarations
 
         # @return [Hash] Map of days of the week from symbols to to OpenHAB cron strings
         DAY_OF_WEEK_MAP = {

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/things.rb

@@ -11,6 +11,7 @@ module OpenHAB
     # Support for OpenHAB Things
     #
     module Things
+      java_import Java::OrgOpenhabCoreThing::ThingStatus
       include OpenHAB::Log
 
       #
@@ -25,6 +26,22 @@ module OpenHAB
           define_action_methods
         end
 
+        #
+        # Defines boolean thing status methods
+        #   uninitialized?
+        #   initializing?
+        #   unknown?
+        #   online?
+        #   offline?
+        #   removing?
+        #   removed?
+        #
+        # @return [Boolean] true if the thing status matches the name
+        #
+        ThingStatus.constants.each do |thingstatus|
+          define_method("#{thingstatus.to_s.downcase}?") { status == ThingStatus.value_of(thingstatus) }
+        end
+
         private
 
         java_import 'org.openhab.core.automation.annotation.RuleAction'

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 description: JRuby Helper Libraries for OpenHAB Scripting
 email:
 - broconne@gmail.com
@@ -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