musa-dsl 0.22.6 → 0.23.0

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

@@ -5,11 +5,15 @@ require_relative 'main-serie-operations'
 
 require_relative 'array-to-serie'
 
-require_relative 'holder-serie'
 require_relative 'proxy-serie'
 require_relative 'queue-serie'
 
+require_relative 'buffer-serie'
+
+require_relative 'series-composer'
+
 require_relative 'hash-or-array-serie-splitter'
 
 require_relative 'quantizer-serie'
 require_relative 'timed-serie'
+

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

@@ -1,9 +1,9 @@
 require_relative '../datasets/e'
 
-module Musa
-  module Series
-    extend self
+require_relative 'base-series'
 
+module Musa
+  module Series::Constructors
     def TIMED_UNION(*array_of_timed_series, **hash_of_timed_series)
       raise ArgumentError, 'Can\'t union an array of series with a hash of series' if array_of_timed_series.any? && hash_of_timed_series.any?
 
@@ -17,29 +17,22 @@ module Musa
     end
 
     class TimedUnionOfArrayOfTimedSeries
-      include Serie
-
-      attr_reader :sources
+      include Series::Serie.with(sources: true)
 
       def initialize(series)
-        @sources = if series[0].prototype?
-                     series.collect(&:prototype).freeze
-                   else
-                     series.collect(&:instance)
-                   end
-
-        _restart false
-
-        mark_regarding! series[0]
+        self.sources = series
+        init
       end
 
-      private def _restart(restart_sources = true)
-        @sources.each(&:restart) if restart_sources
+      private def _init
         @sources_next_values = Array.new(@sources.size)
-
         @components = nil
       end
 
+      private def _restart
+        @sources.each(&:restart)
+      end
+
       private def _next_value
         sources_values = @sources_next_values.each_index.collect do |i|
           @sources_next_values[i] || (@sources_next_values[i] = @sources[i].next_value)
@@ -149,30 +142,27 @@ module Musa
     private_constant :TimedUnionOfArrayOfTimedSeries
 
     class TimedUnionOfHashOfTimedSeries
-      include Serie
-
-      attr_reader :sources
+      include Series::Serie.with(sources: true)
 
       def initialize(series)
-        @components = series.keys
-
-        @sources = if series.values.first.prototype?
-                     series.transform_values(&:prototype).freeze
-                   else
-                     series.transform_values(&:instance)
-                   end
-
-        _restart false
+        self.sources = series
+        init
+      end
 
-        mark_regarding! series.values.first
+      def sources=(series)
+        super
+        @components = series.keys
       end
 
-      private def _restart(restart_sources = true)
-        @sources.each_value(&:restart) if restart_sources
+      private def _init
         @sources_next_values = @components.collect { |k| [k, nil] }.to_h
         @other_attributes = nil
       end
 
+      private def _restart
+        @sources.each_value(&:restart)
+      end
+
       private def _next_value
         sources_values = {}
 
@@ -231,126 +221,123 @@ module Musa
     end
 
     private_constant :TimedUnionOfHashOfTimedSeries
+  end
 
-    module SerieOperations
-      def flatten_timed
-        TimedFlattener.new(self)
-      end
+  module Series::Operations
+    def flatten_timed
+      TimedFlattener.new(self)
+    end
 
-      def compact_timed
-        TimedCompacter.new(self)
-      end
+    def compact_timed
+      TimedCompacter.new(self)
+    end
 
-      def union_timed(*other_timed_series, key: nil, **other_key_timed_series)
-        if key && other_key_timed_series.any?
-          Series::TIMED_UNION(key => self, **other_key_timed_series)
+    def union_timed(*other_timed_series, key: nil, **other_key_timed_series)
+      if key && other_key_timed_series.any?
+        Series::Constructors.TIMED_UNION(key => self, **other_key_timed_series)
 
-        elsif other_timed_series.any? && other_key_timed_series.empty?
-          Series::TIMED_UNION(self, *other_timed_series)
+      elsif other_timed_series.any? && other_key_timed_series.empty?
+        Series::Constructors.TIMED_UNION(self, *other_timed_series)
 
-        else
-          raise ArgumentError, 'Can\'t union an array of series with a hash of series'
-        end
+      else
+        raise ArgumentError, 'Can\'t union an array of series with a hash of series'
       end
+    end
 
-      class TimedFlattener
-        include Serie
-
-        attr_reader :source
+    class TimedFlattener
+      include Series::Serie.with(source: true)
 
-        def initialize(serie)
-          @source = serie
-          mark_regarding! @source
-        end
+      def initialize(serie)
+        self.source = serie
+        init
+      end
 
-        def _restart
-          @source.restart
-        end
+      private def _restart
+        @source.restart
+      end
 
-        def _next_value
-          source_value = @source.next_value
+      private def _next_value
+        source_value = @source.next_value
 
-          if !source_value.nil?
-            time = source_value[:time]
-            source_value_value = source_value[:value]
+        if !source_value.nil?
+          time = source_value[:time]
+          source_value_value = source_value[:value]
 
-            source_value_extra = (source_value.keys - [:time, :value]).collect do |attribute_name|
-              [attribute_name, source_value[attribute_name]]
-            end.to_h
+          source_value_extra = (source_value.keys - [:time, :value]).collect do |attribute_name|
+            [attribute_name, source_value[attribute_name]]
+          end.to_h
 
-            case source_value_value
-            when Hash
-              result = {}
-              source_value_value.each_pair do |key, value|
-                result[key] = { time: time, value: value }.extend(Musa::Datasets::AbsTimed)
+          case source_value_value
+          when Hash
+            result = {}
+            source_value_value.each_pair do |key, value|
+              result[key] = { time: time, value: value }.extend(Musa::Datasets::AbsTimed)
 
-                source_value_extra.each do |attribute_name, attribute_value|
-                  result[key][attribute_name] = attribute_value[key]
-                end
+              source_value_extra.each do |attribute_name, attribute_value|
+                result[key][attribute_name] = attribute_value[key]
               end
+            end
 
-            when Array
-              result = []
-              source_value_value.each_index do |index|
-                result[index] = { time: time, value: source_value_value[index] }.extend(Musa::Datasets::AbsTimed)
+          when Array
+            result = []
+            source_value_value.each_index do |index|
+              result[index] = { time: time, value: source_value_value[index] }.extend(Musa::Datasets::AbsTimed)
 
-                source_value_extra.each do |attribute_name, attribute_value|
-                  result[index][attribute_name] = attribute_value[index]
-                end
+              source_value_extra.each do |attribute_name, attribute_value|
+                result[index][attribute_name] = attribute_value[index]
               end
-            else
-              result = source_value.clone.extend(Musa::Datasets::AbsTimed)
             end
-
-            result.extend(Musa::Datasets::AbsTimed)
           else
-            nil
+            result = source_value.clone.extend(Musa::Datasets::AbsTimed)
           end
-        end
 
-        def infinite?
-          @source.infinite?
+          result.extend(Musa::Datasets::AbsTimed)
+        else
+          nil
         end
       end
 
-      private_constant :TimedFlattener
+      def infinite?
+        @source.infinite?
+      end
     end
 
-    class TimedCompacter
-      include Serie
+    private_constant :TimedFlattener
+  end
 
-      attr_reader :source
+  class TimedCompacter
+    include Series::Serie.with(source: true)
 
-      def initialize(serie)
-        @source = serie
-        mark_regarding! @source
-      end
+    def initialize(serie)
+      self.source = serie
+      init
+    end
 
-      def _restart
-        @source.restart
-      end
+    private def _restart
+      @source.restart
+    end
 
-      def _next_value
-        while (source_value = @source.next_value) && skip_value?(source_value[:value]); end
-        source_value
-      end
+    private def _next_value
+      while (source_value = @source.next_value) && skip_value?(source_value[:value]); end
+      source_value
+    end
 
-      def infinite?
-        @source.infinite?
-      end
+    def infinite?
+      @source.infinite?
+    end
 
-      private def skip_value?(timed_value)
-        case timed_value
-        when Hash
-          timed_value.all? { |_, v| v.nil? }
-        when Array
-          timed_value.all?(&:nil?)
-        else
-          timed_value.nil?
-        end
+    private def skip_value?(timed_value)
+      case timed_value
+      when Hash
+        timed_value.all? { |_, v| v.nil? }
+      when Array
+        timed_value.all?(&:nil?)
+      else
+        timed_value.nil?
       end
     end
-
-    private_constant :TimedCompacter
   end
+
+  private_constant :TimedCompacter
 end
+

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.22.6'
-  s.date        = '2020-11-25'
+  s.version     = '0.23.0'
+  s.date        = '2021-06-29'
   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']
@@ -10,6 +10,16 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/javier-sy/musa-dsl'
   s.license     = 'LGPL-3.0'
 
+  s.required_ruby_version = '~> 2.7'
+
+  # TODO
+  #s.metadata    = {
+    # "source_code_uri" => "https://",
+    # "homepage_uri" => "",
+    # "documentation_uri" => "",
+    # "changelog_uri" => ""
+  #}
+
   s.add_runtime_dependency 'citrus', '~> 3.0.0', '>= 3.0.0'
 
   s.add_runtime_dependency 'midi-message', '~> 0.4', '>= 0.4.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.22.6
+  version: 0.23.0
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -78,7 +78,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -179,13 +178,14 @@ files:
 - lib/musa-dsl/series.rb
 - lib/musa-dsl/series/array-to-serie.rb
 - lib/musa-dsl/series/base-series.rb
+- lib/musa-dsl/series/buffer-serie.rb
 - lib/musa-dsl/series/hash-or-array-serie-splitter.rb
-- lib/musa-dsl/series/holder-serie.rb
 - lib/musa-dsl/series/main-serie-constructors.rb
 - lib/musa-dsl/series/main-serie-operations.rb
 - lib/musa-dsl/series/proxy-serie.rb
 - lib/musa-dsl/series/quantizer-serie.rb
 - lib/musa-dsl/series/queue-serie.rb
+- lib/musa-dsl/series/series-composer.rb
 - lib/musa-dsl/series/series.rb
 - lib/musa-dsl/series/timed-serie.rb
 - lib/musa-dsl/transcription.rb
@@ -212,16 +212,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A simple Ruby DSL for making complex music

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

@@ -1,87 +0,0 @@
-module Musa
-  module Series
-    # TODO: adapt to series prototyping
-
-    def HOLDER(serie = nil)
-      Holder.new(serie)
-    end
-
-    class Holder
-      include Serie
-
-      attr_reader :hold, :next
-
-      def initialize(serie)
-        @hold = serie.instance if serie
-        @next = []
-
-        mark_as_instance!
-      end
-
-      def hold=(serie)
-        @hold = serie.instance
-      end
-
-      def <<(serie)
-        if @hold.nil?
-          @hold = serie.instance
-        else
-          @next << serie.instance
-        end
-
-        self
-      end
-
-      def _prototype!
-        raise PrototypingSerieError, 'Cannot get prototype of a proxy serie'
-      end
-
-      def restart
-        if @next.empty? && @hold
-          @hold.restart
-        else
-          @hold = @next.shift
-        end
-
-        self
-      end
-
-      def current_value
-        @hold.current_value if @hold
-      end
-
-      def next_value
-        @hold.next_value if @hold
-      end
-
-      def peek_next_value
-        @hold.peek_next_value if @hold
-      end
-
-      def infinite?
-        @hold.infinite? if @hold
-      end
-
-      private
-
-      def method_missing(method_name, *args, **key_args, &block)
-        if @hold && @hold.respond_to?(method_name)
-          @hold.send method_name, *args, **key_args, &block
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(method_name, include_private)
-        @hold && @hold.respond_to?(method_name, include_private) || super
-      end
-    end
-  end
-
-  module SerieOperations
-    # TODO add test case
-    def hold
-      Series::Holder.new self
-    end
-  end
-end