Support source in command! and toggle (#346)

Signed-off-by: Jimmy Tanagra <[email protected]>

lib/openhab/core/items/semantics/enumerable.rb

@@ -103,10 +103,10 @@ def command(command, **kwargs)
 
   # Send a command to every item in the collection, even when {OpenHAB::DSL.ensure_states! ensure_states!} is in effect.
   # @return [self]
-  def command!(command)
+  def command!(command, **kwargs)
     # We cannot alias this to #command above, otherwise it will call
     # DSL::Items::Ensure::Item#command which checks for ensure_states
-    each { |i| i.command!(command) }
+    each { |i| i.command!(command, **kwargs) }
     self
   end
 
@@ -198,7 +198,7 @@ def ensure
   # Send a toggle command to every item in the collection
   # @return [self]
   #
-  def toggle
-    each(&:toggle)
+  def toggle(source: nil)
+    each { |i| i.toggle(source: source) }
   end
 end

lib/openhab/core/items/switch_item.rb

@@ -49,10 +49,10 @@ def format_type(command)
         #
         # @return [self]
         #
-        def toggle
-          return on! unless state?
+        def toggle(source: nil)
+          return on!(source: source) unless state?
 
-          command!(!state)
+          command!(!state, source: source)
         end
 
         # @!method on?

spec/openhab/core/items/semantics_spec.rb

@@ -164,6 +164,13 @@
         expect(triggered).to be true
         expect(LivingRoom_Light1_Custom).to be_on
       end
+
+      it "accepts a source" do
+        source = nil
+        received_command(LivingRoom_Light1_Custom) { |event| source = event.source }
+        [LivingRoom_Light1_Custom].toggle(source: "source")
+        expect(source).to eq "source"
+      end
     end
 
     describe "#points" do

spec/openhab/core/items/switch_item_spec.rb

@@ -51,6 +51,20 @@
       item.update(NULL).toggle
       expect(item.state).to be ON
     end
+
+    it "accepts a source" do
+      source = nil
+      received_command(item) { |event| source = event.source }
+
+      item.update(UNDEF).toggle(source: "undef")
+      expect(source).to eq "undef"
+
+      item.on.toggle(source: "on")
+      expect(source).to eq "on"
+
+      item.off.toggle(source: "off")
+      expect(source).to eq "off"
+    end
   end
 
   it "works with grep" do