openhab-scripting 3.2.1 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90af7470bbd47fa813a1a4a5a9083f178a36225ab6f9cfbd2ff1852cc0eb4c92
-  data.tar.gz: 789d9c72ce03d498416bf53c86d6b7f895df8296d849f702b59398e831aad6f1
+  metadata.gz: 9de0c3d111dc483c93a2338e5f76b4593c7c14765a9fd7de06088668b54258c2
+  data.tar.gz: 5947a40d76a62377f7c447251ecd058c453ca5432f0a94e192e7099e68c59b7e
 SHA512:
-  metadata.gz: 9066fe74d2d508e06ce9a62244a19a75470fcffb85bdbcaa2c899b5220a15da351ae4f55be08fb80d3c3222a1a26d16471420049b8621a60d143f16b867d7180
-  data.tar.gz: 53d1df31662e7552566d6dd92237b862b32f988e4edf42bc95b44fff3af425e5a038771c2372e2fe71928867c41962907825a24e05fbf3e91ed31f5ff6ee2778
+  metadata.gz: b6922b2367a0fb9a6f0091ad6538cf8e03a83bf4a613c764528895c432c290f2819a65ece81bb4bc166c18b8e962559bb0fd33526a43d4ae96c2d08a83200e33
+  data.tar.gz: fc9c9c10d35a896cc6643fe6dd33aab04cdffc74fb4005ced6beaa2392254bcfcc89b9c03d1d39c1827a08548e89adef16c4bb6da21fd131c8775a8df3433785

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/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/items/persistence.rb

@@ -9,6 +9,18 @@ module OpenHAB
         #
         module Persistence
           java_import Java::OrgOpenhabCoreTypesUtil::UnitUtils
+
+          # A wrapper for OpenHAB's HistoricItem that returns the state directly
+          class HistoricState < SimpleDelegator
+            attr_reader :timestamp, :state
+
+            def initialize(state, timestamp)
+              @state = state
+              @timestamp = timestamp
+              super(@state)
+            end
+          end
+
           # All persistence methods that could return a Quantity
           QUANTITY_METHODS = %i[average_since
                                 delta_since
@@ -45,13 +57,18 @@ module OpenHAB
           #
           def previous_state(service = nil, skip_equal: false)
             service ||= persistence_service
-            PersistenceExtensions.previous_state(self, skip_equal, service&.to_s)
+            result = PersistenceExtensions.previous_state(self, skip_equal, service&.to_s)
+            HistoricState.new(quantify(result.state), result.timestamp)
           end
 
           PERSISTENCE_METHODS.each do |method|
             define_method(method) do |timestamp, service = nil|
               service ||= persistence_service
               result = PersistenceExtensions.public_send(method, self, to_zdt(timestamp), service&.to_s)
+              if result.is_a? Java::OrgOpenhabCorePersistence::HistoricItem
+                return HistoricState.new(quantify(result.state), result.timestamp)
+              end
+
               QUANTITY_METHODS.include?(method) ? quantify(result) : result
             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/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.2.1'
+  VERSION = '3.4.3'
 end

metadata

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