musa-dsl 0.23.6 → 0.23.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4151142ca6664ad550224f1ab9af55f31ce8982ff24cd4bfdd5bcd02bd45756
-  data.tar.gz: 9c2f01bb75266047984017e7edbd7f18ed353c34321b197af0faf7a3e385449a
+  metadata.gz: abb4a2e7ffcd4376fd2d54f73172d611fe65da0cf6406365c7341b65e0706d30
+  data.tar.gz: 84214e98aa34a365a370e7597e0a64bafb800eafd59e17a6fdd8ac840bd915de
 SHA512:
-  metadata.gz: 5b02d2620956fd954a7435bb7b6888d7107d02b7e57722a0f5e2f84c57f38576eab3a3bc5972b058387bcf4ad92833acce44d60c2808f36690e865b2ac776d38
-  data.tar.gz: 6a13c17fb864649fe6881e5ee3d34f2c1c48ada65b1640835310fb1658897d43a631cb63c30a186c7fa71bf3cee809ddd46627a36869a25a0a94099ea079bcb0
+  metadata.gz: 26936f34fc5038249db6df38ee405af52ff67ff7328d47a0f1f030768c33f61f828004b3d5581adc4857e2fbca60aba628e3c2cf14b21b48e3f455b52f587efd
+  data.tar.gz: 107fbc88359e3fe58b996d3156ae09b381580807bf6e0fe51fe281a37eb1b476eeeb483eacc63cb28e7c215ebd713d30dc432304d54b3b9155ef6fc304b6a33a

data/lib/musa-dsl/core-ext/with.rb

@@ -6,12 +6,13 @@ module Musa
       def with(*value_parameters, **key_parameters, &block)
         binder = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
 
-        keep_block_context = binder.parameters[0][1] == :_ unless binder.parameters.empty?
-        keep_block_context ||= false
+        keep_proc_context = @keep_proc_context_on_with
+        keep_proc_context ||= binder.parameters[0][1] == :_ unless binder.parameters.empty?
+        keep_proc_context ||= false
 
         effective_value_parameters, effective_key_parameters = binder._apply(value_parameters, key_parameters)
 
-        if keep_block_context
+        if keep_proc_context
           binder.call(self, *effective_value_parameters, **effective_key_parameters)
         else
           if effective_value_parameters.empty? && effective_key_parameters.empty?

data/lib/musa-dsl/generative/markov.rb

@@ -9,7 +9,6 @@ module Musa
       include Musa::Extension::SmartProcBinder
       include Musa::Series::Serie.base
 
-
       def initialize(transitions:, start:, finish: nil, random: nil)
         @transitions = transitions.clone.freeze
 
@@ -21,6 +20,7 @@ module Musa
 
         @procedure_binders = {}
 
+        mark_as_prototype!
         init
       end
 

data/lib/musa-dsl/sequencer/base-sequencer-implementation-every.rb

@@ -1,9 +1,10 @@
-module Musa; module Sequencer
+module Musa::Sequencer
   class BaseSequencer
     private def _every(interval, control, block_procedure_binder: nil, &block)
       block ||= proc {}
 
-      block_procedure_binder ||= SmartProcBinder.new block, on_rescue: proc { |e| _rescue_error(e) }
+      block_procedure_binder ||=
+        Musa::Extension::SmartProcBinder::SmartProcBinder.new block, on_rescue: proc { |e| _rescue_error(e) }
 
       _numeric_at position, control do
         control._start_position ||= position
@@ -84,4 +85,4 @@ module Musa; module Sequencer
 
     private_constant :EveryControl
   end
-end; end
+end

data/lib/musa-dsl/sequencer/base-sequencer-implementation-move.rb

@@ -1,9 +1,10 @@
-using Musa::Extension::Hashify
-using Musa::Extension::Arrayfy
+require_relative '../core-ext/arrayfy'
+require_relative '../core-ext/inspect-nice'
 
+using Musa::Extension::Arrayfy
 using Musa::Extension::InspectNice
 
-module Musa; module Sequencer
+module Musa::Sequencer
   class BaseSequencer
     private def _move(every: nil,
                       from:, to: nil,
@@ -436,4 +437,4 @@ module Musa; module Sequencer
 
     private_constant :MoveControl
   end
-end; end
+end

data/lib/musa-dsl/sequencer/base-sequencer-implementation-play-helper.rb

@@ -1,5 +1,3 @@
-using Musa::Extension::DeepCopy
-
 module Musa
   module Sequencer
     class BaseSequencer

data/lib/musa-dsl/sequencer/base-sequencer-implementation-play-timed.rb

@@ -1,13 +1,10 @@
-using Musa::Extension::Hashify
-using Musa::Extension::Arrayfy
+require_relative '../core-ext/inspect-nice'
 
 using Musa::Extension::InspectNice
 
-module Musa; module Sequencer
+module Musa::Sequencer
   class BaseSequencer
-    private def _play_timed(timed_serie,
-                    control,
-                    &block)
+    private def _play_timed(timed_serie, control, &block)
 
       if first_value_sample = timed_serie.peek_next_value
         debug "_play_timed: first_value_sample #{first_value_sample}"
@@ -25,7 +22,7 @@ module Musa; module Sequencer
         last_positions = hash_mode ? {} : []
       end
 
-      binder = SmartProcBinder.new(block)
+      binder = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
 
       _play_timed_step(hash_mode, component_ids, extra_attribute_names, timed_serie,
                        position, last_positions, binder, control)
@@ -40,45 +37,52 @@ module Musa; module Sequencer
 
       source_next_value = timed_serie.next_value
 
-      affected_components = component_ids.select { |_| !source_next_value[:value][_].nil? } if source_next_value
+      if source_next_value
+        affected_components = component_ids.select { |_| !source_next_value[:value][_].nil? }
 
-      if affected_components && affected_components.any?
-        time = source_next_value[:time]
+        if affected_components&.any?
+          time = source_next_value[:time]
 
-        values = hash_mode ? {} : []
-        extra_attributes = extra_attribute_names.collect { |_| [_, hash_mode ? {} : []] }.to_h
-        started_ago = hash_mode ? {} : []
+          values = hash_mode ? {} : []
+          extra_attributes = extra_attribute_names.collect { |_| [_, hash_mode ? {} : []] }.to_h
+          started_ago = hash_mode ? {} : []
 
-        affected_components.each do |component|
-          values[component] = source_next_value[:value][component]
+          affected_components.each do |component|
+            values[component] = source_next_value[:value][component]
 
-          extra_attribute_names.each do |attribute_name|
-            extra_attributes[attribute_name][component] = source_next_value[attribute_name][component]
+            extra_attribute_names.each do |attribute_name|
+              extra_attributes[attribute_name][component] = source_next_value[attribute_name][component]
+            end
+
+            last_positions[component] = _quantize_position(time, warn: false)
           end
 
-          last_positions[component] = _quantize_position(time, warn: false)
-        end
+          component_ids.each do |component|
+            if last_positions[component] && last_positions[component] != time
+              sa = _quantize_position(time, warn: false) - last_positions[component]
+              started_ago[component] = (sa == 0) ? nil : sa
+            end
+          end
 
-        component_ids.each do |component|
-          if last_positions[component] && last_positions[component] != time
-            sa = _quantize_position(time, warn: false) - last_positions[component]
-            started_ago[component] = (sa == 0) ? nil : sa
+          _numeric_at _quantize_position(start_position + time, warn: true), control do
+            binder.call(values,
+                        **extra_attributes,
+                        time: start_position + time,
+                        started_ago: started_ago,
+                        control: control)
+
+            _play_timed_step(hash_mode,
+                             component_ids, extra_attribute_names,
+                             timed_serie,
+                             start_position,
+                             last_positions,
+                             binder, control)
           end
         end
+      else
 
-        _numeric_at _quantize_position(start_position + time, warn: true), control do
-          binder.call(values,
-                      **extra_attributes,
-                      time: start_position + time,
-                      started_ago: started_ago,
-                      control: control)
-
-          _play_timed_step(hash_mode,
-                           component_ids, extra_attribute_names,
-                           timed_serie,
-                           start_position,
-                           last_positions,
-                           binder, control)
+        control.do_after.each do |do_after|
+          _numeric_at position + do_after[:bars], control, &do_after[:block]
         end
       end
     end
@@ -107,5 +111,5 @@ module Musa; module Sequencer
 
     private_constant :PlayTimedControl
   end
-end; end
+end
 

data/lib/musa-dsl/sequencer/base-sequencer-implementation-play.rb

@@ -1,11 +1,9 @@
+require_relative '../core-ext/inspect-nice'
 require_relative 'base-sequencer-implementation-play-helper'
 
-using Musa::Extension::Hashify
-using Musa::Extension::Arrayfy
-
 using Musa::Extension::InspectNice
 
-module Musa; module Sequencer
+module Musa::Sequencer
   class BaseSequencer
     private def _play(serie,
                       control,
@@ -175,4 +173,4 @@ module Musa; module Sequencer
 
     private_constant :PlayControl
   end
-end; end
+end

data/lib/musa-dsl/sequencer/base-sequencer-implementation.rb

@@ -1,16 +1,10 @@
-require_relative '../core-ext/arrayfy'
 require_relative '../core-ext/smart-proc-binder'
+require_relative '../core-ext/inspect-nice'
 
-using Musa::Extension::Arrayfy
-using Musa::Extension::DeepCopy
+using Musa::Extension::InspectNice
 
-module Musa; module Sequencer
+module Musa::Sequencer
   class BaseSequencer
-    include Musa::Extension::SmartProcBinder
-    include Musa::Extension::DeepCopy
-
-    using Musa::Extension::InspectNice
-
     private def _tick(position_to_run)
       @before_tick.each { |block| block.call position_to_run }
       queue = @timeslots[position_to_run]
@@ -72,7 +66,7 @@ module Musa; module Sequencer
       at_position = _quantize_position(at_position)
 
       block_key_parameters_binder =
-          SmartProcBinder.new block, on_rescue: proc { |e| _rescue_error(e) }
+        Musa::Extension::SmartProcBinder::SmartProcBinder.new block, on_rescue: proc { |e| _rescue_error(e) }
 
       key_parameters = {}
       key_parameters[:control] = control if block_key_parameters_binder.key?(:control)
@@ -133,8 +127,6 @@ module Musa; module Sequencer
     end
 
     class EventHandler
-      include Musa::Extension::SmartProcBinder
-
       attr_accessor :continue_parameters
 
       @@counter = 0
@@ -174,7 +166,7 @@ module Musa; module Sequencer
         @handlers[event] ||= {}
 
         # TODO: add on_rescue: proc { |e| _rescue_block_error(e) } [this method is on Sequencer, not in EventHandler]
-        @handlers[event][name] = { block: SmartProcBinder.new(block), only_once: only_once }
+        @handlers[event][name] = { block: Musa::Extension::SmartProcBinder::SmartProcBinder.new(block), only_once: only_once }
       end
 
       def launch(event, *value_parameters, **key_parameters)
@@ -214,4 +206,4 @@ module Musa; module Sequencer
 
     private_constant :EventHandler
   end
-end; end
+end

data/lib/musa-dsl/sequencer/sequencer-dsl.rb

@@ -18,7 +18,7 @@ module Musa
                      :event_handler
 
       def_delegators :@dsl, :position, :quantize_position, :logger, :debug
-      def_delegators :@dsl, :with, :now, :at, :wait, :play, :play_timed, :every, :move
+      def_delegators :@dsl, :now, :at, :wait, :play, :play_timed, :every, :move
       def_delegators :@dsl, :everying, :playing, :moving
       def_delegators :@dsl, :launch, :on
       def_delegators :@dsl, :run
@@ -28,6 +28,7 @@ module Musa
                      sequencer: nil,
                      logger: nil,
                      do_log: nil, do_error_log: nil, log_position_format: nil,
+                     keep_proc_context: nil,
                      &block)
 
         @sequencer = sequencer
@@ -37,14 +38,17 @@ module Musa
                                          do_error_log: do_error_log,
                                          log_position_format: log_position_format
 
-        @dsl = DSLContext.new @sequencer
+        @dsl = DSLContext.new @sequencer, keep_proc_context: keep_proc_context
 
-        with &block if block_given?
+        @dsl.with &block if block_given?
+      end
+
+      def with(&block)
+        @dsl.with &block
       end
 
       class DSLContext
         extend Forwardable
-        include Musa::Extension::SmartProcBinder
         include Musa::Extension::With
 
         attr_reader :sequencer
@@ -57,8 +61,9 @@ module Musa
                        :ticks_per_bar, :logger, :debug, :inspect,
                        :run
 
-        def initialize(sequencer)
+        def initialize(sequencer, keep_proc_context:)
           @sequencer = sequencer
+          @keep_proc_context_on_with = keep_proc_context
         end
 
         def now(*value_parameters, **key_parameters, &block)
@@ -104,7 +109,7 @@ module Musa
           block ||= proc {}
 
           @sequencer.every *value_parameters, **key_parameters do |*value_args, **key_args|
-            args = SmartProcBinder.new(block)._apply(value_args, key_args)
+            args = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)._apply(value_args, key_args)
             with *args.first, **args.last, &block
           end
         end

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

@@ -12,24 +12,36 @@ module Musa
 
     module Serie
       def self.base
-        SerieImplementation
+        Module.new do
+          include SerieImplementation
+
+          def has_source; false; end
+          private def mandatory_source; false; end
+
+          def has_sources; false; end
+          private def mandatory_sources; false; end
+        end
       end
 
       def self.with(source: false,
                     source_as: nil,
                     private_source: nil,
+                    mandatory_source: nil,
                     sources: false,
                     sources_as: nil,
                     private_sources: nil,
+                    mandatory_sources: nil,
                     smart_block: false,
                     block: false,
                     block_as: nil)
 
         source_as ||= :source
         source_setter = (source_as.to_s + '=').to_sym
+        _mandatory_source = source if mandatory_source.nil?
 
         sources_as ||= :sources
         sources_setter = (sources_as.to_s + '=').to_sym
+        _mandatory_sources = sources if mandatory_sources.nil?
 
         block_as ||= :proc
         block_setter = (block_as.to_s + '=').to_sym
@@ -38,15 +50,19 @@ module Musa
           include SerieImplementation
 
           if source
+            private def has_source; true; end
+            define_method(:mandatory_source) { _mandatory_source }
+            private :mandatory_source
+
             define_method source_as do
               @source
             end
 
             define_method source_setter do |serie|
-              raise ArgumentError, "New #{source_as} should be a #{@get}" unless @source.nil? || @source.prototype? == serie&.prototype?
+              unless @source.nil? || @source.undefined? || serie.state == @source.state
+                raise ArgumentError, "New serie for #{source_as} should be a #{@state} instead of a #{serie.state}"
+              end
 
-              serie ||= Musa::Series::Constructors.NIL
-              @get = serie&.instance? ? :instance : :prototype
               @source = serie
               mark_regarding! @source
             end
@@ -55,45 +71,49 @@ module Musa
               private source_as
               private source_setter
             end
+          else
+            private def has_source; false; end
+            private def mandatory_source; false; end
           end
 
           if sources
-            define_method sources_as do ||
+            private def has_sources; true; end
+            define_method(:mandatory_sources) { _mandatory_sources }
+            private :mandatory_source
+
+            define_method sources_as do
               @sources
             end
 
             define_method sources_setter do |series|
-              case series
-              when Array
-                getter = @get || ((series.first)&.instance? ? :instance : :prototype)
-                @sources = series.collect(&getter)
-              when Hash
-                getter = @get || ((series.values.first)&.instance? ? :instance : :prototype)
-                @sources = series.transform_values(&getter)
-              else
-                raise ArgumentError, "Only allowed Array or Hash"
+              unless series.is_a?(Hash) || series.is_a?(Array)
+                raise ArgumentError, "New series for #{sources_as} should be a Hash or an Array instead of a #{series.class.name}"
               end
 
-              mark_as! getter
+              @sources = series
+              try_to_resolve_undefined_state_if_needed
             end
 
             if private_sources
               private sources_as
               private sources_setter
             end
+          else
+            private def has_sources; false; end
+            private def mandatory_sources; false; end
           end
 
           if smart_block
             define_method block_as do |&block|
               if block
-                @block = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
+                @block = Extension::SmartProcBinder::SmartProcBinder.new(block)
               else
                 @block.proc
               end
             end
 
             define_method block_setter do |block|
-              @block = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
+              @block = Extension::SmartProcBinder::SmartProcBinder.new(block)
             end
 
           elsif block
@@ -113,35 +133,53 @@ module Musa
       end
 
       module Prototyping
+        def state
+          try_to_resolve_undefined_state_if_needed
+          @state || :undefined
+        end
+
         def prototype?
-          @is_instance ? false : true
+          try_to_resolve_undefined_state_if_needed
+          @state&.==(:prototype)
         end
 
         def instance?
-          @is_instance ? true : false
+          try_to_resolve_undefined_state_if_needed
+          @state&.==(:instance)
+        end
+
+        def undefined?
+          try_to_resolve_undefined_state_if_needed
+          @state.nil? || @state == :undefined
+        end
+
+        def defined?
+          !undefined?
         end
 
         def prototype
-          if @is_instance
-            if !@instance_of
-              @instance_of = clone
-              @instance_of._prototype!
-              @instance_of.mark_as_prototype!
-              @instance_of.init if @instance_of.respond_to?(:init)
-            end
+          try_to_resolve_undefined_state_if_needed
 
+          if prototype?
+            self
+          elsif instance?
+            # if the series has been directly created as an instance (i.e., because is an operation over an instance)
+            # the prototype doesn't exist.
+            #
             @instance_of
           else
-            self
+            raise PrototypingError, 'Can\'t get the prototype of an undefined serie'
           end
         end
 
         alias_method :p, :prototype
 
         def instance
-          if @is_instance
+          try_to_resolve_undefined_state_if_needed
+
+          if instance?
             self
-          else
+          elsif prototype?
             new_instance = clone
 
             new_instance._instance!
@@ -149,6 +187,8 @@ module Musa
             new_instance.init if new_instance.respond_to?(:init)
 
             new_instance
+          else
+            raise PrototypingError, 'Can\'t get an instance of an undefined serie'
           end
         end
 
@@ -163,61 +203,128 @@ module Musa
         protected def _prototype!
           @source = @source.prototype if @source
 
-          if @sources
-            if @sources.is_a?(Array)
-              @sources = @sources.collect(&:prototype)
-            elsif @sources.is_a?(Hash)
-              @sources = @sources.transform_values(&:prototype)
-            end
+          case @sources
+          when Array
+            @sources = @sources.collect(&:prototype)
+          when Hash
+            @sources = @sources.transform_values(&:prototype)
           end
         end
 
         protected def _instance!
           @source = @source.instance if @source
 
-          if @sources
-            if @sources.is_a?(Array)
-              @sources = @sources.collect(&:instance)
-            elsif @sources.is_a?(Hash)
-              @sources = @sources.transform_values(&:instance)
-            end
+          case @sources
+          when Array
+            @sources = @sources.collect(&:instance)
+          when Hash
+            @sources = @sources.transform_values(&:instance)
           end
         end
 
-        protected def mark_as!(getter)
-          case getter
+        protected def mark_as!(state)
+          case state
+          when nil, :undefined
+            mark_as_undefined!
           when :prototype
             mark_as_prototype!
           when :instance
             mark_as_instance!
           else
-            raise ArgumentError, "Only can be marked as :prototype or :instance"
+            raise ArgumentError, "Unexpected state #{state}. Only accepted nil, :undefined, :prototype or :instance."
           end
         end
 
         protected def mark_regarding!(source)
-          if source.prototype?
+          if source.nil? || source.undefined?
+            mark_as_undefined!
+          elsif source.prototype?
             mark_as_prototype!
-          else
+          elsif source.instance?
             mark_as_instance!
           end
         end
 
+        protected def mark_as_undefined!
+          @state = :undefined
+          self
+        end
+
         protected def mark_as_prototype!
-          @get = :prototype
+          notify = @state != :prototype
 
-          @is_instance = nil
+          @state = :prototype
+
+          _sources_resolved if notify
           self
         end
 
         protected def mark_as_instance!(prototype = nil)
-          @get = :instance
+          notify = @state != :instance
 
+          @state = :instance
           @instance_of = prototype
-          @is_instance = true
+
+          _sources_resolved if notify
           self
         end
 
+        protected def _sources_resolved; end
+
+        private def try_to_resolve_undefined_state_if_needed
+
+          return unless @state.nil? || @state == :undefined
+
+          states = []
+
+          if has_source
+            if mandatory_source
+              states << @source&.state || :undefined
+            elsif @source
+              states << @source.state
+            end
+          end
+
+          if has_sources
+            sources = case @sources
+                      when Array
+                        @sources
+                      when Hash
+                        @sources.values
+                      when nil
+                        []
+                      end
+
+            undefined_sources =
+              sources.empty? ||
+                sources.any?(&:undefined?) ||
+                sources.any?(&:instance?) && sources.any?(&:prototype?)
+
+            instance_sources = sources.all?(&:instance?) unless undefined_sources
+
+            sources_state = if undefined_sources
+                              :undefined
+                            elsif instance_sources
+                              :instance
+                            else
+                              :prototype
+                            end
+
+            if mandatory_sources
+              states << sources_state
+            elsif !(@sources.nil? || @sources.empty?)
+              states << sources_state
+            end
+          end
+
+          # in case of having source and sources, if both states are equal the final state is that one, else the final state is undefined
+          #
+          new_state = states.first if states.first == states.last
+          new_state ||= :undefined
+
+          mark_as!(new_state)
+        end
+
         class PrototypingError < RuntimeError
           def initialize(message = nil)
             message ||= 'This serie is a prototype serie: cannot be consumed. To consume the serie use an instance serie via .instance method'
@@ -245,7 +352,7 @@ module Musa
         private def _init; end
 
         def restart(...)
-          raise PrototypingError unless @is_instance
+          check_state_permissions
           init
           _restart(...)
 
@@ -255,7 +362,7 @@ module Musa
         private def _restart; end
 
         def next_value
-          raise PrototypingError unless @is_instance
+          check_state_permissions
 
           unless @_have_current_value && @_current_value.nil?
             if @_have_peeked_next_value
@@ -274,7 +381,7 @@ module Musa
         alias_method :v, :next_value
 
         def peek_next_value
-          raise PrototypingError unless @is_instance
+          check_state_permissions
 
           if !@_have_peeked_next_value
             @_have_peeked_next_value = true
@@ -285,16 +392,20 @@ module Musa
         end
 
         def current_value
-          raise PrototypingError unless @is_instance
+          check_state_permissions
 
           @_current_value
         end
 
         def infinite?
+          check_state_permissions(allows_prototype: true)
           @source&.infinite? || false
         end
 
         def to_a(duplicate: nil, recursive: nil, restart: nil, dr: nil)
+          check_state_permissions(allows_prototype: true)
+          raise 'Cannot convert to array an infinite serie' if infinite?
+
           recursive ||= false
 
           dr = instance? if dr.nil?
@@ -302,8 +413,6 @@ module Musa
           duplicate = dr if duplicate.nil?
           restart = dr if restart.nil?
 
-          raise 'Cannot convert to array an infinite serie' if infinite?
-
           array = []
 
           serie = instance
@@ -324,12 +433,37 @@ module Musa
 
         alias_method :a, :to_a
 
+        private def process_for_to_a(value)
+          case value
+          when Serie
+            value.to_a(recursive: true, restart: false, duplicate: false)
+          when Array
+            a = value.clone
+            a.collect! { |v| v.is_a?(Serie) ? v.to_a(recursive: true, restart: false, duplicate: false) : process_for_to_a(v) }
+          when Hash
+            h = value.clone
+            h.transform_values! { |v| v.is_a?(Serie) ? v.to_a(recursive: true, restart: false, duplicate: false) : process_for_to_a(v) }
+          else
+            value
+          end
+        end
+
         def to_node(**attributes)
           Nodificator.to_node(self, **attributes)
         end
 
         alias_method :node, :to_node
 
+        private def check_state_permissions(allows_prototype: nil)
+          try_to_resolve_undefined_state_if_needed
+
+          raise PrototypingError if !allows_prototype && prototype?
+
+          unless instance? || prototype?
+            raise PrototypingError, 'This serie is in undefined state: cannot be consumed. To consume the serie be sure the serie\'s sources are all in a defined state.'
+          end
+        end
+
         class Nodificator
           extend Musa::GenerativeGrammar
 
@@ -339,21 +473,6 @@ module Musa
         end
 
         private_constant :Nodificator
-
-        private def process_for_to_a(value)
-          case value
-          when Serie
-            value.to_a(recursive: true, restart: false, duplicate: false)
-          when Array
-            a = value.clone
-            a.collect! { |v| v.is_a?(Serie) ? v.to_a(recursive: true, restart: false, duplicate: false) : process_for_to_a(v) }
-          when Hash
-            h = value.clone
-            h.transform_values! { |v| v.is_a?(Serie) ? v.to_a(recursive: true, restart: false, duplicate: false) : process_for_to_a(v) }
-          else
-            value
-          end
-        end
       end
 
       private_constant :SerieImplementation

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

@@ -30,7 +30,7 @@ module Musa
 
       def buffer
         @buffer ||= Buffer.new(@history)
-        @buffer.send(@get).tap { |_| @buffers << _ }
+        @buffer.send(state).tap { |_| @buffers << _ }
       end
 
       private def clear_old_history
@@ -51,6 +51,7 @@ module Musa
         def initialize(history)
           @history = history
           @last_nil_index = -1
+          mark_as_prototype!
           init
         end
 
@@ -102,19 +103,31 @@ module Musa
         @nils = [0]
         @buffers = Set[]
 
-        @singleton = nil
         @buffer = nil
 
         init
       end
 
-      def instance
-        @singleton ||= super
+      def buffer
+        Buffer.new(self)
       end
 
-      def buffer
-        @buffer ||= Buffer.new(self)
-        @buffer
+      def _sources_resolved
+        (prototype || self).singleton = self if instance?
+      end
+
+      protected def singleton=(the_instance)
+        @singleton ||= the_instance
+      end
+
+      def singleton
+        if instance?
+          prototype.nil? ? @singleton : prototype.singleton
+        elsif prototype?
+          @singleton
+        else
+          raise "ES UNDEFINED!"
+        end
       end
 
       private def _restart(buffer)
@@ -163,9 +176,7 @@ module Musa
       private def clear_old_history
         min_last_nil_index = @buffers.collect(&:last_nil_index).min
 
-        if min_last_nil_index && min_last_nil_index >=0
-
-          pre_nils = @nils.clone
+        if min_last_nil_index && min_last_nil_index >= 0
           @history = @history.drop(min_last_nil_index)
 
           @nils.collect! { |_| _ - min_last_nil_index }
@@ -182,9 +193,6 @@ module Musa
 
         def initialize(base)
           self.source = base
-
-          mark_as_prototype! # necesario para que se creen instancias diferentes cada vez que se ejecute BufferSerie.buffer()
-
           init
         end
 
@@ -198,13 +206,18 @@ module Musa
           @index -= offset
         end
 
-        private def _init
-          @source._register(self) if instance?
+        # private def _init
+        #   @source.prototype.singleton._register(self) if instance?
+        #   @index = @last_nil_index
+        # end
+        #
+        private def _sources_resolved
+          @source.singleton._register(self) if instance?
           @index = @last_nil_index
         end
 
         private def _restart
-          @source.restart(self)
+          @source.singleton.restart(self)
           @needs_restart = false
         end
 
@@ -216,7 +229,7 @@ module Musa
               @index += 1
               value = @history[@index]
             else
-              value = _next_value unless @source.next_value.nil?
+              value = _next_value unless @source.singleton.next_value.nil?
             end
 
             if value.nil?

data/lib/musa-dsl/series/hash-or-array-serie-splitter.rb

@@ -5,26 +5,30 @@ module Musa
     end
 
     class Splitter
+      include Series::Serie.with(source: true)
       include Enumerable
-      include Series::Serie::Prototyping
+
+      private def has_source; true; end
+      private def has_sources; false; end
 
       def initialize(source)
-        @source = source
+        self.source = source
         @series = {}
+
+        init
       end
 
       def source=(serie)
-        @source = serie
+        super
         @proxy.source = @source if @proxy
       end
 
-      protected def _instance!
-        super
+      def _sources_resolved
         @proxy = SplitterProxy.new(@source)
       end
 
       def [](key_or_index)
-        raise "Can't get a component because Splitter is a prototype. To get a component you need a Splitter instance." unless @is_instance
+        raise "Can't get a component because Splitter is a prototype. To get a component you need a Splitter instance." unless instance?
 
         if @series.key?(key_or_index)
           @series[key_or_index]
@@ -34,7 +38,7 @@ module Musa
       end
 
       def each
-        raise "Can't iterate because Splitter is a prototype. To iterate you need a Splitter instance." unless @is_instance
+        raise "Can't iterate because Splitter is in state '#{state}'. To iterate you need a Splitter in state 'instance'." unless instance?
 
         if block_given?
           if @proxy.hash_mode?
@@ -162,6 +166,8 @@ module Musa
         end
       end
 
+      private_constant :SplitterProxy
+
       class Split
         include Series::Serie.base
 

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

@@ -10,6 +10,10 @@ using Musa::Extension::ExplodeRanges
 
 module Musa
   module Series::Constructors
+    def UNDEFINED
+      UndefinedSerie.new
+    end
+
     def NIL
       NilSerie.new
     end
@@ -44,10 +48,14 @@ module Musa
       ForLoop.new from, to, step
     end
 
-    def RND(*values, from: nil, to: nil, step: nil, random: nil)
+    def RND(*_values, values: nil, from: nil, to: nil, step: nil, random: nil)
+      raise ArgumentError, "Can't use both direct values #{_values} and values named parameter #{values} at the same time." if values && !_values.empty?
+
       random = Random.new random if random.is_a?(Integer)
       random ||= Random.new
 
+      values ||= _values
+
       if !values.empty? && from.nil? && to.nil? && step.nil?
         RandomValuesFromArray.new values.explode_ranges, random
       elsif values.empty? && !to.nil?
@@ -63,10 +71,14 @@ module Musa
       Sequence.new(series)
     end
 
-    def RND1(*values, from: nil, to: nil, step: nil, random: nil)
+    def RND1(*_values, values: nil, from: nil, to: nil, step: nil, random: nil)
+      raise ArgumentError, "Can't use both direct values #{_values} and values named parameter #{values} at the same time." if values && !_values.empty?
+
       random = Random.new random if random.is_a?(Integer)
       random ||= Random.new
 
+      values ||= _values
+
       if !values.empty? && from.nil? && to.nil? && step.nil?
         RandomValueFromArray.new values.explode_ranges, random
       elsif values.empty? && !to.nil?
@@ -99,8 +111,22 @@ module Musa
     ### Implementation
     ###
 
+    class UndefinedSerie
+      include Series::Serie.base
+
+      def initialize
+        mark_as_undefined!
+      end
+    end
+
+    private_constant :UndefinedSerie
+
     class NilSerie
-      include Musa::Series::Serie.base
+      include Series::Serie.base
+
+      def initialize
+        mark_as_prototype!
+      end
 
       def _next_value; nil; end
     end
@@ -108,7 +134,7 @@ module Musa
     private_constant :NilSerie
 
     class FromArray
-      include Musa::Series::Serie.base
+      include Series::Serie.base
 
       def initialize(values = nil, extends = nil)
         @values = values
@@ -143,15 +169,14 @@ module Musa
     # private_constant :FromArray
 
     class Sequence
-      include Musa::Series::Serie.with(sources: true)
+      include Series::Serie.with(sources: true)
 
       def initialize(series)
         self.sources = series
-
         init
       end
 
-      attr_accessor :sources
+      attr_reader :sources
 
       private def _init
         @index = 0
@@ -189,9 +214,9 @@ module Musa
     private_constant :Sequence
 
     class FromEvalBlockWithParameters
-      include Musa::Series::Serie.with(smart_block: true)
+      include Series::Serie.with(smart_block: true)
 
-      using Musa::Extension::DeepCopy
+      using Extension::DeepCopy
 
       def initialize(*parameters, **key_parameters, &block)
         raise ArgumentError, 'Yield block is undefined' unless block
@@ -245,7 +270,7 @@ module Musa
     private_constant :FromEvalBlockWithParameters
 
     class ForLoop
-      include Musa::Series::Serie.base
+      include Series::Serie.base
 
       def initialize(from, to, step)
         @from = from
@@ -303,7 +328,7 @@ module Musa
     private_constant :ForLoop
 
     class RandomValueFromArray
-      include Musa::Series::Serie.base
+      include Series::Serie.base
 
       def initialize(values, random)
         @values = values
@@ -332,7 +357,7 @@ module Musa
     private_constant :RandomValueFromArray
 
     class RandomNumberFromRange
-      include Musa::Series::Serie.base
+      include Series::Serie.base
 
       def initialize(from, to, step, random)
         @from = from
@@ -392,7 +417,7 @@ module Musa
     private_constant :RandomNumberFromRange
 
     class RandomValuesFromArray
-      include Musa::Series::Serie.base
+      include Series::Serie.base
 
       def initialize(values, random)
         @values = values.clone.freeze
@@ -424,7 +449,7 @@ module Musa
     private_constant :RandomValuesFromArray
 
     class RandomNumbersFromRange
-      include Musa::Series::Serie.base
+      include Series::Serie.base
 
       def initialize(from, to, step, random)
         @from = from
@@ -486,7 +511,7 @@ module Musa
     private_constant :RandomNumbersFromRange
 
     class FromHashOfSeries
-      include Musa::Series::Serie.with(sources: true)
+      include Series::Serie.with(sources: true)
 
       def initialize(hash_of_series, cycle_all_series)
         self.sources = hash_of_series
@@ -545,7 +570,7 @@ module Musa
     private_constant :FromHashOfSeries
 
     class FromArrayOfSeries
-      include Musa::Series::Serie.with(sources: true)
+      include Series::Serie.with(sources: true)
 
       def initialize(series_array, cycle_all_series)
         self.sources = series_array
@@ -604,7 +629,7 @@ module Musa
     private_constant :FromArrayOfSeries
 
     class SinFunction
-      include Musa::Series::Serie.base
+      include Series::Serie.base
 
       def initialize(start, steps, amplitude, center)
         @start = start.to_f
@@ -679,7 +704,7 @@ module Musa
     private_constant :SinFunction
 
     class Fibonacci
-      include Musa::Series::Serie.base
+      include Series::Serie.base
 
       def initialize
         mark_as_prototype!
@@ -707,7 +732,7 @@ module Musa
     private_constant :Fibonacci
 
     class HarmonicNotes
-      include Musa::Series::Serie.base
+      include Series::Serie.base
 
       def initialize(error, extended)
         @error = error

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

@@ -125,7 +125,9 @@ module Musa
       ###
 
       class ProcessWith
-        include Serie.with(source: true, sources: true, sources_as: :with_sources, smart_block: true)
+        include Serie.with(source: true,
+                           sources: true, sources_as: :with_sources, mandatory_sources: false,
+                           smart_block: true)
 
         def initialize(serie, with_series = nil, on_restart = nil, &block)
           self.source = serie
@@ -800,12 +802,6 @@ module Musa
           init
         end
 
-        def source=(serie)
-          raise ArgumentError, "A serie to reverse can't be infinite" if serie.infinite?
-          super
-          init
-        end
-
         private def _init
           @reversed = nil
         end
@@ -815,6 +811,8 @@ module Musa
         end
 
         private def _next_value
+          raise ArgumentError, "A serie to reverse can't be infinite" if @source.infinite?
+
           @reversed ||= Constructors.S(*next_values_array_of(@source).reverse).instance
           @reversed.next_value
         end

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

@@ -22,10 +22,6 @@ module Musa
         @source.next_value if @source
       end
 
-      def infinite?
-        @source.infinite? if @source
-      end
-
       private def method_missing(method_name, *args, **key_args, &block)
         if @source
           if @source.respond_to?(method_name)

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

@@ -15,7 +15,7 @@ module Musa
                  left_open: nil,
                  right_open: nil)
 
-      Series.QUANTIZE(self,
+      Series::Constructors.QUANTIZE(self,
                       reference: reference,
                       step: step,
                       value_attribute: value_attribute,

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

@@ -6,7 +6,33 @@ module Musa
   module Series
     module Operations
       def composer(&block)
-        Composer::Composer.new(input: self, &block).output
+        ComposerAsOperationSerie.new(self, &block)
+      end
+
+      class ComposerAsOperationSerie
+        include Serie.with(source: true)
+
+        def initialize(serie, &block)
+          self.source = serie
+          @block = block
+
+          init
+        end
+
+        attr_reader :composer
+
+        private def _init
+          @composer = Composer::Composer.new(input: @source, &@block)
+          @output = @composer.output
+        end
+
+        private def _restart
+          @output.restart
+        end
+
+        private def _next_value
+          @output.next_value
+        end
       end
     end
 
@@ -42,8 +68,7 @@ module Musa
           @outputs = {}
 
           inputs.keys&.each do |input|
-            p = PROXY()
-            p.proxy_source = inputs[input] if inputs[input]
+            p = PROXY(inputs[input])
 
             @inputs[input] = @pipelines[input] = Pipeline.new(input, input: p, output: p.buffered, pipelines: @pipelines)
 
@@ -119,7 +144,8 @@ module Musa
           end
 
           def commit!
-            first_serie_operation = @first_proc&.call(NIL())
+            first_serie_operation = @first_proc&.call(UNDEFINED())
+
             @input ||= first_serie_operation
 
             @routes.each_value do |route|
@@ -256,9 +282,18 @@ module Musa
             when Proc
               call_constructor_according_to_last_and_parameter(last.call, constructor, parameter)
 
+            when UndefinedSerie
+              case parameter
+              when Hash
+                Musa::Series::Constructors.method(constructor).call(**parameter)
+              when Array
+                Musa::Series::Constructors.method(constructor).call(*parameter)
+              else
+                raise "Unexpected parameter #{parameter} for constructor #{constructor}"
+              end
+
             when Serie
-              # TODO: ignoring last, should make an error?
-              Musa::Series::Constructors.method(constructor).call(*parameter)
+              raise "Unexpected source serie #{last} for constructor #{constructor}"
 
             when nil
               Musa::Series::Constructors.method(constructor).call(*parameter)

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.23.6'
-  s.date        = '2021-07-29'
+  s.version     = '0.23.11'
+  s.date        = '2021-08-31'
   s.summary     = 'A simple Ruby DSL for making complex music'
   s.description = 'Musa-DSL: A Ruby framework and DSL for algorithmic sound and musical thinking and composition'
   s.authors     = ['Javier Sánchez Yeste']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.23.6
+  version: 0.23.11
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus