rhythmmml 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6910bb661fa7543e33efcc11cba0bb73c2d3b3
-  data.tar.gz: 21563af764fb579fca57f6ca78c71fd36a42fd4b
+  metadata.gz: 0d41c409deeb7f63e8c9795913be84a46ada7fe5
+  data.tar.gz: 4912abeba6c447bc3d97bcb9584d561de7aeb991
 SHA512:
-  metadata.gz: bdb8e3b03f5ea28ecada61bfdc97c3c5b1f488874330dd3b983c61787564ac13017fcb9c367f8ee543560b92c548036a21c73c8cb3fa49e255d65854ff3357f3
-  data.tar.gz: 90f1a799d48b1fe2b142fc23f641fbe452d24d5413951ca67a150975aab2756f66484b4993d9125949d0978119d02d73ac8fa75b43e0bf0b8cd4357a1ceb5abf
+  metadata.gz: a9b1c51894c35fc231359257f053563e1f9e74e53d506331fe9a986884d08d1cb9f087eed5409d6118385ed06708137721b43f74a37c96418226fe783d5e7bb8
+  data.tar.gz: 384267c1f1cbe8ae5e32e01e9d24f9a5bed03fc7644e9c73ac74774ac6a8ef6760fd56bdd64d983312f192a1d8071f0324e5cf32d98e45ec05b0b6a9bbdfa51f

data/NEWS.md

@@ -0,0 +1,21 @@
+# NEWS
+
+## 0.0.3: 2015-05-03
+
+### Improvements
+
+* Supported tie.
+
+### Fixes
+
+* Supported dot without length.
+
+## 0.0.2: 2015-04-29
+
+### Improvements
+
+* Supported Windows.
+
+## 0.0.1: 2015-04-29
+
+Initial release!

data/Rakefile

@@ -4,4 +4,8 @@ task :run do
   ruby("-I", "lib", "bin/rhythmmml")
 end
 
-task :default => :run
+task :test do
+  ruby("test/run-test.rb")
+end
+
+task :default => :test

data/lib/rhythmmml/parser.rb

@@ -3,7 +3,7 @@ require "mml2wav"
 module Rhythmmml
   class Parser
     def initialize(sounds, sampling_rate, options={})
-      pattern = /T\d+|V\d+|L\d+|[A-GR][#+-]?\d*\.?|O\d+|[><]|./i
+      pattern = /T\d+|V\d+|L\d+|[A-GR][#+-]?\d*\.?(?:&[A-GR][#+-]?\d*\.?)*|O\d+|[><]|./i
       @sounds = sounds.scan(pattern)
       @sampling_rate = sampling_rate
       @bpm = options[:bpm] || 120
@@ -30,10 +30,23 @@ module Rhythmmml
         when /\AL(\d+)/i
           @default_length = $1.to_f
           next
-        when /\A([A-GR][#+-]?)(\d+)(\.)?/i
-          length = $2.to_f
+        when /\A([A-GR][#+-]?)(\d+)?(\.)?((?:&[A-GR][#+-]?\d*\.?)*)/i
           sound = $1
-          length = @default_length / 1.5 if $3
+          length = $2.to_f if $2
+          length /= 1.5 if $3
+          sec = base_sec / length / @bpm
+          if $4
+            $4.scan(/&[A-GR][#+-]?(\d+)?(\.)?/i).each do |len, dot|
+              if len
+                sub_length = len.to_f
+              else
+                sub_length = @default_length
+              end
+              sub_length /= 1.5 if dot
+              sub_sec = base_sec / sub_length / @bpm
+              sec += sub_sec
+            end
+          end
         when /\AO(\d+)/i
           @octave = $1.to_i
           next
@@ -44,7 +57,6 @@ module Rhythmmml
           @octave -= @octave_reverse ? -1 : 1
           next
         end
-        sec = base_sec / length / @bpm
         amplitude = @velocity.to_f / 10
         frequency = Mml2wav::Scale::FREQUENCIES[sound.downcase]
         next unless frequency

data/lib/rhythmmml/version.rb

@@ -1,3 +1,3 @@
 module Rhythmmml
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/rhythmmml.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("gosu")
   spec.add_runtime_dependency("mml2wav")
 
+  spec.add_development_dependency("test-unit")
+  spec.add_development_dependency("test-unit-notify")
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")
 end

data/test/run-test.rb

@@ -0,0 +1,12 @@
+#!/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'
+require 'test/unit/notify'
+
+exit Test::Unit::AutoRunner.run(true, test_dir)

data/test/test-parser.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhythmmml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -38,6 +38,34 @@ 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: test-unit-notify
+  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
@@ -77,6 +105,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
+- NEWS.md
 - README.md
 - Rakefile
 - bin/rhythmmml
@@ -91,6 +120,8 @@ files:
 - lib/rhythmmml/version.rb
 - lib/rhythmmml/z_order.rb
 - rhythmmml.gemspec
+- test/run-test.rb
+- test/test-parser.rb
 homepage: https://github.com/myokoym/rhythmmml
 licenses:
 - MIT
@@ -115,5 +146,7 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A rhythm game for MML (Music Macro Language) by Gosu.
-test_files: []
+test_files:
+- test/run-test.rb
+- test/test-parser.rb
 has_rdoc: