musa-dsl 0.23.8 → 0.23.13

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

@@ -1,6 +1,7 @@
 require_relative 'base-series'
 
 require_relative '../core-ext/with'
+require_relative '../core-ext/arrayfy'
 
 module Musa
   module Series
@@ -10,7 +11,7 @@ module Musa
       end
 
       class ComposerAsOperationSerie
-        include Serie.with(source: true)
+        include Musa::Series::Serie.with(source: true)
 
         def initialize(serie, &block)
           self.source = serie
@@ -68,7 +69,7 @@ module Musa
           @outputs = {}
 
           inputs.keys&.each do |input|
-            p = PROXY(inputs[input])
+            p = Musa::Series::Constructors.PROXY(inputs[input])
 
             @inputs[input] = @pipelines[input] = Pipeline.new(input, input: p, output: p.buffered, pipelines: @pipelines)
 
@@ -76,7 +77,7 @@ module Musa
           end
 
           outputs&.each do |output|
-            p = PROXY()
+            p = Musa::Series::Constructors.PROXY()
             @outputs[output] = @pipelines[output] = Pipeline.new(output, is_output: true, input: p, output: p, pipelines: @pipelines)
 
             @dsl.define_singleton_method(output) { output }
@@ -144,7 +145,7 @@ module Musa
           end
 
           def commit!
-            first_serie_operation = @first_proc&.call(UNDEFINED())
+            first_serie_operation = @first_proc&.call(Musa::Series::Constructors.UNDEFINED())
 
             @input ||= first_serie_operation
 
@@ -282,9 +283,18 @@ module Musa
             when Proc
               call_constructor_according_to_last_and_parameter(last.call, constructor, parameter)
 
+            when Musa::Series::Constructors::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/lib/musa-dsl/series/timed-serie.rb

@@ -54,13 +54,13 @@ module Musa
           result = { time: time }
 
           @components.each do |attribute_name, components|
-            if @hash_mode
-              result[attribute_name] = {}
-            elsif @array_mode
-              result[attribute_name] = []
-            else # value mode
-              result[attribute_name] = []
-            end
+            result[attribute_name] = if @hash_mode
+                                       {}
+                                     elsif @array_mode
+                                       []
+                                     else # value mode
+                                       []
+                                     end
 
             components.each do |target_key_or_index, source_placement|
               result[attribute_name][target_key_or_index] = selected_values.dig(*source_placement)
@@ -76,67 +76,68 @@ module Musa
       def infinite?
         !!@sources.find(&:infinite?)
       end
-    end
 
-    private def infer_components(sources_values)
-      other_attributes = Set[]
+      private def infer_components(sources_values)
+        other_attributes = Set[]
 
-      sources_values.each do |source_value|
-        (source_value.keys - [:time, :value]).each { |_| other_attributes << _ }
-      end
+        sources_values.each do |source_value|
+          (source_value.keys - [:time, :value]).each { |_| other_attributes << _ }
+        end
 
-      components = {}
-      components[:value] = {}
+        components = {}
+        components[:value] = {}
 
-      hash_mode = array_mode = nil
+        hash_mode = array_mode = nil
 
-      other_attributes.each do |attribute_name|
-        components[attribute_name] = {}
-      end
+        other_attributes.each do |attribute_name|
+          components[attribute_name] = {}
+        end
 
-      target_index = 0
+        target_index = 0
 
-      sources_values.each_with_index do |source_value, i|
-        case source_value[:value]
-        when Hash
-          hash_mode = true
+        sources_values.each_with_index do |source_value, i|
+          case source_value[:value]
+          when Hash
+            hash_mode = true
 
-          source_value[:value].keys.each do |key|
-            raise RuntimeError, "Value: key #{key} already used" unless components[:value][key].nil?
+            source_value[:value].each_key do |key|
+              raise "Value: key #{key} already used" unless components[:value][key].nil?
 
-            components[:value][key] = [i, :value, key]
+              components[:value][key] = [i, :value, key]
 
-            other_attributes.each do |attribute_name|
-              raise RuntimeError, "Attribute #{attribute_name}: key #{key} already used" unless components[attribute_name][key].nil?
-              components[attribute_name][key] = [i, attribute_name, key]
+              other_attributes.each do |attribute_name|
+                raise "Attribute #{attribute_name}: key #{key} already used" unless components[attribute_name][key].nil?
+
+                components[attribute_name][key] = [i, attribute_name, key]
+              end
             end
-          end
-        when Array
-          array_mode = true
+          when Array
+            array_mode = true
+
+            (0..source_value[:value].size - 1).each do |index|
+              components[:value][target_index] = [i, :value, index]
+
+              other_attributes.each do |attribute_name|
+                components[attribute_name][target_index] = [i, attribute_name, index]
+              end
 
-          (0..source_value[:value].size - 1).each do |index|
-            components[:value][target_index] = [i, :value, index]
+              target_index += 1
+            end
+          else
+            components[:value][target_index] = [i, :value]
 
             other_attributes.each do |attribute_name|
-              components[attribute_name][target_index] = [i, attribute_name, index]
+              components[attribute_name][target_index] = [i, attribute_name]
             end
 
             target_index += 1
           end
-        else
-          components[:value][target_index] = [i, :value]
-
-          other_attributes.each do |attribute_name|
-            components[attribute_name][target_index] = [i, attribute_name]
-          end
-
-          target_index += 1
         end
-      end
 
-      raise RuntimeError, "source series values are of incompatible type (can't combine Hash and Array values)" if array_mode && hash_mode
+        raise "source series values are of incompatible type (can't combine Hash and Array values)" if array_mode && hash_mode
 
-      return components, hash_mode, array_mode
+        [components, hash_mode, array_mode]
+      end
     end
 
     private_constant :TimedUnionOfArrayOfTimedSeries
@@ -170,7 +171,7 @@ module Musa
           sources_values[key] = @sources_next_values[key] || (@sources_next_values[key] = @sources[key].next_value)
         end
 
-        @other_attributes = infer_other_attributes(sources_values) unless @other_attributes
+        @other_attributes ||= infer_other_attributes(sources_values)
 
         time = sources_values.values.collect { |_| _&.[](:time) }.compact.min
 

data/lib/musa-dsl/transcription/from-gdv-to-midi.rb

@@ -1,7 +1,5 @@
 require_relative 'from-gdv'
 
-include Musa::Transcription
-
 module Musa::Transcriptors
   module FromGDV
     module ToMIDI
@@ -15,7 +13,7 @@ module Musa::Transcriptors
       end
 
       # Process: appogiatura (neuma)neuma
-      class Appogiatura < FeatureTranscriptor
+      class Appogiatura < Musa::Transcription::FeatureTranscriptor
         def transcript(gdv, base_duration:, tick_duration:)
           gdv_appogiatura = gdv.delete :appogiatura
 
@@ -34,7 +32,7 @@ module Musa::Transcriptors
       end
 
       # Process: .mor
-      class Mordent < FeatureTranscriptor
+      class Mordent < Musa::Transcription::FeatureTranscriptor
         def initialize(duration_factor: nil)
           @duration_factor = duration_factor || 1/4r
         end
@@ -77,7 +75,7 @@ module Musa::Transcriptors
       end
 
       # Process: .turn
-      class Turn < FeatureTranscriptor
+      class Turn < Musa::Transcription::FeatureTranscriptor
         def transcript(gdv, base_duration:, tick_duration:)
           turn = gdv.delete :turn
 
@@ -118,7 +116,7 @@ module Musa::Transcriptors
       end
 
       # Process: .tr
-      class Trill < FeatureTranscriptor
+      class Trill < Musa::Transcription::FeatureTranscriptor
         def initialize(duration_factor: nil)
           @duration_factor = duration_factor || 1/4r
         end
@@ -195,7 +193,7 @@ module Musa::Transcriptors
       end
 
       # Process: .st .st(1) .st(2) .st(3): staccato level 1 2 3
-      class Staccato < FeatureTranscriptor
+      class Staccato < Musa::Transcription::FeatureTranscriptor
         def initialize(min_duration_factor: nil)
           @min_duration_factor = min_duration_factor || 1/8r
         end

data/lib/musa-dsl/transcription/from-gdv-to-musicxml.rb

@@ -1,7 +1,5 @@
 require_relative 'from-gdv'
 
-include Musa::Transcription
-
 module Musa::Transcriptors
   module FromGDV
     module ToMusicXML
@@ -11,7 +9,7 @@ module Musa::Transcriptors
       end
 
       # Process: appogiatura (neuma)neuma
-      class Appogiatura < FeatureTranscriptor
+      class Appogiatura < Musa::Transcription::FeatureTranscriptor
         def transcript(gdv, base_duration:, tick_duration:)
           if gdv_appogiatura = gdv[:appogiatura]
             gdv.delete :appogiatura
@@ -30,7 +28,6 @@ module Musa::Transcriptors
           end
         end
       end
-
     end
   end
 end

data/lib/musa-dsl/transcription/from-gdv.rb

@@ -1,11 +1,9 @@
 require_relative 'transcription'
 
-include Musa::Transcription
-
 module Musa::Transcriptors
   module FromGDV
     # Process: .base .b
-    class Base < FeatureTranscriptor
+    class Base < Musa::Transcription::FeatureTranscriptor
       def transcript(gdv, base_duration:, tick_duration:)
         base = gdv.delete :base
         base ||= gdv.delete :b

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

@@ -21,8 +21,6 @@ module Musa
           end
         end
 
-
-
         element
       end
     end
@@ -39,10 +37,10 @@ module Musa
         element
       end
 
-      def check(value_or_array)
+      def check(value_or_array, &block)
         if block_given?
           if value_or_array.is_a?(Array)
-            value_or_array.each { |value| yield value }
+            value_or_array.each(&block)
           else
             yield value_or_array
           end

data/lib/musa-dsl/transport/input-midi-clock.rb

@@ -120,12 +120,15 @@ module Musa
           yield if block_given? && @started
 
         when 'Song Position Pointer'
-          new_position_in_midi_beats =
-              m.data[0] & 0x7F | ((m.data[1] & 0x7F) << 7)
+          new_position_in_midi_beats = m.data[0] & 0x7F | ((m.data[1] & 0x7F) << 7)
 
-          @logger.debug('InputMidiClock') { "processing Song Position Pointer new_position_in_midi_beats #{new_position_in_midi_beats}..." }
+          @logger.debug('InputMidiClock') do
+            "processing Song Position Pointer new_position_in_midi_beats #{new_position_in_midi_beats}..."
+          end
           @on_change_position.each { |block| block.call midi_beats: new_position_in_midi_beats }
-          @logger.debug('InputMidiClock') { "processing Song Position Pointer new_position_in_beats #{new_position_in_midi_beats}... done" }
+          @logger.debug('InputMidiClock') do
+            "processing Song Position Pointer new_position_in_beats #{new_position_in_midi_beats}... done"
+          end
         end
       end
     end

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

@@ -2,12 +2,10 @@ require_relative '../core-ext/smart-proc-binder'
 require_relative '../core-ext/inspect-nice'
 require_relative '../sequencer'
 
-using Musa::Extension::InspectNice
-
 module Musa
   module Transport
     class Transport
-      include Musa::Extension::SmartProcBinder
+      using Musa::Extension::InspectNice
 
       attr_reader :sequencer
 
@@ -28,20 +26,20 @@ module Musa
         @clock = clock
 
         @before_begin = []
-        @before_begin << SmartProcBinder.new(before_begin) if before_begin
+        @before_begin << Musa::Extension::SmartProcBinder::SmartProcBinder.new(before_begin) if before_begin
 
         @on_start = []
-        @on_start << SmartProcBinder.new(on_start) if on_start
+        @on_start << Musa::Extension::SmartProcBinder::SmartProcBinder.new(on_start) if on_start
 
         @on_change_position = []
-        @on_change_position << SmartProcBinder.new(on_position_change) if on_position_change
+        @on_change_position << Musa::Extension::SmartProcBinder::SmartProcBinder.new(on_position_change) if on_position_change
 
         @after_stop = []
-        @after_stop << SmartProcBinder.new(after_stop) if after_stop
+        @after_stop << Musa::Extension::SmartProcBinder::SmartProcBinder.new(after_stop) if after_stop
 
         @do_log = do_log
 
-        @sequencer = Sequencer::Sequencer.new beats_per_bar, ticks_per_beat, logger: logger, do_log: @do_log
+        @sequencer = Musa::Sequencer::Sequencer.new beats_per_bar, ticks_per_beat, logger: logger, do_log: @do_log
 
         @clock.on_start do
           do_on_start
@@ -57,19 +55,19 @@ module Musa
       end
 
       def before_begin(&block)
-        @before_begin << SmartProcBinder.new(block)
+        @before_begin << Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
       end
 
       def on_start(&block)
-        @on_start << SmartProcBinder.new(block)
+        @on_start << Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
       end
 
       def after_stop(&block)
-        @after_stop << SmartProcBinder.new(block)
+        @after_stop << Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
       end
 
       def on_change_position(&block)
-        @on_change_position << SmartProcBinder.new(block)
+        @on_change_position << Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
       end
 
       def start

data/lib/musa-dsl.rb

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