rspec-openhab-scripting 0.0.9-java → 0.0.10-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec85830015f39fcbcf027f869f5af4b215717b1c027deb47959428a8f156b652
-  data.tar.gz: 22050257da398fa958a657e69c773f27e215e2d478bacb9d9e1400f84b0c6191
+  metadata.gz: ec06e2cfb8832f84f5bd953e22904dbf99ec22a97e5ba0b900ee0e09a163a566
+  data.tar.gz: 959d078c55a2147e8b1899a8efabc6e8d8065fa9c869cda1c1d5ff057784de3c
 SHA512:
-  metadata.gz: d29f9f59280c73b33cb7caef1bbde2baf7b1931bbf9c8fdd8ccb51c3ec8ec13bf9efe51d6e13a410fadd9a53bf78928f22cdc25917ee37d64dc66906fc47bcfc
-  data.tar.gz: b0132dec180bf8e9bf6fca0e8223c67e6fda04529f376f74a9b2405c0defd01bf1661fed63534a15ccf4392440a4faefe8936f4a42428af8de1be5c6778755d8
+  metadata.gz: d806b85fd33ce2c42b09f5442bd7dc752327a21c1aae8df5fa57b615dd4935a96c62274ffab8d5dcad9bc94fe034c3073d0af20221cd59e647e00568ae7acc64
+  data.tar.gz: a2565829aa4ddd62cdd1e3ac34e23f55ec9794dcbdeac806bb7175c546f2dcca483cddd72116b1f7726d249c983b7407939de8906e0ec442320d2f2b7b515947

data/lib/rspec/openhab/dsl/imports.rb

@@ -157,6 +157,8 @@ module OpenHAB
           OpenHAB::Core::OSGI.register_service("org.openhab.core.items.MetadataRegistry", mr)
           mr.managed_provider = mmp = org.openhab.core.internal.items.ManagedMetadataProviderImpl.new(ss)
           mr.add_provider(mmp)
+          gmp = org.openhab.core.model.item.internal.GenericMetadataProvider.new
+          mr.add_provider(gmp)
           ir = org.openhab.core.internal.items.ItemRegistryImpl.new(mr)
           ir.managed_provider = mip = org.openhab.core.items.ManagedItemProvider.new(ss, nil)
           ir.add_provider(mip)
@@ -171,6 +173,22 @@ module OpenHAB
           rr.managed_provider = mrp = org.openhab.core.automation.ManagedRuleProvider.new(ss)
           rr.add_provider(mrp)
           iclr = org.openhab.core.thing.link.ItemChannelLinkRegistry.new(tr, ir)
+          ctr = org.openhab.core.thing.type.ChannelTypeRegistry.new
+          ttr = org.openhab.core.thing.type.ThingTypeRegistry.new(ctr)
+
+          safe_emf = org.openhab.core.model.core.internal.SafeEMFImpl.new
+          model_repository = org.openhab.core.model.core.internal.ModelRepositoryImpl.new(safe_emf)
+
+          # set up state descriptions
+          sds = org.openhab.core.internal.service.StateDescriptionServiceImpl.new
+          gip = org.openhab.core.model.item.internal.GenericItemProvider.new(model_repository, gmp, {})
+          sds.add_state_description_fragment_provider(gip)
+          msdfp = org.openhab.core.internal.items.MetadataStateDescriptionFragmentProvider.new(mr, {})
+          sds.add_state_description_fragment_provider(msdfp)
+          csdp = org.openhab.core.thing.internal.ChannelStateDescriptionProvider.new(iclr, ttr, tr)
+          csdp.activate(org.osgi.framework.Constants::SERVICE_RANKING => java.lang.Integer.new(-1))
+          sds.add_state_description_fragment_provider(csdp)
+          ir.state_description_service = sds
 
           # set up stuff accessed from rules
           preset = org.openhab.core.automation.module.script.internal.defaultscope

data/lib/rspec/openhab/items.rb

@@ -8,25 +8,24 @@ module RSpec
           all_items = api.items
 
           gfh = org.openhab.core.internal.items.GroupFunctionHelper.new
+          item_factory = org.openhab.core.library.CoreItemFactory.new
 
           all_items.each do |item_json|
-            type, _dimension = item_json["type"].split(":")
+            full_type = item_json["type"]
+            name = item_json["name"]
+
+            type, _dimension = full_type.split(":")
             if type == "Group"
-              if item_json["groupType"]
-                type, _dimension = item_json["groupType"].split(":")
-                klass = ::OpenHAB::DSL::Items.const_get(:"#{type}Item")
-                base_item = klass.new(item_json["name"])
-              end
+              base_item = item_factory.create_item(item_json["groupType"], name) if item_json["groupType"]
               if item_json["function"]
                 dto = org.openhab.core.items.dto.GroupFunctionDTO.new
                 dto.name = item_json.dig("function", "name")
                 dto.params = item_json.dig("function", "params")
                 function = gfh.create_group_function(dto, base_item)
               end
-              item = GroupItem.new(item_json["name"], base_item, function)
+              item = GroupItem.new(name, base_item, function)
             else
-              klass = ::OpenHAB::DSL::Items.const_get(:"#{type}Item")
-              item = klass.new(item_json["name"])
+              item = item_factory.create_item(full_type, name)
             end
 
             item.label = item_json["label"]
@@ -36,6 +35,8 @@ module RSpec
             item_json["metadata"]&.each do |key, config|
               item.meta[key] = config["value"], config["config"]
             end
+            item.meta["stateDescription"] = item_json["stateDescription"] if item_json["stateDescription"]
+            item.category = item_json["category"] if item_json["category"]
 
             $ir.add(item)
           end

data/lib/rspec/openhab/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenHAB
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/lib/rspec-openhab-scripting.rb

@@ -40,6 +40,7 @@ maven_require do
   require "jar org.openhab.core.bundles, org.openhab.core.config.core, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.io.monitor, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.model.core, #{openhab_version}"
+  require "jar org.openhab.core.bundles, org.openhab.core.model.item, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.model.script, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.semantics, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.thing, #{openhab_version}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: java
 authors:
 - Cody Cutrer