musa-dsl 0.26.2 → 0.26.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7f400c1a2c9841fc229ddb34343788eb688c4ab627e3f5ad8d4bcb57bd9ab90
-  data.tar.gz: f0a0bf769dc19d17fc54818f83ca92174b223a503fb1f5145b996ac743bc0a1a
+  metadata.gz: 9d9154434fb485380e87cf24b6efa8ebdbaee0a223a94c2ad1988ae808b0a691
+  data.tar.gz: 6323750820c35c1ef1e8b2220d4f511bba9fafaf504dacadce14aba33ee647f2
 SHA512:
-  metadata.gz: d35323bf0ef3686f839fcbdc4683fe3c7a05e9de99b4fab7a365f55576fd125704b52833bbea89bfae11db3c70d9d34a2fb2a2400252bd6fedf1d881483000ce
-  data.tar.gz: bf02e13897e2441ce2d48c82a0ac9d1a2ba25ba244a22597597232710fb18efd688c8f5228fa94ef8956f9fea9818725c251d122dfe05086d4e745e1c745538c
+  metadata.gz: 91e4c3067db836ae8eac4f0242bb4ac1dd6ee48da8959bb4f06b8133e49065260bf316d04dc893c1e2e9cd7f1cbf57b882167868ca3f27072869f15de9962424
+  data.tar.gz: d0df67a8d02ce6ab12764cfd2478de3322a3006ada484bbbe32cef0e885eac35be2d157fda16ee7453db7b314bb93f81cb46bf83409b218b6936e673c1e4dc2a

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

@@ -3,22 +3,22 @@ require_relative 'smart-proc-binder'
 module Musa
   module Extension
     module With
-      def with(*value_parameters, **key_parameters, &block)
-        binder = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
+      def with(*value_parameters, keep_block_context: nil, **key_parameters, &block)
+        smart_block = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
 
-        send_self_as_underscore_parameter = binder.parameters[0][1] == :_ unless binder.parameters.empty?
+        send_self_as_underscore_parameter = smart_block.parameters[0][1] == :_ unless smart_block.parameters.empty?
 
-        keep_proc_context = @keep_proc_context_on_with
-        keep_proc_context ||= send_self_as_underscore_parameter
-        keep_proc_context ||= false
+        effective_keep_block_context = keep_block_context
+        effective_keep_block_context = send_self_as_underscore_parameter if effective_keep_block_context.nil?
+        effective_keep_block_context = false if effective_keep_block_context.nil?
 
-        effective_value_parameters, effective_key_parameters = binder._apply(value_parameters, key_parameters)
+        effective_value_parameters, effective_key_parameters = smart_block._apply(value_parameters, key_parameters)
 
-        if keep_proc_context
+        if effective_keep_block_context
           if send_self_as_underscore_parameter
-            binder.call(self, *effective_value_parameters, **effective_key_parameters)
+            smart_block.call(self, *effective_value_parameters, **effective_key_parameters)
           else
-            binder.call(*effective_value_parameters, **effective_key_parameters)
+            smart_block.call(*effective_value_parameters, **effective_key_parameters)
           end
         elsif effective_value_parameters.empty? && effective_key_parameters.empty?
           instance_eval &block

data/lib/musa-dsl/music/chord-definitions.rb

@@ -1,17 +1,15 @@
 require_relative 'chord-definition'
 
-include Musa::Chords
+Musa::Chords::ChordDefinition.register :maj, quality: :major, size: :triad, offsets: { root: 0, third: 4, fifth: 7 }
+Musa::Chords::ChordDefinition.register :min, quality: :minor, size: :triad, offsets: { root: 0, third: 3, fifth: 7 }
 
-ChordDefinition.register :maj, quality: :major, size: :triad, offsets: { root: 0, third: 4, fifth: 7 }
-ChordDefinition.register :min, quality: :minor, size: :triad, offsets: { root: 0, third: 3, fifth: 7 }
+Musa::Chords::ChordDefinition.register :maj7, quality: :major, size: :seventh, offsets: { root: 0, third: 4, fifth: 7, seventh: 11 }
+Musa::Chords::ChordDefinition.register :maj7, quality: :major, size: :seventh, dominant: :dominant , offsets: { root: 0, third: 4, fifth: 7, seventh: 10 }
 
-ChordDefinition.register :maj7, quality: :major, size: :seventh, offsets: { root: 0, third: 4, fifth: 7, seventh: 11 }
-ChordDefinition.register :maj7, quality: :major, size: :seventh, dominant: :dominant , offsets: { root: 0, third: 4, fifth: 7, seventh: 10 }
+Musa::Chords::ChordDefinition.register :min7, quality: :minor, size: :seventh, offsets: { root: 0, third: 3, fifth: 7, seventh: 11 }
 
-ChordDefinition.register :min7, quality: :minor, size: :seventh, offsets: { root: 0, third: 3, fifth: 7, seventh: 11 }
+Musa::Chords::ChordDefinition.register :maj9, quality: :major, size: :ninth, offsets: { root: 0, third: 4, fifth: 7, seventh: 11, ninth: 14 }
+Musa::Chords::ChordDefinition.register :min9, quality: :minor, size: :ninth, offsets: { root: 0, third: 3, fifth: 7, seventh: 11, ninth: 14 }
 
-ChordDefinition.register :maj9, quality: :major, size: :ninth, offsets: { root: 0, third: 4, fifth: 7, seventh: 11, ninth: 14 }
-ChordDefinition.register :min9, quality: :minor, size: :ninth, offsets: { root: 0, third: 3, fifth: 7, seventh: 11, ninth: 14 }
-
-ChordDefinition.register :maj11, quality: :major, size: :eleventh, offsets: { root: 0, third: 4, fifth: 7, seventh: 11, ninth: 14, eleventh: 17 }
-ChordDefinition.register :min11, quality: :minor, size: :eleventh, offsets: { root: 0, third: 3, fifth: 7, seventh: 11, ninth: 14, eleventh: 17 }
+Musa::Chords::ChordDefinition.register :maj11, quality: :major, size: :eleventh, offsets: { root: 0, third: 4, fifth: 7, seventh: 11, ninth: 14, eleventh: 17 }
+Musa::Chords::ChordDefinition.register :min11, quality: :minor, size: :eleventh, offsets: { root: 0, third: 3, fifth: 7, seventh: 11, ninth: 14, eleventh: 17 }

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

@@ -6,13 +6,14 @@ module Musa
     class REPL
       @@repl_mutex = Mutex.new
 
-      def initialize(binder = nil, port: nil, after_eval: nil, logger: nil)
+      def initialize(bind = nil, port: nil, after_eval: nil, logger: nil, highlight_exception: true)
 
-        self.binder = binder
+        self.bind = bind
 
         port ||= 1327
 
         @logger = logger || Musa::Logger::Logger.new
+        @highlight_exception = highlight_exception
 
         @block_source = nil
 
@@ -38,7 +39,7 @@ module Musa
 
                     when '#begin'
                       user_path = buffer&.string
-                      @binder.receiver.instance_variable_set(:@user_pathname, Pathname.new(user_path)) if user_path
+                      @bind.receiver.instance_variable_set(:@user_pathname, Pathname.new(user_path)) if user_path
 
                       buffer = StringIO.new
 
@@ -48,11 +49,11 @@ module Musa
 
                         begin
                           send_echo @block_source, output: @connection
-                          @binder.eval @block_source, "(repl)", 1
+                          @bind.receiver.execute @block_source, '(repl)', 1
 
                         rescue StandardError, ScriptError => e
                           @logger.warn('REPL') { 'code execution error' }
-                          @logger.warn('REPL') { e.full_message(highlight: true, order: :top) }
+                          @logger.warn('REPL') { e.full_message(highlight: @highlight_exception, order: :top) }
 
                           send_exception e, output: @connection
                         else
@@ -66,10 +67,10 @@ module Musa
 
                 rescue IOError, Errno::ECONNRESET, Errno::EPIPE => e
                   @logger.warn('REPL') { 'lost connection' }
-                  @logger.warn('REPL') { e.full_message(highlight: true, order: :top) }
+                  @logger.warn('REPL') { e.full_message(highlight: @highlight_exception, order: :top) }
 
                 ensure
-                  @logger.debug("REPL") { "closing connection (running #{@run})" }
+                  @logger.debug('REPL') { "closing connection (running #{@run})" }
                   @connection.close
                 end
 
@@ -77,24 +78,24 @@ module Musa
             end
           rescue Errno::ECONNRESET, Errno::EPIPE => e
             @logger.warn('REPL') { 'connection failure while getting server port; will retry...' }
-            @logger.warn('REPL') { e.full_message(highlight: true, order: :top) }
+            @logger.warn('REPL') { e.full_message(highlight: @highlight_exception, order: :top) }
             retry
 
           end
         end
       end
 
-      def binder=(binder)
-        raise 'Already binded' if @binder
+      def bind=(bind)
+        raise 'Already binded' if @bind
 
-        @binder = binder
+        @bind = bind
 
-        return unless @binder
+        return unless @bind
 
-        if @binder.receiver.respond_to?(:sequencer) &&
-           @binder.receiver.sequencer.respond_to?(:on_error)
+        if @bind.receiver.respond_to?(:sequencer) &&
+           @bind.receiver.sequencer.respond_to?(:on_error)
 
-          @binder.receiver.sequencer.on_error do |e|
+          @bind.receiver.sequencer.on_error do |e|
             send_exception e, output: @connection
           end
         end
@@ -130,7 +131,7 @@ module Musa
 
       def send_exception(e, output:)
 
-        @logger.error('REPL') { e.full_message(highlight: true, order: :top) }
+        @logger.error('REPL') { e.full_message(highlight: @highlight_exception, order: :top) }
 
         send output: output, command: '//error'
 
@@ -184,5 +185,15 @@ module Musa
         end
       end
     end
+
+    module CustomizableDSLContext
+      protected def binder
+        raise NotImplementedError, 'Binder method should be implemented in target namespace as def binder; @__binder ||= binding; end'
+      end
+
+      def execute(source_block, file, line)
+        binder.eval source_block, file, line
+      end
+    end
   end
 end

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

@@ -2,6 +2,8 @@ require 'forwardable'
 
 require_relative '../core-ext/with'
 
+module TEMP; end
+
 module Musa
   module Sequencer
     class Sequencer
@@ -28,7 +30,8 @@ module Musa
                      sequencer: nil,
                      logger: nil,
                      do_log: nil, do_error_log: nil, log_position_format: nil,
-                     keep_proc_context: nil,
+                     dsl_context_class: nil,
+                     keep_block_context: nil,
                      &block)
 
         @sequencer = sequencer
@@ -38,7 +41,9 @@ module Musa
                                          do_error_log: do_error_log,
                                          log_position_format: log_position_format
 
-        @dsl = DSLContext.new @sequencer, keep_proc_context: keep_proc_context
+        # dsl_context_class ||= DSLContext
+
+        @dsl = dsl_context_class.new @sequencer, keep_block_context: keep_block_context
 
         @dsl.with &block if block_given?
       end
@@ -61,16 +66,16 @@ module Musa
                        :ticks_per_bar, :logger, :debug, :inspect,
                        :run
 
-        def initialize(sequencer, keep_proc_context:)
+        def initialize(sequencer, keep_block_context:)
           @sequencer = sequencer
-          @keep_proc_context_on_with = keep_proc_context
+          @keep_block_context_on_with = keep_block_context
         end
 
         def now(*value_parameters, **key_parameters, &block)
           block ||= proc {}
 
           @sequencer.now *value_parameters, **key_parameters do |*value_args, **key_args|
-            with *value_args, **key_args, &block
+            with *value_args, **key_args, keep_block_context: @keep_block_context_on_with, &block
           end
         end
 
@@ -78,14 +83,14 @@ module Musa
           block ||= proc {}
 
           @sequencer.at *value_parameters, **key_parameters do |*value_args, **key_args|
-            with *value_args, **key_args, &block
+            with *value_args, **key_args, keep_block_context: @keep_block_context_on_with, &block
           end
         end
 
         def wait(*value_parameters, **key_parameters, &block)
           block ||= proc {}
-          @sequencer.wait *value_parameters, **key_parameters do | *values, **key_values |
-            with *values, **key_values, &block
+          @sequencer.wait *value_parameters, **key_parameters do |*values, **key_values|
+            with *values, **key_values, keep_block_context: @keep_block_context_on_with, &block
           end
         end
 
@@ -93,7 +98,7 @@ module Musa
           block ||= proc {}
 
           @sequencer.play *value_parameters, **key_parameters do |*value_args, **key_args|
-            with *value_args, **key_args, &block
+            with *value_args, **key_args, keep_block_context: @keep_block_context_on_with, &block
           end
         end
 
@@ -101,7 +106,7 @@ module Musa
           block ||= proc {}
 
           @sequencer.play_timed *value_parameters, **key_parameters do |*value_args, **key_args|
-            with *value_args, **key_args, &block
+            with *value_args, **key_args, keep_block_context: @keep_block_context_on_with, &block
           end
         end
 
@@ -110,7 +115,7 @@ module Musa
 
           @sequencer.every *value_parameters, **key_parameters do |*value_args, **key_args|
             args = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)._apply(value_args, key_args)
-            with *args.first, **args.last, &block
+            with *args.first, **args.last, keep_block_context: @keep_block_context_on_with, &block
           end
         end
 
@@ -118,12 +123,10 @@ module Musa
           block ||= proc {}
 
           @sequencer.move *value_parameters, **key_parameters do |*value_args, **key_args|
-            with *value_args, **key_args, &block
+            with *value_args, **key_args, keep_block_context: @keep_block_context_on_with, &block
           end
         end
       end
-
-      private_constant :DSLContext
     end
   end
 end

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.26.2'.freeze
+  VERSION = '0.26.5'.freeze
 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.26.2'
-  s.date        = '2021-11-25'
+  s.version     = '0.26.5'
+  s.date        = '2022-02-25'
   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.26.2
+  version: 0.26.5
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger