musa-dsl 0.23.10 → 0.23.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03b06753c72ecbea6d6b7b056996afa6defaa57e74edd389272728822c537e52
-  data.tar.gz: 6580590252818be5df7a5f42094a026897852e874ece2ce77e657a499255b2d1
+  metadata.gz: abb4a2e7ffcd4376fd2d54f73172d611fe65da0cf6406365c7341b65e0706d30
+  data.tar.gz: 84214e98aa34a365a370e7597e0a64bafb800eafd59e17a6fdd8ac840bd915de
 SHA512:
-  metadata.gz: 52a8bb01f12163cac1598946db6a60b10cb460894eac06952c82fb7b9eb32a76c6c05d1ff6b1c2133cd024253f3be5e100eec06c67afc6e0314d3bbbf2332bc2
-  data.tar.gz: a7eb355bb4d9e13523f4769d4f204f150d0eb59fb2adaf0ddc989750b42e3958f1422074d11d798df99d560990a5e005d748ad06d99205273af0bdf3cf12e5e2
+  metadata.gz: 26936f34fc5038249db6df38ee405af52ff67ff7328d47a0f1f030768c33f61f828004b3d5581adc4857e2fbca60aba628e3c2cf14b21b48e3f455b52f587efd
+  data.tar.gz: 107fbc88359e3fe58b996d3156ae09b381580807bf6e0fe51fe281a37eb1b476eeeb483eacc63cb28e7c215ebd713d30dc432304d54b3b9155ef6fc304b6a33a

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

@@ -6,12 +6,13 @@ module Musa
       def with(*value_parameters, **key_parameters, &block)
         binder = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
 
-        keep_block_context = binder.parameters[0][1] == :_ unless binder.parameters.empty?
-        keep_block_context ||= false
+        keep_proc_context = @keep_proc_context_on_with
+        keep_proc_context ||= binder.parameters[0][1] == :_ unless binder.parameters.empty?
+        keep_proc_context ||= false
 
         effective_value_parameters, effective_key_parameters = binder._apply(value_parameters, key_parameters)
 
-        if keep_block_context
+        if keep_proc_context
           binder.call(self, *effective_value_parameters, **effective_key_parameters)
         else
           if effective_value_parameters.empty? && effective_key_parameters.empty?

data/lib/musa-dsl/sequencer/base-sequencer-implementation-every.rb

@@ -3,7 +3,8 @@ module Musa::Sequencer
     private def _every(interval, control, block_procedure_binder: nil, &block)
       block ||= proc {}
 
-      block_procedure_binder ||= SmartProcBinder.new block, on_rescue: proc { |e| _rescue_error(e) }
+      block_procedure_binder ||=
+        Musa::Extension::SmartProcBinder::SmartProcBinder.new block, on_rescue: proc { |e| _rescue_error(e) }
 
       _numeric_at position, control do
         control._start_position ||= position

data/lib/musa-dsl/sequencer/base-sequencer-implementation-move.rb

@@ -1,6 +1,7 @@
-using Musa::Extension::Hashify
-using Musa::Extension::Arrayfy
+require_relative '../core-ext/arrayfy'
+require_relative '../core-ext/inspect-nice'
 
+using Musa::Extension::Arrayfy
 using Musa::Extension::InspectNice
 
 module Musa::Sequencer

data/lib/musa-dsl/sequencer/base-sequencer-implementation-play-helper.rb

@@ -1,5 +1,3 @@
-using Musa::Extension::DeepCopy
-
 module Musa
   module Sequencer
     class BaseSequencer

data/lib/musa-dsl/sequencer/base-sequencer-implementation-play-timed.rb

@@ -1,5 +1,4 @@
-using Musa::Extension::Hashify
-using Musa::Extension::Arrayfy
+require_relative '../core-ext/inspect-nice'
 
 using Musa::Extension::InspectNice
 
@@ -23,7 +22,7 @@ module Musa::Sequencer
         last_positions = hash_mode ? {} : []
       end
 
-      binder = SmartProcBinder.new(block)
+      binder = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
 
       _play_timed_step(hash_mode, component_ids, extra_attribute_names, timed_serie,
                        position, last_positions, binder, control)

data/lib/musa-dsl/sequencer/base-sequencer-implementation-play.rb

@@ -1,8 +1,6 @@
+require_relative '../core-ext/inspect-nice'
 require_relative 'base-sequencer-implementation-play-helper'
 
-using Musa::Extension::Hashify
-using Musa::Extension::Arrayfy
-
 using Musa::Extension::InspectNice
 
 module Musa::Sequencer

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

@@ -1,16 +1,10 @@
-require_relative '../core-ext/arrayfy'
 require_relative '../core-ext/smart-proc-binder'
+require_relative '../core-ext/inspect-nice'
 
-using Musa::Extension::Arrayfy
-using Musa::Extension::DeepCopy
+using Musa::Extension::InspectNice
 
 module Musa::Sequencer
   class BaseSequencer
-    include Musa::Extension::SmartProcBinder
-    include Musa::Extension::DeepCopy
-
-    using Musa::Extension::InspectNice
-
     private def _tick(position_to_run)
       @before_tick.each { |block| block.call position_to_run }
       queue = @timeslots[position_to_run]
@@ -72,7 +66,7 @@ module Musa::Sequencer
       at_position = _quantize_position(at_position)
 
       block_key_parameters_binder =
-          SmartProcBinder.new block, on_rescue: proc { |e| _rescue_error(e) }
+        Musa::Extension::SmartProcBinder::SmartProcBinder.new block, on_rescue: proc { |e| _rescue_error(e) }
 
       key_parameters = {}
       key_parameters[:control] = control if block_key_parameters_binder.key?(:control)
@@ -133,8 +127,6 @@ module Musa::Sequencer
     end
 
     class EventHandler
-      include Musa::Extension::SmartProcBinder
-
       attr_accessor :continue_parameters
 
       @@counter = 0
@@ -174,7 +166,7 @@ module Musa::Sequencer
         @handlers[event] ||= {}
 
         # TODO: add on_rescue: proc { |e| _rescue_block_error(e) } [this method is on Sequencer, not in EventHandler]
-        @handlers[event][name] = { block: SmartProcBinder.new(block), only_once: only_once }
+        @handlers[event][name] = { block: Musa::Extension::SmartProcBinder::SmartProcBinder.new(block), only_once: only_once }
       end
 
       def launch(event, *value_parameters, **key_parameters)

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

@@ -18,7 +18,7 @@ module Musa
                      :event_handler
 
       def_delegators :@dsl, :position, :quantize_position, :logger, :debug
-      def_delegators :@dsl, :with, :now, :at, :wait, :play, :play_timed, :every, :move
+      def_delegators :@dsl, :now, :at, :wait, :play, :play_timed, :every, :move
       def_delegators :@dsl, :everying, :playing, :moving
       def_delegators :@dsl, :launch, :on
       def_delegators :@dsl, :run
@@ -28,6 +28,7 @@ module Musa
                      sequencer: nil,
                      logger: nil,
                      do_log: nil, do_error_log: nil, log_position_format: nil,
+                     keep_proc_context: nil,
                      &block)
 
         @sequencer = sequencer
@@ -37,14 +38,17 @@ module Musa
                                          do_error_log: do_error_log,
                                          log_position_format: log_position_format
 
-        @dsl = DSLContext.new @sequencer
+        @dsl = DSLContext.new @sequencer, keep_proc_context: keep_proc_context
 
-        with &block if block_given?
+        @dsl.with &block if block_given?
+      end
+
+      def with(&block)
+        @dsl.with &block
       end
 
       class DSLContext
         extend Forwardable
-        include Musa::Extension::SmartProcBinder
         include Musa::Extension::With
 
         attr_reader :sequencer
@@ -57,8 +61,9 @@ module Musa
                        :ticks_per_bar, :logger, :debug, :inspect,
                        :run
 
-        def initialize(sequencer)
+        def initialize(sequencer, keep_proc_context:)
           @sequencer = sequencer
+          @keep_proc_context_on_with = keep_proc_context
         end
 
         def now(*value_parameters, **key_parameters, &block)
@@ -104,7 +109,7 @@ module Musa
           block ||= proc {}
 
           @sequencer.every *value_parameters, **key_parameters do |*value_args, **key_args|
-            args = SmartProcBinder.new(block)._apply(value_args, key_args)
+            args = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)._apply(value_args, key_args)
             with *args.first, **args.last, &block
           end
         end

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

@@ -15,7 +15,7 @@ module Musa
                  left_open: nil,
                  right_open: nil)
 
-      Series.QUANTIZE(self,
+      Series::Constructors.QUANTIZE(self,
                       reference: reference,
                       step: step,
                       value_attribute: value_attribute,

data/musa-dsl.gemspec

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