musa-dsl 0.23.13 → 0.23.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e058435542d40d1947cb484686b8b78b67c39e0a00f88d60d3b1c534620401
-  data.tar.gz: eef1c767f85c7ad1c174986eee492f7588d6c6c32e57b3fa13f8dcb7e8a8db23
+  metadata.gz: ef23a7cf410efe4d9fa21687e85678c5f2bbf4deca1255e188d199246d221e62
+  data.tar.gz: 5a97ebc91408d7d29a09ec441cecba974c8b994c83a982610288b52897cb1327
 SHA512:
-  metadata.gz: ce2bbb09377ad73191994790009429f469a7c46edaa47bdf5dd7cbc04b4541cfeef36006bc9b68c0f5baf2598e9c52acf339dd3b166702cef102e96209cb5013
-  data.tar.gz: 0c787f3da1d3beddbf09dcf20493c0cb0ed97868a49ea26432307093df222ec69ef9128cf2ce9d58a0211ccd2ec3a4ea59446fb14026b00f90dd41691c4cbf3a
+  metadata.gz: 5ef6043e7356890a1806b73c2884f92cfbc1ad8c09f232f8c60254179737d85047bca63bfa1bd3a206a743aa11125d1ae61b3de3be3a88aac7b4fba1beade4b5
+  data.tar.gz: e3047601fd766e64103bbaa00c3cf14d28f509682b25fb1e6db2dac6878155827e6fb03bd3a324f11e877ee2765c071a51be43210557df678c2fbab92f652916

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.7.3'
+ruby '2.7.4'
 
 gem 'logger', '~> 1.4', '>= 1.4.3'
 

data/lib/musa-dsl/core-ext/smart-proc-binder.rb

@@ -33,7 +33,7 @@ module Musa
           _call value_parameters, key_parameters
         end
 
-        def _call(value_parameters, key_parameters)
+        def _call(value_parameters, key_parameters = {})
           if @on_rescue
             begin
               __call value_parameters, key_parameters
@@ -45,7 +45,7 @@ module Musa
           end
         end
 
-        private def __call(value_parameters, key_parameters)
+        private def __call(value_parameters, key_parameters = {})
           effective_value_parameters, effective_key_parameters = apply(*value_parameters, **key_parameters)
 
           if effective_key_parameters.empty?
@@ -100,7 +100,7 @@ module Musa
         end
 
         def inspect
-          "KeyParametersProcedureBinder: parameters = #{@key_parameters} has_rest = #{@has_key_rest}"
+          "SmartProcBinder: parameters = #{parameters} key_parameters = #{@key_parameters} has_rest = #{@has_key_rest}"
         end
 
         alias to_s inspect

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

@@ -7,19 +7,22 @@ module Musa
         binder = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
 
         keep_proc_context = @keep_proc_context_on_with
-        keep_proc_context ||= binder.parameters[0][1] == :_ unless binder.parameters.empty?
+        send_self_as_underscore_parameter = binder.parameters[0][1] == :_ unless binder.parameters.empty?
+        keep_proc_context ||= send_self_as_underscore_parameter
         keep_proc_context ||= false
 
         effective_value_parameters, effective_key_parameters = binder._apply(value_parameters, key_parameters)
 
         if keep_proc_context
-          binder.call(self, *effective_value_parameters, **effective_key_parameters)
-        else
-          if effective_value_parameters.empty? && effective_key_parameters.empty?
-            instance_eval &block
+          if send_self_as_underscore_parameter
+            binder.call(self, *effective_value_parameters, **effective_key_parameters)
           else
-            instance_exec *effective_value_parameters, **effective_key_parameters, &block
+            binder.call(*effective_value_parameters, **effective_key_parameters)
           end
+        elsif effective_value_parameters.empty? && effective_key_parameters.empty?
+          instance_eval &block
+        else
+          instance_exec *effective_value_parameters, **effective_key_parameters, &block
         end
       end
     end

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

@@ -20,7 +20,7 @@ module Musa
           def value
             { kind: :parallel,
               parallel: [{ kind: :serie,
-                           serie: S(*capture(:aa).value) }] +
+                           serie: Musa::Series::Constructors.S(*capture(:aa).value) }] +
                                   captures(:bb).collect { |c| { kind: :serie, serie: Musa::Series::Constructors.S(*c.value) } }
             }.extend(Musa::Neumas::Neuma::Parallel)
           end

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

@@ -101,15 +101,28 @@ module Musa
 
       # TODO on with and map methods implement parameter passing with cloning on restart as on E()
       #
-      def with(block = nil, on_restart: nil, **with_series, &yield_block)
-        block ||= yield_block
-        ProcessWith.new self, with_series, on_restart, &block
+      def with(*with_series, on_restart: nil, isolate_values: nil, **with_key_series, &block)
+        if with_series.any? && with_key_series.any?
+          raise ArgumentError, 'Can\'t use extra parameters series and key named parameters series'
+        end
+
+        extra_series = if with_series.any?
+                         with_series
+                       elsif with_key_series.any?
+                         with_key_series
+                       end
+
+        isolate_values ||= isolate_values.nil? ? true : isolate_values
+
+        ProcessWith.new self, extra_series, on_restart, isolate_values: isolate_values, &block
       end
 
       alias_method :eval, :with
 
-      def map(&block)
-        ProcessWith.new self, &block
+      def map(isolate_values: nil, &block)
+        isolate_values ||= isolate_values.nil? ? false : isolate_values
+
+        ProcessWith.new self, isolate_values: isolate_values, &block
       end
 
       def anticipate(&block)
@@ -129,12 +142,16 @@ module Musa
                            sources: true, sources_as: :with_sources, mandatory_sources: false,
                            smart_block: true)
 
-        def initialize(serie, with_series = nil, on_restart = nil, &block)
+        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.with_sources = with_series || []
           self.on_restart = on_restart
           self.proc = block if block
 
+          @isolate_values = isolate_values
+
           init
         end
 
@@ -152,21 +169,59 @@ module Musa
 
         private def _restart
           @source.restart
-          @sources.values.each(&:restart)
+
+          case @sources
+          when Array
+            @sources.each(&:restart)
+          when Hash
+            @sources.each_value(&:restart)
+          end
+
           @on_restart.call if @on_restart
         end
 
         private def _next_value
           main = @source.next_value
-          others = @sources.transform_values { |v| v.next_value }
+
+          others = case @sources
+                   when Array
+                     @sources.map(&:next_value)
+                   when Hash
+                     @sources.transform_values(&:next_value)
+                  end
 
           value = nil
 
-          if main && !others.values.include?(nil)
-            if @block
-              value = @block._call([main], others)
-            else
-              value = [main, others]
+
+          if main
+            case others
+            when Array
+              unless others.include?(nil)
+                value = if @block
+                          if @isolate_values
+                            raise ArgumentError, "Received 'with_sources' as an Array and asked to 'isolate_values'. This can't be done. Please, set 'isolate_values' to false or make with_sources to be a Hash." if others.any?
+
+                            @block._call([main])
+                          else
+                            @block._call(main.arrayfy + others)
+                          end
+                        else
+                          if @isolate_values
+                            [main, others]
+                          else
+                            main.arrayfy + others
+                          end
+                        end
+              end
+
+            when Hash
+              unless others.values.include?(nil)
+                value = if @block
+                          @block._call(main, others)
+                        else
+                          [main, others]
+                        end
+              end
             end
           end
 
@@ -243,7 +298,7 @@ module Musa
         end
 
         def infinite?
-          @source.infinite? && @sources.any? { |serie| serie.infinite? }
+          @source.infinite? && @sources.any?(&:infinite?)
         end
       end
 
@@ -287,7 +342,7 @@ module Musa
         end
 
         def infinite?
-          @source.infinite? && @sources.any? { |serie| serie.infinite? }
+          @source.infinite? && @sources.any?(&:infinite?)
         end
       end
 
@@ -641,9 +696,7 @@ module Musa
           else
             value = @pending_values.shift
 
-            if value.nil?
-              value = _next_value
-            end
+            value = _next_value if value.nil?
 
             value
           end

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

@@ -468,16 +468,19 @@ module Musa
       private def next_crossings
         from_time, from_value = get_time_value(@source.next_value)
 
-        if from_time && from_value
-          raise 'time only can go forward' if @last_time && from_time <= @last_time
+        return unless from_time && from_value
 
-          @last_time = from_time
+        if @last_time && from_time < @last_time
+          raise "time only can go forward: last time = #{@last_time} (#{@last_time.to_f}) but " \
+          "from_time = #{from_time} (#{from_time.to_f}) (expected last_time to be < from_time) "
+        end
 
-          to_time, to_value = get_time_value(@source.peek_next_value)
+        @last_time = from_time
 
-          if to_time && to_value
-            crossings(from_time, from_value, to_time, to_value)
-          end
+        to_time, to_value = get_time_value(@source.peek_next_value)
+
+        if to_time && to_value
+          crossings(from_time, from_value, to_time, to_value)
         end
       end
 

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

@@ -3,7 +3,7 @@ require_relative 'clock'
 module Musa
   module Clock
     class TimerClock < Clock
-      def initialize(period = nil, ticks_per_beat: nil, bpm: nil, correction: nil, do_log: nil)
+      def initialize(period = nil, ticks_per_beat: nil, bpm: nil, correction: nil, logger: nil)
         do_log ||= false
 
         super()
@@ -20,7 +20,7 @@ module Musa
         @started = false
         @paused = false
 
-        @do_log = do_log
+        @logger = logger
       end
 
       attr_reader :period, :ticks_per_beat, :bpm
@@ -55,7 +55,7 @@ module Musa
         @run = true
 
         while @run
-          @timer = Timer.new(@period, correction: @correction, stop: true)
+          @timer = Timer.new(@period, correction: @correction, stop: true, logger: @logger)
 
           @timer.run do
             yield if block_given?

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

@@ -3,10 +3,11 @@ module Musa
     class Timer
       attr_accessor :period
 
-      def initialize(period_in_seconds, correction: nil, stop: nil)
+      def initialize(period_in_seconds, correction: nil, stop: nil, logger: nil)
         @period = period_in_seconds.rationalize
         @correction = (correction || 0r).rationalize
         @stop = stop || false
+        @logger = logger
       end
 
       def run
@@ -21,6 +22,8 @@ module Musa
             @next_moment += @period
             to_sleep = (@next_moment  + @correction) - Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
+            @logger&.error "Timer spected to sleep a negative time #{to_sleep}" if to_sleep.negative?
+
             sleep to_sleep if to_sleep > 0.0
           end
 

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.23.13'
+  VERSION = '0.23.17'
 end
 
 require_relative 'musa-dsl/core-ext'

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.23.13'
-  s.date        = '2021-09-02'
+  s.version     = '0.23.17'
+  s.date        = '2021-09-27'
   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.13
+  version: 0.23.17
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus