xi-lang 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da981b394c4516c9f35f6f144d848fd127b62e1f7a8979128dd873c69c658319
-  data.tar.gz: 3bbf55fd2d3dd8758f4704764954929e93e6a41b0aecec69f467c831d503bba2
+  metadata.gz: da63fd14e08f6b37c4a915b77bc517b1e42d57979c336a09aebab8b2122ec798
+  data.tar.gz: 33873883823d14e5356ef6580b5dd8e34eb983f78d7c35e7634ce91a8daf4d65
 SHA512:
-  metadata.gz: b36c6dc5621bfe9823f8ecd68f66ba255c951be3c5aa1eecdb1ad9e4942906901156f330f00b0c47ca6293b1854c79f1908616a56dae6369e484322e7430fcd8
-  data.tar.gz: bd512cd619d2d849bc5dc3093e78ed69e952b6b7f6a123d8d27068334c9596152622285981ae824c71010650cf435f061fbdfe876bca3f7124967b113140c3b8
+  metadata.gz: 575c7d49a0b42294acc8c6d405354ca7060fae687375d00a0461f8b65d2d301a6515edb9cd022d86c8bc42003d6c64e677480ca4261229f96e56a1a485c092a1
+  data.tar.gz: '08d14d4326fd8b901eb3bc5012c2c12b2a4074ca357630ab5c8aaf4cc2a1f69b86f0287ed6b528915c4890210c38d2be201c115ba14ccaab27b9e0d8dae311f2'

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.13.6
+  - 2.4
+before_install: gem install bundler -v 1.17.2

data/README.md

@@ -14,7 +14,7 @@ multiple known bugs, missing features, documentation and tests.
 ## Example
 
 ```ruby
-melody = [1,4,7,8,9]
+melody = [0,3,6,7,8]
 scale = [Scale.iwato, Scale.jiao]
 
 fm.set degree: melody.p(1/2,1/8,1/8,1/8,1/16,1/8,1/8).seq(2),
@@ -28,7 +28,7 @@ fm.set degree: melody.p(1/2,1/8,1/8,1/8,1/16,1/8,1/8).seq(2),
 
 kick.set freq: s("xi.x .ix. | xi.x xx.x", 70, 200), amp: 0.8, gate: :freq
 
-clap.set n: s("..x. xyz. .x.. .xyx", 60, 61, 60).p.decelerate(2),
+clap.set n: s("..x. xyz. .x.. .xyx", 60, 61, 60).p.slow(2),
          gate: :n,
          amp: 0.35,
          pan: P.sin(16, 2) * 0.6,

data/lib/xi/core_ext/numeric.rb

@@ -10,8 +10,8 @@ module Xi::CoreExt
 
     def degree_to_key(scale, steps_per_octave)
       accidental = (self - self.to_i) * 10.0
-      inner_key = scale[(self - 1) % scale.size]
-      base_key = ((self - 1) / scale.size).to_i * steps_per_octave + inner_key
+      inner_key = scale[self % scale.size]
+      base_key = (self / scale.size).to_i * steps_per_octave + inner_key
       if accidental != 0
         base_key + accidental * (steps_per_octave / 12.0)
       else

data/lib/xi/osc.rb

@@ -1,4 +1,3 @@
-require "xi/osc/version"
 require 'osc-ruby'
 
 module Xi

data/lib/xi/pattern/generators.rb

@@ -124,13 +124,11 @@ module Xi
       # Generates values from a sinewave discretized to +quant+ events
       # for the duration of +delta+ cycles.
       #
-      # Values range from -1 to 1
-      #
-      # @see #sin1 for the same function but constrained on 0 to 1 values
+      # Values range from 0 to 1
       #
       # @example
       #   peek P.sin(8).map { |i| i.round(2) }
-      #     #=> [0.0, 0.71, 1.0, 0.71, 0.0, -0.71, -1.0, -0.71]
+      #     #=> [0.5, 0.85, 1.0, 0.85, 0.5, 0.15, 0.0, 0.15, 0.5, 0.85]
       #
       # @example +quant+ determines the size, +delta+ the total duration
       #   P.sin(8).size           #=> 8
@@ -144,28 +142,83 @@ module Xi
       def sin(quant, delta=1)
         Pattern.new(size: quant, delta: delta / quant) do |y|
           quant.times do |i|
-            y << Math.sin(i / quant * 2 * Math::PI)
+            y << (Math.sin(i / quant * 2 * Math::PI) + 1) / 2
           end
         end
       end
 
-      # Generates values from a sinewave discretized to +quant+ events
-      # for the duration of +delta+ cycles.
+      # Generates values from a sawtooth waveform, discretized to +quant+ events
+      # for the duration of +delta+ cycles
       #
       # Values range from 0 to 1
       #
-      # @see #sin
+      # @example
+      #   peek P.saw(8)
+      #     #=> [(0/1), (1/8), (1/4), (3/8), (1/2), (5/8), (3/4), (7/8), (0/1), (1/8)]
+      #
+      # @example +quant+ determines the size, +delta+ the total duration
+      #   P.saw(8).size           #=> 8
+      #   P.saw(22).duration      #=> (1/1)
+      #   P.saw(19, 2).duration   #=> (2/1)
+      #
+      # @param quant [Integer]
+      # @param delta [Integer] (default: 1)
+      # @return [Pattern]
+      #
+      def saw(quant, delta=1)
+        Pattern.new(size: quant, delta: delta / quant) do |y|
+          quant.times do |i|
+            y << i / quant
+          end
+        end
+      end
+
+      # Generates an inverse sawtooth waveform, discretized to +quant+ events
+      # for the duration of +delta+ cycles
+      #
+      # Values range from 0 to 1
+      #
+      # @see P.saw
+      #
+      # @example
+      #   peek P.isaw(8)
+      #     #=> [(1/1), (7/8), (3/4), (5/8), (1/2), (3/8), (1/4), (1/8), (1/1), (7/8)]
+      #
+      # @param quant [Integer]
+      # @param delta [Integer] (default: 1)
+      # @return [Pattern]
+      #
+      def isaw(*args)
+        -P.saw(*args) + 1
+      end
+
+      # Generates a triangle waveform, discretized to +quant+ events for the
+      # duration of +delta+ cycles
+      #
+      # Values range from 0 to 1
       #
       # @example
-      #   peek P.sin1(8).map { |i| i.round(2) }
-      #     #=> [0.5, 0.85, 1.0, 0.85, 0.5, 0.15, 0.0, 0.15]
+      #   peek P.tri(8)
+      #     #=> [(0/1), (1/4), (1/2), (3/4), (1/1), (3/4), (1/2), (1/4), (0/1), (1/4)]
       #
       # @param quant [Integer]
       # @param delta [Integer] (default: 1)
       # @return [Pattern]
       #
-      def sin1(quant, delta=1)
-        sin(quant, delta).scale(-1, 1, 0, 1)
+      def tri(quant, delta=1)
+        Pattern.new(size: quant, delta: delta / quant) do |y|
+          half_quant = quant / 2
+          up_half = half_quant.to_f.ceil
+          down_half = quant - up_half
+
+          up_half.times do |i|
+            y << i / half_quant
+          end
+          down_half.times do |i|
+            j = down_half - i
+            y << j / half_quant
+          end
+        end
       end
 
       private

data/lib/xi/pattern/transforms.rb

@@ -219,6 +219,7 @@ module Xi
       def normalize(min, max)
         map { |v| v.respond_to?(:-) ? (v - min) / (max - min) : v }
       end
+      alias_method :norm, :normalize
 
       # Scales a pattern of normalized values (0..1) to a custom range
       # +min+..+max+
@@ -239,6 +240,7 @@ module Xi
       def denormalize(min, max)
         map { |v| v.respond_to?(:*) ? (max - min) * v + min : v }
       end
+      alias_method :denorm, :denormalize
 
       # Scale from one range of values to another range of values
       #
@@ -259,36 +261,36 @@ module Xi
       # Slows down a pattern by stretching start and duration of events
       # +num+ times.
       #
-      # It is the inverse operation of #accelerate
+      # It is the inverse operation of #fast
       #
-      # @see #accelerate
+      # @see #fast
       #
       # @example
-      #   peek_events %w(a b c d).p([1/4, 1/8, 1/6]).decelerate(2)
+      #   peek_events %w(a b c d).p([1/4, 1/8, 1/6]).slow(2)
       #     #=> [E["a",0,1/2], E["b",1/2,1/4], E["c",3/4,1/3], E["d",13/12,1/2]]
       #
       # @param num [Numeric]
       # @return [Pattern]
       #
-      def decelerate(num)
+      def slow(num)
         Pattern.new(self, delta: delta.p * num)
       end
 
       # Advance a pattern by shrinking start and duration of events
       # +num+ times.
       #
-      # It is the inverse operation of #decelerate
+      # It is the inverse operation of #slow
       #
-      # @see #decelerate
+      # @see #slow
       #
       # @example
-      #   peek_events %w(a b c d).p([1/2, 1/4]).accelerate(2)
+      #   peek_events %w(a b c d).p([1/2, 1/4]).fast(2)
       #     #=> [E["a",0,1/4], E["b",1/4,1/8], E["c",3/8,1/4], E["d",5/8,1/8]]
       #
       # @param num [Numeric]
       # @return [Pattern]
       #
-      def accelerate(num)
+      def fast(num)
         Pattern.new(self, delta: delta.p / num)
       end
 

data/lib/xi/scale.rb

@@ -1,4 +1,8 @@
+require 'forwardable'
+
 class Xi::Scale
+  extend Forwardable
+
   DEGREES = {
     # TWELVE TONES PER OCTAVE
     # 5 note scales
@@ -91,7 +95,23 @@ class Xi::Scale
 
   class << self
     DEGREES.each do |name, list|
-      define_method(name) { list }
+      define_method(name) { self.new(list) }
     end
   end
+
+  attr_reader :notes
+
+  def initialize(notes)
+    @notes = notes
+  end
+
+  def_delegators :@notes, :size, :[], :to_a, :first
+
+  def p(*delta, **metadata)
+    [@notes].p(*delta, **metadata)
+  end
+
+  #def size
+    #@notes.size
+  #end
 end

data/lib/xi/stream.rb

@@ -33,8 +33,9 @@ module Xi
 
     def set(delta: nil, gate: nil, **source)
       @mutex.synchronize do
+        remove_parameters_from_prev_source(source)
         @source = source
-        @gate = gate if gate
+        @gate = gate || parameter_with_smallest_delta(source)
         @delta = delta if delta
         @reset = true unless @playing
         update_internal_structures
@@ -279,9 +280,21 @@ module Xi
         n_value, _ = enum.peek
         update_state(p, n_value)
       end
+      transform_state
       @reset = false
     end
 
+    def parameter_with_smallest_delta(source)
+      source.min_by { |param, enum|
+        delta = enum.p.delta
+        delta.is_a?(Array) ? delta.min : delta
+      }.first
+    end
+
+    def remove_parameters_from_prev_source(new_source)
+      (@source.keys - new_source.keys).each { |k| @state.delete(k) } unless @source.nil?
+    end
+
     def latency_sec
       0.05
     end

data/lib/xi/supercollider/stream.rb

@@ -22,10 +22,6 @@ module Xi::Supercollider
       at_exit { free_playing_synths }
     end
 
-    def set(params)
-      super(gate: params[:gate] || :freq, **params)
-    end
-
     def stop
       @mutex.synchronize do
         @playing_synths.each do |so_id|

data/lib/xi/supercollider.rb

@@ -1,4 +1,3 @@
-require "xi/supercollider/version"
 require "xi/supercollider/stream"
 
 module Xi

data/lib/xi/version.rb

@@ -1,3 +1,3 @@
 module Xi
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/xi.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-minitest"
+  spec.add_development_dependency "yard"
 
   spec.add_dependency 'pry'
   spec.add_dependency 'osc-ruby'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xi-lang
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Damián Silvani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2019-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +170,6 @@ files:
 - lib/xi/error_log.rb
 - lib/xi/logger.rb
 - lib/xi/osc.rb
-- lib/xi/osc/version.rb
 - lib/xi/pattern.rb
 - lib/xi/pattern/generators.rb
 - lib/xi/pattern/transforms.rb
@@ -166,7 +179,6 @@ files:
 - lib/xi/stream.rb
 - lib/xi/supercollider.rb
 - lib/xi/supercollider/stream.rb
-- lib/xi/supercollider/version.rb
 - lib/xi/tidal_clock.rb
 - lib/xi/version.rb
 - synthdefs/other.scd

data/lib/xi/osc/version.rb

@@ -1,5 +0,0 @@
-module Xi
-  module OSC
-    VERSION = "0.1.5"
-  end
-end

data/lib/xi/supercollider/version.rb

@@ -1,5 +0,0 @@
-module Xi
-  module Supercollider
-    VERSION = "0.1.6"
-  end
-end