musa-dsl 0.14.31 → 0.14.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0d0e02c2e0316db71806cd4a1370c6f7488d074c7f0c56f9debefa68e041d14
-  data.tar.gz: 4d6e5c5f7dcd225ed5cb4f2f01129fa12a15be16253f5bfcb8cedf07c1bb6296
+  metadata.gz: 38849caa61ab0d2381beb2b3dfc85686c9b7592b027dfd5a4f1f3aadae60ae7d
+  data.tar.gz: cdea129555d1bba7a5933cf71a522852463196a27fdca1ac39e10d8d0aca2dcb
 SHA512:
-  metadata.gz: d7872920c8d0b01d28ea8359a7bccb84937820dcb1ce4cb98a158c351ac46f9e5a802d5986b6e7b584f3c527dd9be65e2df75d31dc5fa7394296dc2123ed4b5d
-  data.tar.gz: a2dae59c40f1e713593a691e93ba989ee3aed3fe176b7da81e01aec579db83afc1c91d082c2915150249ab55a124c5f45f15fc99f506cc1cbdc3fb6a5d237d83
+  metadata.gz: 9ae1524d885d66a1d6dc5e1cb4d88e17d069e38cd6a98c3ce8fe4131b2fb2e2df09490e3e2fbcb657a6e35a6ce27f363734e742393d10af5300502262b8d44a1
+  data.tar.gz: 7b8186dd41f7243f2b1b168929a845efa93a6028c13ff286628b505de7515cb91b4c4861c89c1a1759ab9fb3512bb042b0e20821ff300458e9fec671b9304975

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

@@ -333,9 +333,11 @@ class Musa::BaseSequencer
     nil
   end
 
-  def _move(every: nil, from:, to: nil, step: nil, duration: nil, till: nil, right_open: nil, on_stop: nil, after_bars: nil, after: nil, &block)
+  def _move(every: nil, from:, to: nil, step: nil, duration: nil, till: nil, function: nil, right_open: nil, on_stop: nil, after_bars: nil, after: nil, &block)
 
     raise ArgumentError, "Cannot use duration: #{duration} and till: #{till} parameters at the same time. Use only one of them." if till && duration
+    raise ArgumentError, "Invalid use: 'function:' parameter is incompatible with 'step:' parameter" if function && step
+    raise ArgumentError, "Invalid use: 'function:' parameter needs 'to:' parameter not nil" if function && !to
 
     # from, to, step, every
     # from, to, step, (duration | till)
@@ -347,6 +349,10 @@ class Musa::BaseSequencer
     step = -step if step && to && ((step > 0 && to < from) || (step < 0 && from < to))
     right_open ||= false
 
+    function ||= proc { |ratio| ratio }
+    function_range = 1r
+    function_offset = 0r
+
     start_position = position
 
     if duration || till
@@ -358,12 +364,24 @@ class Musa::BaseSequencer
         every = Rational(effective_duration, steps + right_open_offset)
 
       elsif to && !step && !every
-        step = (to - from) / (effective_duration * @ticks_per_bar - right_open_offset)
+        function_range = to - from
+        function_offset = from
+
+        from = 0r
+        to = 1r
+
+        step = 1r / (effective_duration * @ticks_per_bar - right_open_offset)
         every = @tick_duration
 
       elsif to && !step && every
+        function_range = to - from
+        function_offset = from
+
+        from = 0r
+        to = 1r
+
         steps = effective_duration / every
-        step = (to - from) / (steps - right_open_offset)
+        step = 1r / (steps - right_open_offset)
 
       elsif !to && step && every
         # ok
@@ -383,7 +401,6 @@ class Musa::BaseSequencer
       end
     end
 
-
     binder = KeyParametersProcedureBinder.new(block)
 
     every_control = EveryControl.new(@event_handlers.last, capture_stdout: true, duration: duration, till: till, on_stop: on_stop, after_bars: after_bars, after: after)
@@ -399,7 +416,7 @@ class Musa::BaseSequencer
 
         parameters = binder.apply(control: control)
 
-        yield value, **parameters
+        yield function.call(value) * function_range + function_offset, **parameters
 
         if to && (value >= to && step.positive? || value <= to && step.negative?)
           control.stop

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

@@ -227,8 +227,8 @@ class Musa::BaseSequencer
     control
   end
 
-  def move(every: nil, from: nil, to: nil, step: nil, duration: nil, till: nil, right_open: nil, on_stop: nil, after_bars: nil, after: nil, &block)
-    control = _move every: every, from: from, to: to, step: step, duration: duration, till: till, right_open: right_open, on_stop: on_stop, after_bars: after_bars, after: after, &block
+  def move(every: nil, from: nil, to: nil, step: nil, duration: nil, till: nil, function: nil, right_open: nil, on_stop: nil, after_bars: nil, after: nil, &block)
+    control = _move every: every, from: from, to: to, step: step, duration: duration, till: till, function: function, right_open: right_open, on_stop: on_stop, after_bars: after_bars, after: after, &block
 
     @moving << control
 

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.14.31'
-  s.date        = '2019-10-03'
+  s.version     = '0.14.32'
+  s.date        = '2019-10-05'
   s.summary     = 'A simple Ruby DSL for making complex music'
   s.description = 'Musa-DSL: A Ruby DSL for algorithmic music composition, device language neutral (MIDI, OSC, etc)'
   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.14.31
+  version: 0.14.32
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus