lib/music-transcription/part.rb in music-transcription-0.7.1 vs lib/music-transcription/part.rb in music-transcription-0.7.2

@@ -2,24 +2,28 @@
 
 module Music
 module Transcription
 
 class Part
+  include Validatable
+  
   attr_reader :start_dynamic, :dynamic_changes, :notes
   
   def initialize start_dynamic, notes: [], dynamic_changes: {}
     @notes = notes
     @start_dynamic = start_dynamic
     @dynamic_changes = dynamic_changes
     
-    d = self.duration
-    badkeys = dynamic_changes.keys.select {|k| k < 0 || k > d }
-    if badkeys.any?
-      raise ArgumentError, "dynamic profile has changes outside 0..d"
-    end
+    @check_methods = [:ensure_start_dynamic, :ensure_dynamic_change_values_range 
+      #:ensure_dynamic_change_offsets
+    ]
   end
   
+  def validatables
+    @notes + @dynamic_changes.values
+  end
+  
   def clone
     Marshal.load(Marshal.dump(self))
   end
   
   def ==(other)
@@ -28,9 +32,30 @@
     (@dynamic_changes == other.dynamic_changes)
   end
 
   def duration
     return @notes.inject(0) { |sum, note| sum + note.duration }
+  end
+  
+  def ensure_start_dynamic
+    unless @start_dynamic.between?(0,1)
+      raise RangeError, "start dynamic #{@start_dynamic} is not between 0 and 1"
+    end
+  end
+
+  #def ensure_dynamic_change_offsets
+  #  d = self.duration
+  #  outofrange = @dynamic_changes.keys.select {|k| !k.between?(0,d) }
+  #  if outofrange.any?
+  #    raise RangeError, "dynamic change offsets #{outofrange} are not between 0 and #{d}"
+  #  end
+  #end
+  
+  def ensure_dynamic_change_values_range
+    outofrange = @dynamic_changes.values.select {|v| !v.value.between?(0,1) }
+    if outofrange.any?
+      raise RangeError, "dynamic change values #{outofrange} are not between 0 and 1"
+    end
   end
 end
 
 end
 end