hammelin 0.0.2 → 0.0.3

data/demos/each.rb

@@ -0,0 +1,8 @@
+require_relative '../lib/hammelin'
+
+note = Hammelin::Note.new("C")
+beat = note.upto("D#").map{|n| n.upto("D#")}
+
+Hammelin.compose "iterative.mid" do
+  5.times { play beat }
+end

data/demos/nested_play.rb

@@ -1,6 +1,6 @@
 require_relative '../lib/hammelin'
 
-Hammelin.compose("file.mid") do
+Hammelin.compose("nested.mid") do
 
   note = Hammelin::Note.new("C")
   tune = note.upto("D#")
@@ -17,4 +17,4 @@ Hammelin.compose("file.mid") do
 
   end
 
-end
+end

data/lib/hammelin/hammelin.rb

@@ -15,11 +15,14 @@ module Hammelin
   @logged_music_string = ""
 
   def play(tune)
-    if playable_tune?(tune)
-      play_tune(tune)
-    else
-      play_string(tune)
-     end
+    tune.play
+  rescue NoMethodError
+    case tune
+    when String
+      Note.new(tune).play
+    when Array
+      NotesRange.from_array(tune).play
+    end
   end
 
   def play_string(tune)
@@ -28,19 +31,6 @@ module Hammelin
     player.close
   end
 
-  def playable_tune?(tune)
-    return true if tune.respond_to? :play
-    return true if tune.is_a?(Array) ? playable_tune?(tune.first) : false
-  end
-
-  def play_tune(tune)
-    if tune.respond_to? :play
-      tune.play
-    else
-      tune.each(&:play) if playable_tune?(tune.first)
-    end
-  end
-
   def compose(filename=nil,&block)
     instance_eval &block
     save_to_file(filename) if filename
@@ -50,6 +40,10 @@ module Hammelin
 
   private
 
+  def player
+    @player ||= Player.new
+  end
+
   def add_to_log(tune)
     logged_music_string << tune + PADDING
   end
@@ -63,8 +57,4 @@ module Hammelin
     player.save_midi(logged_music_string,file)
   end
 
-  def player
-    @player ||= Player.new
-  end
-
 end

data/lib/hammelin/note.rb

@@ -5,8 +5,8 @@ module Hammelin
     include Comparable
     attr_accessor :token
 
-    OCTAVE_JUMP = 12
-    MAX_VALUE = 127
+    OCTAVE_JUMP  = 12
+    MAX_VALUE    = 127
     CAPPED_VALUE = MAX_VALUE - OCTAVE_JUMP
     
     def initialize(note)
@@ -14,15 +14,15 @@ module Hammelin
     end
 
     def play
-      Hammelin.play(music_string)
+      Hammelin.play_string (music_string)
     end
 
     def upto(note)
-      NotesRange.new(self,Note.new(note))
+      NotesRange.from_range(self,Note.new(note))
     end
 
     def downto(note)
-      NotesRange.new(Note.new(note),self)
+      NotesRange.from_range(Note.new(note),self)
     end
 
     def self.from_value(value)
@@ -42,11 +42,13 @@ module Hammelin
     end
 
     def increase_octave!(times)
-      self.token = increase_octaves(times).value
+      value = increase_octave(times).value
+      self.token = "[#{value}]"
     end
 
     def decrease_octave!(times)
-      self.token = decrease_octaves(times).value
+      value = decrease_octave(times).value
+      self.token = "[#{value}]"
     end
 
     def value
@@ -64,19 +66,19 @@ module Hammelin
     end
 
     def higher_octave(times=1)
-      OCTAVE_JUMP*times + self.value unless highest_octave?
+      highest_octave? ? value : OCTAVE_JUMP*times + self.value 
     end
 
     def lower_octave(times=1)
-      OCTAVE_JUMP*times + self.value unless lowest_octave?
+      lowest_octave? ? value : OCTAVE_JUMP*times + self.value 
     end
 
     def highest_octave?
-      self.value >= CAPPED_VALUE
+      self.value + OCTAVE_JUMP >= CAPPED_VALUE
     end
 
     def lowest_octave?
-      self.value <= OCTAVE_JUMP
+      self.value - OCTAVE_JUMP <= OCTAVE_JUMP
     end
 
   end

data/lib/hammelin/notes_range.rb

@@ -4,35 +4,43 @@ module Hammelin
 
   class NotesRange < DelegateClass(Array)
 
-    def initialize(from,to)
-      @from, @to = from,to
-      super(transverse_notes)
+    def initialize(array)
+      super(array)
     end
 
-    def play
-      Hammelin.play music_string
-      self
+    def self.from_range(from,to)
+      NotesRange.new(transverse_notes(from,to))
+    end
+
+    def self.from_array(array)
+      notes_range = array.inject([]) {|notes,notes_range| notes += notes_range }
+      NotesRange.new(notes_range)
     end
 
-    def reverse
-      NotesRange.new(@to,@from)
+    def play
+      Hammelin.play_string music_string
+      self
     end
 
     # downto and upto are just some sintactic sugar for expanding the range to 
     # a new value. It will create a new NotesRange object with the last Note 
     # and then will figure out how to get to the newest one. 
     def downto(value)
-      NotesRange.new(@to,value)
+      NotesRange.from_range(last,value)
     end
 
     alias :upto :downto
 
     def increase_octave(times=1)
-      NotesRange.new(@from.increase_octave(times), @to.increase_octave(times))
+      notes = map {|note| note.increase_octave(times)}
+
+      NotesRange.new(notes)
     end
 
     def decrease_octave(times=1)
-      NotesRange.new(@from.decrease_octave(times), @to.decrease_octave(times))
+      notes = map {|note| note.decrease_octave(times)}
+
+      NotesRange.new(notes)      
     end
 
     def music_string
@@ -41,11 +49,11 @@ module Hammelin
 
     private
 
-    def transverse_notes
-      enum = if @from > @to
-        @from.value.downto(@to.value)
+    def self.transverse_notes(from,to)
+      enum = if from > to
+        from.value.downto(to.value)
       else
-        @from.value.upto(@to.value)
+        from.value.upto(to.value)
       end
       enum.map{|value| Note.from_value(value) }
     end

data/lib/hammelin/version.rb

@@ -1,3 +1,3 @@
 module Hammelin
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -2,15 +2,15 @@
 name: hammelin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
-  - Alvaro Pereyra
+- Alvaro Pereyra
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 -05:00
+date: 2011-09-19 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -23,21 +23,22 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - .gitignore
-  - .rvmrc.example
-  - Gemfile
-  - README.md
-  - Rakefile
-  - bin/jfugue-4.0.3.jar
-  - demos/nested_play.rb
-  - hammelin.gemspec
-  - lib/hammelin.rb
-  - lib/hammelin/hammelin.rb
-  - lib/hammelin/note.rb
-  - lib/hammelin/notes_range.rb
-  - lib/hammelin/version.rb
-  - reference/Main.class
-  - reference/Main.java
+- .gitignore
+- .rvmrc.example
+- Gemfile
+- README.md
+- Rakefile
+- bin/jfugue-4.0.3.jar
+- demos/each.rb
+- demos/nested_play.rb
+- hammelin.gemspec
+- lib/hammelin.rb
+- lib/hammelin/hammelin.rb
+- lib/hammelin/note.rb
+- lib/hammelin/notes_range.rb
+- lib/hammelin/version.rb
+- reference/Main.class
+- reference/Main.java
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -46,23 +47,23 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
 
 rubyforge_project: hammelin
-rubygems_version: 1.5.1
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Hammelin allows you to play around with JFugue MIDI capabilities