chords 0.4.2 → 0.4.3

data/lib/chords/fingering.rb

@@ -34,12 +34,12 @@ module Chords
     # Expanded note wil be on a higher string than existing notes.
     # It will also be the highest note.
     def expand(note, opts={})
-      max_fret_distance = opts[:max_fret_distance] || DEFAULT_MAX_FRET_DISTANCE
+      max_fret_dist = opts[:max_fret_distance] || DEFAULT_MAX_FRET_DISTANCE
       
       fingerings = []
       
       ((highest_used_string+1)..(@positions.size-1)).each do |str_i|
-        new_note_positions(note, str_i, max_fret_distance).each do |pos|
+        new_note_positions(note, str_i, max_fret_dist).each do |pos|
           if (@fretboard.open_notes[str_i] + pos) > highest_note
             new_positions = @positions.dup
             new_positions[str_i] = pos
@@ -54,7 +54,7 @@ module Chords
     # returns variations of this fingering with one duplicate note added
     def add_duplicate(opts={})
       return [] if unused_strings < 1
-      max_fret_distance = opts[:max_fret_distance] || DEFAULT_MAX_FRET_DISTANCE
+      max_fret_dist = opts[:max_fret_distance] || DEFAULT_MAX_FRET_DISTANCE
       
       fingerings = []
       
@@ -62,7 +62,7 @@ module Chords
         next unless pos.nil?
         
         each_note do |note|
-          new_note_positions(note, i, max_fret_distance).each do |pos|
+          new_note_positions(note, i, max_fret_dist).each do |pos|
             new_positions = @positions.dup
             new_positions[i] = pos
             fingerings << Fingering.new(@fretboard, new_positions)
@@ -110,16 +110,23 @@ module Chords
       end
     end
     
+    def max_fret_distance
+      max_fret_dist = 0
+      tmp = @positions.select{|pos| !pos.nil? and pos > 0}
+      max_fret_dist = tmp.max - tmp.min unless tmp.empty?
+      max_fret_dist
+    end
+    
     private
     
-    def new_note_positions(note, string_index, max_fret_distance)
+    def new_note_positions(note, string_index, max_fret_dist)
       positions = []
       open_note = @fretboard.open_notes[string_index]
       pos = note.new(open_note.octave).value - open_note.value
       pos += 12 if pos < 0
       
       while pos <= @fretboard.frets
-        positions << pos if distance(pos) <= max_fret_distance
+        positions << pos if distance(pos) <= max_fret_dist
         pos += 12
       end
       positions

data/lib/chords/fretboard.rb

@@ -109,11 +109,14 @@ module Chords
       
       fretboard = Fretboard.new_by_string(tuning_part, 50, formatter_class)
       
-      max_fret_distance, positions = parse_positions(fingering_part, 
-                                                     fretboard.open_notes.size)
+      positions = parse_positions(fingering_part, fretboard.open_notes.size)
+      
+      fingering = Fingering.new(fretboard, positions)
+      max_fret_dist = fingering.max_fret_distance
+      max_fret_dist = 2 if max_fret_dist < 2
                                                      
-      fretboard.formatter.print('', [Fingering.new(fretboard, positions)],
-                                opts.merge(:max_fret_distance => max_fret_distance))
+      fretboard.formatter.print('', [fingering],
+                                opts.merge(:max_fret_distance => max_fret_dist))
     end
     
     # parse positions from a string, for example '022100'
@@ -132,12 +135,8 @@ module Chords
         end
         over_tens -= 1
       end
-      max_fret_distance = 2
-      tmp = positions.select{|pos| !pos.nil? and pos > 0}
-      max_fret_distance = tmp.max - tmp.min unless tmp.empty?
-      max_fret_distance = 2 if max_fret_distance < 2
       
-      [max_fret_distance, positions]
+      positions
     end
     
   end

data/lib/chords/html_formatter.rb

@@ -1,4 +1,5 @@
 require 'chords/png_formatter'
+require 'base64'
 
 module Chords
   
@@ -18,7 +19,7 @@ module Chords
     
     # TODO: accept a separator element in opts
     def print(title, fingerings, opts={})
-      html = "<h2>#{title}</h2>\n"
+      html = title.empty? ? '' : "<h2>#{title}</h2>\n"
       
       fingerings.each do |fingering|
         html += get_element(fingering, opts)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chords
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Antti Hakala
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +03:00
+date: 2010-08-13 00:00:00 +03:00
 default_executable: 
 dependencies: []