musa-dsl 0.22.3 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 193117ba393c58eaf2387d7b0a5ba54bc7fbad0c6ac2e5a7171997b1629d5f69
-  data.tar.gz: 5ac3515f62f3c5d8ea34cd91552fb6d0f8d53e40f60d1383fa34a28c0b11289d
+  metadata.gz: 38a9835b1d87d869a99fac037037eed22b8eaaf3ad133c70e732578a5631aa79
+  data.tar.gz: 7e9057ff2498fc3039baa1d749cb1c23b5fcc42bdb56879aab38c4fafc3d9468
 SHA512:
-  metadata.gz: 13ec912683ee5e0f0f0865ff9197e641671c430ed5a59d438b15acb5423f6d18f3f57624d5dd4c348daa69c93ac1d47428809cea84953893a4cb7f9b224613f9
-  data.tar.gz: b64ee9f844989e4db527787f763089c6bcd5aa050254da270c2c5c3461145aefef9b701da6944cda20b53286bfee2e42650c2a21de864ee8ea53f5d48aff0791
+  metadata.gz: 191ea705bc3b3378d5660d1e75e63bb53ef0e53d1030fcae2642ff777b9753118b33af4ec7cf0edaec884c793fecded95d41bc6aef9ad41698feb2ca2c04e14e
+  data.tar.gz: 0ee6ed871246af66ed7553a95ec2ca683d874034344b06e3c6128c54f70ec9592b33c7ac0df196dd11dc9a5290bd4c247df008fbf5b4f57af975fbd3a66bb468

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'logger', '~> 1.4', '>= 1.4.3'
+
 group :neuma do
   gem 'citrus', '~> 3.0.0'
 end
@@ -10,8 +12,8 @@ group :transport do
 end
 
 group :test do
-  gem 'rspec', '~> 3.0'
   gem 'descriptive-statistics'
+  gem 'rspec', '~> 3.0'
 end
 
 group :documentation do

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.22.3'
+  VERSION = '0.23.0'
 end
 
 require_relative 'musa-dsl/core-ext'
@@ -27,21 +27,30 @@ require_relative 'musa-dsl/music'
 require_relative 'musa-dsl/generative'
 
 module Musa::All
+  # Core
+  #
   include Musa::Logger
 
   include Musa::Clock
   include Musa::Transport
   include Musa::Sequencer
 
-  include Musa::Scales
-  include Musa::Chords
+  include Musa::Series
   include Musa::Datasets
 
   include Musa::Neumalang
   include Musa::Neumas
-  include Musa::Matrix
 
-  include Musa::Series
+  include Musa::Transcription
+
+  include Musa::REPL
+
+  # Extensions: ojo, el nombre extensions ya se usa para algunos paquetes de core-ext que funcionan con Refinements
+  #
+  include Musa::Scales
+  include Musa::Chords
+
+  include Musa::Matrix
 
   include Musa::Darwin
   include Musa::Markov
@@ -53,8 +62,5 @@ module Musa::All
 
   include Musa::MusicXML
 
-  include Musa::Transcription
   include Musa::Transcriptors
-
-  include Musa::REPL
 end

data/lib/musa-dsl/core-ext/deep-copy.rb

@@ -118,7 +118,18 @@ module Musa
         end
 
         def deep_copy_proc(register, object, method, freeze)
-          register(register, object, object.dup)
+          if (receiver_dup = registered(object.binding.receiver, register))
+            register(register,
+                     object,
+                     proc do |*args, **kargs|
+                       # when the receiver of the proc is also a duplicated object
+                       # the new copy of the proc should be the new object, not the original one.
+                       #
+                       receiver_dup.instance_exec(object, *args, **kargs, &object)
+                     end)
+          else
+            register(register, object, object.dup)
+          end
         end
 
         def deep_copy_instance_variables(register, object, duplication, method, freeze)

data/lib/musa-dsl/core-ext/inspect-nice.rb

@@ -12,7 +12,6 @@ module Musa
         alias to_s inspect
       end
 
-
       refine Rational.singleton_class do
         attr_accessor :to_s_as_inspect
       end
@@ -43,7 +42,7 @@ module Musa
         end
 
         def to_s
-          inspect simple: true # !Rational.to_s_as_inspect
+          inspect simple: !Rational.to_s_as_inspect
         end
       end
     end

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

@@ -2,8 +2,8 @@ module Musa
   module Extension
     module SmartProcBinder
       class SmartProcBinder
-        def initialize(procedure, on_rescue: nil)
-          @procedure = procedure
+        def initialize(block, on_rescue: nil)
+          @block = block
           @on_rescue = on_rescue
 
           @key_parameters = {}
@@ -12,7 +12,7 @@ module Musa
           @value_parameters_count = 0
           @has_value_rest = false
 
