chord_diagrams 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f917ed924b695bd82eaa9dc5f5253ce86136de34050c372166dd2e958952244e
-  data.tar.gz: 467fc8f53c37e965c7f137c6e4749545956b2477f467dcdb730ea3d8a7a93957
+  metadata.gz: 135386bd1af18078290e62fb0bc3792ddb07ff973717b4148ebead48e017bd2b
+  data.tar.gz: 6f2f12911358baae68cf0299a76348439619e757d428c8ccbccf0ad7bae0c332
 SHA512:
-  metadata.gz: 29be58789b8c63d8ba6a19b1c84cf0c3d03b557ac48c234c2abc3f4e2f68ed2345f464037a89d4b93f4f172e3f589f82bfb4a84cbe67bc95ab49943a25fa7199
-  data.tar.gz: 5317272f9c36b0856e92d47cc667171b8849cd38b82fcb9cd4b20b48515eac99783756ea8ba55b71106f430d42c6e2ec7894c3a66eeac037deb10739984f3ae4
+  metadata.gz: 317c76f9d1f67d9f0048fbb536c241ef25cc2e4a78bde7fe5d80afa2883d437ded28cb7b9ac1ac99b5835154eb3d654aa2b10d2e6b3b98e8af954c20280ecca2
+  data.tar.gz: 315b30e1547f28f0d104879e6bac1e2aeb218738f32fe5bff1de5b5988563ed30de3c1d51c39f03235778baa268dee12c49b0b22359b18db1792815426152075

data/.gitignore

@@ -12,3 +12,4 @@
 
 .idea
 Gemfile.lock
+sheet.html

data/Rakefile

@@ -4,3 +4,16 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
+
+task :sheet do
+  require 'chord_diagrams'
+
+  html = ""
+
+  ChordDiagrams::FINGERINGS.each do |name, fingering|
+    diagram = ChordDiagrams.chord_svg(name, fingering)
+    html << diagram
+  end
+
+  File.open('sheet.html', 'w') { |file| file.write(html) }
+end

data/chord_diagrams.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'nokogiri'
 end

data/lib/chord_diagrams.rb

@@ -43,18 +43,12 @@ module ChordDiagrams
     def draw_chord_diagram(fingerings, svg)
       fingerings = fingerings.split('')
 
-      lowest_fret = fingerings.min
+      lowest_fret = fingerings.reject{ |fret| fret.to_i < 1 }.min
 
       if lowest_fret.to_i > 2
-        svg.text lowest_fret, x: 35, y: 96, text_anchor: :end, style: { font_size: 20 }
-
-        fingerings = fingerings.map do |fingering|
-          if fingering != 'x'
-            fingering.to_i - lowest_fret.to_i + 1
-          else
-            fingering
-          end
-        end
+        svg.text lowest_fret, id: 'fretNumber', x: 35, y: 96, text_anchor: :end, style: { font_size: 20 }
+
+        fingerings = shift_fingerings(fingerings, lowest_fret)
       else
         draw_nut(svg)
       end
@@ -73,14 +67,14 @@ module ChordDiagrams
     end
 
     def draw_name(name, svg)
-      svg.text name, x: 100, y: 40, text_anchor: :middle, style: {
+      svg.text name, id: 'chordName', x: 100, y: 40, text_anchor: :middle, style: {
         font_size: 36,
         font_weight: :bold
       }
     end
 
     def draw_nut(svg)
-      svg.line x1: 49, y1: 77, x2: 151, y2: 77, style: {
+      svg.line id: 'nut', x1: 49, y1: 77, x2: 151, y2: 77, style: {
         stroke: :black,
         stroke_width: 8
       }
@@ -114,5 +108,17 @@ module ChordDiagrams
         svg.line x1: 50, y1: y, x2: 150, y2: y, style: LINE_STYLE
       end
     end
+
+    private
+
+    def shift_fingerings(fingerings, lowest_fret)
+      fingerings.map do |fingering|
+        if fingering != 'x' && fingering != '0'
+          fingering.to_i - lowest_fret.to_i + 1
+        else
+          fingering
+        end
+      end
+    end
   end
 end

data/lib/chord_diagrams/fingerings.rb

@@ -6,7 +6,7 @@ module ChordDiagrams
       'Bb': 'x13331',
       'C': 'x32010',
       'C#': 'x46664',
-      'D': 'x00232',
+      'D': 'xx0232',
       'D#': 'x68886',
       'E': '022100',
       'Eb': 'x68886',
@@ -21,6 +21,7 @@ module ChordDiagrams
       'D#5': 'x688xx',
 
       # Six Chords
+      'C6': 'x32210',
       'D6': 'xx0202',
       'E6': '022120',
       'G6': '320000',
@@ -44,6 +45,10 @@ module ChordDiagrams
       'EM7': 'xx2444',
       'FM7': '132211',
 
+      # Major 9th Chords
+      'Cadd9': 'x32033',
+      'Fadd9': 'xx3213',
+
       # Major Suspended 2nd Chords
       'Dsus2': 'xx0230',
       'Asus2': 'x02200',
@@ -81,16 +86,16 @@ module ChordDiagrams
       'F#m7': '242222',
       'Gm7': '353333',
 
+      # Minor Ninth Chotds
+      'Am9': "x05557",
+
       # Minor Eleventh Chords
       'Bm11': 'x20220',
       'F#m11': '202200',
 
-      # Major 9th Chords
-      'Cadd9': 'x32033',
-
       # Major Chords with Bass Notes
-      'A/C#': '002220',
-      'A/E': '04222x',
+      'A/C#': '042220',
+      'A/E': '00222x',
       'A/F#': '202220',
       'Bb/A': 'x00331',
       'C/B': 'x22010',
@@ -105,6 +110,9 @@ module ChordDiagrams
       'D7/F#': '200212',
       'G7/F': '123003',
 
+      # Ninth Chords with Bass Notes
+      'D9/F#': '2x0210',
+
       # Minor Chords with Bass Notes
       'Am/D': 'xx0210',
       'Am/G': '302210',

data/lib/chord_diagrams/version.rb

@@ -1,3 +1,3 @@
 module ChordDiagrams
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chord_diagrams
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Brian Kelly
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: victor
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate Chord Diagrams for Guitar
 email:
 - bkelly@carbonfive.com