music-transcription 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66c5eddd1a46c3374147365e9ec806fbfe177517
-  data.tar.gz: f8bac705a7e97be2b72d79aee5e0df6d28106068
+  metadata.gz: e410c49d0b013842573762574ed5406d7676843b
+  data.tar.gz: 425be325e12b0908c57c1897ebad82443e685f81
 SHA512:
-  metadata.gz: 106be9a38df5ced12384ffb2b52f8be9940890357d1b157e7d4fbe79aa551e3601ff0887f02c8db638a42ed4a4b2a2f931444322bb0cf211e8b32df3f73177e6
-  data.tar.gz: 1679a0dddcbdc64c4fc7a33f5a4e4ebd3b40919665d194c09db5094e11d87e2bf7cccd3354cebae1020f9736815cfca109d96e6d4ebdecd44888fe1876741df2
+  metadata.gz: 6fffac146f3b86db14687f3bd1b7e348d883351a3d368f2a192142f36951e5ae8225bd13c98c5f8fd2c2773766b162354528d82e035a350e1c0c01b6bddc75d0
+  data.tar.gz: 942d91f19af6e77d8ab61714bfe43e6c35d36e186dbd6adce002b131a6211e182c999e83a6472418d4e100156c7321569ecee6532f714e452ce4ec2f82fd544e

data/Rakefile

@@ -32,19 +32,19 @@ require 'yard'
 YARD::Rake::YardocTask.new  
 task :doc => :yard
 
-task :make_samples do
+task :make_examples do
   current_dir = Dir.getwd
-  samples_dir = File.join(File.dirname(__FILE__), 'samples')
-  Dir.chdir samples_dir
+  examples_dir = File.join(File.dirname(__FILE__), 'examples')
+  Dir.chdir examples_dir
   
-  samples = []
+  examples = []
   Dir.glob('**/make*.rb') do |file|
-    samples.push File.expand_path(file)
+    examples.push File.expand_path(file)
   end
   
-  samples.each do |sample|
-    dirname = File.dirname(sample)
-    filename = File.basename(sample)
+  examples.each do |example|
+    dirname = File.dirname(example)
+    filename = File.basename(example)
     
     Dir.chdir dirname
     ruby filename

data/lib/music-transcription/link.rb

@@ -23,19 +23,15 @@ class Link
     self.class.new @target_pitch.clone
   end
   
-  { :Slur => "=",
-    :Legato => "-",
-    :Glissando => "~",
-    :Portamento => "/",
-  }.each do |name,print_str|
+  [ :Slur,
+    :Legato,
+    :Glissando,
+    :Portamento,
+  ].each do |name|
     klass = Class.new(Link) do
       def initialize target_pitch
         super(target_pitch)
       end
-      
-      def to_s
-        print_str + @target_pitch
-      end
     end
     Link.const_set(name.to_sym, klass)
   end

data/lib/music-transcription/meter.rb

@@ -9,6 +9,11 @@ class Meter
     @beat_duration = beat_duration
     @measure_duration = beats_per_measure * beat_duration
   end
+  
+  def ==(other)
+    return (@beats_per_measure == other.beats_per_measure &&
+      @beat_duration == other.beat_duration)
+  end
 end
 
 end

data/lib/music-transcription/pitch.rb

@@ -102,7 +102,8 @@ class Pitch
   
   # Compare pitch equality using total semitone
   def ==(other)
-    self.total_semitone == other.total_semitone
+    return (self.class == other.class &&
+      self.total_semitone == other.total_semitone)
   end
   
   def eql?(other)
@@ -148,26 +149,6 @@ class Pitch
     @semitone = semitoneTotal
     return self
   end
-
-  # Produce a string representation of a pitch (e.g. "C2")
-  def to_s
-    semitone_str = case @semitone
-    when 0 then "C"
-    when 1 then "Db"
-    when 2 then "D"
-    when 3 then "Eb"
-    when 4 then "E"
-    when 5 then "F"
-    when 6 then "Gb"
-    when 7 then "G"
-    when 8 then "Ab"
-    when 9 then "A"
-    when 10 then "Bb"
-    when 11 then "B"
-    end
-    
-    return semitone_str + @octave.to_s
-  end
   
   def self.make_from_freq(freq)
     pitch = Pitch.new()
@@ -186,46 +167,3 @@ end
 
 end
 end
-
-class String
-  # Create a Pitch object from a string (e.g. "C2"). String can contain a letter (A-G),
-  # to indicate the semitone, followed by an optional sharp/flat (#/b) and then the
-  # octave number (non-negative integer).
-  def to_pitch
-    string = self
-    if string =~ /[AaBbCcDdEeFfGg][#b][\d]+/
-      semitone = letter_to_semitone string[0]
-      semitone = case string[1]
-      when "#" then semitone + 1
-      when "b" then semitone - 1
-      else raise ArgumentError, "unexpected symbol found"
-      end
-      octave = string[2..-1].to_i
-      return Music::Transcription::Pitch.new(:octave => octave, :semitone => semitone)
-    elsif string =~ /[AaBbCcDdEeFfGg][\d]+/
-      semitone = letter_to_semitone string[0]
-      octave = string[1..-1].to_i
-      return Music::Transcription::Pitch.new(:octave => octave, :semitone => semitone)
-    else
-      raise ArgumentError, "string #{string} cannot be converted to a pitch"
-    end    
-  end
-
-  private
-  
-  def letter_to_semitone letter
-    semitone = case letter
-    when /[Cc]/ then 0
-    when /[Dd]/ then 2
-    when /[Ee]/ then 4
-    when /[Ff]/ then 5
-    when /[Gg]/ then 7
-    when /[Aa]/ then 9
-    when /[Bb]/ then 11
-    else raise ArgumentError, "invalid letter \"#{letter}\" given"
-    end
-    
-    return semitone
-  end
-
-end

data/lib/music-transcription/version.rb

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

data/music-transcription.gemspec

@@ -28,4 +28,5 @@ DESCRIPTION
   gem.add_development_dependency 'yard', '~> 0.8'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'pry-nav'
+  gem.add_development_dependency 'pry-stack_explorer'
 end

data/spec/change_spec.rb

@@ -19,7 +19,14 @@ describe Change::Immediate do
     it 'should return false if two immediate changes do not have the same value' do
       Change::Immediate.new(5).should_not eq(Change::Immediate.new(4))
     end
-  end  
+  end
+  
+  describe '#to_yaml' do
+    it 'should produce YAML that can be loaded' do
+      c = Change::Immediate.new(4)
+      YAML.load(c.to_yaml).should eq c
+    end
+  end
 end
 
 describe Change::Gradual do
@@ -45,5 +52,12 @@ describe Change::Gradual do
     it 'should return false if two gradual changes do not have the same duration' do
       Change::Gradual.new(5,2).should_not eq(Change::Gradual.new(5,1))
     end
-  end  
+  end
+  
+  describe '#to_yaml' do
+    it 'should produce YAML that can be loaded' do
+      c = Change::Gradual.new(4,2)
+      YAML.load(c.to_yaml).should eq c
+    end
+  end
 end

data/spec/link_spec.rb

@@ -1,13 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Link do
-  context '.new' do
+  context '#initialize' do
     it 'should assign the given pitch to :target_pitch' do
       Link.new(C2).target_pitch.should eq(C2)
     end
   end
     
-  describe '==' do
+  describe '#==' do
     it 'should return true if two links have the same target pitch' do
       Link.new(C2).should eq(Link.new(C2))
     end
@@ -17,10 +17,17 @@ describe Link do
     end
   end
   
-  describe 'clone' do
+  describe '#clone' do
     it 'should return a link with the same target pitch' do
       l = Link.new(C4)
       l.clone.should eq(l)
     end
   end
+  
+  describe '#to_yaml' do
+    it 'should produce YAML that can be loaded' do
+      l = Link::Slur.new(C5)
+      YAML.load(l.to_yaml).should eq l
+    end
+  end
 end

data/spec/meter_spec.rb

@@ -22,4 +22,29 @@ describe Meter do
       end      
     end
   end
+  
+  describe '#==' do
+    context 'meters with same beat duration and beats per measure' do
+      it 'should return true' do
+        m1 = Meter.new(4,"1/4".to_r)
+        m2 = Meter.new(4,"1/4".to_r)
+        m1.should eq m2
+      end
+    end
+    
+    context 'meters with same meausre duration but different beat duration' do
+      it 'should return false' do
+        m1 = Meter.new(4,"1/4".to_r)
+        m2 = Meter.new(2,"1/2".to_r)
+        m1.should_not eq m2
+      end
+    end
+  end
+  
+  describe '#to_yaml' do
+    it 'should produce YAML that can be loaded' do
+      m = Meter.new(4,"1/4".to_r)
+      YAML.load(m.to_yaml).should eq m
+    end
+  end
 end

data/spec/note_spec.rb

@@ -86,4 +86,20 @@ describe Note do
       note.stretch!(1).should be note
     end
   end
+  
+  describe '#to_yaml' do
+    it 'should produce YAML that can be loaded' do
+      n = Note.new(1,[C2])
+      YAML.load(n.to_yaml).should eq n
+      
+      n = Note.new(1,[C2,E2])
+      YAML.load(n.to_yaml).should eq n
+      
+      n = Note.new(1,[C2], accent: Accents::STACCATO)
+      YAML.load(n.to_yaml).should eq n
+      
+      n = Note.new(1,[E2], links: {E2 => Link::Legato.new(F2)})
+      YAML.load(n.to_yaml).should eq n
+    end
+  end
 end

data/spec/part_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Part do
-  context '#initialize' do
+  describe '#initialize' do
     it 'should use empty containers for parameters not given' do
       p = Part.new(Dynamics::MP)
       p.notes.should be_empty
@@ -19,4 +19,11 @@ describe Part do
       p.dynamic_changes.should eq dcs
     end
   end
+  
+  describe '#to_yaml' do
+    it 'should produce YAML that can be loaded' do
+      p = Samples::SAMPLE_PART
+      YAML.load(p.to_yaml).should eq p
+    end
+  end
 end

data/spec/pitch_spec.rb

@@ -18,7 +18,7 @@ describe Pitch do
   end
   
   it "should be constructible with no parameters (no error raised)" do
-	  lambda { Pitch.new }.should_not raise_error
+    lambda { Pitch.new }.should_not raise_error
   end
   
   it "should be hash-makeable" do
@@ -101,19 +101,10 @@ describe Pitch do
     a4.freq.should be_within(0.01).of(440.0)
   end
   
-  describe 'String#to_pitch' do
-    it 'should create a Pitch object that matches the musical note' do
-      {
-	"Ab2" => Pitch.new(octave: 2, semitone: 8),
-	"C0" => Pitch.new(octave: 0, semitone: 0),
-	"db4" => Pitch.new(octave: 4, semitone: 1),
-	"F#12" => Pitch.new(octave: 12, semitone: 6),
-	"E#7" => Pitch.new(octave: 7, semitone: 5),
-	"G9" => Pitch.new(octave: 9, semitone: 7),
-	"Bb10" => Pitch.new(octave: 10, semitone: 10),
-      }.each do |str, expected_pitch|
-	str.to_pitch.should eq(expected_pitch)
-      end
+  describe '#to_yaml' do
+    it 'should produce YAML that can be loaded' do
+      p = Pitch.new(octave: 1, semitone: 2)
+      YAML.load(p.to_yaml).should eq p
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - James Tunnell
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  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'
 description: "The goal of music-transcription is the abstract representation of standard
   \nmusical features such as pitch, note, loudness, tempo, etc. Establishing\na common
   representation enables composition and performance.\n"