musa-dsl 0.26.5 → 0.26.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9154434fb485380e87cf24b6efa8ebdbaee0a223a94c2ad1988ae808b0a691
-  data.tar.gz: 6323750820c35c1ef1e8b2220d4f511bba9fafaf504dacadce14aba33ee647f2
+  metadata.gz: a1598e463290a813acd81f7d4c2a380c2b4f904c266505efb1c0c76295a2e891
+  data.tar.gz: 7b6c53ec4109d923f6aab5a1c250672b87a0c1bcc275c0e3359e769b01dd9371
 SHA512:
-  metadata.gz: 91e4c3067db836ae8eac4f0242bb4ac1dd6ee48da8959bb4f06b8133e49065260bf316d04dc893c1e2e9cd7f1cbf57b882167868ca3f27072869f15de9962424
-  data.tar.gz: d0df67a8d02ce6ab12764cfd2478de3322a3006ada484bbbe32cef0e885eac35be2d157fda16ee7453db7b314bb93f81cb46bf83409b218b6936e673c1e4dc2a
+  metadata.gz: 8178a6d752685d3ae592c1e80374b85cba4f59ffdcc556d358d1f0c9a2787812421a74c6c247b890b80e05bf221ce3b490a60d2201361041419b0ca4e42f93cc
+  data.tar.gz: bfd208048b17a2e4f5374eedda0bd5dd5b2d6eb7268a867c63523477da6170f2a7a340d2dca8ab719467c58efd9662fed221118301d3d321c8176cb9785f380b

data/.github/workflows/gem-test-and-push.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7']
+        ruby-version: ['2.7.8']
 
     steps:
     - uses: actions/checkout@v2
@@ -32,31 +32,17 @@ jobs:
       packages: write
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 2.7
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 2.7.8
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.x
-
-#    - name: Publish to GPR
-#      run: |
-#        mkdir -p $HOME/.gem
-#        touch $HOME/.gem/credentials
-#        chmod 0600 $HOME/.gem/credentials
-#        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-#        gem build *.gemspec
-#        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
-#      env:
-#        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
-#        OWNER: ${{ github.repository_owner }}
+        ruby-version: 2.7.8
 
     - name: Publish to RubyGems
       run: |
         mkdir -p $HOME/.gem
         touch $HOME/.gem/credentials
         chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${{secrets.GEM_HOST_API_KEY}}\n" > $HOME/.gem/credentials
         gem build *.gemspec
         gem push *.gem
-      env:
-        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
 gemspec
+gem 'rubocop', group: 'development'
+gem 'rubocop', group: 'development'
+gem 'rubocop', group: 'development'

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

@@ -29,36 +29,36 @@ module Musa
           @block.parameters
         end
 
-        def call(*value_parameters, **key_parameters)
-          _call value_parameters, key_parameters
+        def call(*value_parameters, **key_parameters, &block)
+          _call value_parameters, key_parameters, block
         end
 
-        def _call(value_parameters, key_parameters = {})
+        def _call(value_parameters, key_parameters = {}, block = nil)
           if @on_rescue
             begin
-              __call value_parameters, key_parameters
+              __call value_parameters, key_parameters, block
             rescue StandardError, ScriptError => e
               @on_rescue.call e
             end
           else
-            __call value_parameters, key_parameters
+            __call value_parameters, key_parameters, block
           end
         end
 
-        private def __call(value_parameters, key_parameters = {})
+        private def __call(value_parameters, key_parameters = {}, block = nil)
           effective_value_parameters, effective_key_parameters = apply(*value_parameters, **key_parameters)
 
           if effective_key_parameters.empty?
             if effective_value_parameters.empty?
-              @block.call
+              @block.call(&block)
             else
-              @block.call *effective_value_parameters
+              @block.call(*effective_value_parameters, &block)
             end
           else
             if effective_value_parameters.empty?
-              @block.call **effective_key_parameters
+              @block.call(**effective_key_parameters, &block)
             else
-              @block.call *effective_value_parameters, **effective_key_parameters
+              @block.call(*effective_value_parameters, **effective_key_parameters, &block)
             end
           end
         end

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

@@ -45,7 +45,7 @@ module Musa::Datasets
 
     NaturalKeys = (NaturalKeys +
                    [:duration, # duration of the process (note reproduction, dynamics evolution, etc)
-                    :note_duration, # duration of the note (a staccato note is effectvely shorter than elapsed duration until next note)
+                    :note_duration, # duration of the note (a staccato note is effectively shorter than elapsed duration until next note)
                     :forward_duration # duration to wait until next event (if 0 means the next event should be executed at the same time than this one)
                    ]).freeze
 

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

@@ -109,7 +109,7 @@ module Musa::Datasets
       r
     end
 
-    def normalize_to_scale(scale, grade, sharps)
+    private def normalize_to_scale(scale, grade, sharps)
       note = scale[grade].sharp(sharps)
       background = note.background_note
 

data/lib/musa-dsl/generative/{backboner.rb → rules.rb}

@@ -1,21 +1,22 @@
 require_relative '../core-ext/smart-proc-binder'
 require_relative '../core-ext/with'
 
-# TODO hacer que pueda funcionar en tiempo real? le vas suministrando seeds y le vas diciendo qué opción has elegido (p.ej. para hacer un armonizador en tiempo real)
-# TODO esto mismo sería aplicable en otros generadores? variatio/darwin? generative-grammar? markov?
+# TODO: hacer que pueda funcionar en tiempo real? le vas suministrando seeds y le vas diciendo qué opción has elegido (p.ej. para hacer un armonizador en tiempo real)
+# TODO: esto mismo sería aplicable en otros generadores? variatio/darwin? generative-grammar? markov?
+# TODO: optimizar la llamada a .with que internamente genera cada vez un SmartProcBinder; podría generarse sólo una vez por cada &block
 
 module Musa
-  module Backboner
+  module Rules
     using Musa::Extension::Arrayfy
 
-    class Backboner
+    class Rules
       include Musa::Extension::With
 
       def initialize(&block)
         @dsl = RulesEvalContext.new(&block)
       end
 
-      def generate_possibilities(object, confirmed_node = nil, node = nil, grow_rules = nil)
+      def generate_possibilities(object, confirmed_node = nil, node = nil, grow_rules = nil, **parameters)
         node ||= Node.new
         grow_rules ||= @dsl._grow_rules
 
@@ -26,11 +27,15 @@ module Musa
         grow_rule = grow_rules.shift
 
         if grow_rule
-          grow_rule.generate_possibilities(object, history).each do |new_object|
+          grow_rule.generate_possibilities(object, history, **parameters).each do |new_object|
             new_node = Node.new new_object, node
-            new_node.mark_as_ended! if @dsl._ended? new_object
+            if @dsl._has_ending? && @dsl._ended?(new_object, history, **parameters) ||
+              !@dsl._has_ending? && grow_rules.empty?
 
-            rejection = @dsl._cut_rules.find { |cut_rule| cut_rule.rejects?(new_object, history) }
+              new_node.mark_as_ended!
+            end
+
+            rejection = @dsl._cut_rules.find { |cut_rule| cut_rule.rejects?(new_object, history, **parameters) }
             # TODO: include rejection secondary reasons in rejection message
 
             new_node.reject! rejection if rejection
@@ -41,14 +46,14 @@ module Musa
 
         unless grow_rules.empty?
           node.children.each do |node|
-            generate_possibilities node.object, confirmed_node, node, grow_rules unless node.rejected || node.ended?
+            generate_possibilities node.object, confirmed_node, node, grow_rules, **parameters unless node.rejected || node.ended?
           end
         end
 
         node
       end
 
-      def apply(object_or_list, node = nil)
+      def apply(object_or_list, node = nil, **parameters)
         list = object_or_list.arrayfy.clone
 
         node ||= Node.new
@@ -56,7 +61,7 @@ module Musa
         seed = list.shift
 
         if seed
-          result = generate_possibilities seed, node
+          result = generate_possibilities seed, node, **parameters
 
           fished = result.fish
 
@@ -64,7 +69,7 @@ module Musa
 
           fished.each do |object|
             subnode = node.add(object).mark_as_ended!
-            apply list, subnode
+            apply list, subnode, **parameters
           end
         end
 
@@ -77,11 +82,12 @@ module Musa
         attr_reader :_grow_rules, :_ended_when, :_cut_rules
 
         def initialize(&block)
+          @_grow_rules = []
+          @_cut_rules = []
           with &block
         end
 
         def grow(name, &block)
-          @_grow_rules ||= []
           @_grow_rules << GrowRule.new(name, &block)
           self
         end
@@ -92,13 +98,20 @@ module Musa
         end
 
         def cut(reason, &block)
-          @_cut_rules ||= []
           @_cut_rules << CutRule.new(reason, &block)
           self
         end
 
-        def _ended?(object)
-          instance_exec object, &@_ended_when
+        def _has_ending?
+          !@_ended_when.nil?
+        end
+
+        def _ended?(object, history, **parameters)
+          if @_ended_when
+            with object, history, **parameters, &@_ended_when
+          else
+            false
+          end
         end
 
         class GrowRule
@@ -109,10 +122,10 @@ module Musa
             @block = block
           end
 
-          def generate_possibilities(object, history)
+          def generate_possibilities(object, history, **parameters)
             # TODO: optimize context using only one instance for all genereate_possibilities calls
             context = GrowRuleEvalContext.new
-            context.with object, history, &@block
+            context.with object, history, **parameters, &@block
 
             context._branches
           end
