hammelin 0.0.4 → 0.0.5

data/demos/each.rb

@@ -4,5 +4,8 @@ note = Hammelin::Note.new("C")
 beat = note.upto("D#").map{|n| n.upto("D#")}
 
 Hammelin.compose "iterative.mid" do
-  5.times { play beat }
+  5.times do beat.each do |note| 
+    play note
+   end
+  end
 end

data/lib/hammelin.rb

@@ -1,3 +1,63 @@
-require_relative 'hammelin/hammelin'
+require 'java'
+
+require_relative '../vendor/jfugue-4.0.3.jar'
+
 require_relative 'hammelin/note'
-require_relative 'hammelin/notes_range'
+require_relative 'hammelin/notes_range'
+
+java_import org.jfugue.Player
+java_import org.jfugue.Pattern
+java_import org.jfugue.Rhythm
+java_import org.jfugue.MusicStringParser
+
+module Hammelin
+
+  extend self
+
+  PADDING = " "
+  @logged_music_string = ""
+
+  def play(tune)
+    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)
+    player.play(tune)
+    add_to_log(tune)
+    player.close
+  end
+
+  def compose(filename=nil,&block)
+    instance_eval &block
+    save_to_file(filename) if filename
+  ensure
+    player.close
+  end
+
+  private
+
+  def player
+    @player ||= Player.new
+  end
+
+  def add_to_log(tune)
+    logged_music_string << tune + PADDING
+  end
+
+  def logged_music_string
+    @logged_music_string
+  end
+
+  def save_to_file(filename)
+    file = java.io.File.new(filename)
+    player.save_midi(logged_music_string,file)
+  end
+
+end

data/lib/hammelin/notes_range.rb

@@ -1,11 +1,13 @@
-require 'delegate'
-
 module Hammelin
 
-  class NotesRange < DelegateClass(Array)
+  class NotesRange
+
+    include Enumerable
+    
+    attr_accessor :notes
 
     def initialize(array)
-      super(array)
+      @notes = array
     end
 
     def self.from_range(from,to)
@@ -13,8 +15,19 @@ module Hammelin
     end
 
     def self.from_array(array)
-      notes_range = array.inject([]) {|notes,notes_range| notes += notes_range }
-      NotesRange.new(notes_range)
+      NotesRange.new(array)
+    end
+
+    def each
+      if block_given? 
+        @notes.each {|note| yield note} 
+      else 
+        to_enum(:each) 
+      end
+    end
+
+    def reverse
+      @notes.reverse
     end
 
     def play
@@ -32,19 +45,19 @@ module Hammelin
     alias :upto :downto
 
     def increase_octave(times=1)
-      notes = map {|note| note.increase_octave(times)}
+      notes = @notes.map {|note| note.increase_octave(times)}
 
       NotesRange.new(notes)
     end
 
     def decrease_octave(times=1)
-      notes = map {|note| note.decrease_octave(times)}
+      notes = @notes.map {|note| note.decrease_octave(times)}
 
       NotesRange.new(notes)      
     end
 
     def music_string
-      map{|i| i.music_string }.join(" ")
+      @notes.map{|i| i.music_string }.join(" ")
     end
 
     private

data/lib/hammelin/version.rb

@@ -1,3 +1,3 @@
 module Hammelin
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,28 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hammelin
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Alvaro Pereyra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2011-09-20 00:00:00 -05:00
-default_executable: 
+date: 2012-02-02 00:00:00.000000000 -05:00
+default_executable:
 dependencies: []
-
 description: Hammelin wraps around JFugue and lets your play with notes, making Ruby sing
 email: alvaro@xendacentral.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc.example
 - Gemfile
@@ -32,7 +27,6 @@ files:
 - 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
@@ -40,32 +34,29 @@ files:
 - reference/Main.java
 - vendor/jfugue-4.0.3.jar
 has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
 requirements: []
-
 rubyforge_project: hammelin
-rubygems_version: 1.5.0
-signing_key: 
+rubygems_version: 1.6.2
+signing_key:
 specification_version: 3
 summary: Hammelin allows you to play around with JFugue MIDI capabilities
 test_files: []
-
+...

data/lib/hammelin/hammelin.rb

@@ -1,60 +0,0 @@
-require 'java'
-
-require_relative '../../bin/jfugue-4.0.3.jar'
-
-java_import org.jfugue.Player
-java_import org.jfugue.Pattern
-java_import org.jfugue.Rhythm
-java_import org.jfugue.MusicStringParser
-
-module Hammelin
-
-  extend self
-
-  PADDING = " "
-  @logged_music_string = ""
-
-  def play(tune)
-    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)
-    player.play(tune)
-    add_to_log(tune)
-    player.close
-  end
-
-  def compose(filename=nil,&block)
-    instance_eval &block
-    save_to_file(filename) if filename
-  ensure
-    player.close
-  end
-
-  private
-
-  def player
-    @player ||= Player.new
-  end
-
-  def add_to_log(tune)
-    logged_music_string << tune + PADDING
-  end
-
-  def logged_music_string
-    @logged_music_string
-  end
-
-  def save_to_file(filename)
-    file = java.io.File.new(filename)
-    player.save_midi(logged_music_string,file)
-  end
-
-end