mml2wav 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cbdd2cc35197a65e4d8065938b269a33107958e
-  data.tar.gz: a5520c6bab70019d406db2768480202c7a283b92
+  metadata.gz: f0b325f6a24997c7eb3e5809c9d88157e8a716c9
+  data.tar.gz: 988565abd717f2d4f0da47cbfcac11f9d4946420
 SHA512:
-  metadata.gz: 6a4a662e1be6f29c0436fc9b4719497428f829be31f5ca88ba9fd94954bcfcc8c671a59563d375cde177e6c668709c8c647f04dfff7170dab80edddbaeb4018a
-  data.tar.gz: 6948108039e53bb0c81bf7a596423fd38643983f8f69d3ecb22f553ab585e0b0bf5e82d26e70a2b438b8d1a0d6f79ff366f1824b5662c343b6f0e9e49e731ad7
+  metadata.gz: b36f80ab26a4485faee59d4314d12ee2d42e6e98dfd29bee78eef9abe1c8ab234d521665847a1f89b4e9ec9ab748ac152c3381cb6ee8d6c763e9690f96c2b7ce
+  data.tar.gz: ae63294edd22fa5b5b2c8525cd73eeed9deaf2ac24294f489a11056b6a9496bd00bb21edc39e74ec7d03d668245ae3e51dde89616bd6f09d71bb3a92152b2224

data/NEWS.md

@@ -1,5 +1,15 @@
 # NEWS
 
+## 0.0.6: 2016-04-14
+
+### Improvements
+
+* Make Parser useful.
+
+### Fixes
+
+* Added missing require.
+
 ## 0.0.5: 2015-05-03
 
 ### Improvements

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+
+task :test do
+  ruby("test/run-test.rb")
+end
+
+task :default => :test

data/lib/mml2wav.rb

@@ -1,3 +1,4 @@
+require "mml2wav/parser"
 require "mml2wav/scale"
 require "mml2wav/version"
 require "mml2wav/wave"

data/lib/mml2wav/parser.rb

@@ -11,12 +11,11 @@ module Mml2wav
       @octave = options[:octave] || 4
       @default_length = options[:default_length] || 4.0
       @octave_reverse = options[:octave_reverse] || false
-      @cursor = 0
     end
 
-    def wave!
-      @cursor.upto(@sounds.size - 1) do |i|
-        sound = @sounds[i]
+    def parse
+      infos = []
+      @sounds.each do |sound|
         base_sec = 60.0 * 4
         length = @default_length
         case sound
@@ -60,23 +59,15 @@ module Mml2wav
         frequency = Scale::FREQUENCIES[sound.downcase]
         next unless frequency
         frequency *= (2 ** @octave)
-        wave = sine_wave(frequency, @sampling_rate, sec, amplitude)
-        @cursor = i + 1
-        return wave
-      end
-      nil
-    end
-
-    private
-    def sine_wave(frequency, sampling_rate, sec, amplitude=0.5)
-      max = sampling_rate * sec
-      if frequency == 0
-        return Array.new(max) { 0.0 }
-      end
-      base_x = 2.0 * Math::PI * frequency / sampling_rate
-      1.upto(max).collect do |n|
-        amplitude * Math.sin(base_x * n)
+        infos << {
+          sound: sound.downcase,
+          frequency: frequency,
+          sampling_rate: @sampling_rate,
+          sec: sec,
+          amplitude: amplitude,
+        }
       end
+      infos
     end
   end
 end

data/lib/mml2wav/version.rb

@@ -1,3 +1,3 @@
 module Mml2wav
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/mml2wav/wave.rb

@@ -27,15 +27,19 @@ module Mml2wav
         format = Format.new(n_channels, :pcm_8, sampling_rate)
         Writer.new(output_path, format) do |writer|
           buffer_format = Format.new(n_channels, :float, sampling_rate)
-          parsers = []
+          infoses = []
           soundses.each do |sounds|
-            parsers << Parser.new(sounds, sampling_rate, options)
+            infoses << Parser.new(sounds, sampling_rate, options).parse
           end
-          waves = Array.new(parsers.size) { [] }
-          loop do
-            parsers.each_with_index do |parser, i|
-              wave = parser.wave!
-              waves[i] += wave if wave
+          waves = Array.new(soundses.size) { [] }
+          0.upto(infoses.collect {|info| info.size }.max) do |infos_index|
+            infoses.each_with_index do |infos, infoses_index|
+              next unless infos[infos_index]
+              wave = sine_wave(infos[infos_index][:frequency],
+                               infos[infos_index][:sampling_rate],
+                               infos[infos_index][:sec],
+                               infos[infos_index][:amplitude])
+              waves[infoses_index] += wave
             end
             break if waves.all? {|wave| wave.empty? }
             buffer_size = waves.reject {|wave| wave.empty? }.collect(&:size).min
@@ -57,6 +61,17 @@ module Mml2wav
           end
         end
       end
