openhab-scripting 3.4.0 → 3.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/openhab/dsl/items/image_item.rb +4 -3
- data/lib/openhab/dsl/items/item_delegate.rb +1 -0
- data/lib/openhab/dsl/monkey_patch/items/metadata.rb +39 -1
- data/lib/openhab/dsl/rules/triggers/cron.rb +1 -4
- data/lib/openhab/dsl/states.rb +2 -1
- data/lib/openhab/version.rb +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1632c5be62c2e9dc294f817a74bfdd91cb0e46bb88b62dcaf535d4ca9bf1be0b
|
4
|
+
data.tar.gz: 30c1c7dc5a666fb69a4cda420fa78940d97d605b0d071d683120d2cf1e7625f4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 75dc4696b4be9625df41a52c9cc27d0c40309b7eaae1fb4b5bf3e34b2cb72180c28cef20e6e55cdaf7707828c8fee5678c7fcaccc37ab40d2e39433e9c964634
|
7
|
+
data.tar.gz: facaaac190bf434d8e83fe3a537bd5a81d45fb5024760549e3c730434f8cabbc766e0adf4b4b59c9a59875552078ea10c9ca09a7e659c7ca092c903fb61d3964
|
@@ -1,9 +1,10 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require 'base64'
|
4
|
+
require 'pathname'
|
4
5
|
require 'net/http'
|
5
6
|
require 'java'
|
6
|
-
require '
|
7
|
+
require 'marcel'
|
7
8
|
require 'openhab/dsl/items/item_command'
|
8
9
|
require 'openhab/dsl/items/item_delegate'
|
9
10
|
|
@@ -57,7 +58,7 @@ module OpenHAB
|
|
57
58
|
#
|
58
59
|
def update_from_file(file, mime_type: nil)
|
59
60
|
file_data = IO.binread(file)
|
60
|
-
mime_type ||= (
|
61
|
+
mime_type ||= Marcel::MimeType.for(Pathname.new(file)) || Marcel::MimeType.for(file_data)
|
61
62
|
update_from_bytes(file_data, mime_type: mime_type)
|
62
63
|
end
|
63
64
|
|
@@ -130,7 +131,7 @@ module OpenHAB
|
|
130
131
|
#
|
131
132
|
def detect_mime_from_bytes(bytes:)
|
132
133
|
logger.trace('Detecting mime type from file image contents')
|
133
|
-
|
134
|
+
Marcel::MimeType.for(bytes)
|
134
135
|
end
|
135
136
|
end
|
136
137
|
end
|
@@ -30,7 +30,7 @@ module OpenHAB
|
|
30
30
|
|
31
31
|
def initialize(metadata: nil, key: nil, value: nil, config: nil)
|
32
32
|
@metadata = metadata || Metadata.new(key || MetadataKey.new('', ''), value&.to_s, config)
|
33
|
-
super(@metadata&.configuration)
|
33
|
+
super(to_ruby(@metadata&.configuration))
|
34
34
|
end
|
35
35
|
|
36
36
|
#
|
@@ -85,6 +85,44 @@ module OpenHAB
|
|
85
85
|
def to_a
|
86
86
|
[@metadata&.value, @metadata&.configuration || {}]
|
87
87
|
end
|
88
|
+
|
89
|
+
private
|
90
|
+
|
91
|
+
#
|
92
|
+
# Recursively convert the supplied Hash object into a Ruby Hash and recreate the keys and values
|
93
|
+
#
|
94
|
+
# @param [Hash] Hash to convert
|
95
|
+
#
|
96
|
+
# @return [Hash] The converted hash
|
97
|
+
#
|
98
|
+
def to_ruby_hash(hash)
|
99
|
+
return unless hash.respond_to? :each_with_object
|
100
|
+
|
101
|
+
hash.each_with_object({}) { |(key, value), ruby_hash| ruby_hash[to_ruby(key)] = to_ruby(value) }
|
102
|
+
end
|
103
|
+
|
104
|
+
#
|
105
|
+
# Recursively convert the supplied array to a Ruby array and recreate all String values
|
106
|
+
#
|
107
|
+
# @param [Object] array to convert
|
108
|
+
#
|
109
|
+
# @return [Array] The converted array
|
110
|
+
#
|
111
|
+
def to_ruby_array(array)
|
112
|
+
return unless array.respond_to? :each_with_object
|
113
|
+
|
114
|
+
array.each_with_object([]) { |value, ruby_array| ruby_array << to_ruby(value) }
|
115
|
+
end
|
116
|
+
|
117
|
+
# Convert the given object to Ruby equivalent
|
118
|
+
def to_ruby(value)
|
119
|
+
case value
|
120
|
+
when Hash, Java::JavaUtil::Map then to_ruby_hash(value)
|
121
|
+
when Array, Java::JavaUtil::List then to_ruby_array(value)
|
122
|
+
when String then String.new(value)
|
123
|
+
else value
|
124
|
+
end
|
125
|
+
end
|
88
126
|
end
|
89
127
|
|
90
128
|
#
|
@@ -30,11 +30,8 @@ module OpenHAB
|
|
30
30
|
dow: '?'
|
31
31
|
}
|
32
32
|
end
|
33
|
-
|
34
|
-
# the method definition
|
35
|
-
# rubocop:disable Style/AccessModifierDeclarations
|
33
|
+
|
36
34
|
module_function :cron_expression_map
|
37
|
-
# rubocop:enable Style/AccessModifierDeclarations
|
38
35
|
|
39
36
|
# @return [Hash] Map of days of the week from symbols to to OpenHAB cron strings
|
40
37
|
DAY_OF_WEEK_MAP = {
|
data/lib/openhab/dsl/states.rb
CHANGED
@@ -48,7 +48,8 @@ module OpenHAB
|
|
48
48
|
# @return [StateStorage] item states
|
49
49
|
#
|
50
50
|
def store_states(*items)
|
51
|
-
|
51
|
+
items = items.flatten.map { |item| item.respond_to?(:oh_item) ? item.oh_item : item }
|
52
|
+
states = StateStorage.new(BusEvent.storeStates(*items).to_h)
|
52
53
|
if block_given?
|
53
54
|
yield
|
54
55
|
states.restore
|
data/lib/openhab/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: openhab-scripting
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.
|
4
|
+
version: 3.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Brian O'Connell
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-06-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -25,19 +25,19 @@ dependencies:
|
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: '2.2'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
|
-
name:
|
28
|
+
name: marcel
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '0
|
33
|
+
version: '1.0'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: '0
|
40
|
+
version: '1.0'
|
41
41
|
description: JRuby Helper Libraries for OpenHAB Scripting
|
42
42
|
email:
|
43
43
|
- broconne@gmail.com
|
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
133
133
|
version: '0'
|
134
134
|
requirements: []
|
135
135
|
rubyforge_project:
|
136
|
-
rubygems_version: 2.7.6.
|
136
|
+
rubygems_version: 2.7.6.3
|
137
137
|
signing_key:
|
138
138
|
specification_version: 4
|
139
139
|
summary: JRuby Helper Libraries for OpenHAB Scripting
|