musa-dsl 0.22.0 → 0.22.5

data/lib/musa-dsl/sequencer/{base-sequencer-public.rb → base-sequencer.rb}

@@ -30,6 +30,7 @@ module Musa
         else
           @logger = Musa::Logger::Logger.new(sequencer: self, position_format: log_position_format)
 
+          @logger.fatal!
           @logger.error! if do_error_log || do_error_log.nil?
           @logger.debug! if do_log
         end
@@ -82,6 +83,11 @@ module Musa
         @timeslots.empty?
       end
 
+      def quantize_position(position, warn: nil)
+        warn ||= false
+        _quantize_position(position, warn: warn)
+      end
+
       def run
         tick until empty?
       end
@@ -114,22 +120,19 @@ module Musa
         @event_handlers.last.launch event, *value_parameters, **key_parameters
       end
 
-      def wait(bars_delay, with: nil, debug: nil, &block)
+      def wait(bars_delay, debug: nil, &block)
         debug ||= false
 
         control = EventHandler.new @event_handlers.last
         @event_handlers.push control
 
         if bars_delay.is_a? Numeric
-          _numeric_at position + bars_delay.rationalize, control, with: with, debug: debug, &block
+          _numeric_at position + bars_delay.rationalize, control, debug: debug, &block
         else
           bars_delay = Series::S(*bars_delay) if bars_delay.is_a?(Array)
           bars_delay = bars_delay.instance if bars_delay
 
-          with = Series::S(*with).repeat if with.is_a?(Array)
-          with = with.instance if with
-
-          _serie_at bars_delay.eval { |delay| position + delay }, control, with: with, debug: debug, &block
+          _serie_at bars_delay.eval { |delay| position + delay }, control, debug: debug, &block
         end
 
         @event_handlers.pop
@@ -137,11 +140,11 @@ module Musa
         control
       end
 
-      def now(with: nil, &block)
+      def now(&block)
         control = EventHandler.new @event_handlers.last
         @event_handlers.push control
 
-        _numeric_at position, control, with: with, &block
+        _numeric_at position, control, &block
 
         @event_handlers.pop
 
@@ -154,22 +157,19 @@ module Musa
         nil
       end
 
-      def at(bar_position, with: nil, debug: nil, &block)
+      def at(bar_position, debug: nil, &block)
         debug ||= false
 
         control = EventHandler.new @event_handlers.last
         @event_handlers.push control
 
         if bar_position.is_a? Numeric
-          _numeric_at bar_position.rationalize, control, with: with, debug: debug, &block
+          _numeric_at bar_position.rationalize, control, debug: debug, &block
         else
           bar_position = Series::S(*bar_position) if bar_position.is_a? Array
           bar_position = bar_position.instance if bar_position
 
-          with = Series::S(*with).repeat if with.is_a? Array
-          with = with.instance if with
-
-          _serie_at bar_position, control, with: with, debug: debug, &block
+          _serie_at bar_position, control, debug: debug, &block
         end
 
         @event_handlers.pop
@@ -215,9 +215,6 @@ module Musa
       end
 
       def play_timed(timed_serie,
-                     reference: nil,
-                     step: nil,
-                     right_open: nil,
                      on_stop: nil,
                      after_bars: nil, after: nil,
                      &block)
@@ -233,12 +230,7 @@ module Musa
 
         @event_handlers.push control
 
-        _play_timed(timed_serie.instance,
-                    control,
-                    reference: reference,
-                    step: step,
-                    right_open: right_open,
-                    &block)
+        _play_timed(timed_serie.instance, control, &block)
 
         @event_handlers.pop
 

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

@@ -17,13 +17,14 @@ module Musa
                      :position=,
                      :event_handler
 
-      def_delegators :@context, :position, :logger, :debug
-      def_delegators :@context, :with, :now, :at, :wait, :play, :every, :move
+      def_delegators :@context, :position, :quantize_position, :logger, :debug
+      def_delegators :@context, :with, :now, :at, :wait, :play, :play_timed, :every, :move
       def_delegators :@context, :everying, :playing, :moving
       def_delegators :@context, :launch, :on
       def_delegators :@context, :run
 
-      def initialize(beats_per_bar, ticks_per_beat,
+      def initialize(beats_per_bar = nil,
+                     ticks_per_beat = nil,
                      sequencer: nil,
                      logger: nil,
                      do_log: nil, do_error_log: nil, log_position_format: nil,
@@ -50,7 +51,9 @@ module Musa
 
         def_delegators :@sequencer,
                        :launch, :on,
-                       :position, :size, :everying, :playing, :moving,
+                       :position, :quantize_position,
+                       :size,
+                       :everying, :playing, :moving,
                        :ticks_per_bar, :logger, :debug, :inspect,
                        :run
 

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

@@ -1,3 +1,10 @@
-require_relative 'base-sequencer-public'
+require_relative 'base-sequencer'
+
 require_relative 'base-sequencer-implementation'
+
+require_relative 'base-sequencer-implementation-every'
+require_relative 'base-sequencer-implementation-move'
+require_relative 'base-sequencer-implementation-play'
+require_relative 'base-sequencer-implementation-play-timed'
+
 require_relative 'sequencer-dsl'

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

@@ -30,7 +30,7 @@ module Musa
         if @is_instance
           self
         else
-          clone(freeze: false).tap(&:_instance!).mark_as_instance!(self)
+          clone(freeze: false).tap(&:_instance!).mark_as_instance!(self).tap(&:restart)
         end
       end
 
@@ -40,7 +40,7 @@ module Musa
       # handle prototyping/instancing automatically.
       # If there is a @sources attribute with the eventual several sources, SeriePrototyping will handle them by
       # default.
-      # If needed the subclasses can override this behaviour to accomodate to real subclass specificities.
+      # If needed the subclasses can override this behaviour to accommodate to real subclass specificities.
       #
       protected def _prototype!
         @source = @source.prototype if @source

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

@@ -6,6 +6,8 @@ module Musa
       end
 
       class Splitter
+        include Enumerable
+
         def initialize(proxy)
           @proxy = proxy
           @series = {}
@@ -19,6 +21,46 @@ module Musa
           end
         end
 
+        def each
+          if block_given?
+            if @proxy.hash_mode?
+              @proxy.components.each do |key|
+                yield [key, self[key]]
+              end
+            elsif @proxy.array_mode?
+              @proxy.components.each do |index|
+                yield self[index]
+              end
+            else
+              # do nothing
+            end
+          else
+            if @proxy.hash_mode?
+              @proxy.components.collect { |key| [key, self[key]] }.each
+            elsif @proxy.array_mode?
+              @proxy.components.collect { |index| self[index] }.each
+            else
+              [].each
+            end
+          end
+        end
+
+        def to_hash
+          if @proxy.hash_mode?
+            @proxy.components.collect { |key| [key, self[key]] }.to_h
+          else
+            raise RuntimeError, 'Splitter is not based on Hash: can\'t convert to Hash'
+          end
+        end
+
+        def to_array
+          if @proxy.array_mode?
+            [].tap { |_| @proxy.components.each { |i| _[i] = self[i] } }
+          else
+            raise RuntimeError, 'Splitter is not based on Array: can\'t convert to Array'
+          end
+        end
+
         class BufferedProxy
           include SeriePrototyping
 
@@ -29,6 +71,11 @@ module Musa
             mark_regarding! @source
           end
 
+          attr_reader :components
+
+          def hash_mode?; @hash_mode; end
+          def array_mode?; @array_mode; end
+
           protected def _instance!
             super
             restart
@@ -36,22 +83,39 @@ module Musa
 
           def restart(restart_source: true)
             @source.restart if restart_source
-            @values = nil
+
+            source = @source.instance
+            sample = source.current_value || source.peek_next_value
+
+            case sample
+            when Array
+              @components = (0..sample.size-1).to_a
+              @values = []
+              @array_mode = true
+              @hash_mode = false
+            when Hash
+              @components = sample.keys.clone
+              @values = {}
+              @array_mode = false
+              @hash_mode = true
+            else
+              @components = []
+              @values = nil
+              @array_mode = @hash_mode = false
+            end
           end
 
           def next_value(key_or_index)
-            if @values.nil? || @values[key_or_index].nil? || @values[key_or_index].empty?
+            if @values[key_or_index].nil? || @values[key_or_index].empty?
               hash_or_array_value = @source.next_value
 
               case hash_or_array_value
               when Hash
-                @values ||= {}
                 hash_or_array_value.each do |k, v|
                   @values[k] ||= []
                   @values[k] << v
                 end
               when Array
-                @values ||= []
                 hash_or_array_value.each_index do |i|
                   @values[i] ||= []
                   @values[i] << hash_or_array_value[i]

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

@@ -192,6 +192,8 @@ module Musa
     private_constant :Sequence
 
     class FromEvalBlockWithParameters
+      using Musa::Extension::DeepCopy
+
       include Serie
       include Musa::Extension::SmartProcBinder
 
@@ -211,8 +213,8 @@ module Musa
       end
 
       def _restart
-        @value_parameters = @original_value_parameters.collect(&:clone)
-        @key_parameters = @original_key_parameters.transform_values(&:clone)
+        @value_parameters = @original_value_parameters.clone(deep: true)
+        @key_parameters = @original_key_parameters.clone(deep: true)
 
         @first = true
         @value = nil
@@ -268,9 +270,7 @@ module Musa
         @to.nil?
       end
 
-      private
-
-      def sign_adjust_step
+      private def sign_adjust_step
         @step = (-@step if @to && (@from < @to && @step < 0 || @from > @to && @step > 0)) || @step
       end
     end
@@ -337,9 +337,7 @@ module Musa
         end
       end
 
-      private
-
-      def adjust_step
+      private def adjust_step
         @step = (-@step if @from < @to && @step < 0 || @from > @to && @step > 0) || @step
         @step_count = ((@to - @from) / @step).to_i
       end
@@ -411,9 +409,7 @@ module Musa
         value
       end
 
-      private
-
-      def adjust_step
+      private def adjust_step
         @step = (-@step if @from < @to && @step < 0 || @from > @to && @step > 0) || @step
         @step_count = ((@to - @from) / @step).to_i
       end

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

@@ -112,6 +112,10 @@ module Musa
         ProcessWith.new self, &yield_block
       end
 
+      def anticipate(&yield_block)
+        Anticipate.new self, &yield_block
+      end
+
       ###
       ### Implementation
       ###
@@ -130,7 +134,7 @@ module Musa
           @block = SmartProcBinder.new(block) if block_given?
 
           if @source.prototype?
-            @sources = @sources.transform_values { |s| s.prototype }
+            @sources = @sources.transform_values { |s| s.prototype }.freeze
           else
             @sources = @sources.transform_values { |s| s.instance }
           end
@@ -168,6 +172,37 @@ module Musa
 
       private_constant :ProcessWith
 
+      class Anticipate
+        include Musa::Extension::SmartProcBinder
+        include Serie
+
+        attr_reader :source, :block
+
+        def initialize(serie, &block)
+          @source = serie
+          @block = block
+
+          mark_regarding! @source
+        end
+
+        def _restart
+          @source.restart
+        end
+
+        def _next_value
+          value = @source.next_value
+          peek_next_value = @source.peek_next_value
+
+          @block.call(value, peek_next_value)
+        end
+
+        def infinite?
+          @source.infinite?
+        end
+      end
+
+      private_constant :Anticipate
+
       class Switcher
         include Serie
 
@@ -185,7 +220,7 @@ module Musa
             @sources = hash_series.clone.transform_values(&get)
           end
 
-          if get == :_prototype!
+          if get == :prototype!
             @sources.freeze
           end
 
@@ -236,7 +271,7 @@ module Musa
 
           _restart false
 
-          if get == :_prototype!
+          if get == :prototype
             @sources.freeze
           end
 
@@ -293,7 +328,7 @@ module Musa
             @sources = hash_series.clone.transform_values(&get)
           end
 
-          if get == :_prototype!
+          if get == :prototype
             @sources.freeze
           end
 

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

@@ -65,7 +65,7 @@ module Musa
         case n
         when nil
           time = value = nil
-        when AbsTimed
+        when Musa::Datasets::AbsTimed
           time = n[:time].rationalize
           value = n[@value_attribute].rationalize
         when Array
@@ -87,8 +87,6 @@ module Musa
 
       attr_reader :source
 
-      attr_reader :points_history
-
       def initialize(reference, step, source, value_attribute, stops, left_open, right_open)
         @reference = reference
         @step_size = step.abs
@@ -144,7 +142,9 @@ module Musa
 
               return { time: first[:time],
                        @value_attribute => first[:value],
-                       duration: durations_to_sum.sum { |_| _[:duration] } }.extend(AbsTimed).extend(AbsD)
+                       duration: durations_to_sum.sum { |_| _[:duration] } }
+                         .extend(Musa::Datasets::AbsTimed)
+                         .extend(Musa::Datasets::AbsD)
             else
               i += 1
             end
@@ -179,7 +179,9 @@ module Musa
 
               return { time: first[:time],
                        @value_attribute => first[:value],
-                       duration: durations_to_sum.sum { |_| _[:duration] } }.extend(AbsTimed).extend(AbsD)
+                       duration: durations_to_sum.sum { |_| _[:duration] } }
+                         .extend(Musa::Datasets::AbsTimed)
+                         .extend(Musa::Datasets::AbsD)
             else
               i += 1
             end
@@ -214,13 +216,13 @@ module Musa
             if @segments.last && @segments.last[:time] == from_time
 
               @segments.last[:duration] = to_time - from_time
-              @segments.last[:info] += "; edited on a as start"
+              @segments.last[:info] += '; edited on a as start'
 
             else
               @segments << { time: from_time,
                              value: from_value,
                              duration: to_time - from_time,
-                             info: "added on a as start" }
+                             info: 'added on a as start' }
 
             end
 
@@ -229,7 +231,7 @@ module Musa
                              value: from_value,
                              duration: 0,
                              stop: true,
-                             info: "added on a as end stop" }
+                             info: 'added on a as end stop' }
             end
           else
             time_increment = to_time - from_time
@@ -264,7 +266,7 @@ module Musa
                 @segments.last[:value] == value
 
                 @segments.last[:duration] = step_time_increment
-                @segments.last[:info] += "; edited on b"
+                @segments.last[:info] += '; edited on b'
 
                 # puts "process2: editing #{@segments.last}"
 
@@ -272,7 +274,7 @@ module Musa
                 @segments <<  v = { time: intermediate_point_time,
                                     value: value,
                                     duration: step_time_increment,
-                                    info: "added on b" }
+                                    info: 'added on b' }
 
                 # puts "process2: adding #{v.inspect}"
               end
@@ -293,7 +295,7 @@ module Musa
 
       private def process(time, value, last_time_value)
         if time && value
-          raise RuntimeError, "time only can go forward" if @last_processed_time && time <= @last_processed_time
+          raise RuntimeError, 'time only can go forward' if @last_processed_time && time <= @last_processed_time
 
           q_value = round_quantize(value)
 
@@ -400,7 +402,9 @@ module Musa
             if time > first_time
               result = { time: first_time,
                          @value_attribute => round_to_nearest_quantize(first_value, value),
-                         duration: time - first_time }.extend(AbsD).extend(AbsTimed)
+                         duration: time - first_time }
+                           .extend(Musa::Datasets::AbsD)
+                           .extend(Musa::Datasets::AbsTimed)
             else
               result = _next_value
             end
@@ -409,7 +413,9 @@ module Musa
               next_time = @crossings[1][:time]
               result = { time: time,
                          @value_attribute => value,
-                         duration: next_time - time }.extend(AbsD).extend(AbsTimed)
+                         duration: next_time - time }
+                           .extend(Musa::Datasets::AbsD)
+                           .extend(Musa::Datasets::AbsTimed)
 
               @crossings.shift
 
@@ -417,7 +423,9 @@ module Musa
               if @last_time && @last_time > @crossings[0][:time]
                 result = { time: @crossings[0][:time],
                            @value_attribute => @crossings[0][@value_attribute],
-                           duration: @last_time - @crossings[0][:time] }.extend(AbsD).extend(AbsTimed)
+                           duration: @last_time - @crossings[0][:time] }
+                             .extend(Musa::Datasets::AbsD)
+                             .extend(Musa::Datasets::AbsTimed)
 
                 @last_time = nil
               end
@@ -427,7 +435,9 @@ module Musa
           if @first && @last_time && @last_time > first_time
             result = { time: first_time,
                        value: round_to_nearest_quantize(first_value),
-                       duration: @last_time - first_time }.extend(AbsD).extend(AbsTimed)
+                       duration: @last_time - first_time }
+                         .extend(Musa::Datasets::AbsD)
+                         .extend(Musa::Datasets::AbsTimed)
 
             @first = false
             @last_time = false