peas 0.1.1 → 0.2.0

data/lib/peas/integer_helper.rb

@@ -7,88 +7,88 @@ class Integer
   alias unison unisons
   
   def semitones
-    Peas::Interval::Semitone "S#{self}", self
+    Peas::Interval::Semitone "S#{self}" => self
   end
   alias semitone semitones
   
   def minor_seconds
-    Peas::Interval::Diatonic "m2x#{self}", self
+    Peas::Interval::Diatonic "m2x#{self}" => self
   end
   alias minor_second minor_seconds
   
   def wholetones
-    Peas::Interval::Wholetone "W#{self}", self * 2
+    Peas::Interval::Wholetone "W#{self}" => self * 2
   end
   alias wholetone wholetones
   
   def major_seconds
-    Peas::Interval::Diatonic "M2x#{self}", self * 2
+    Peas::Interval::Diatonic "M2x#{self}" => self * 2
   end
   alias major_second major_seconds
   
   def minor_thirds
-    Peas::Interval::Diatonic "m3x#{self}", self * 3
+    Peas::Interval::Diatonic "m3x#{self}" => self * 3
   end
   alias minor_third minor_thirds
   
   def major_thirds
-    Peas::Interval::Diatonic "M3x#{self}", self * 4
+    Peas::Interval::Diatonic "M3x#{self}" => self * 4
   end
   alias major_third major_thirds
   
   def perfect_fourths
-    Peas::Interval::Diatonic "P4x#{self}", self * 5
+    Peas::Interval::Diatonic "P4x#{self}" => self * 5
   end
   alias perfect_fourth perfect_fourths
   
   def tritones
-    # Peas::Interval::Latin "TTx#{self}", self * 6
+    # Peas::Interval::Latin "TTx#{self}" => self * 6
     self * 6
   end
   alias tritone tritones
   
   def diminished_fifths
-    Peas::Interval::Diatonic "d5x#{self}", self * 6
+    Peas::Interval::Diatonic "d5x#{self}" => self * 6
   end
   alias diminished_fifth diminished_fifths
   
   def augmented_fourths
-    Peas::Interval::Diatonic "S6x#{self}", self * 6
+    Peas::Interval::Diatonic "S6x#{self}" => self * 6
   end
   alias augmented_fourth augmented_fourths
   
   def perfect_fifths
-    Peas::Interval::Diatonic "P5x#{self}", self * 7
+    Peas::Interval::Diatonic "P5x#{self}" => self * 7
   end
   alias perfect_fifth perfect_fifths
   
   def minor_sixths
-    Peas::Interval::Diatonic "m6x#{self}", self * 8
+    Peas::Interval::Diatonic "m6x#{self}" => self * 8
   end
   alias minor_sixth minor_sixths
   
   def augmented_fifths
-    Peas::Interval::Chromatic "S8x#{self}", self * 8
+    Peas::Interval::Chromatic "S8x#{self}" => self * 8
   end
   alias augmented_fifth augmented_fifths
   
   def major_sixths
-    Peas::Interval::Diatonic "M6x#{self}", self * 9
+    Peas::Interval::Diatonic "M6x#{self}" => self * 9
   end
   alias major_sixth major_sixths
   
   def minor_sevenths
-    Peas::Interval::Diatonic "m7x#{self}", self * 10
+    Peas::Interval::Diatonic "m7x#{self}" => self * 10
   end
   alias minor_seventh minor_sevenths
   
   def major_sevenths
-    Peas::Interval::Diatonic "M7x#{self}", self * 11
+    Peas::Interval::Diatonic "M7x#{self}" => self * 11
   end
   alias major_seventh major_sevenths
   
   def octaves
-    Peas::Interval::Diatonic "P8x#{self}", self * 12
+    Peas::Interval::Diatonic "P8x#{self}" => self * 12
   end
   alias octave octaves
 end

data/lib/peas/interval.rb

@@ -4,7 +4,8 @@ require 'peas/pitch'
 module Peas
   module Interval
     # see: http://en.wikipedia.org/wiki/Interval_(music)
-    module Math
+    
+    NamedValueClass Base:Integer do
       def -(rhs)
         if [Pitch,PitchClass].include?(rhs.class)
           raise Peas::InvalidOperation, '(Interval - Pitch) has no meaning'
@@ -13,48 +14,39 @@ module Peas
         end
       end
     end
-
-    NamedValueClass 'Semitone', Fixnum do
-      include Peas::Interval::Math
-    end
+  
+    class Semitone < Base; end
     128.times do |x|
-      Semitone "S#{x}", x
+      Semitone "S#{x}" => x
     end
     
-    NamedValueClass 'Wholetone', Fixnum  do
-      include Peas::Interval::Math
-    end
+    class Wholetone < Base; end
     64.times do |x|
-      Wholetone "W#{x}", x * 2
+      Wholetone "W#{x}" => x * 2
     end
     
-    NamedValueClass 'Chromatic', Fixnum do
-      include Peas::Interval::Math
-    end
-    Chromatic :d2, 0
-    Chromatic :A1, 1
-    Chromatic :d3, 2
-    Chromatic :A2, 3
-    Chromatic :d4, 4
-    Chromatic :A3, 5
-    Chromatic :d5, 6
-    Chromatic :A4, 6
-    Chromatic :d6, 7
-    Chromatic :A5, 8
-    Chromatic :d7, 9
-    Chromatic :A6, 10
-    Chromatic :d8, 11
-    Chromatic :A7, 12
+    class Chromatic < Base; end
+    Chromatic d2: 0
+    Chromatic A1: 1
+    Chromatic d3: 2
+    Chromatic A2: 3
+    Chromatic d4: 4
+    Chromatic A3: 5
+    Chromatic d5: 6
+    Chromatic A4: 6
+    Chromatic d6: 7
+    Chromatic A5: 8
+    Chromatic d7: 9
+    Chromatic A6:10
+    Chromatic d8:11
+    Chromatic A7:12
 
-    NamedValueClass 'Latin', Fixnum do
-      include Peas::Interval::Math
-    end
-    Latin 'S',  1
-    Latin 'T',  3
-    Latin 'TT', 6
+    class Latin < Base; end
+    Latin S: 1
+    Latin T: 3
+    Latin TT:6
     
-    NamedValueClass 'Diatonic',  Fixnum do
-      include Peas::Interval::Math
+    class Diatonic < Base
       def inverse
         case @name
         when 'P1' then Diatonic::P8
@@ -82,20 +74,20 @@ module Peas
         end
       end
     end
-    Diatonic 'P1',  0 
-    Diatonic 'm2',  1 
-    Diatonic 'M2',  2 
-    Diatonic 'm3',  3 
-    Diatonic 'M3',  4 
-    Diatonic 'P4',  5 
-    Diatonic 'A4',  6 
-    Diatonic 'd5',  6 
-    Diatonic 'P5',  7 
-    Diatonic 'm6',  8 
-    Diatonic 'M6',  9 
-    Diatonic 'm7', 10
-    Diatonic 'M7', 11
-    Diatonic 'P8', 12 
+    Diatonic P1: 0 
+    Diatonic m2: 1 
+    Diatonic M2: 2 
+    Diatonic m3: 3 
+    Diatonic M3: 4 
+    Diatonic P4: 5 
+    Diatonic A4: 6 
+    Diatonic d5: 6 
+    Diatonic P5: 7 
+    Diatonic m6: 8 
+    Diatonic M6: 9 
+    Diatonic m7:10
+    Diatonic M7:11
+    Diatonic P8:12 
   end
   
   module Intervals
@@ -114,12 +106,4 @@ module Peas
     include Interval::Diatonic::NamedValues
     extend  Interval::Diatonic::NamedValues
   end
-  
-  def self.is_an_interval?(obj)
-    [Interval::Semitone,
-     Interval::Wholetone,
-     Interval::Chromatic,
-     Interval::Latin,
-     Interval::Diatonic].include? obj.class
-  end
 end

data/lib/peas/pitch.rb

@@ -3,7 +3,7 @@ require 'peas/pitch_class'
 require 'peas/interval'
 
 module Peas
-  NamedValueClass 'Pitch', Fixnum do
+  NamedValueClass Pitch:Fixnum do
     extend Forwardable
     def_delegators :pitch_class, :is_sharp?, :is_flat?, :is_natural?
 
@@ -18,7 +18,7 @@ module Peas
         end
       elsif rhs.class == PitchClass
         self.pitch_class - rhs
-      elsif Peas.is_an_interval?(rhs)
+      elsif rhs.is_a? Interval::Base
         if is_sharp?
           Pitch.sharps(self._minus(rhs))
         else
@@ -110,10 +110,10 @@ module Peas
     end
   end
   PitchClass::NamedValues::Collection.each do |pclass|
-    Pitch "#{pclass}_1", pclass, pitch_class:pclass, octave:-1
+    Pitch "#{pclass}_1" => pclass, pitch_class:pclass, octave:-1
     0.upto(9) do |octave|
       name = pclass.to_s + octave.to_s
-      Pitch name, (((octave+1)*12)+pclass), pitch_class:pclass, octave:octave
+      Pitch name => (((octave+1)*12)+pclass), pitch_class:pclass, octave:octave
     end
   end
   

data/lib/peas/pitch_class.rb

@@ -3,7 +3,7 @@ require 'named_value_class'
 module Peas
   class InvalidOperation < RuntimeError; end
   
-  NamedValueClass 'PitchClass', Fixnum do
+  NamedValueClass PitchClass:Fixnum do
     alias _minus :-
      
     def -(rhs)
@@ -19,7 +19,7 @@ module Peas
         end
       elsif rhs.class == Pitch
         self - rhs.pitch_class
-      elsif Peas.is_an_interval?(rhs)
+      elsif rhs.is_a? Interval::Base
         result = self._minus(rhs) % 12
         if is_sharp?
           PitchClass.sharps(result)
@@ -72,25 +72,25 @@ module Peas
     end
   end
   
-  PitchClass 'Bs', 0  # B sharp is just Bs
-  PitchClass 'C',  0
-  PitchClass 'Cs', 1
-  PitchClass 'Db', 1
-  PitchClass 'D',  2
-  PitchClass 'Ds', 3
-  PitchClass 'Eb', 3 
-  PitchClass 'E',  4
-  PitchClass 'Es', 5
-  PitchClass 'Fb', 4
-  PitchClass 'F',  5
-  PitchClass 'Fs', 6
-  PitchClass 'Gb', 6
-  PitchClass 'G',  7
-  PitchClass 'Gs', 8
-  PitchClass 'Ab', 8
-  PitchClass 'A',  9
-  PitchClass 'As', 10
-  PitchClass 'Bb', 10
-  PitchClass 'B',  11
-  PitchClass 'Cb', 11
+  PitchClass Bs: 0  # B sharp is just Bs
+  PitchClass C:  0
+  PitchClass Cs: 1
+  PitchClass Db: 1
+  PitchClass D:  2
+  PitchClass Ds: 3
+  PitchClass Eb: 3 
+  PitchClass E:  4
+  PitchClass Es: 5
+  PitchClass Fb: 4
+  PitchClass F:  5
+  PitchClass Fs: 6
+  PitchClass Gb: 6
+  PitchClass G:  7
+  PitchClass Gs: 8
+  PitchClass Ab: 8
+  PitchClass A:  9
+  PitchClass As: 10
+  PitchClass Bb: 10
+  PitchClass B:  11
+  PitchClass Cb: 11
 end

data/lib/peas/version.rb

@@ -1,5 +1,5 @@
 module Peas
   NAME    = 'peas'
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
   SUMMARY = 'Do math with music pitches, intervals, scales, chords and progressions in Ruby.'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peas
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000Z
+date: 2011-11-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: named_value_class
-  requirement: &2155967180 !ruby/object:Gem::Requirement
+  requirement: &2160584520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155967180
+  version_requirements: *2160584520
 description: ! 'Peas defines constants from music theory and allows one to perform
   math with them.  Currently supports pitches (as MIDI values), pitch classes, and
   intervals using semitones, wholetones, chromatic, latin or diatonic