openhab-scripting 2.25.0 → 2.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c6a3905160edfd4bf027cb1afbac0af180f0e79641b4558a875d0f89cc275f8
-  data.tar.gz: 97bc0f35a27b2ccd0fdcac64bfa0e5228b89a68085d5bf8213514e38f33a2add
+  metadata.gz: 7226c1329289ce5ce0f85f552c091a6c5f89cb27427b9e6419d528c77a792239
+  data.tar.gz: e92ad134d92584fed6ddeeef98984cabc56355cd94f4d205a5228263ac2677d1
 SHA512:
-  metadata.gz: 39c074134bcd470a537c57256c57203ad1b750daa7137feea17a18dbc457c990dea3b2a985d271a9d6f5d4f7ae9c215c2444cdd4745ca6ae51aee4eebba8ae0f
-  data.tar.gz: a8d60e555d4dc743bfdcda7e222281cb40e5fcd4bbea970e0d5473791e1f5e4d2cc590fa8256ba7d60a88a0c661ec7fb13ddc458d923e91166f3228333669926
+  metadata.gz: '0519c68cec3b2316751c36ba27c208267ee86f76230a1722dcd3369d61e19da73a96b6616ed2a71838daf68beb3f64b88e1553f82f8cb00daec4de5c859ecb87'
+  data.tar.gz: f688f894e8a4bde1c3ee12facc846836a922cc7a1120ffd5d89ff41a6d6be1692608467265179543aaed1262394ea37aaa92d4bd5b03ad9eb33bcdd13b06c8dc

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

@@ -17,11 +17,13 @@ module OpenHAB
       class DateTimeItem
         extend Forwardable
         extend OpenHAB::DSL::Items::ItemDelegate
-
+        extend OpenHAB::DSL::Items::ItemCommand
         include Comparable
 
         def_item_delegator :@datetime_item
 
+        item_type Java::OrgOpenhabCoreLibraryItems::DateTimeItem
+
         #
         # Create a new DateTimeItem
         #

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

@@ -51,6 +51,21 @@ module OpenHAB
           end
           # rubocop:enable Style/HashEachMethods
         end
+
+        #
+        # Extract the accepted state and command types from the specified OpenHAB
+        # Item class and pass them to item_state/item_command
+        #
+        # @param [Java::JavaLang::Class] item_class a Class that implements Java::OrgOpenhabCoreItems::Item
+        #
+        def item_type(item_class)
+          item_class.field_reader(:ACCEPTED_DATA_TYPES)
+          item_class.field_reader(:ACCEPTED_COMMAND_TYPES)
+          item_class.ACCEPTED_DATA_TYPES.select(&:is_enum).grep_v(UnDefType).each { |type| item_state(type.ruby_class) }
+          item_class.ACCEPTED_COMMAND_TYPES.select(&:is_enum).grep_v(UnDefType).each do |type|
+            item_command(type.ruby_class)
+          end
+        end
       end
     end
   end

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

@@ -17,6 +17,7 @@ module OpenHAB
       # way of breaking it up into multiple classes
       class NumberItem < Numeric
         extend OpenHAB::DSL::Items::ItemDelegate
+        extend OpenHAB::DSL::Items::ItemCommand
 
         def_item_delegator :@number_item
 
@@ -25,6 +26,8 @@ module OpenHAB
         java_import 'tec.uom.se.format.SimpleUnitFormat'
         java_import 'tec.uom.se.AbstractUnit'
 
+        item_type Java::OrgOpenhabCoreLibraryItems::NumberItem
+
         #
         # Create a new NumberItem
         #

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

@@ -19,13 +19,7 @@ module OpenHAB
 
         def_item_delegator :@rollershutter_item
 
-        java_import Java::OrgOpenhabCoreLibraryTypes::PercentType
-        java_import Java::OrgOpenhabCoreLibraryTypes::UpDownType
-        java_import Java::OrgOpenhabCoreLibraryTypes::StopMoveType
-
-        item_command Java::OrgOpenhabCoreLibraryTypes::StopMoveType
-        item_command Java::OrgOpenhabCoreLibraryTypes::UpDownType
-        item_state   Java::OrgOpenhabCoreLibraryTypes::UpDownType
+        item_type Java::OrgOpenhabCoreLibraryItems::RollershutterItem
 
         #
         # Creates a new RollershutterItem

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

@@ -13,7 +13,7 @@ module OpenHAB
       #
       class StringItem
         extend Forwardable
-
+        extend OpenHAB::DSL::Items::ItemCommand
         include Comparable
         extend OpenHAB::DSL::Items::ItemDelegate
 
@@ -23,6 +23,8 @@ module OpenHAB
 
         def_item_delegator :@string_item
 
+        item_type Java::OrgOpenhabCoreLibraryItems::StringItem
+
         #
         # Create a new StringItem
         #

data/lib/openhab/dsl/monkey_patch/items/contact_item.rb

@@ -25,7 +25,7 @@ module OpenHAB
 
           java_import Java::OrgOpenhabCoreLibraryTypes::OpenClosedType
 
-          item_state Java::OrgOpenhabCoreLibraryTypes::OpenClosedType
+          item_type Java::OrgOpenhabCoreLibraryItems::ContactItem
 
           #
           # Compares contacts to OpenClosedTypes

data/lib/openhab/dsl/monkey_patch/items/dimmer_item.rb

@@ -30,8 +30,7 @@ module OpenHAB
           extend Forwardable
           extend OpenHAB::DSL::Items::ItemCommand
 
-          item_state Java::OrgOpenhabCoreLibraryTypes::OnOffType
-          item_command Java::OrgOpenhabCoreLibraryTypes::IncreaseDecreaseType
+          item_type Java::OrgOpenhabCoreLibraryItems::DimmerItem
 
           def_delegator :state, :to_s
 

data/lib/openhab/dsl/monkey_patch/items/switch_item.rb

@@ -23,8 +23,7 @@ module OpenHAB
 
           java_import Java::OrgOpenhabCoreLibraryTypes::OnOffType
 
-          item_command Java::OrgOpenhabCoreLibraryTypes::OnOffType
-          item_state Java::OrgOpenhabCoreLibraryTypes::OnOffType
+          item_type Java::OrgOpenhabCoreLibraryItems::SwitchItem
 
           alias truthy? on?
 

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 2.25.0
+  version: 2.25.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler