musa-dsl 0.41.0 → 0.42.0

data/lib/musa-dsl/series/main-serie-constructors.rb

@@ -493,7 +493,7 @@ module Musa
     ###
 
     class UndefinedSerie
-      include Series::Serie.base
+      include Series::Serie::Base
 
       def initialize
         mark_as_undefined!
@@ -504,7 +504,7 @@ module Musa
     # private_constant :UndefinedSerie
 
     class NilSerie
-      include Series::Serie.base
+      include Series::Serie::Base
 
       def initialize
         mark_as_prototype!
@@ -530,7 +530,7 @@ module Musa
     #
     # @api private
     class FromArray
-      include Series::Serie.base
+      include Series::Serie::Base
 
       using Musa::Extension::Arrayfy
 
@@ -567,7 +567,8 @@ module Musa
     # private_constant :FromArray
 
     class Sequence
-      include Series::Serie.with(sources: true)
+      include Series::Serie::Base
+      include Series::Serie::WithSources
 
       def initialize(series)
         self.sources = series
@@ -612,7 +613,8 @@ module Musa
     private_constant :Sequence
 
     class FromEvalBlockWithParameters
-      include Series::Serie.with(smart_block: true)
+      include Series::Serie::Base
+      include Series::Serie::WithSmartBlock
 
       using Extension::DeepCopy
 
@@ -668,7 +670,7 @@ module Musa
     private_constant :FromEvalBlockWithParameters
 
     class ForLoop
-      include Series::Serie.base
+      include Series::Serie::Base
 
       def initialize(from, to, step)
         @from = from
@@ -726,7 +728,7 @@ module Musa
     private_constant :ForLoop
 
     class RandomValueFromArray
-      include Series::Serie.base
+      include Series::Serie::Base
 
       def initialize(values, random)
         @values = values
@@ -755,7 +757,7 @@ module Musa
     private_constant :RandomValueFromArray
 
     class RandomNumberFromRange
-      include Series::Serie.base
+      include Series::Serie::Base
 
       def initialize(from, to, step, random)
         @from = from
@@ -815,7 +817,7 @@ module Musa
     private_constant :RandomNumberFromRange
 
     class RandomValuesFromArray
-      include Series::Serie.base
+      include Series::Serie::Base
 
       def initialize(values, random)
         @values = values.clone.freeze
@@ -847,7 +849,7 @@ module Musa
     private_constant :RandomValuesFromArray
 
     class RandomNumbersFromRange
-      include Series::Serie.base
+      include Series::Serie::Base
 
       def initialize(from, to, step, random)
         @from = from
@@ -909,7 +911,8 @@ module Musa
     private_constant :RandomNumbersFromRange
 
     class FromHashOfSeries
-      include Series::Serie.with(sources: true)
+      include Series::Serie::Base
+      include Series::Serie::WithSources
 
       def initialize(hash_of_series, cycle_all_series)
         self.sources = hash_of_series
@@ -968,7 +971,8 @@ module Musa
     private_constant :FromHashOfSeries
 
     class FromArrayOfSeries
-      include Series::Serie.with(sources: true)
+      include Series::Serie::Base
+      include Series::Serie::WithSources
 
       def initialize(series_array, cycle_all_series)
         self.sources = series_array
@@ -1027,7 +1031,7 @@ module Musa
     private_constant :FromArrayOfSeries
 
     class SinFunction
-      include Series::Serie.base
+      include Series::Serie::Base
 
       def initialize(start, steps, amplitude, center)
         @start = start.to_f
@@ -1102,7 +1106,7 @@ module Musa
     private_constant :SinFunction
 
     class Fibonacci
-      include Series::Serie.base
+      include Series::Serie::Base
 
       def initialize
         mark_as_prototype!
@@ -1130,7 +1134,7 @@ module Musa
     private_constant :Fibonacci
 
     class HarmonicNotes
-      include Series::Serie.base
+      include Series::Serie::Base
 
       def initialize(error, extended)
         @error = error

data/lib/musa-dsl/series/main-serie-operations.rb

@@ -611,15 +611,22 @@ module Musa
       ###
 
       class ProcessWith
-        include Serie.with(source: true,
-                           sources: true, sources_as: :with_sources, mandatory_sources: false,
-                           smart_block: true)
+        include Serie::Base
+        include Serie::WithSource
+        include Serie::WithSources
+        include Serie::WithSmartBlock
+
+        # sources are optional for ProcessWith
+        private def mandatory_sources; false; end
+
+        alias with_sources sources
+        alias with_sources= sources=
 
         using Musa::Extension::Arrayfy
 
         def initialize(serie, with_series = nil, on_restart = nil, isolate_values: nil, &block)
           self.source = serie
-          self.with_sources = with_series || []
+          self.sources = with_series || []
           self.on_restart = on_restart
 
           if block
@@ -714,7 +721,9 @@ module Musa
       private_constant :ProcessWith
 
       class Anticipate
-        include Serie.with(source: true, block: true)
+        include Serie::Base
+        include Serie::WithSource
+        include Serie::WithBlock
 
         def initialize(serie, &block)
           self.source = serie
@@ -747,11 +756,16 @@ module Musa
       private_constant :Anticipate
 
       class Switcher
-        include Serie.with(source: true, sources: true, sources_as: :options)
+        include Serie::Base
+        include Serie::WithSource
+        include Serie::WithSources
+
+        alias options sources
+        alias options= sources=
 
         def initialize(selector, indexed_series, hash_series)
           self.source = selector
-          self.options = indexed_series || hash_series
+          self.sources = indexed_series || hash_series
 
           init
         end
@@ -785,11 +799,16 @@ module Musa
       private_constant :Switcher
 
       class MultiplexSelector
-        include Serie.with(source: true, sources: true, sources_as: :options)
+        include Serie::Base
+        include Serie::WithSource
+        include Serie::WithSources
+
+        alias options sources
+        alias options= sources=
 
         def initialize(selector, indexed_series, hash_series)
           self.source = selector
-          self.options = indexed_series || hash_series
+          self.sources = indexed_series || hash_series
 
           init
         end
@@ -829,11 +848,16 @@ module Musa
       private_constant :MultiplexSelector
 
       class SwitchFullSerie
-        include Serie.with(source: true, sources: true, sources_as: :options)
+        include Serie::Base
+        include Serie::WithSource
+        include Serie::WithSources
+
+        alias options sources
+        alias options= sources=
 
         def initialize(selector, indexed_series, hash_series)
           self.source = selector
-          self.options = indexed_series || hash_series
+          self.sources = indexed_series || hash_series
 
           init
         end
@@ -865,7 +889,8 @@ module Musa
       private_constant :SwitchFullSerie
 
       class InfiniteRepeater
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie)
           self.source = serie
@@ -895,7 +920,8 @@ module Musa
       private_constant :InfiniteRepeater
 
       class Repeater
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie, times = nil, &condition)
           self.source = serie
@@ -968,7 +994,8 @@ module Musa
       private_constant :Repeater
 
       class LengthLimiter
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie, length)
           self.source = serie
@@ -1002,7 +1029,8 @@ module Musa
       private_constant :LengthLimiter
 
       class Skipper
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie, length)
           self.source = serie
@@ -1036,7 +1064,7 @@ module Musa
       private_constant :Skipper
 
       class Flattener
-        include Serie.base
+        include Serie::Base
 
         def initialize(serie)
           @source = serie
@@ -1081,7 +1109,8 @@ module Musa
       private_constant :Flattener
 
       class MergeSerieOfSeries
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie)
           self.source = serie
@@ -1158,7 +1187,9 @@ module Musa
       #
       # @api private
       class Processor
-        include Serie.with(source: true, smart_block: true)
+        include Serie::Base
+        include Serie::WithSource
+        include Serie::WithSmartBlock
 
         def initialize(serie, parameters, &processor)
           self.source = serie
@@ -1211,7 +1242,8 @@ module Musa
       end
 
       class Autorestart
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie)
           self.source = serie
@@ -1243,7 +1275,8 @@ module Musa
       private_constant :Autorestart
 
       class Cutter
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie, length)
           self.source = serie
@@ -1273,7 +1306,8 @@ module Musa
         end
 
         class CutSerie
-          include Serie.with(source: true)
+          include Serie::Base
+          include Serie::WithSource
 
           def initialize(serie, length)
             self.source = serie.instance
@@ -1314,7 +1348,8 @@ module Musa
       private_constant :Cutter
 
       class Locker
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie)
           self.source = serie
@@ -1351,7 +1386,8 @@ module Musa
       private_constant :Locker
 
       class Reverser
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie)
           self.source = serie
@@ -1387,7 +1423,8 @@ module Musa
       private_constant :Reverser
 
       class Randomizer
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie, random)
           self.source = serie
@@ -1424,7 +1461,8 @@ module Musa
       private_constant :Randomizer
 
       class Shifter
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie, shift)
           self.shift = shift
@@ -1500,7 +1538,9 @@ module Musa
       private_constant :Shifter
 
       class Remover
-        include Serie.with(source: true, block: true)
+        include Serie::Base
+        include Serie::WithSource
+        include Serie::WithBlock
 
         def initialize(serie, &block)
           self.source = serie
@@ -1534,7 +1574,9 @@ module Musa
       private_constant :Remover
 
       class Selector
-        include Serie.with(source: true, block: true)
+        include Serie::Base
+        include Serie::WithSource
+        include Serie::WithBlock
 
         def initialize(serie, &block)
           self.source = serie
@@ -1559,7 +1601,8 @@ module Musa
       private_constant :Selector
 
       class HashFromSeriesArray
-        include Serie.with(source: true)
+        include Serie::Base
+        include Serie::WithSource
 
         def initialize(serie, keys)
           self.source = serie
@@ -1592,7 +1635,9 @@ module Musa
       private_constant :HashFromSeriesArray
 
       class LazySerieEval
-        include Serie.with(source: true, block: true)
+        include Serie::Base
+        include Serie::WithSource
+        include Serie::WithBlock
 
         def initialize(serie, &block)
           self.source = serie

data/lib/musa-dsl/series/proxy-serie.rb

@@ -74,7 +74,11 @@ module Musa
     #
     # @api private
     class ProxySerie
-      include Series::Serie.with(source: true, source_as: :proxy_source)
+      include Series::Serie::Base
+      include Series::Serie::WithSource
+
+      alias proxy_source source
+      alias proxy_source= source=
 
       def initialize(serie)
         self.proxy_source = serie

data/lib/musa-dsl/series/quantizer-serie.rb

@@ -128,7 +128,8 @@ module Musa
     private_constant :QuantizerTools
 
     class RawQuantizer
-      include Series::Serie.with(source: true)
+      include Series::Serie::Base
+      include Series::Serie::WithSource
       include QuantizerTools
 
       attr_reader :source
@@ -393,7 +394,8 @@ module Musa
     private_constant :RawQuantizer
 
     class PredictiveQuantizer
-      include Series::Serie.with(source: true)
+      include Series::Serie::Base
+      include Series::Serie::WithSource
       include QuantizerTools
 
       attr_reader :source

data/lib/musa-dsl/series/queue-serie.rb

@@ -72,7 +72,8 @@ module Musa
     #
     # @api private
     class QueueSerie
-      include Series::Serie.with(sources: true)
+      include Series::Serie::Base
+      include Series::Serie::WithSources
 
       def initialize(series)
         self.sources = series

data/lib/musa-dsl/series/series-composer.rb

@@ -84,7 +84,8 @@ module Musa
       # @see Composer::Composer Full composer implementation
       # @api private
       class ComposerAsOperationSerie
-        include Musa::Series::Serie.with(source: true)
+        include Musa::Series::Serie::Base
+        include Musa::Series::Serie::WithSource
 
         def initialize(serie, &block)
           self.source = serie
@@ -593,10 +594,12 @@ module Musa
           # @return [Route, nil] route at connection point
           #
           # @api private
-          def [](on, as)
+          def get(on, as)
             @routes[[on, as]]
           end
 
+          alias_method :[], :get
+
           # Stores route at specified connection point.
           #
           # @param on [Symbol] connection attribute name

data/lib/musa-dsl/series/timed-serie.rb

@@ -179,7 +179,8 @@ module Musa
     #
     # @api private
     class TimedUnionOfArrayOfTimedSeries
-      include Series::Serie.with(sources: true)
+      include Series::Serie::Base
+      include Series::Serie::WithSources
 
       # Creates array-mode union from series array.
       #
