musa-dsl 0.23.8 → 0.23.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aedf1b2e55be310702169b869ff68a41c79d0d787002b21918c096ad18373dcf
-  data.tar.gz: 4bc6bd9694bffe3c97040e2d33e4a451accdeb5e621346c030fc699c2325ba5d
+  metadata.gz: 79f0b29dc4afd60274d8c1e5727ae70d3233b91a004a0173b57e398f152dcf56
+  data.tar.gz: 7538b77296f7185211e56b344bd3d332afb6de8b2cfa95b166737830a524c68b
 SHA512:
-  metadata.gz: 30173d87a84a7d4288ddd00f5b212a9178f6f1836f673972f4c29c6528d57231588c4e9152ce06ba24319e834aac087a25f793ca8bf862d83d8bfae898c7d620
-  data.tar.gz: de0f34c68858de9629d2e65f9c0d794c2bb122855716476130b35f921297b731facd1b039c339235ec7168bedafa1652611722cc9ac684e3f66748b5275fa101
+  metadata.gz: 91d9441bc8fb61321764876d90c7ac8079a475e4dd9ce4c12184e3262a7682bdce2cd5d66e272daa2e1e1233734d46bb9bda6232522781ab40e07f27ae5a51e7
+  data.tar.gz: c20a18071678dd0c68567de8a2f1b1b8b1a2fe1cf5d541b99bef712bce79385172e2102219d484acb5e131b25e52a94081e866c56b28736da244a48ead7d78b0

data/lib/musa-dsl/series/main-serie-constructors.rb

@@ -48,10 +48,14 @@ module Musa
       ForLoop.new from, to, step
     end
 
-    def RND(*values, from: nil, to: nil, step: nil, random: nil)
+    def RND(*_values, values: nil, from: nil, to: nil, step: nil, random: nil)
+      raise ArgumentError, "Can't use both direct values #{_values} and values named parameter #{values} at the same time." if values && !_values.empty?
+
       random = Random.new random if random.is_a?(Integer)
       random ||= Random.new
 
+      values ||= _values
+
       if !values.empty? && from.nil? && to.nil? && step.nil?
         RandomValuesFromArray.new values.explode_ranges, random
       elsif values.empty? && !to.nil?
@@ -67,10 +71,14 @@ module Musa
       Sequence.new(series)
     end
 
-    def RND1(*values, from: nil, to: nil, step: nil, random: nil)
+    def RND1(*_values, values: nil, from: nil, to: nil, step: nil, random: nil)
+      raise ArgumentError, "Can't use both direct values #{_values} and values named parameter #{values} at the same time." if values && !_values.empty?
+
       random = Random.new random if random.is_a?(Integer)
       random ||= Random.new
 
+      values ||= _values
+
       if !values.empty? && from.nil? && to.nil? && step.nil?
         RandomValueFromArray.new values.explode_ranges, random
       elsif values.empty? && !to.nil?

data/lib/musa-dsl/series/series-composer.rb

@@ -282,9 +282,18 @@ module Musa
             when Proc
               call_constructor_according_to_last_and_parameter(last.call, constructor, parameter)
 
+            when UndefinedSerie
+              case parameter
+              when Hash
+                Musa::Series::Constructors.method(constructor).call(**parameter)
+              when Array
+                Musa::Series::Constructors.method(constructor).call(*parameter)
+              else
+                raise "Unexpected parameter #{parameter} for constructor #{constructor}"
+              end
+
             when Serie
-              # TODO: ignoring last, should make an error?
-              Musa::Series::Constructors.method(constructor).call(*parameter)
+              raise "Unexpected source serie #{last} for constructor #{constructor}"
 
             when nil
               Musa::Series::Constructors.method(constructor).call(*parameter)

data/musa-dsl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.23.8'
+  s.version     = '0.23.9'
   s.date        = '2021-08-03'
   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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.23.8
+  version: 0.23.9
 platform: ruby
 authors:
 - Javier Sánchez Yeste