-          procedure.parameters.each do |parameter|
+          block.parameters.each do |parameter|
             @key_parameters[parameter[1]] = nil if parameter[0] == :key || parameter[0] == :keyreq
             @has_key_rest = true if parameter[0] == :keyrest
 
@@ -21,8 +21,12 @@ module Musa
           end
         end
 
+        def proc
+          @block
+        end
+
         def parameters
-          @procedure.parameters
+          @block.parameters
         end
 
         def call(*value_parameters, **key_parameters)
@@ -41,26 +45,24 @@ module Musa
           end
         end
 
-        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?
             if effective_value_parameters.empty?
-              @procedure.call
+              @block.call
             else
-              @procedure.call *effective_value_parameters
+              @block.call *effective_value_parameters
             end
           else
             if effective_value_parameters.empty?
-              @procedure.call **effective_key_parameters
+              @block.call **effective_key_parameters
             else
-              @procedure.call *effective_value_parameters, **effective_key_parameters
+              @block.call *effective_value_parameters, **effective_key_parameters
             end
           end
         end
 
-        private :__call
-
         def key?(key)
           @has_key_rest || @key_parameters.include?(key)
         end

data/lib/musa-dsl/datasets/p.rb

@@ -13,7 +13,7 @@ module Musa::Datasets
 
       # TODO if instead of using clone (needed because of p.shift) we use index counter the P elements would be evaluated on the last moment
 
-      Musa::Series::E(clone, base_duration) do |p, base_duration|
+      Musa::Series::Constructors.E(clone, base_duration) do |p, base_duration|
         (p.size >= 3) ?
           { from: p.shift,
             duration: p.shift * base_duration,
@@ -22,24 +22,13 @@ module Musa::Datasets
       end
     end
 
-    def to_timed_serie(time_start = nil, base_duration: nil)
+    def to_timed_serie(time_start: nil, time_start_component: nil, base_duration: nil)
       time_start ||= 0r
-      base_duration ||= 1/4r # TODO review incoherence between neumalang 1/4r base duration for quarter notes and general 1r size of bar
-
-      # TODO if instead of using clone (needed because of p.shift) we use index counter the P elements would be evaluated on the last moment
+      time_start += self.first[time_start_component] if time_start_component
 
-      Musa::Series::E(clone, base_duration, context: { time: time_start }) do |p, base_duration, context: |
-        value = p.shift
-
-        if value
-          r = { time: context[:time], value: value } if !value.nil?
-
-          delta_time = p.shift
-          context[:time] += delta_time * base_duration if delta_time
+      base_duration ||= 1/4r # TODO review incoherence between neumalang 1/4r base duration for quarter notes and general 1r size of bar
 
-          r&.extend(AbsTimed)
-        end
-      end
+      PtoTimedSerie.new(self, base_duration, time_start)
     end
 
     def map(&block)
@@ -55,5 +44,41 @@ module Musa::Datasets
         end
       end
     end
+
+    class PtoTimedSerie
+      include Musa::Series::Serie.base
+
+      def initialize(origin, base_duration, time_start)
+        @origin = origin
+        @base_duration = base_duration
+        @time_start = time_start
+
+        init
+
+        mark_as_prototype!
+      end
+
+      attr_accessor :origin
+      attr_accessor :base_duration
+      attr_accessor :time_start
+
+      private def _init
+        @index = 0
+        @time = @time_start
+      end
+
+      private def _next_value
+        if value = @origin[@index]
+          @index += 1
+          r = { time: @time, value: value }.extend(AbsTimed)
+
+          delta_time = @origin[@index]
+          @index += 1
+          @time += delta_time * @base_duration if delta_time
+
+          r
+        end
+      end
+    end
   end
 end

data/lib/musa-dsl/datasets/score/to-mxml/process-pdv.rb

@@ -1,9 +1,9 @@
 require 'prime'
 
 module Musa::Datasets::Score::ToMXML
-  private
+  using Musa::Extension::InspectNice
 
-  def process_pdv(measure, bar, divisions_per_bar, element, pointer, logger, do_log)
+  private def process_pdv(measure, bar, divisions_per_bar, element, pointer, logger, do_log)
 
     pitch, octave, sharps = pitch_and_octave_and_sharps(element[:dataset])
 
@@ -21,24 +21,26 @@ module Musa::Datasets::Score::ToMXML
         decompose_as_sum_of_simple_durations(effective_duration))
 
     if do_log
-      logger.debug "\nprocess_pdv #{element}"
-      logger.debug ""
-      logger.debug "             pointer #{pointer} continue_from_previous #{continue_from_previous_bar} continue_to_next #{continue_to_next_bar}"
-      logger.debug "             effective_start #{effective_start} effective_duration #{effective_duration}"
-      logger.debug "             duration decomposition #{effective_duration_decomposition}"
+      logger.debug ''
+      logger.debug('process_pdv') { "processing #{element.inspect}" }
+      logger.debug { "" }
+      logger.debug { "           pointer #{pointer.inspect} continue_from_previous #{continue_from_previous_bar} continue_to_next #{continue_to_next_bar}" }
+      logger.debug { "           effective_start #{effective_start.inspect} effective_duration #{effective_duration.inspect}" }
+      logger.debug { "           duration decomposition #{effective_duration_decomposition}" }
     end
 
     if pointer > effective_start
       duration_to_go_back = (pointer - effective_start)
 
-      logger.debug "\n         ->  adding backup #{duration_to_go_back * divisions_per_bar}" if do_log
+      logger.debug ''
+      logger.debug { "       ->  adding backup #{duration_to_go_back * divisions_per_bar}" } if do_log
 
       measure.add_backup(duration_to_go_back * divisions_per_bar)
       pointer -= duration_to_go_back
 
 
     elsif pointer < effective_start
-      warn "\n         ->  adding start rest duration #{effective_start - pointer} start #{bar + pointer} finish #{bar + effective_start}" if do_log
+      logger.warn { "       ->  adding start rest duration #{effective_start - pointer} start #{bar + pointer} finish #{bar + effective_start}" } if do_log
 
       pointer = process_pdv(measure, bar, divisions_per_bar,
                             { start: bar + pointer,
@@ -125,7 +127,7 @@ module Musa::Datasets::Score::ToMXML
     pointer
   end
 
-  def pitch_and_octave_and_sharps(pdv)
+  private def pitch_and_octave_and_sharps(pdv)
     if pdv[:pitch] == :silence
       [:silence, nil, nil]
     else
@@ -143,7 +145,7 @@ module Musa::Datasets::Score::ToMXML
     end
   end
 
-  def dynamics_index_of(midi_velocity)
+  private def dynamics_index_of(midi_velocity)
     return nil unless midi_velocity
 
     # ppp = midi 16 ... fff = midi 127
@@ -153,7 +155,7 @@ module Musa::Datasets::Score::ToMXML
        .index { |r| r.cover? midi_velocity.round.to_i }
   end
 
-  def dynamics_to_string(dynamics_index)
+  private def dynamics_to_string(dynamics_index)
     return nil unless dynamics_index
     ['pppppp', 'ppppp', 'pppp', 'ppp', 'pp', 'p', 'mp', 'mf', 'f', 'ff', 'fff'][dynamics_index.round.to_i]
   end

data/lib/musa-dsl/datasets/score/to-mxml/process-ps.rb

@@ -1,13 +1,14 @@
 module Musa::Datasets::Score::ToMXML
-  private
+  using Musa::Extension::InspectNice
 
   DynamicsContext = Struct.new(:last_dynamics)
   private_constant :DynamicsContext
 
-  def process_ps(measure, element, context, logger, do_log)
+  private def process_ps(measure, element, context, logger, do_log)
     context ||= DynamicsContext.new
 
-    logger.debug "\nprocess_ps #{element}" if do_log
+    logger.debug ''
+    logger.debug('process_ps') { "processing #{element.inspect}" } if do_log
 
     case element[:dataset][:type]
     when :crescendo, :diminuendo
@@ -15,7 +16,14 @@ module Musa::Datasets::Score::ToMXML
         dynamics = dynamics_to_string(element[:dataset][:from])
 
         if dynamics != context.last_dynamics
-          measure.add_dynamics dynamics, placement: 'below' if dynamics && element[:dataset][:from] > 0
+          if dynamics
+            if element[:dataset][:from] < 0
+              logger.warn { "dynamics #{element[:dataset][:from]} not renderizable" } if do_log
+            elsif element[:dataset][:from] > 0
+              measure.add_dynamics dynamics, placement: 'below'
+            end
+          end
+
           context.last_dynamics = dynamics
         end
 
@@ -29,7 +37,16 @@ module Musa::Datasets::Score::ToMXML
 
         dynamics = dynamics_to_string(element[:dataset][:to])
 
-        measure.add_dynamics dynamics, placement: 'below' if dynamics && element[:dataset][:to] > 0
+        if dynamics != context.last_dynamics
+          if dynamics
+            if element[:dataset][:to] < 0
+              logger.warn { "dynamics #{element[:dataset][:to]} not renderizable" } if do_log
+            elsif element[:dataset][:to] > 0
+              measure.add_dynamics dynamics, placement: 'below'
+            end
+          end
+        end
+
         context.last_dynamics = dynamics
       end
 
@@ -37,7 +54,16 @@ module Musa::Datasets::Score::ToMXML
       dynamics = dynamics_to_string(element[:dataset][:from])
 
       if dynamics != context.last_dynamics
-        measure.add_dynamics dynamics, placement: 'below'
+
+
+        if dynamics
+          if element[:dataset][:from] < 0
+            logger.warn { "dynamics #{element[:dataset][:to]} not renderizable" } if do_log
+          elsif element[:dataset][:from] > 0
+            measure.add_dynamics dynamics, placement: 'below'
+          end
+        end
+
         context.last_dynamics = dynamics
       end
 

data/lib/musa-dsl/datasets/score/to-mxml/to-mxml.rb

@@ -1,5 +1,6 @@
 require_relative '../../../logger'
 require_relative '../../../musicxml'
+require_relative '../../../core-ext/inspect-nice'
 
 require_relative 'process-time'
 require_relative 'process-pdv'
@@ -10,6 +11,8 @@ module Musa::Datasets; class Score
     include Musa::MusicXML::Builder
     include Musa::Datasets
 
+    using Musa::Extension::InspectNice
+
     def to_mxml(beats_per_bar, ticks_per_beat,
                 bpm: nil,
                 title: nil,
@@ -22,7 +25,12 @@ module Musa::Datasets; class Score
       bpm ||= 90
       title ||= 'Untitled'
       creators ||= { composer: 'Unknown' }
-      logger ||= Musa::Logger::Logger.new
+
+      if logger.nil?
+        logger = Musa::Logger::Logger.new
+        logger.debug! if do_log
+      end
+
       do_log ||= nil
 
       mxml = ScorePartwise.new do |_|
@@ -54,12 +62,16 @@ module Musa::Datasets; class Score
       end
 
       if do_log
-        logger.debug"\nscore.to_mxl log:"
-        logger.debug  "-----------------"
+        logger.debug ""
+        logger.debug"score.to_mxml log:"
+        logger.debug"------------------"
       end
 
       parts.each_key do |part_id|
-        fill_part mxml.parts[part_id], beats_per_bar * ticks_per_beat, (parts.size > 1 ? part_id : nil), logger, do_log
+        fill_part mxml.parts[part_id],
+                  beats_per_bar * ticks_per_beat,
+                  (parts.size > 1 ? part_id : nil),
+                  logger, do_log
       end
 
       mxml
@@ -74,7 +86,7 @@ module Musa::Datasets; class Score
       (1..finish || 0).each do |bar|
         if do_log
           logger.debug ""
-          logger.debug msg = "filling part #{part.name} (#{instrument}): processing bar #{bar}"
+          logger.debug msg = "filling part #{part.name} (#{instrument || 'nil'}): processing bar #{bar}"
           logger.debug "-" * msg.size
         end
 
@@ -83,7 +95,7 @@ module Musa::Datasets; class Score
 
         pointer = 0r
 
-        instrument_score = subset { |dataset| dataset[:instrument] == instrument }
+        instrument_score = subset { |dataset| instrument.nil? || dataset[:instrument] == instrument }
 
         bar_elements = \
         (instrument_score.changes_between(bar, bar + 1).select { |p| p[:dataset].is_a?(PS) } +
@@ -92,7 +104,7 @@ module Musa::Datasets; class Score
                                                     e[:dataset].is_a?(PS) ? 0 : 1 ] }
 
         if pdvs.empty?
-          logger.debug "\nadded full bar silence" if do_log
+          logger.debug "\nadding full bar silence..." if do_log
 
           process_pdv(measure, bar, divisions_per_bar,
                       { start: bar,
@@ -104,7 +116,7 @@ module Musa::Datasets; class Score
         else
           first = bar_elements.first
 
-          logger.debug "\nfirst element #{first}" if do_log
+          logger.debug "\nfirst element #{first.inspect}" if do_log
 
           # TODO habrá que arreglar el cálculo de pointer cuando haya avances y retrocesos para que
           # TODO no añada silencios incorrectos al principio o al final
@@ -113,7 +125,7 @@ module Musa::Datasets; class Score
 
             silence_duration = first[:start_in_interval] - bar
 
-            logger.debug "\nadded initial silence for duration #{silence_duration}" if do_log
+            logger.debug "\nadding initial silence for duration #{silence_duration}..." if do_log
 
             pointer = process_pdv(measure, bar, divisions_per_bar,
                                   { start: bar,
@@ -124,6 +136,8 @@ module Musa::Datasets; class Score
                                   do_log)
           end
 
+          logger.debug "\nadding PDV and PS elements..." if do_log
+
           bar_elements.each do |element|
             case element[:dataset]
             when PDV
@@ -140,7 +154,7 @@ module Musa::Datasets; class Score
           if pointer < 1r
             silence_duration = 1r - pointer
 
-            logger.debug "\nadded ending silence for duration #{silence_duration}" if do_log
+            logger.debug "\nadded ending silence for duration #{silence_duration}..." if do_log
 
             process_pdv(measure, bar, divisions_per_bar,
                         { start: bar + pointer,