music-transcription 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c2fc709b232296837b37e177d25e0137463190d
-  data.tar.gz: 81a65dbc071f0d8348639ac3d62a1d24f1228cf5
+  metadata.gz: 8585079e44d770cd9b479c84c0ecc3e9271cc024
+  data.tar.gz: a8eb0336f24ddc38d6a4db9ef455cb257dbf0bdd
 SHA512:
-  metadata.gz: cbce6472afdf023f80b0f96a8b504a07d7d45ad52eb669cb8364c63a088846c6c0abf05b6159bd92d77af5ce7452a8ab2054a8e590ab891ac189aa40e70a48b0
-  data.tar.gz: 926ddd4d1255da7023bf38dcbe60c51cf89b03e8cf1abf3383485d2cab6df61df0e79219d304b41af9a2ee3953d5586ab410ab39bb4dfabcbb7c5215c4d9e3fd
+  metadata.gz: c2553a91e355ae72e6a8323e6bea35ee13e52d3bcd83b107d29e898bee273b4fcea220c1a3215df26e5ea563e310ce5b180f27d7fe18cde73e3adbc0d2b73b45
+  data.tar.gz: 23e06712c82eb5dd92c4be0f77562ff2c3ed89ad6a2e2b6ce889194e7aa287c1a33b778c727a7c4d5c217defe2e6fcdc1e0da35e070a39d1337bb030d655af93

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

@@ -40,7 +40,7 @@ class Pitch
     @semitone = semitone
     @cent = cent
     @total_cents = (@octave*SEMITONES_PER_OCTAVE + @semitone)*CENTS_PER_SEMITONE + @cent
-    normalize!
+    balance!
   end
 
   # Return the pitch's frequency, which is determined by multiplying the base
@@ -96,7 +96,15 @@ class Pitch
   def transpose semitones
     Pitch.new(cent: (@total_cents + semitones * CENTS_PER_SEMITONE).round)
   end
-
+  
+  def total_semitones
+    Rational(@total_cents, CENTS_PER_SEMITONE)
+  end
+  
+  def self.from_semitones semitones
+    Pitch.new(cent: (semitones * CENTS_PER_SEMITONE).round)
+  end
+  
   def clone
     Pitch.new(cent: @total_cents)
   end
@@ -139,7 +147,7 @@ class Pitch
   private
 
   # Balance out the octave and semitone count.
-  def normalize!
+  def balance!
     centsTotal = @total_cents
     
     @octave = centsTotal / CENTS_PER_OCTAVE

data/lib/music-transcription/version.rb

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

data/spec/model/pitch_spec.rb

@@ -70,6 +70,25 @@ describe Pitch do
     end
   end
 
+  describe '.total_semitones' do
+    it 'should convert to whole/fractional total semitones value' do
+      C4.total_semitones.should eq(48)
+      C5.total_semitones.should eq(60)
+      C4.transpose(0.1).total_semitones.should eq(48.1)
+      C5.transpose(0.19).total_semitones.should eq(60.19)
+      C5.transpose(-0.19).total_semitones.should eq(59.81)
+    end
+  end
+  
+  describe '.from_semitones' do
+    it 'should convert (rounded) fractional part to cent value' do
+      Pitch.from_semitones(4).total_cents.should eq(400)
+      Pitch.from_semitones(4.11).total_cents.should eq(411)
+      Pitch.from_semitones(57.123).total_cents.should eq(5712)
+      Pitch.from_semitones(57.125).total_cents.should eq(5713)
+    end
+  end
+  
   describe '.from_ratio' do
     it 'should return a Pitch with given ratio' do
       @cases.each do |case_data|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - James Tunnell