midilib 1.2.1 → 2.0.0

data/test/test_sequence.rb

@@ -12,7 +12,7 @@ class SequenceTester < Test::Unit::TestCase
 	@seq = MIDI::Sequence.new
 	@track = MIDI::Track.new(@seq)
 	@seq.tracks << @track
-	3.times { @track.events << MIDI::NoteOnEvent.new(0, 64, 64, 100) }
+	3.times { @track.events << MIDI::NoteOn.new(0, 64, 64, 100) }
 	@track.recalc_times
     end
 

data/test/test_track.rb

@@ -12,7 +12,7 @@ class TrackTester < Test::Unit::TestCase
 	@seq = MIDI::Sequence.new
 	@track = MIDI::Track.new(@seq)
 	@seq.tracks << @track
-	3.times { @track.events << MIDI::NoteOnEvent.new(0, 64, 64, 100) }
+	3.times { @track.events << MIDI::NoteOn.new(0, 64, 64, 100) }
 	@track.recalc_times
     end
 
@@ -26,7 +26,7 @@ class TrackTester < Test::Unit::TestCase
     end
 
     def test_append_event
-	@track.events << MIDI::NoteOnEvent.new(0, 64, 64, 100)
+	@track.events << MIDI::NoteOn.new(0, 64, 64, 100)
 	@track.recalc_times
 	assert_equal(4, @track.events.length)
 	4.times { | i |
@@ -36,7 +36,7 @@ class TrackTester < Test::Unit::TestCase
 
     def test_append_list
 	@track.events +=
-	       (1..12).collect { | i | MIDI::NoteOnEvent.new(0, 64, 64, 3) }
+	       (1..12).collect { | i | MIDI::NoteOn.new(0, 64, 64, 3) }
 	@track.recalc_times
 
 	3.times { | i |
@@ -51,7 +51,7 @@ class TrackTester < Test::Unit::TestCase
     end
 
     def test_insert
-	@track.events[1,0] = MIDI::NoteOnEvent.new(0, 64, 64, 3)
+	@track.events[1,0] = MIDI::NoteOn.new(0, 64, 64, 3)
 	@track.recalc_times
 	assert_equal(100, @track.events[0].time_from_start)
 	assert_equal(103, @track.events[1].time_from_start)
@@ -60,7 +60,7 @@ class TrackTester < Test::Unit::TestCase
     end
 
     def test_merge
-	list = (1..12).collect { | i | MIDI::NoteOnEvent.new(0, 64, 64, 10) }
+	list = (1..12).collect { | i | MIDI::NoteOn.new(0, 64, 64, 10) }
 	@track.merge(list)
 	assert_equal(15, @track.events.length)
 	assert_equal(10, @track.events[0].time_from_start)
@@ -135,4 +135,38 @@ class TrackTester < Test::Unit::TestCase
 	assert_equal('foo', @track.instrument)
     end
 
+    def test_old_note_class_names
+        x = MIDI::NoteOn.new(0, 64, 64, 10)
+        assert(x.kind_of?(MIDI::NoteOnEvent))  # old name
+        x = MIDI::NoteOff.new(0, 64, 64, 10)
+        assert(x.kind_of?(MIDI::NoteOffEvent)) # old name
+    end
+
+    def test_mergesort
+        @track.events = []
+
+        # Two events with later start times but earlier in the event list
+        e2 = MIDI::NoteOff.new(0, 64, 64, 100)
+        e2.time_from_start = 100
+        @track.events << e2
+
+        e3 = MIDI::NoteOn.new(0, 64, 64, 100)
+        e3.time_from_start = 100
+        @track.events << e3
+
+        # Earliest start time, latest in the list of events
+        e1 = MIDI::NoteOn.new(0, 64, 64, 100)
+        e1.time_from_start = 0
+        @track.events << e1
+
+        # Recalc sorts. Make sure note off/note on pair at t 100 are in the
+        # correct order.
+        @track.recalc_delta_from_times
+        
+        # These tests would fail before we moved to mergesort.
+        assert_equal(e1, @track.events[0])
+        assert_equal(e2, @track.events[1])
+        assert_equal(e3, @track.events[2])
+
+    end
 end

metadata

@@ -1,19 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: midilib
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Jim Menard
-autorequire: midilib
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-06 00:00:00 -04:00
+date: 2010-10-03 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: midilib is a pure Ruby MIDI library useful for reading and writing standard MIDI files and manipulating MIDI event data.
+description: |
+  midilib is a pure Ruby MIDI library useful for reading and
+  writing standard MIDI files and manipulating MIDI event data.
+
 email: jimm@io.com
 executables: []
 
@@ -38,6 +46,85 @@ files:
 - examples/split.rb
 - examples/strings.rb
 - examples/transpose.rb
+- html/Array.html
+- html/created.rid
+- html/images/brick.png
+- html/images/brick_link.png
+- html/images/bug.png
+- html/images/bullet_black.png
+- html/images/bullet_toggle_minus.png
+- html/images/bullet_toggle_plus.png
+- html/images/date.png
+- html/images/find.png
+- html/images/loadingAnimation.gif
+- html/images/macFFBgHack.png
+- html/images/package.png
+- html/images/page_green.png
+- html/images/page_white_text.png
+- html/images/page_white_width.png
+- html/images/plugin.png
+- html/images/ruby.png
+- html/images/tag_green.png
+- html/images/wrench.png
+- html/images/wrench_orange.png
+- html/images/zoom.png
+- html/index.html
+- html/IO.html
+- html/js/darkfish.js
+- html/js/jquery.js
+- html/js/quicksearch.js
+- html/js/thickbox-compressed.js
+- html/lib/midilib/consts_rb.html
+- html/lib/midilib/event_rb.html
+- html/lib/midilib/info_rb.html
+- html/lib/midilib/io/midifile_rb.html
+- html/lib/midilib/io/seqreader_rb.html
+- html/lib/midilib/io/seqwriter_rb.html
+- html/lib/midilib/measure_rb.html
+- html/lib/midilib/sequence_rb.html
+- html/lib/midilib/track_rb.html
+- html/lib/midilib/utils_rb.html
+- html/lib/midilib_rb.html
+- html/MIDI/ActiveSense.html
+- html/MIDI/ChannelEvent.html
+- html/MIDI/ChannelPressure.html
+- html/MIDI/Clock.html
+- html/MIDI/Continue.html
+- html/MIDI/Controller.html
+- html/MIDI/Event.html
+- html/MIDI/IO/MIDIFile.html
+- html/MIDI/IO/SeqReader.html
+- html/MIDI/IO/SeqWriter.html
+- html/MIDI/IO.html
+- html/MIDI/KeySig.html
+- html/MIDI/Marker.html
+- html/MIDI/Measure.html
+- html/MIDI/Measures.html
+- html/MIDI/MetaEvent.html
+- html/MIDI/NoteEvent.html
+- html/MIDI/NoteOff.html
+- html/MIDI/NoteOn.html
+- html/MIDI/PitchBend.html
+- html/MIDI/PolyPressure.html
+- html/MIDI/ProgramChange.html
+- html/MIDI/Realtime.html
+- html/MIDI/Sequence.html
+- html/MIDI/SongPointer.html
+- html/MIDI/SongSelect.html
+- html/MIDI/Start.html
+- html/MIDI/Stop.html
+- html/MIDI/SystemCommon.html
+- html/MIDI/SystemExclusive.html
+- html/MIDI/SystemReset.html
+- html/MIDI/Tempo.html
+- html/MIDI/TimeSig.html
+- html/MIDI/Track.html
+- html/MIDI/TuneRequest.html
+- html/MIDI/Utils.html
+- html/MIDI.html
+- html/rdoc.css
+- html/README_rdoc.html
+- html/TODO_rdoc.html
 - install.rb
 - lib/midilib/consts.rb
 - lib/midilib/event.rb
@@ -59,7 +146,9 @@ files:
 - test/test_track.rb
 - test/test_varlen.rb
 has_rdoc: true
-homepage: http://midilib.rubyforge.org
+homepage: http://github.com/jimm/midilib
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -67,23 +156,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - none
 rubyforge_project: midilib
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: MIDI file and event manipulation library
 test_files: []