@@ -145,10 +158,10 @@ module Musa
             @block = block
           end
 
-          def rejects?(object, history)
+          def rejects?(object, history, **parameters)
             # TODO: optimize context using only one instance for all rejects? checks
             context = CutRuleEvalContext.new
-            context.with object, history, &@block
+            context.with object, history, **parameters, &@block
 
             reasons = context._secondary_reasons.collect { |_| ("#{@reason} (#{_})" if _) || @reason }
 
@@ -203,7 +216,7 @@ module Musa
           @children.each(&:update_rejection_by_children!)
 
           if !@children.empty? && !@children.find { |n| !n.rejected }
-            reject! "Node rejected because all children are rejected"
+            reject! 'Node rejected because all children are rejected'
           end
 
           @ended = true

data/lib/musa-dsl/generative.rb

@@ -1,5 +1,5 @@
 require_relative 'generative/variatio'
 require_relative 'generative/darwin'
-require_relative 'generative/backboner'
+require_relative 'generative/rules'
 require_relative 'generative/markov'
 require_relative 'generative/generative-grammar'

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

@@ -1,3 +1,5 @@
+require 'set'
+
 module Musa
   module Chords
     class ChordDefinition
@@ -6,7 +8,7 @@ module Musa
       end
 
       def self.register(name, offsets:, **features)
-        definition = ChordDefinition.new(name, offsets: offsets, **features).freeze
+        definition = ChordDefinition.new(name, offsets: offsets, **features)
 
         @definitions ||= {}
         @definitions[definition.name] = definition
@@ -14,6 +16,9 @@ module Musa
         @features_by_value ||= {}
         definition.features.each { |k, v| @features_by_value[v] = k }
 
+        @feature_keys ||= Set[]
+        features.keys.each { |feature_name| @feature_keys << feature_name }
+
         self
       end
 
@@ -44,11 +49,16 @@ module Musa
         @features_by_value.keys
       end
 
+      def self.feature_keys
+        @feature_keys
+      end
+
       def initialize(name, offsets:, **features)
-        @name = name
-        @features = features.clone.freeze
-        @pitch_offsets = offsets.clone.freeze
-        @pitch_names = offsets.collect { |k, v| [v, k] }.to_h
+        @name = name.freeze
+        @features = features.transform_values(&:dup).transform_values(&:freeze).freeze
+        @pitch_offsets = offsets.dup.freeze
+        @pitch_names = offsets.collect { |k, v| [v, k] }.to_h.freeze
+        freeze
       end
 
       attr_reader :name, :features, :pitch_offsets, :pitch_names
@@ -57,6 +67,10 @@ module Musa
         @pitch_offsets.values.collect { |offset| root_pitch + offset }
       end
 
+      def in_scale?(scale, chord_root_pitch:)
+        !pitches(chord_root_pitch).find { |chord_pitch| scale.note_of_pitch(chord_pitch).nil? }
+      end
+
       def named_pitches(elements_or_pitches, &block)
         pitches = elements_or_pitches.collect do |element_or_pitch|
           [if block_given?
@@ -93,7 +107,7 @@ module Musa
 
       alias to_s inspect
 
-      protected
+      private
 
       def octave_reduce(pitches)
         pitches.collect { |p| p % 12 }

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

@@ -1,15 +1,23 @@
 require_relative 'chord-definition'
 
+# TODO trasladar los acordes de https://en.wikipedia.org/wiki/Chord_notation
+
 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 }
+Musa::Chords::ChordDefinition.register :dim, quality: :diminished, size: :triad, offsets: { root: 0, third: 3, fifth: 3 }
+Musa::Chords::ChordDefinition.register :aug, quality: :augmented, size: :triad, offsets: { root: 0, third: 4, fifth: 8 }
 
 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 }
-
 Musa::Chords::ChordDefinition.register :min7, quality: :minor, size: :seventh, offsets: { root: 0, third: 3, fifth: 7, seventh: 11 }
 
+Musa::Chords::ChordDefinition.register :dom7, quality: :dominant, size: :seventh, offsets: { root: 0, third: 4, fifth: 7, seventh: 10 }
+
 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 }
+Musa::Chords::ChordDefinition.register :dom9, quality: :dominant, size: :ninth, offsets: { root: 0, third: 4, fifth: 7, seventh: 10, ninth: 14 }
 
 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 }
+
+Musa::Chords::ChordDefinition.register :maj13, quality: :major, size: :eleventh, offsets: { root: 0, third: 4, fifth: 7, seventh: 11, ninth: 14, eleventh: 17 }
+Musa::Chords::ChordDefinition.register :min13, quality: :minor, size: :eleventh, offsets: { root: 0, third: 3, fifth: 7, seventh: 11, ninth: 14, eleventh: 17 }