musa-dsl 0.23.14 → 0.23.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 575141955334ac2cc933f922f854faa5211aa2e8749e1bd1c9994f1fd9d199f2
-  data.tar.gz: 42f7507bc1870565af4fc96bacbb32b92d62cbcf49b3e322e1f83642ff5c30c4
+  metadata.gz: 7b3da8a6794922e430f83799de2679402d3bfefda3208fa1788f0beedb1ae55e
+  data.tar.gz: 8583d5e0e518ff221cdf8b3f7cd6bc96ffe5a2c8b6c86ae53eb7d339b2a0eabd
 SHA512:
-  metadata.gz: 9112018924f197cc6d92cb974741609d557319a234ed1fd930ee38f4c99d253ecc5391d3a7dac32d8dae668b8ce6a1ddd534470cf36143330f531547f18d1b9c
-  data.tar.gz: f2d172183d72bf7713f9aaa3dd303ac9b6b90afb513574c7eda406ea6c7a97873325a748f813a3accd8810b059213e3de3996f10a72b9674306c20e501b03095
+  metadata.gz: 06642f37659b697dca34396cca40aaa0ee30788cb2905e29ae9e2be16d3df570e1195996d50b81d10506059b37ef319f0c7c0aec8ccf789a35dc5d4734ba19ce
+  data.tar.gz: bd2c24988b5f1ef6e11d3b426de27a8ed46a9ca14f08f4d7eb1fbcff95e6854f839bb369e716c3ed05b393852571440bffbb223e2d3333a82900b62ffd0ce0db

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?

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

@@ -19,12 +19,10 @@ module Musa
           else
             binder.call(*effective_value_parameters, **effective_key_parameters)
           end
+        elsif effective_value_parameters.empty? && effective_key_parameters.empty?
+          instance_eval &block
         else
-          if effective_value_parameters.empty? && effective_key_parameters.empty?
-            instance_eval &block
-          else
-            instance_exec *effective_value_parameters, **effective_key_parameters, &block
-          end
+          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: nil)
         do_log ||= false
 
         super()
@@ -20,6 +20,7 @@ module Musa
         @started = false
         @paused = false
 
+        @logger = logger
         @do_log = do_log
       end
 
@@ -55,7 +56,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, do_log: @do_log)
 
           @timer.run do
             yield if block_given?

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

@@ -3,10 +3,12 @@ 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, do_log: nil)
         @period = period_in_seconds.rationalize
         @correction = (correction || 0r).rationalize
         @stop = stop || false
+        @logger = logger
+        @do_log = do_log
       end
 
       def run
@@ -21,6 +23,10 @@ module Musa
             @next_moment += @period
             to_sleep = (@next_moment  + @correction) - Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
+            if @do_log && to_sleep.negative?
+              @logger&.error "Timer delayed #{-to_sleep}s (near #{(-to_sleep / @period).round} ticks)"
+            end
+
             sleep to_sleep if to_sleep > 0.0
           end
 

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.23.14'
+  VERSION = '0.23.18'
 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.14'
-  s.date        = '2021-09-03'
+  s.version     = '0.23.18'
+  s.date        = '2021-09-28'
   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.14
+  version: 0.23.18
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus