music-transcription 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31245c605d780f4ff342ad6a33f9296a05a1dba1
-  data.tar.gz: 9be01f0138f712d589178163b62d71439f6e0c4f
+  metadata.gz: ef4e1b1a2226ec89a5a829c21bb11776da593edd
+  data.tar.gz: 57558652bbb28a3b083ff86c472c039ae1f6edc8
 SHA512:
-  metadata.gz: 80e8d7b289839c11bf75ef05e1786d1fa058c43e82f2ae67e3bae242954dca33fbd2eb2013664e481c41c5f1517a3a38664eabe45fdab187a63f7a6c30c0b917
-  data.tar.gz: dff4b97a87751abafebc8f95364b85b47d453773e838e4c3e896840d2a31b00e32ca6688e444c2a342b96e5b0d7385bba8d602e6055d7e52a2d05d86d5bcdb97
+  metadata.gz: e687171913e9eabf15d5987b874f6e2df2a51f8ffde8c0bca96345b036ce4052f5d196758bd226b60e90d4546db61524e604cce5b275bbd9b3e5fd476b0bd6c7
+  data.tar.gz: 8148701c9bd8f1251bd57b97a12fd85ef3e962b940707d772ce2d47d5e72c640886c9cee71dd72b488867ac35f584ad020d333912f3449c864a0bd50619d5b62

data/examples/hip.rb

@@ -5,9 +5,8 @@ include Music::Transcription
 include Pitches
 include Articulations
 include Meters
-include Parsing
 
-score = Score.new(FOUR_FOUR,120) do |s|
+score = MeasureScore.new(FOUR_FOUR,Tempo::BPM.new(120)) do |s|
   s.program = Program.new([0...2, 0...2,2...4,0...2])
   s.parts["lead"] = Part.new(Dynamics::MF) do |p|
     riff = "/6Bb3 /4 /12Db4= /6Db4= /36Db4 /36Eb4 /36Db4 /6Ab3 /12Db4 \
@@ -29,5 +28,5 @@ File.open("#{name}.yml", "w") do |file|
 end
 
 File.open("#{name}_packed.yml", "w") do |file|
-  file.write score.pack.to_yaml
+  file.write pack_score(score).to_yaml
 end

data/examples/hip.yml

@@ -1,4 +1,4 @@
---- !ruby/object:Music::Transcription::Score
+--- !ruby/object:Music::Transcription::MeasureScore
 start_meter: !ruby/object:Music::Transcription::Meter
   beats_per_measure: 4
   beat_duration: !ruby/object:Rational
@@ -7,8 +7,9 @@ start_meter: !ruby/object:Music::Transcription::Meter
   measure_duration: !ruby/object:Rational
     denominator: 1
     numerator: 1
-start_tempo: 120
 meter_changes: {}
+start_tempo: !ruby/object:Music::Transcription::Tempo::BPM
+  value: 120
 tempo_changes: {}
 parts:
   lead: !ruby/object:Music::Transcription::Part

data/examples/hip_packed.yml

@@ -1,7 +1,5 @@
 ---
-start_meter: 4/4
-meter_changes: {}
-start_tempo: 120
+start_tempo: 120bpm
 tempo_changes: {}
 program:
 - 0...2
@@ -20,3 +18,6 @@ parts:
       /6C3 /4 /3Bb2 /4Bb2
     start_dynamic: 0.5
     dynamic_changes: {}
+start_meter: 4/4
+meter_changes: {}
+type: Music::Transcription::MeasureScore

data/examples/missed_connection.rb

@@ -5,9 +5,8 @@ include Music::Transcription
 include Pitches
 include Articulations
 include Meters
-include Parsing
 
-score = Score.new(FOUR_FOUR, 120) do |s|
+score = MeasureScore.new(FOUR_FOUR, Tempo::BPM.new(120)) do |s|
   s.program = Program.new([0...2,0...6])
   s.parts["bass"] = Part.new(Dynamics::MF) do |p|
     p.notes =  "/4Eb2 /4 /4Bb2 /4 /4Eb2 /8 /8B2 /4Bb2 /4Ab2".to_notes
@@ -23,5 +22,5 @@ File.open("#{name}.yml", "w") do |file|
 end
 
 File.open("#{name}_packed.yml", "w") do |file|
-  file.write score.pack.to_yaml
+  file.write pack_score(score).to_yaml
 end

data/examples/missed_connection.yml

@@ -1,4 +1,4 @@
---- !ruby/object:Music::Transcription::Score
+--- !ruby/object:Music::Transcription::MeasureScore
 start_meter: !ruby/object:Music::Transcription::Meter
   beats_per_measure: 4
   beat_duration: !ruby/object:Rational
@@ -7,8 +7,9 @@ start_meter: !ruby/object:Music::Transcription::Meter
   measure_duration: !ruby/object:Rational
     denominator: 1
     numerator: 1
-start_tempo: 120
 meter_changes: {}
+start_tempo: !ruby/object:Music::Transcription::Tempo::BPM
+  value: 120
 tempo_changes: {}
 parts:
   bass: !ruby/object:Music::Transcription::Part

data/examples/missed_connection_packed.yml

@@ -1,7 +1,5 @@
 ---
-start_meter: 4/4
-meter_changes: {}
-start_tempo: 120
+start_tempo: 120bpm
 tempo_changes: {}
 program:
 - 0...2
@@ -12,3 +10,6 @@ parts:
       /8F3= /2F3 /4B2 /8 /8Gb3= /2Gb3 /8 /8Gb3= /2Gb3
     start_dynamic: 0.625
     dynamic_changes: {}
+start_meter: 4/4
+meter_changes: {}
+type: Music::Transcription::MeasureScore

data/examples/song1.rb

@@ -5,9 +5,8 @@ include Music::Transcription
 include Pitches
 include Articulations
 include Meters
-include Parsing
 
-score = Score.new(FOUR_FOUR, 120) do |s|
+score = MeasureScore.new(FOUR_FOUR, Tempo::BPM.new(120)) do |s|
   s.program = Program.new([ 0...4.0, 0...4.0 ])
   
   s.parts[1] = Part.new(Dynamics::MF) do |p|
@@ -30,5 +29,5 @@ File.open("#{name}.yml", "w") do |file|
 end
 
 File.open("#{name}_packed.yml", "w") do |file|
-  file.write score.pack.to_yaml
+  file.write pack_score(score).to_yaml
 end

data/examples/song1.yml

@@ -1,4 +1,4 @@
---- !ruby/object:Music::Transcription::Score
+--- !ruby/object:Music::Transcription::MeasureScore
 start_meter: !ruby/object:Music::Transcription::Meter
   beats_per_measure: 4
   beat_duration: !ruby/object:Rational
@@ -7,8 +7,9 @@ start_meter: !ruby/object:Music::Transcription::Meter
   measure_duration: !ruby/object:Rational
     denominator: 1
     numerator: 1
-start_tempo: 120
 meter_changes: {}
+start_tempo: !ruby/object:Music::Transcription::Tempo::BPM
+  value: 120
 tempo_changes: {}
 parts:
   1: !ruby/object:Music::Transcription::Part

data/examples/song1_packed.yml

@@ -1,7 +1,5 @@
 ---
-start_meter: 4/4
-meter_changes: {}
-start_tempo: 120
+start_tempo: 120bpm
 tempo_changes: {}
 program:
 - 0...4.0
@@ -17,3 +15,6 @@ parts:
       /8Bb3 /8Bb3 /8Bb3 /8Bb3 /4C4 /8A3 /8E4 /8=E4 /8=D4 /8C4
     start_dynamic: 0.625
     dynamic_changes: {}
+start_meter: 4/4
+meter_changes: {}
+type: Music::Transcription::MeasureScore

data/examples/song2.rb

@@ -4,9 +4,8 @@ require 'yaml'
 include Music::Transcription
 include Pitches
 include Meters
-include Parsing
 
-score = Score.new(FOUR_FOUR, 120) do |s|
+score = MeasureScore.new(FOUR_FOUR, Tempo::BPM.new(120)) do |s|
   s.program = Program.new([0...4.0, 0...4.0 ])
   
   s.parts[1] = Part.new(Dynamics::MF) do |p|
@@ -29,5 +28,5 @@ File.open("#{name}.yml", "w") do |file|
 end
 
 File.open("#{name}_packed.yml", "w") do |file|
-  file.write score.pack.to_yaml
+  file.write pack_score(score).to_yaml
 end

data/examples/song2.yml

@@ -1,4 +1,4 @@
---- !ruby/object:Music::Transcription::Score
+--- !ruby/object:Music::Transcription::MeasureScore
 start_meter: !ruby/object:Music::Transcription::Meter
   beats_per_measure: 4
   beat_duration: !ruby/object:Rational
@@ -7,8 +7,9 @@ start_meter: !ruby/object:Music::Transcription::Meter
   measure_duration: !ruby/object:Rational
     denominator: 1
     numerator: 1
-start_tempo: 120
 meter_changes: {}
+start_tempo: !ruby/object:Music::Transcription::Tempo::BPM
+  value: 120
 tempo_changes: {}
 parts:
   1: !ruby/object:Music::Transcription::Part

data/examples/song2_packed.yml

@@ -1,7 +1,5 @@
 ---
-start_meter: 4/4
-meter_changes: {}
-start_tempo: 120
+start_tempo: 120bpm
 tempo_changes: {}
 program:
 - 0...4.0
@@ -19,3 +17,6 @@ parts:
     notes: /8 /4G5 /2F5 /4 /4F5 /2Eb5 /4 /4Eb5 /2Eb5 /8 /2Eb5 /2F5
     start_dynamic: 0.625
     dynamic_changes: {}
+start_meter: 4/4
+meter_changes: {}
+type: Music::Transcription::MeasureScore

data/lib/music-transcription.rb

@@ -46,6 +46,7 @@ require 'music-transcription/packing/part_packing'
 require 'music-transcription/packing/program_packing'
 require 'music-transcription/packing/note_score_packing'
 require 'music-transcription/packing/measure_score_packing'
+require 'music-transcription/packing/score_packing'
 
 require 'music-transcription/conversion/tempo_conversion'
 require 'music-transcription/conversion/measure_note_map'

data/lib/music-transcription/model/measure_score.rb

@@ -54,7 +54,7 @@ class MeasureScore < NoteScore
   end
   
   def ==(other)
-    return super() && @start_meter == other.start_meter &&
+    return super(other) && @start_meter == other.start_meter &&
       @meter_changes == other.meter_changes
   end    
 end

data/lib/music-transcription/packing/score_packing.rb

@@ -0,0 +1,17 @@
+module Music
+module Transcription
+
+module_function
+def pack_score score
+  packing = score.pack
+  packing["type"] = score.class.to_s
+  return packing
+end
+
+def unpack_score packing
+  type = Kernel.const_get(packing["type"])
+  type.unpack(packing)
+end
+
+end
+end

data/lib/music-transcription/version.rb

@@ -2,6 +2,6 @@
 module Music
 module Transcription
   # music-transcription version
-  VERSION = "0.20.0"
+  VERSION = "0.21.0"
 end
 end

data/spec/packing/score_packing_spec.rb

@@ -0,0 +1,95 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+note_score = NoteScore.new(Tempo::QNPM.new(30)) do |s|
+  s.program = Program.new([0...2, 0...2,2...4,0...2])
+  s.parts["lead"] = Part.new(Dynamics::MF) do |p|
+    riff = "/6Bb3 /4 /12Db4= /6Db4= /36Db4 /36Eb4 /36Db4 /6Ab3 /12Db4 \
+            /6Bb3 /4 /12Db4= /4Db4=                      /8=Db4 /8C4".to_notes
+    p.notes = riff + riff.map {|n| n.transpose(2) }
+  end
+  
+  s.parts["bass"] = Part.new(Dynamics::MP) do |p|
+    riff = "/6Bb2 /4 /3Ab2 /6F2 /12Ab2 \
+            /6Bb2 /4 /3Ab2 /4Ab2".to_notes
+    p.notes = riff + riff.map {|n| n.transpose(2) }
+  end
+end
+
+measure_score = MeasureScore.new(FOUR_FOUR,Tempo::BPM.new(120)) do |s|
+  s.program = Program.new([0...2, 0...2,2...4,0...2])
+  s.parts["lead"] = Part.new(Dynamics::MF) do |p|
+    riff = "/6Bb3 /4 /12Db4= /6Db4= /36Db4 /36Eb4 /36Db4 /6Ab3 /12Db4 \
+            /6Bb3 /4 /12Db4= /4Db4=                      /8=Db4 /8C4".to_notes
+    p.notes = riff + riff.map {|n| n.transpose(2) }
+  end
+  
+  s.parts["bass"] = Part.new(Dynamics::MP) do |p|
+    riff = "/6Bb2 /4 /3Ab2 /6F2 /12Ab2 \
+            /6Bb2 /4 /3Ab2 /4Ab2".to_notes
+    p.notes = riff + riff.map {|n| n.transpose(2) }
+  end
+end
+
+describe 'pack_score' do
+  context 'give a NoteScore' do
+    before :all do
+      @packing = pack_score(note_score)
+    end
+    
+    it 'should produce a Hash' do
+      @packing.should be_a Hash
+    end
+    
+    it 'should add a "type" key' do
+      @packing.should have_key("type")
+    end
+    
+    it 'should be otherwise equal to the Hash produced by NoteScore#pack' do
+      note_score.pack.each do |k,v|
+        @packing.should have_key(k)
+        @packing[k].should eq(v)
+      end
+    end
+  end
+  
+  context 'give a MeasureScore' do
+    before :all do
+      @packing = pack_score(measure_score)
+    end
+    
+    it 'should produce a Hash' do
+      @packing.should be_a Hash
+    end
+    
+    it 'should add a "type" key' do
+      @packing.should have_key("type")
+    end
+    
+    it 'should be otherwise equal to the Hash produced by MeasureScore#pack' do
+      measure_score.pack.each do |k,v|
+        @packing.should have_key(k)
+        @packing[k].should eq(v)
+      end
+    end
+  end
+end
+
+describe 'unpack_score' do
+  context 'given packing from NoteScore#pack' do
+    it 'should return a NoteScore object equal to original' do
+      packing = pack_score(note_score)
+      score = unpack_score(packing)
+      score.should be_a NoteScore
+      score.should eq(note_score)
+    end
+  end
+  
+  context 'given packing from MeasureScore#pack' do
+    it 'should return a NoteScore object equal to original' do
+      packing = pack_score(measure_score)
+      score = unpack_score(packing)
+      score.should be_a MeasureScore
+      score.should eq(measure_score)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,7 @@ files:
 - lib/music-transcription/packing/note_score_packing.rb
 - lib/music-transcription/packing/part_packing.rb
 - lib/music-transcription/packing/program_packing.rb
+- lib/music-transcription/packing/score_packing.rb
 - lib/music-transcription/parsing/articulation_parsing.rb
 - lib/music-transcription/parsing/articulation_parsing.treetop
 - lib/music-transcription/parsing/convenience_methods.rb
@@ -248,6 +249,7 @@ files:
 - spec/packing/note_score_packing_spec.rb
 - spec/packing/part_packing_spec.rb
 - spec/packing/program_packing_spec.rb
+- spec/packing/score_packing_spec.rb
 - spec/parsing/articulation_parsing_spec.rb
 - spec/parsing/convenience_methods_spec.rb
 - spec/parsing/duration_nodes_spec.rb
@@ -313,6 +315,7 @@ test_files:
 - spec/packing/note_score_packing_spec.rb
 - spec/packing/part_packing_spec.rb
 - spec/packing/program_packing_spec.rb
+- spec/packing/score_packing_spec.rb
 - spec/parsing/articulation_parsing_spec.rb
 - spec/parsing/convenience_methods_spec.rb
 - spec/parsing/duration_nodes_spec.rb