peas 0.1.0 → 0.1.1

data/lib/peas/interval.rb

@@ -4,18 +4,33 @@ require 'peas/pitch'
 module Peas
   module Interval
     # see: http://en.wikipedia.org/wiki/Interval_(music)
+    module Math
+      def -(rhs)
+        if [Pitch,PitchClass].include?(rhs.class)
+          raise Peas::InvalidOperation, '(Interval - Pitch) has no meaning'
+        else
+          super
+        end
+      end
+    end
 
-    NamedValueClass 'Semitone', Fixnum 
+    NamedValueClass 'Semitone', Fixnum do
+      include Peas::Interval::Math
+    end
     128.times do |x|
       Semitone "S#{x}", x
     end
     
-    NamedValueClass 'Wholetone', Fixnum 
+    NamedValueClass 'Wholetone', Fixnum  do
+      include Peas::Interval::Math
+    end
     64.times do |x|
       Wholetone "W#{x}", x * 2
     end
     
-    NamedValueClass 'Chromatic', Fixnum 
+    NamedValueClass 'Chromatic', Fixnum do
+      include Peas::Interval::Math
+    end
     Chromatic :d2, 0
     Chromatic :A1, 1
     Chromatic :d3, 2
@@ -31,12 +46,15 @@ module Peas
     Chromatic :d8, 11
     Chromatic :A7, 12
 
-    NamedValueClass 'Latin', Fixnum 
+    NamedValueClass 'Latin', Fixnum do
+      include Peas::Interval::Math
+    end
     Latin 'S',  1
     Latin 'T',  3
     Latin 'TT', 6
     
     NamedValueClass 'Diatonic',  Fixnum do
+      include Peas::Interval::Math
       def inverse
         case @name
         when 'P1' then Diatonic::P8
@@ -96,4 +114,12 @@ 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

@@ -1,10 +1,31 @@
 require 'forwardable'
 require 'peas/pitch_class'
+require 'peas/interval'
 
 module Peas
   NamedValueClass 'Pitch', Fixnum do
     extend Forwardable
     def_delegators :pitch_class, :is_sharp?, :is_flat?, :is_natural?
+
+    alias _minus :-
+     
+    def -(rhs)
+      if rhs.class == Pitch
+        if self >= rhs
+          Interval::Diatonic[super(rhs)] || Interval::Semitone[super(rhs)]
+        else
+          rhs - self
+        end
+      elsif rhs.class == PitchClass
+        self.pitch_class - rhs
+      elsif Peas.is_an_interval?(rhs)
+        if is_sharp?
+          Pitch.sharps(self._minus(rhs))
+        else
+          Pitch.flats(self._minus(rhs))
+        end
+      end
+    end
     
     def as_flat
       self.class.flats(self)

data/lib/peas/pitch_class.rb

@@ -1,7 +1,34 @@
 require 'named_value_class'
 
 module Peas
+  class InvalidOperation < RuntimeError; end
+  
   NamedValueClass 'PitchClass', Fixnum do
+    alias _minus :-
+     
+    def -(rhs)
+      if rhs.class == PitchClass
+        if self >= rhs
+          # TODO: stop the insanity
+          Interval::Diatonic[
+            Interval::Diatonic[self._minus(rhs)].interval_class] ||
+          Interval::Semitone[
+            Interval::Semitone[self._minus(rhs)].interval_class]
+        else
+          Interval::Diatonic[rhs - self]
+        end
+      elsif rhs.class == Pitch
+        self - rhs.pitch_class
+      elsif Peas.is_an_interval?(rhs)
+        result = self._minus(rhs) % 12
+        if is_sharp?
+          PitchClass.sharps(result)
+        else
+          PitchClass.flats(result)
+        end
+      end
+    end
+    
     def is_sharp?
       %w|Bs Cs Ds Es Fs Gs As|.include? @name
     end

data/lib/peas/version.rb

@@ -1,5 +1,5 @@
 module Peas
   NAME    = 'peas'
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   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.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: named_value_class
-  requirement: &2156329420 !ruby/object:Gem::Requirement
+  requirement: &2155967180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.4'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156329420
+  version_requirements: *2155967180
 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