@@ -356,7 +357,8 @@ module Musa
     #
     # @api private
     class TimedUnionOfHashOfTimedSeries
-      include Series::Serie.with(sources: true)
+      include Series::Serie::Base
+      include Series::Serie::WithSources
 
       # Creates hash-mode union from named series hash.
       #
@@ -632,7 +634,8 @@ module Musa
     #
     # @api private
     class TimedFlattener
-      include Series::Serie.with(source: true)
+      include Series::Serie::Base
+      include Series::Serie::WithSource
 
       # Creates flattener wrapping source serie.
       #
@@ -726,7 +729,8 @@ module Musa
     #
     # @api private
     class TimedCompacter
-      include Series::Serie.with(source: true)
+      include Series::Serie::Base
+      include Series::Serie::WithSource
 
       # Creates compacter wrapping source serie.
       #

data/lib/musa-dsl/transport/timer-clock.rb

@@ -279,13 +279,15 @@ module Musa
 
       # Terminates the clock's run loop.
       #
-      # Causes {#run} to exit. This is the clean shutdown mechanism.
+      # Causes {#run} to exit by setting the run flag to false and terminating
+      # the internal timer. This is the clean shutdown mechanism.
       #
       # @return [void]
       #
-      # @note After calling this, {#run} will exit
+      # @note After calling this, {#run} will exit and {Musa::Transport::Transport#start} will return
       def terminate
         @run = false
+        @timer&.terminate
       end
     end
   end

data/lib/musa-dsl/transport/timer.rb

@@ -53,6 +53,7 @@ module Musa
         @period = tick_period_in_seconds.rationalize
         @correction = (correction || 0r).rationalize
         @stop = stop || false
+        @terminate = false
 
         @delayed_ticks_error = delayed_ticks_error || 1.0
         @logger = logger
@@ -61,25 +62,29 @@ module Musa
 
       # Runs the timer loop, yielding for each tick.
       #
-      # This method blocks and runs indefinitely until stopped. For each tick:
+      # This method blocks and runs until terminated. For each tick:
       # 1. Yields to caller if not stopped
       # 2. Calculates next tick time
       # 3. Sleeps precisely until next tick
       # 4. Logs warnings if timing cannot be maintained
       #
       # When stopped (@stop = true), the thread sleeps until {#continue} is called.
+      # When terminated (@terminate = true), the loop exits and this method returns.
       #
       # @yield Called once per tick for processing
       # @return [void]
       #
-      # @note This method blocks the current thread
+      # @note This method blocks the current thread until {#terminate} is called
       # @note Uses monotonic clock for drift-free timing
       def run
         @thread = Thread.current
+        @terminate = false
 
         @next_moment = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
         loop do
+          break if @terminate
+
           unless @stop
             # Process the tick
             yield
@@ -102,8 +107,11 @@ module Musa
             sleep to_sleep if to_sleep > 0.0
           end
 
-          # When stopped, sleep thread until continue is called
-          sleep if @stop
+          # When stopped, sleep thread until continue or terminate is called
+          if @stop
+            break if @terminate
+            sleep
+          end
         end
       end
 
@@ -133,6 +141,21 @@ module Musa
         @next_moment = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @thread.run
       end
+
+      # Terminates the timer loop permanently.
+      #
+      # Unlike {#stop} which pauses the timer (allowing {#continue} to resume),
+      # terminate causes the {#run} loop to exit completely. Use this for
+      # clean shutdown.
+      #
+      # @return [void]
+      #
+      # @note This wakes the thread if sleeping and causes {#run} to return
+      # @see #stop For pausing without terminating
+      def terminate
+        @terminate = true
+        @thread&.wakeup
+      end
     end
   end
 end

data/lib/musa-dsl/version.rb

@@ -1,4 +1,3 @@
 module Musa
-  VERSION = '0.41.0'.freeze
-  VERSION_DATE = '2026-01-15'.freeze
+  VERSION = '0.42.0'.freeze
 end

data/musa-dsl.gemspec

@@ -40,6 +40,4 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'debug', '~> 1'
   s.add_development_dependency 'rubocop', '~> 1'
-  # s.add_development_dependency 'ruby-lsp'
-  # s.add_development_dependency 'steep'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.42.0
 platform: ruby
 authors:
 - Javier Sánchez Yeste