peas 0.3.0 → 0.3.1

data/lib/peas/{interger_helper.rb → integer_helper.rb}

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

data/lib/peas/interval.rb

@@ -2,104 +2,78 @@ require 'named_value_class'
 require 'peas/pitch'
 
 module Peas
-  
   # see: http://en.wikipedia.org/wiki/Interval_(music)
   #
-  module Interval
-    NamedValueClass Base:Integer, constrain:0..24 do
-      minus_a Pitch, raises:SyntaxError
-      minus_a PitchClass, raises:SyntaxError
-    end
-  
-    class Semitone < Base; end
-    25.times do |x|
-      Semitone "S#{x}" => x
-    end
+  NamedValueClass Interval:Fixnum do
+    multiplied_by_a 'Interval', raises:SyntaxError
     
-    class Wholetone < Base; end
-    13.times do |x|
-      Wholetone "W#{x}" => x * 2
+    def inverse
+      case @name
+      when 'P1' then Interval::P8
+      when 'm2' then Interval::M7
+      when 'M2' then Interval::m7
+      when 'm3' then Interval::M6
+      when 'M3' then Interval::m6
+      when 'P4' then Interval::P5
+      when 'A4' then Interval::d5
+      when 'd5' then Interval::A4
+      when 'P5' then Interval::P4
+      when 'm6' then Interval::M3
+      when 'M6' then Interval::m3
+      when 'm7' then Interval::M2
+      when 'M7' then Interval::m2
+      when 'P8' then Interval::P1
+      end
     end
     
-    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
-
-    class Latin < Base; end
-    Latin S: 1
-    Latin T: 3
-    Latin TT:6
-    
-    class Diatonic < Base
-      def inverse
-        case @name
-        when 'P1' then Diatonic::P8
-        when 'm2' then Diatonic::M7
-        when 'M2' then Diatonic::m7
-        when 'm3' then Diatonic::M6
-        when 'M3' then Diatonic::m6
-        when 'P4' then Diatonic::P5
-        when 'A4' then Diatonic::d5
-        when 'd5' then Diatonic::A4
-        when 'P5' then Diatonic::P4
-        when 'm6' then Diatonic::M3
-        when 'M6' then Diatonic::m3
-        when 'm7' then Diatonic::M2
-        when 'M7' then Diatonic::m2
-        when 'P8' then Diatonic::P1
-        end
-      end
-      
-      def interval_class
-        if (mod_12 = self % 12) > 6
-          12 - mod_12
-        else
-          mod_12
-        end
+    def interval_class
+      if (mod_12 = self % 12) > 6
+        12 - mod_12
+      else
+        mod_12
       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 
+  end
+    
+  25.times do |x|
+    Interval "S#{x}" => x
   end
   
-  module Intervals
-    include Interval::Semitone::NamedValues
-    extend  Interval::Semitone::NamedValues
-
-    include Interval::Wholetone::NamedValues
-    extend  Interval::Wholetone::NamedValues
-
-    include Interval::Chromatic::NamedValues
-    extend  Interval::Chromatic::NamedValues
-
-    include Interval::Latin::NamedValues
-    extend  Interval::Latin::NamedValues
-
-    include Interval::Diatonic::NamedValues
-    extend  Interval::Diatonic::NamedValues
+  13.times do |x|
+    Interval "W#{x}" => x * 2
   end
+  
+  Interval d2: 0
+  Interval A1: 1
+  Interval d3: 2
+  Interval A2: 3
+  Interval d4: 4
+  Interval A3: 5
+  Interval d5: 6
+  Interval A4: 6
+  Interval d6: 7
+  Interval A5: 8
+  Interval d7: 9
+  Interval A6:10
+  Interval d8:11
+  Interval A7:12
+
+  Interval S: 1
+  Interval T: 3
+  Interval TT:6
+  
+  Interval P1: 0 
+  Interval m2: 1 
+  Interval M2: 2 
+  Interval m3: 3 
+  Interval M3: 4 
+  Interval P4: 5 
+  Interval A4: 6 
+  Interval d5: 6 
+  Interval P5: 7 
+  Interval m6: 8 
+  Interval M6: 9 
+  Interval m7:10
+  Interval M7:11
+  Interval P8:12 
 end

data/lib/peas/pitch_class.rb

@@ -2,7 +2,7 @@ require 'named_value_class'
 
 module Peas
   NamedValueClass PitchClass:Fixnum, constrain:0..11 do
-    minus_a 'Interval::Base' do |lhs,minus,rhs|
+    minus_a :Interval do |lhs,minus,rhs|
       result = minus.call(rhs) % 12
       is_sharp? ? PitchClass.sharps[result] : PitchClass.flats[result]
     end
@@ -10,6 +10,8 @@ module Peas
     all_operators_with_a :PitchClass, raise:SyntaxError
     all_operators_with_a :Pitch, raise:SyntaxError
     
+    divided_by_a :Interval, raises:SyntaxError
+    
     def as_flat
       self.class.naturals[self] || self.class.flats[self]
     end

data/lib/peas/scale.rb

@@ -0,0 +1,6 @@
+require 'named_value_class'
+
+module Peas
+  NamedValueClass Scale:Array do 
+  end
+end

data/lib/peas/version.rb

@@ -1,5 +1,5 @@
 module Peas
   NAME    = 'peas'
-  VERSION = '0.3.0'
+  VERSION = '0.3.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.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000Z
+date: 2012-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: named_value_class
-  requirement: &2151835560 !ruby/object:Gem::Requirement
+  requirement: &2153195200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,7 +24,7 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151835560
+  version_requirements: *2153195200
 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 abbreviations.
@@ -33,10 +33,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/peas/interger_helper.rb
+- lib/peas/integer_helper.rb
 - lib/peas/interval.rb
 - lib/peas/pitch.rb
 - lib/peas/pitch_class.rb
+- lib/peas/scale.rb
 - lib/peas/version.rb
 - lib/peas.rb
 homepage: http://github.com/mgarriss/peas
@@ -59,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Peas defines constants from music theory and allows one to perform math with