music-transcription 0.5.11 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 693041857559185a3b35e513e64f5d0ec39b7d7f
-  data.tar.gz: 815fcf70a4a859adcb043b7d34cfb093f492ca71
+  metadata.gz: 9e5ce482a31fa5f96be5e43f326fcee0dc743999
+  data.tar.gz: 55401ebda9f844af86fd799ce230f7cc7a98eea3
 SHA512:
-  metadata.gz: 98e2b0d53a98619aa58e3e376ede9557e59b7b3d36d19791b749388ba64b54a416db2246eb9fb533fa40b890459743c6f764d2d40af28078be96e49047ebd2a7
-  data.tar.gz: fbe7411e757ca16a46b86d6a97ab2fde24931a620c394e37f2d69a1818dad8a364523da242f40155a725077f9707b432128e92a7951622fd8a666fb12b267449
+  metadata.gz: 93e176daaf8376649eea0ff8124e84a0cd774ed5fcb8e9196b1f05b06a7bb22086bc74e54c833aedac7b09e46f22a245bbc2cfd693a13a5a66d31fe0b00b84a8
+  data.tar.gz: 30fba405514a07bb81e0df8c54e1a71307252ca6133b255c06ea1222299a4ee8427552d8c2d9dd0f2d9088cdb1d153e798b31df66427a10cbbd726b3edfa3051

data/lib/music-transcription/change.rb

@@ -2,25 +2,32 @@ module Music
 module Transcription
 
 class Change
-  attr_accessor :value
+  attr_accessor :value, :duration
   
-  def initialize value
+  def initialize value, duration
     @value = value
+    @duration = duration
+    
+    unless duration >= 0
+      raise ArgumentError, "duration #{duration} must be >= 0"
+    end
   end
   
   def ==(other)
-    self.class == other.class && self.value == other.value
+    self.class == other.class &&
+    self.value == other.value &&
+    self.duration == other.duration
   end
 
   class Immediate < Change
     def initialize value
-      super(value)
+      super(value,0)
     end
   end
   
   class Gradual < Change
-    def initialize value
-      super(value)
+    def initialize value, transition_duration
+      super(value, transition_duration)
     end
   end
 end

data/lib/music-transcription/version.rb

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

data/spec/change_spec.rb

@@ -0,0 +1,49 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Change::Immediate do
+  context '.new' do
+    it 'should set value to given' do
+      Change::Immediate.new(5).value.should eq 5
+    end
+    
+    it 'should set duration to 0' do
+      Change::Immediate.new(5).duration.should eq 0
+    end
+  end
+    
+  describe '==' do
+    it 'should return true if two immediate changes have the same value' do
+      Change::Immediate.new(5).should eq(Change::Immediate.new(5))
+    end
+    
+    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 Change::Gradual do
+  context '.new' do
+    it 'should set value to given value' do
+      Change::Gradual.new(5,2).value.should eq 5
+    end
+    
+    it 'should set duration to given duration' do
+      Change::Gradual.new(5,2).duration.should eq 2
+    end
+  end
+    
+  describe '==' do
+    it 'should return true if two gradual changes have the same value and duration' do
+      Change::Gradual.new(5,2).should eq(Change::Gradual.new(5,2))
+    end
+    
+    it 'should return false if two gradual changes do not have the same value' do
+      Change::Gradual.new(5,2).should_not eq(Change::Gradual.new(4,2))
+    end
+    
+    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

data/spec/part_spec.rb

@@ -77,15 +77,15 @@ describe Part do
         notes: [Note::Whole.new],
         dynamic_profile: Profile.new(
           Dynamics::PPP,
-          Rational(1,8) => Change::Gradual.new(Dynamics::PP),
-          Rational(2,8) => Change::Immediate.new(Dynamics::P)
+          Rational(1,8) => Change::Gradual.new(Dynamics::PP,Rational(1,8)),
+          Rational(3,8) => Change::Immediate.new(Dynamics::P)
         )
       )
       p1.append! p2
       p1.dynamic_profile.value_changes.size.should eq 3
       p1.dynamic_profile.value_changes[Rational(1,1)].value.should eq Dynamics::PPP
       p1.dynamic_profile.value_changes[Rational(9,8)].value.should eq Dynamics::PP
-      p1.dynamic_profile.value_changes[Rational(10,8)].value.should eq Dynamics::P
+      p1.dynamic_profile.value_changes[Rational(11,8)].value.should eq Dynamics::P
     end
   end
 end

data/spec/profile_spec.rb

@@ -118,7 +118,7 @@ describe Profile do
   describe '#append!' do
     before :each do
       @p1 = Profile.new(0.0, 5.0 => Change::Immediate.new(0.1), 7.5 => Change::Immediate.new(0.2))
-      @p2 = Profile.new(0.2, 1.0 => Change::Immediate.new(0.0), 2.0 => Change::Gradual.new(100.0))
+      @p2 = Profile.new(0.2, 1.0 => Change::Immediate.new(0.0), 2.0 => Change::Gradual.new(100.0,1.0))
       @p3 = Profile.new(0.1, 1.0 => Change::Immediate.new(0.0))
     end
     

data/spec/score_spec.rb

@@ -14,7 +14,7 @@ describe Score do
     end
 
     it "should assign tempo profile given during construction" do
-      profile = Profile.new(Tempo.new(200), { 0.5 => Change::Gradual.new(120) })
+      profile = Profile.new(Tempo.new(200), 0.5 => Change::Gradual.new(Tempo.new(120),0.5) )
       score = Score.new tempo_profile: profile
       score.tempo_profile.should eq(profile)
     end    

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.6.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,6 +163,7 @@ files:
 - samples/arrangements/slur_test.yml
 - samples/arrangements/song1.yml
 - samples/arrangements/song2.yml
+- spec/change_spec.rb
 - spec/link_spec.rb
 - spec/music-transcription_spec.rb
 - spec/note_spec.rb
@@ -199,6 +200,7 @@ specification_version: 4
 summary: Classes for representing music notational features like pitch, note, loudness,
   tempo, etc.
 test_files:
+- spec/change_spec.rb
 - spec/link_spec.rb
 - spec/music-transcription_spec.rb
 - spec/note_spec.rb