openhab-scripting 5.38.3 → 5.38.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d7aee54d03e87992e3febb4d12eef831d42156837dcd7b8ed61e09edbf78a3d
-  data.tar.gz: c9a792688e50984ef7463eb6e49abbfbdbccd4ab619d704b3d4eca0537f7a5f7
+  metadata.gz: de1cd952cd575534190d36d824d13a2b39e0eff5411471d2846a343a48830b1e
+  data.tar.gz: 5501e9e018cdf251f42253d887f261d49977e626b1d8cf9f88820a96b89840e8
 SHA512:
-  metadata.gz: 3e23bd7be96cbaf3e3b6ad00d731562f2059e1f2061f5e34f2bf25ef1087b06ccd77bc916ecb8b2aff55ce6de75cb24feac730fa2a2171f444e518ac1688c1a7
-  data.tar.gz: '0149d4812c49c7bdd7ae5b7919deeccc068bfc1acf42b94c8962e67a8657252f55269648706759f9f55cb7e73573314273b73f9a6af7b2264111c8c87874c5b1'
+  metadata.gz: e4ae9164c16df30f5c2f66e02663628b6be1310d8940bc56a60c60dd1e26af9db38a1f17f42ef63cf1bc415924cd0fc5e4945a9d03320c79f77bd3136b198d29
+  data.tar.gz: 941cd83990e52ec3fe1f6e9a4728f7d0ea2e0018991d2692ac4eb0398071f1869961a4e49e389385bb0ceb320c7401778c3e0897010ed37aaff1877e322a7257

data/lib/openhab/core/actions/notification.rb

@@ -94,7 +94,7 @@ module OpenHAB
             # @deprecated OH 4.1
             if Core.version >= Core::V4_2
               buttons ||= []
-              buttons = buttons.map { |title, action| "#{title}=#{action}" } if buttons.is_a?(Hash)
+              buttons = buttons.map { |button_title, action| "#{button_title}=#{action}" } if buttons.is_a?(Hash)
               raise ArgumentError, "buttons must contain (0..3) elements." unless (0..3).cover?(buttons.size)
 
               attachment = "item:#{attachment.name}" if attachment.is_a?(Item) && attachment.image_item?

data/lib/openhab/core/items/generic_item.rb

@@ -231,7 +231,7 @@ module OpenHAB
         #     @return [void]
         def tags=(values)
           modify do
-            values = DSL::Items::ItemBuilder.normalize_tags(*values)
+            values = DSL::Items::Tags.normalize(*values)
             next if values.to_set == tags.to_set
 
             @modified = true

data/lib/openhab/core/items/metadata/namespace_hash.rb

@@ -2,6 +2,8 @@
 
 require "forwardable"
 
+require_relative "hash"
+
 module OpenHAB
   module Core
     module Items

data/lib/openhab/core/items/metadata.rb

@@ -5,6 +5,9 @@ module OpenHAB
     module Items
       # Contains classes wrapping interactions with item metadata.
       module Metadata
+        autoload :Provider, "openhab/core/items/metadata/provider"
+        autoload :NamespaceHash, "openhab/core/items/metadata/namespace_hash"
+        autoload :Hash, "openhab/core/items/metadata/hash"
       end
     end
   end

data/lib/openhab/core/items/registry.rb

@@ -4,7 +4,6 @@ require "singleton"
 
 require "openhab/core/entity_lookup"
 require "openhab/core/lazy_array"
-require "openhab/dsl/items/builder"
 
 module OpenHAB
   module Core

data/lib/openhab/core.rb

@@ -149,5 +149,6 @@ end
 require_relative "core/provider"
 
 Dir[File.expand_path("core/**/*.rb", __dir__)].each do |f|
-  require f
+  # metadata is autoloaded
+  require f unless f.include?("/metadata/")
 end

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

@@ -278,27 +278,6 @@ module OpenHAB
           def item_factory
             @item_factory ||= OpenHAB::OSGi.service("org.openhab.core.items.ItemFactory")
           end
-
-          #
-          # Convert the given array to an array of strings.
-          # Convert Semantics classes to their simple name.
-          #
-          # @param [String,Symbol,Semantics::Tag] tags A list of strings, symbols, or Semantics classes
-          # @return [Array] An array of strings
-          #
-          # @example
-          #   tags = normalize_tags("tag1", Semantics::LivingRoom)
-          #
-          # @!visibility private
-          def normalize_tags(*tags)
-            tags.compact.map do |tag|
-              case tag
-              when String then tag
-              when Symbol, Semantics::SemanticTag then tag.to_s
-              else raise ArgumentError, "`#{tag}` must be a subclass of Semantics::Tag, a `Symbol`, or a `String`."
-              end
-            end
-          end
         end
 
         # @param dimension [Symbol, String, nil] The unit dimension for a {NumberItem} (see {ItemBuilder#dimension})
@@ -450,7 +429,7 @@ module OpenHAB
         def tag(*tags)
           return @tags if tags.empty?
 
-          @tags.concat(self.class.normalize_tags(*tags))
+          @tags.concat(Tags.normalize(*tags))
         end
         alias_method :tags, :tag
 

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  module DSL
+    module Items
+      # A helper module for handling tags in OpenHAB DSL.
+      module Tags
+        module_function
+
+        #
+        # Convert the given array to an array of strings.
+        # Convert Semantics classes to their simple name.
+        #
+        # @param [String,Symbol,Semantics::Tag] tags A list of strings, symbols, or Semantics classes
+        # @return [Array] An array of strings
+        #
+        # @example
+        #   tags = normalize("tag1", Semantics::LivingRoom)
+        #
+        # @!visibility private
+        def normalize(*tags)
+          tags.compact.map do |tag|
+            case tag
+            when String then tag
+            when Symbol, Semantics::SemanticTag then tag.to_s
+            else raise ArgumentError,
+                       "`#{tag}` must be a subclass of Semantics::Tag, a `Symbol`, or a `String`."
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/openhab/dsl/rules/builder.rb

@@ -4,6 +4,7 @@ require "forwardable"
 
 require_relative "property"
 require_relative "guard"
+require_relative "triggers"
 require_relative "rule_triggers"
 require_relative "terse"
 
@@ -2212,7 +2213,7 @@ module OpenHAB
         # @return [void]
         def add_tag(tag)
           # have to normalize tags first
-          @tags = DSL::Items::ItemBuilder.normalize_tags(*tags)
+          @tags = DSL::Items::Tags.normalize(*tags)
           @tags << tag unless @tags.include?(tag)
         end
 
@@ -2240,7 +2241,7 @@ module OpenHAB
         # @return [true,false] true if it should be created, false otherwise
         #
         def create_rule?
-          @tags = DSL::Items::ItemBuilder.normalize_tags(*tags)
+          @tags = DSL::Items::Tags.normalize(*tags)
           return true if tags.intersect?(%w[Script Scene])
 
           if !triggers?

data/lib/openhab/dsl/rules/triggers.rb

@@ -10,3 +10,7 @@ module OpenHAB
     end
   end
 end
+
+Dir[File.expand_path("triggers/**/*.rb", __dir__)].each do |f|
+  require f
+end

data/lib/openhab/dsl/things/builder.rb

@@ -360,7 +360,7 @@ module OpenHAB
           @type = type
           @label = label
           @config = config&.transform_keys(&:to_s)
-          @default_tags = Items::ItemBuilder.normalize_tags(*Array.wrap(default_tags))
+          @default_tags = Items::Tags.normalize(*Array.wrap(default_tags))
           @properties = properties&.transform_keys(&:to_s)
           @description = description
           @accepted_item_type = accepted_item_type

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.38.3"
+    VERSION = "5.38.4"
   end
 end

data/lib/openhab/dsl.rb

@@ -10,7 +10,8 @@ require_relative "osgi"
 require_relative "core"
 
 Dir[File.expand_path("dsl/**/*.rb", __dir__)].each do |f|
-  require f
+  # some files are excluded because they're autoloaded
+  require f unless f.include?("/rules/") || f =~ %r{dsl/(items|sitemaps|things)/builder.rb$}
 end
 
 require_relative "core_ext"
@@ -27,6 +28,32 @@ module OpenHAB
   # inside of other classes, or include the module.
   #
   module DSL
+    module Items
+      autoload :Builder, "openhab/dsl/items/builder"
+      autoload :BaseBuilderDSL, "openhab/dsl/items/builder"
+      autoload :ItemBuilder, "openhab/dsl/items/builder"
+    end
+
+    module Things
+      autoload :Builder, "openhab/dsl/things/builder"
+    end
+
+    module Sitemaps
+      autoload :Builder, "openhab/dsl/sitemaps/builder"
+      autoload :LinkableWidgetBuilder, "openhab/dsl/sitemaps/builder"
+    end
+
+    module Rules
+      # sorted alphabetically
+      autoload :AutomationRule, "openhab/dsl/rules/automation_rule"
+      autoload :Builder, "openhab/dsl/rules/builder"
+      autoload :Guard, "openhab/dsl/rules/guard"
+      autoload :NameInference, "openhab/dsl/rules/name_inference"
+      autoload :Property, "openhab/dsl/rules/property"
+      autoload :RuleTriggers, "openhab/dsl/rules/rule_triggers"
+      autoload :Terse, "openhab/dsl/rules/terse"
+    end
+
     # include this before Core::Actions so that Core::Action's method_missing
     # takes priority
     include Core::EntityLookup

data/lib/openhab/yard/html_helper.rb

@@ -26,6 +26,9 @@ module OpenHAB
       end
 
       def html_markup_markdown(text)
+        # Remove the "omit from toc" comments
+        text.gsub!(" <!-- omit from toc -->", "")
+
         result = super
 
         html = Nokogiri::HTML5.fragment(result)
@@ -42,13 +45,10 @@ module OpenHAB
           end
         end
 
-        # wtf commonmarker, you don't generate anchors?!
-        html.css("h1, h2, h3, h4, h5, h6").each do |header|
-          next if header["id"]
-
-          id = header.text.strip.downcase.delete(%(.?"')).gsub(/[ ,]+/, "-")
-          header["id"] = id
-          header.prepend_child(%(<a href="##{id}" class="header-anchor">#</a>))
+        # add the "#" mouse-over to header links
+        html.css(Array.new(6) { |i| "h#{i + 1} > a.anchor" }.join(", ")).each do |anchor|
+          anchor["class"] = "header-anchor"
+          anchor.content = "#"
         end
 
         html.to_s

data/lib/openhab/yard/markdown_helper.rb

@@ -55,9 +55,6 @@ module OpenHAB
           end
         end
 
-        # Remove the "omit from toc" comments
-        result.gsub!(" <!-- omit from toc -->", "")
-
         # re-link files in docs/*.md. They're written so they work on github without any
         # processing
         result.gsub!(%r{\[([A-Za-z0-9,. ]+)\]\(([A-Za-z0-9./-]+)\)}) do |str|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.38.3
+  version: 5.38.4
 platform: ruby
 authors:
 - Brian O'Connell
@@ -53,160 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.2'
-- !ruby/object:Gem::Dependency
-  name: cuke_linter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: gem-release
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.20'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.20'
-- !ruby/object:Gem::Dependency
-  name: persistent_httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: process_exists
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: tty-command
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: yaml-lint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
 email:
 - broconne+github@gmail.com
 - cody@cutrer.us
@@ -383,6 +229,7 @@ files:
 - lib/openhab/dsl/gems.rb
 - lib/openhab/dsl/items/builder.rb
 - lib/openhab/dsl/items/ensure.rb
+- lib/openhab/dsl/items/tags.rb
 - lib/openhab/dsl/items/timed_command.rb
 - lib/openhab/dsl/rules.rb
 - lib/openhab/dsl/rules/automation_rule.rb