+
+      def sine_wave(frequency, sampling_rate, sec, amplitude=0.5)
+        max = sampling_rate * sec
+        if frequency == 0
+          return Array.new(max) { 0.0 }
+        end
+        base_x = 2.0 * Math::PI * frequency / sampling_rate
+        1.upto(max).collect do |n|
+          amplitude * Math.sin(base_x * n)
+        end
+      end
     end
   end
 end

data/mml2wav.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("wavefile")
 
+  spec.add_development_dependency("test-unit")
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")
 end

data/test/run-test.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+base_dir = File.expand_path("..", File.dirname(__FILE__))
+lib_dir = File.join(base_dir, "lib")
+test_dir = File.join(base_dir, "test")
+$LOAD_PATH.unshift(lib_dir)
+$LOAD_PATH.unshift(test_dir)
+
+require "test-unit"
+
+exit Test::Unit::AutoRunner.run(true, test_dir)

data/test/test-parser.rb

@@ -0,0 +1,129 @@
+require "mml2wav/parser"
+
+class TestParser < Test::Unit::TestCase
+  def test_a_scale
+    parser = Mml2wav::Parser.new("c", 8000)
+    assert_equal([
+                   {
+                     sound: "c",
+                     frequency: 523.252,
+                     sampling_rate: 8000,
+                     sec: 0.5,
+                     amplitude: 0.5,
+                   },
+                 ],
+                 parser.parse)
+  end
+
+  def test_length
+    parser = Mml2wav::Parser.new("c8", 8000)
+    assert_equal([
+                   {
+                     sound: "c",
+                     frequency: 523.252,
+                     sampling_rate: 8000,
+                     sec: 0.25,
+                     amplitude: 0.5,
+                   },
+                 ],
+                 parser.parse)
+  end
+
+  def test_dot
+    parser = Mml2wav::Parser.new("c.", 8000)
+    assert_equal([
+                   {
+                     sound: "c",
+                     frequency: 523.252,
+                     sampling_rate: 8000,
+                     sec: 0.75,
+                     amplitude: 0.5,
+                   },
+                 ],
+                 parser.parse)
+  end
+
+  def test_length_with_dot
+    parser = Mml2wav::Parser.new("c8.", 8000)
+    assert_equal([
+                   {
+                     sound: "c",
+                     frequency: 523.252,
+                     sampling_rate: 8000,
+                     sec: 0.375,
+                     amplitude: 0.5,
+                   },
+                 ],
+                 parser.parse)
+  end
+
+  def test_a_tie
+    parser = Mml2wav::Parser.new("c&c", 8000, bpm: 60)
+    assert_equal([
+                   {
+                     sound: "c",
+                     frequency: 523.252,
+                     sampling_rate: 8000,
+                     sec: 2.0,
+                     amplitude: 0.5,
+                   },
+                 ],
+                 parser.parse)
+  end
+
+  def test_a_tie_with_length
+    parser = Mml2wav::Parser.new("c&c16", 8000, bpm: 60)
+    assert_equal([
+                   {
+                     sound: "c",
+                     frequency: 523.252,
+                     sampling_rate: 8000,
+                     sec: 1.25,
+                     amplitude: 0.5,
+                   },
+                 ],
+                 parser.parse)
+  end
+
+  def test_a_tie_with_dot
+    parser = Mml2wav::Parser.new("c&c.", 8000, bpm: 60)
+    assert_equal([
+                   {
+                     sound: "c",
+                     frequency: 523.252,
+                     sampling_rate: 8000,
+                     sec: 2.5,
+                     amplitude: 0.5,
+                   },
+                 ],
+                 parser.parse)
+  end
+
+  def test_a_tie_with_length_with_dot
+    parser = Mml2wav::Parser.new("c&c2.", 8000, bpm: 60)
+    assert_equal([
+                   {
+                     sound: "c",
+                     frequency: 523.252,
+                     sampling_rate: 8000,
+                     sec: 4.0,
+                     amplitude: 0.5,
+                   },
+                 ],
+                 parser.parse)
+  end
+
+  def test_ties
+    parser = Mml2wav::Parser.new("c&c&c", 8000, bpm: 60)
+    assert_equal([
+                   {
+                     sound: "c",
+                     frequency: 523.252,
+                     sampling_rate: 8000,
+                     sec: 3.0,
+                     amplitude: 0.5,
+                   },
+                 ],
+                 parser.parse)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mml2wav
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wavefile
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +89,8 @@ files:
 - lib/mml2wav/version.rb
 - lib/mml2wav/wave.rb
 - mml2wav.gemspec
+- test/run-test.rb
+- test/test-parser.rb
 homepage: https://github.com/myokoym/mml2wav
 licenses:
 - MIT
@@ -95,9 +111,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: MML (Music Macro Language) to WAV audio converter by pure Ruby.
-test_files: []
+test_files:
+- test/run-test.rb
+- test/test-parser.rb
 has_rdoc: