jmtk 0.0.3.3-java → 0.4-java

data/spec/mtk/lang/pitch_classes_spec.rb

@@ -48,15 +48,4 @@ describe MTK::Lang::PitchClasses do
     end
   end
 
-  describe ".[]" do
-    it "acts like PitchClass.[]" do
-      for name in PitchClasses::PITCH_CLASS_NAMES
-        PitchClasses[name].should == PitchClass[name]
-      end
-    end
-
-    it "returns nil for arguments it doesn't understand" do
-      PitchClasses[:invalid].should be_nil
-    end
-  end
 end

data/spec/mtk/lang/pitches_spec.rb

@@ -38,19 +38,4 @@ describe MTK::Lang::Pitches do
     end
   end
 
-  describe ".[]" do
-    it "acts like Pitch.from_s for the names in PITCH_NAMES, and also treats '_' like '-'" do
-      for name in Pitches::PITCH_NAMES
-        Pitches[name].should == Pitch.from_s(name.sub('_','-')) # the constant names need to use underscores, but Pitch.from_s doesn't understand that
-        if name =~ /_/
-          Pitches[name.sub('_','-')].should == Pitch.from_s(name.sub('_','-')) # make sure '-' works too
-        end
-      end
-    end
-
-    it "returns nil for arguments it doesn't understand" do
-      Pitches[:invalid].should be_nil
-    end
-  end
-
 end

data/spec/mtk/patterns/chain_spec.rb

@@ -43,11 +43,11 @@ describe MTK::Patterns::Chain do
     end
 
     it 'combines 2 patterns, and returns #next until the last StopIteration of a nested Pattern occurs' do
-      chain = CHAIN.new [Patterns.Sequence(C,D,E), Patterns.Sequence(w,h,q,i)]
+      chain = CHAIN.new [Patterns.Sequence(C,D,E), Patterns.Sequence(w,h,q,e)]
       chain.next.should == [C,w]
       chain.next.should == [D,h]
       chain.next.should == [E,q]
-      chain.next.should == [C,i]
+      chain.next.should == [C,e]
       lambda{ chain.next }.should raise_error StopIteration
     end
 
@@ -56,18 +56,18 @@ describe MTK::Patterns::Chain do
 
 
     it 'combines Choice patterns with max_cycles' do
-      chain = CHAIN.new [Patterns.Choice(i,s), Patterns.Choice(C,D,E)], max_cycles:100
+      chain = CHAIN.new [Patterns.Choice(e,s), Patterns.Choice(C,D,E)], max_cycles:100
       100.times do |time|
         attrs = chain.next
         attrs.length.should == 2
-        (attrs[0]==i or attrs[0]==s).should be_true
+        (attrs[0]==e or attrs[0]==s).should be_true
         (attrs[1]==C or attrs[1]==D or attrs[1]==E).should be_true
       end
       lambda{ chain.next }.should raise_error StopIteration
     end
 
     it 'combines Choice patterns and emits a only single combination of attributes by default' do
-      chain = CHAIN.new [Patterns.Choice(i,s), Patterns.Choice(C,D,E)]
+      chain = CHAIN.new [Patterns.Choice(e,s), Patterns.Choice(C,D,E)]
       chain.next
       lambda{ chain.next }.should raise_error StopIteration
     end
@@ -78,7 +78,7 @@ describe MTK::Patterns::Chain do
     end
 
     it 'throws StopIteration when any subpattern throws StopIteration with max_elements_exceeded' do
-      chain = CHAIN.new [Patterns.Sequence(C,D,E,F,G), Patterns.Sequence(w,h,q,i,  max_elements:3)]
+      chain = CHAIN.new [Patterns.Sequence(C,D,E,F,G), Patterns.Sequence(w,h,q,e,  max_elements:3)]
       chain.next.should == [C,w]
       chain.next.should == [D,h]
       chain.next.should == [E,q]
@@ -100,7 +100,7 @@ describe MTK::Patterns::Chain do
       chain = CHAIN.new [C,q]
       chain.next
       chain.rewind
-      lambda{ chain.next }.should_not raise_error StopIteration
+      lambda{ chain.next }.should_not raise_error
       lambda{ chain.next }.should raise_error StopIteration
     end
   end

data/spec/mtk/patterns/for_each_spec.rb

@@ -83,11 +83,11 @@ describe MTK::Patterns::ForEach do
 
     it "evaluates nested variables" do
       # (C4 Bb Ab G)@( (C D C $):(q i i)*4:(mp mf) )
-      foreach = FOREACH.new( [seq(G,A), chain(seq(C,D,var('$')),seq(q,i,s))] )
+      foreach = FOREACH.new( [seq(G,A), chain(seq(C,D,var('$')),seq(q,e,s))] )
       vals = []
       6.times{ vals << foreach.next }
       lambda{ foreach.next }.should raise_error StopIteration
-      vals.should == [[C,q],[D,i],[G,s],[C,q],[D,i],[A,s]]
+      vals.should == [[C,q],[D,e],[G,s],[C,q],[D,e],[A,s]]
     end
 
   end

data/spec/mtk/sequencers/event_builder_spec.rb

@@ -57,20 +57,26 @@ describe MTK::Sequencers::EventBuilder do
       event_builder.next.should == notes(C4)
     end
 
-    it "defaults to intensity 'o' when no intensities are given" do
+    it "defaults to intensity 'f' when no intensities are given" do
       event_builder = EVENT_BUILDER.new [Patterns.PitchSequence(C4, D4, E4), Patterns.DurationCycle(2)]
-      event_builder.next.should == [Note(C4, o, 2)]
-      event_builder.next.should == [Note(D4, o, 2)]
-      event_builder.next.should == [Note(E4, o, 2)]
+      event_builder.next.should == [Note(C4, f, 2)]
+      event_builder.next.should == [Note(D4, f, 2)]
+      event_builder.next.should == [Note(E4, f, 2)]
     end
 
     it "defaults to duration 1 when no durations are given" do
-      event_builder =  EVENT_BUILDER.new [Patterns.PitchSequence(C4, D4, E4), Patterns.IntensityCycle(p,o)]
+      event_builder =  EVENT_BUILDER.new [Patterns.PitchSequence(C4, D4, E4), Patterns.IntensityCycle(p,f)]
       event_builder.next.should == [Note(C4, p, 1)]
-      event_builder.next.should == [Note(D4, o, 1)]
+      event_builder.next.should == [Note(D4, f, 1)]
       event_builder.next.should == [Note(E4, p, 1)]
     end
 
+    it "builds notes from pitch class sets, selecting the first pitches nearest to the default pitch" do
+      pitch_class_sequence = MTK::Patterns::Sequence.new([PitchClassSet(C,G)])
+      event_builder = EVENT_BUILDER.new [pitch_class_sequence], :default_pitch => D3
+      event_builder.next.should == notes(C3,G3)
+    end
+
     it "builds notes from pitch class sets, selecting the nearest pitch classes to the previous/default pitch" do
       pitch_class_sequence = MTK::Patterns::Sequence.new([PitchClassSet(C,G),PitchClassSet(B,Eb),PitchClassSet(D,C)])
       event_builder = EVENT_BUILDER.new [pitch_class_sequence], :default_pitch => D3
@@ -108,17 +114,17 @@ describe MTK::Sequencers::EventBuilder do
     end
 
     it "iterates through the pitch, intensity, and duration list in parallel to emit Notes" do
-      event_builder = EVENT_BUILDER.new [Patterns.PitchCycle(C4, D4, E4), Patterns.IntensityCycle(p, o), Patterns.DurationCycle(1,2,3,4)]
+      event_builder = EVENT_BUILDER.new [Patterns.PitchCycle(C4, D4, E4), Patterns.IntensityCycle(p, f), Patterns.DurationCycle(1,2,3,4)]
       event_builder.next.should == [Note(C4, p, 1)]
-      event_builder.next.should == [Note(D4, o, 2)]
+      event_builder.next.should == [Note(D4, f, 2)]
       event_builder.next.should == [Note(E4, p, 3)]
-      event_builder.next.should == [Note(C4, o, 4)]
+      event_builder.next.should == [Note(C4, f, 4)]
       event_builder.next.should == [Note(D4, p, 1)]
-      event_builder.next.should == [Note(E4, o, 2)]
+      event_builder.next.should == [Note(E4, f, 2)]
     end
 
     it "returns nil (for a rest) when it encounters a nil value" do
-      event_builder = EVENT_BUILDER.new [Patterns.PitchCycle(C4, D4, E4, F4, nil), Patterns.IntensityCycle(mp, mf, o, nil), Patterns.DurationCycle(1, 2, nil)]
+      event_builder = EVENT_BUILDER.new [Patterns.PitchCycle(C4, D4, E4, F4, nil), Patterns.IntensityCycle(mp, mf, f, nil), Patterns.DurationCycle(1, 2, nil)]
       event_builder.next.should == [Note(C4, mp, 1)]
       event_builder.next.should == [Note(D4, mf, 2)]
       event_builder.next.should be_nil
@@ -166,10 +172,10 @@ describe MTK::Sequencers::EventBuilder do
     end
 
     it "uses the default_pitch when no pitch pattern is provided" do
-      event_builder = EVENT_BUILDER.new [Patterns.Cycle( mp, mf, o )], :default_pitch => G3
+      event_builder = EVENT_BUILDER.new [Patterns.Cycle( mp, mf, f )], :default_pitch => G3
       event_builder.next.should == [Note(G3,mp,1)]
       event_builder.next.should == [Note(G3,mf,1)]
-      event_builder.next.should == [Note(G3,o,1)]
+      event_builder.next.should == [Note(G3,f,1)]
     end
 
     it "handles chains of sequences" do
@@ -204,8 +210,8 @@ describe MTK::Sequencers::EventBuilder do
     end
 
     it "adds chained durations together" do
-      event_builder = EVENT_BUILDER.new( [Patterns.Chain(h,q,i,s)] )
-      event_builder.next[0].duration.should == h+q+i+s
+      event_builder = EVENT_BUILDER.new( [Patterns.Chain(h,q,e,s)] )
+      event_builder.next[0].duration.should == h+q+e+s
     end
 
     it "averages chained intensities together" do
@@ -215,11 +221,11 @@ describe MTK::Sequencers::EventBuilder do
 
     it "defaults the intensity to the previous intensity" do
       event_builder = EVENT_BUILDER.new(
-        [Patterns.Sequence(Patterns.Chain(C4,ppp,q), Patterns.Chain(D4,i), Patterns.Chain(E4,ff,h), Patterns.Chain(F4,i))]
+        [Patterns.Sequence(Patterns.Chain(C4,ppp,q), Patterns.Chain(D4,e), Patterns.Chain(E4,ff,h), Patterns.Chain(F4,e))]
       )
       notes = []
       4.times{ notes += event_builder.next }
-      notes.should == [Note(C4,ppp,q), Note(D4,ppp,i), Note(E4,ff,h), Note(F4,ff,i)]
+      notes.should == [Note(C4,ppp,q), Note(D4,ppp,e), Note(E4,ff,h), Note(F4,ff,e)]
     end
 
     it "defaults the duration to the previous duration" do
@@ -230,6 +236,32 @@ describe MTK::Sequencers::EventBuilder do
       4.times{ notes += event_builder.next }
       notes.should == [Note(C4,ppp,h), Note(D4,mp,h), Note(E4,ff,s), Note(F4,mf,s)]
     end
+
+    it "uses the previous pitch class in the chain to determine the octave of the current pitch class" do
+      event_builder = EVENT_BUILDER.new([Patterns.Chain(C4,E,G)])
+      event_builder.next.should == [Note(C4),Note(E4),Note(G4)]
+    end
+
+    it "returns a Rest event when the duration is negative" do
+      event_builder = EVENT_BUILDER.new([Patterns.Chain(C4,-q)])
+      event_builder.next.should == [Rest(q)]
+    end
+
+    it "doesn't uses the absolute value of the previous rest when generating the next event" do
+      event_builder = EVENT_BUILDER.new([Patterns.Sequence(Patterns.Chain(C4,q), -q, D4)])
+      event_builder.next.should == [Note(C4,q)]
+      event_builder.next.should == [Rest(q)]
+      event_builder.next.should == [Note(D4,q)]
+    end
+
+    it "makes all event chained to a rest be a rest" do
+      event_builder = EVENT_BUILDER.new(
+        [Patterns.Sequence(Patterns.Chain(C4,q), Patterns.Chain(-q, Patterns.Sequence(D4,E4)))]
+      )
+      event_builder.next.should == [Note(C4,q)]
+      event_builder.next.should == [Rest(q)]
+      event_builder.next.should == [Rest(q)]
+    end
   end
 
   describe "#rewind" do

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: jmtk
 version: !ruby/object:Gem::Version
-  version: 0.0.3.3
-  prerelease: 
+  version: '0.4'
 platform: java
 authors:
 - Adam Murray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: midilib
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gamelan
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jsound
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -95,6 +86,7 @@ files:
 - examples/drum_pattern.rb
 - examples/dynamic_pattern.rb
 - examples/gets_and_play.rb
+- examples/helpers/output_selector.rb
 - examples/notation.rb
 - examples/play_midi.rb
 - examples/print_midi.rb
@@ -110,6 +102,7 @@ files:
 - lib/mtk/events/event.rb
 - lib/mtk/events/note.rb
 - lib/mtk/events/parameter.rb
+- lib/mtk/events/rest.rb
 - lib/mtk/events/timeline.rb
 - lib/mtk/groups/chord.rb
 - lib/mtk/groups/collection.rb
@@ -134,6 +127,8 @@ files:
 - lib/mtk/lang/pitch_classes.rb
 - lib/mtk/lang/pitches.rb
 - lib/mtk/lang/pseudo_constants.rb
+- lib/mtk/lang/tutorial.rb
+- lib/mtk/lang/tutorial_lesson.rb
 - lib/mtk/lang/variable.rb
 - lib/mtk/numeric_extensions.rb
 - lib/mtk/patterns/chain.rb
@@ -159,6 +154,7 @@ files:
 - spec/mtk/events/event_spec.rb
 - spec/mtk/events/note_spec.rb
 - spec/mtk/events/parameter_spec.rb
+- spec/mtk/events/rest_spec.rb
 - spec/mtk/events/timeline_spec.rb
 - spec/mtk/groups/chord_spec.rb
 - spec/mtk/groups/collection_spec.rb
@@ -193,34 +189,28 @@ files:
 - spec/spec_helper.rb
 - spec/test.mid
 homepage: http://github.com/adamjmurray/mtk
-licenses: []
+licenses:
+- BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1626364894868064054
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1626364894868064054
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Music Tool Kit for Ruby
 test_files: []
 has_rdoc: