chords 0.2 → 0.3

data/README

@@ -2,7 +2,7 @@ Chords
 ======
 A chord generator lib for guitar-like instruments.
 
-Using via gem (hosted at gemcutter.org)
+Using via gem (hosted at rubygems.org)
 ---------------------------------------
 
 $ sudo gem install chords

data/lib/chords/command_line_parser.rb

@@ -49,10 +49,26 @@ module Chords
         @tuning = Chords::Fretboard::TUNINGS[t.to_sym]
       end
       
-      @opts.on("--pdf", "Output to pdf.") do
+      @opts.on("--pdf", "Output to pdf. Requires Prawn") do
+        begin
+          require 'chords/pdf_formatter'
+        rescue LoadError => e
+          puts "#{e.message}\n\nMake sure you have 'prawn' gem installed."
+          exit(1)
+        end
         @formatter = Chords::PDFFormatter
       end
       
+      @opts.on("--html", "Output to html. Requires RMagick") do
+        begin
+          require 'chords/html_formatter'
+        rescue LoadError => e
+          puts "#{e.message}\n\nMake sure you have 'rmagick' gem installed."
+          exit(1)
+        end
+        @formatter = Chords::HTMLFormatter
+      end
+      
       @opts.on_tail("-h", "--help", examples) do
         puts @opts
       end

data/lib/chords/fingering.rb

@@ -87,6 +87,11 @@ module Chords
       @positions.hash
     end
     
+    # fingering id, a unique identifier for fretboard/fingering combo
+    def fid
+      @fretboard.open_notes.to_s + @positions.to_s
+    end
+    
     # return an array of relative positions
     def relative(max_fret_dist)
       not_open = @positions.select{|p| !p.nil? and p > 0}

data/lib/chords/fretboard.rb

@@ -1,7 +1,6 @@
 require 'chords/chord_factory'
 require 'chords/fingering'
 require 'chords/text_formatter'
-require 'chords/pdf_formatter'
 
 module Chords
   

data/lib/chords/html_formatter.rb

@@ -0,0 +1,84 @@
+require 'rvg/rvg' # rmagick's RVG (Ruby Vector Graphics) 
+require 'base64'
+
+Magick::RVG::dpi = 72
+
+module Chords
+  
+  # Formats fingerings as <img/> tags (base64-encoded data URIs) 
+  class HTMLFormatter
+    class NonCache
+      def fetch(key); yield end
+    end
+    
+    def initialize(fretboard, cache=NonCache.new)
+      @fretboard = fretboard
+      @cache = cache
+    end
+    
+    # TODO: accept a separator element in opts
+    def print(title, fingerings, opts={})
+      @max_dist = opts[:max_fret_distance] || Fingering::DEFAULT_MAX_FRET_DISTANCE
+      html = "<h2>#{title}</h2>\n"
+      
+      fingerings.each do |fingering|
+        html += get_element(fingering)
+      end
+      
+      File.open('chords.html', 'w') do |file|
+        file.write html
+      end
+      
+      puts "Wrote chords.html"
+    end
+    
+    private
+    
+    def get_element(fingering)
+      
+      @cache.fetch(fingering.fid) do
+        rvg = Magick::RVG.new(5.cm, 5.cm).viewbox(0,0,270,250) do |canvas|
+          canvas.background_fill = 'white'
+          x_div = @fretboard.open_notes.size - 1
+          
+          y_diff = 215 / (@max_dist + 1)
+          
+          (@max_dist+2).times do |n|
+            canvas.line(20, n*y_diff+20, 250, n*y_diff+20)
+          end
+          
+          @fretboard.open_notes.each_with_index do |note, i|
+            canvas.line(i*(230/x_div)+20, 20, i*(230/x_div)+20, 230)
+            
+            unless [0,nil].include?(fingering[i])
+              canvas.circle(15, i*(230/x_div)+20, 
+                            fingering.relative(@max_dist)[i]*y_diff - 5)
+            end
+            
+            canvas.text(i*(230/x_div)+20, 15) do |txt| 
+              txt.tspan((fingering[i] || 'x').to_s).styles(
+                                           :text_anchor => 'middle',
+                                           :font_size => 20, 
+                                           :font_family => 'helvetica',
+                                           :fill => 'black')
+            end
+            canvas.text(i*(230/x_div)+20, 249) do |txt| 
+              txt.tspan(note.title).styles(:text_anchor => 'middle',
+                                           :font_size => 18, 
+                                           :font_family => 'helvetica',
+                                           :fill => 'black')
+            end
+          end
+          
+        end
+        img = rvg.draw
+        img.format = 'PNG'
+        "<img src=\"data:image/png;base64,#{Base64.encode64(img.to_blob)}\" />\n"
+      end
+    end
+    
+  end
+  
+end
+
+# TODO: change pdf and png formatter to be required only when needed

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: chords
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Antti Hakala
@@ -13,23 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +03:00
+date: 2010-07-22 00:00:00 +03:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: prawn
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 4
-        version: 0.8.4
-  type: :runtime
-  version_requirements: *id001
+dependencies: []
+
 description: "Chords is a chord generator for guitar-like instruments. Handy for special tunings. "
 email: antti.hakala@gmail.com
 executables: 
@@ -47,6 +35,7 @@ files:
 - lib/chords/command_line_parser.rb
 - lib/chords/fingering.rb
 - lib/chords/fretboard.rb
+- lib/chords/html_formatter.rb
 - lib/chords/note.rb
 - lib/chords/pdf_formatter.rb
 - lib/chords/text_formatter.rb
@@ -61,23 +50,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Chord generator for guitar-like instruments.