chord_diagrams 0.0.8 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e56056772c4f4100a4db3b552b6a0bc66a7c8f1c1ec23b277a88c51a814bb269
-  data.tar.gz: 61891135a02b9a0be77d5f2c161ba965b3335fc7abf0cd6dcaba2e1763058317
+  metadata.gz: a16a88b747ac512e5fc309130f6cd953228ac284fe4ffdef1aba5022e31fd059
+  data.tar.gz: ab2db5f28c06082ae209bd575420d3f98c5cdca1167f7a6e4b1f7b0d4f4ecdeb
 SHA512:
-  metadata.gz: fbc0c91f23afb8ef4852fa4fe310428b705f3c12a10d0026f7d00564ce43aec8e26c4c9e387b08d47db2b5294638af2ba0214213fa4552adf648985126bd5440
-  data.tar.gz: 6466d866c0e60af031713df8871b35ebeaf412dee20d0013370e01594a259ccf72308e5daa102068e9ee9c78e6afaf957b1f0ae8bc3f461159019fde150c95c4
+  metadata.gz: c23e1acd4a41acd93365ebf96e96ca680ef13cb841e6a8ddf3df0398d7d4c65ff2ad14f491055fbc316815b53334b58f49200e9ad83312781aaf33418f112c7b
+  data.tar.gz: 28e712bd7a6ebdacbccaa6b85f5e7df6e0fb01ff1cc0b8bc693b6de073a0d779673c5b788fca390b787b6f9e862181fb96a8498907a65fed87b55c7c8ff0d5e4

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+2.7.3

data/.travis.yml

@@ -3,5 +3,5 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.3
-before_install: gem install bundler -v 2.0.1
+  - 2.7.2
+before_install: gem install bundler -v 2.2

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in chord_diagrams.gemspec
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# ChordDiagrams
+# ChordDiagrams [![Build Status](https://www.travis-ci.com/spilth/chord_diagrams.svg?branch=master)](https://www.travis-ci.com/spilth/chord_diagrams)
 
 Generate SVGs for Guitar and Ukulele Chord Diagrams
 
@@ -12,11 +12,15 @@ gem 'chord_diagrams'
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install chord_diagrams
+```bash
+$ gem install chord_diagrams
+```
 
 ## Usage
 
@@ -26,14 +30,6 @@ puts ChordDiagrams.guitar_svg('Am')
 puts ChordDiagrams.ukulele_svg('Am')
 ```
 
-### Guitar
-
-<svg width="100" height="100" viewBox="0 0 200 200"><text x="100" y="40" text-anchor="middle" style="font-size:36; font-weight:bold">Am</text><line x1="50" y1="80" x2="150" y2="80" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="50" y1="100" x2="150" y2="100" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="50" y1="120" x2="150" y2="120" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="50" y1="140" x2="150" y2="140" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="50" y1="160" x2="150" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="50" y1="80" x2="50" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="70" y1="80" x2="70" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="90" y1="80" x2="90" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="110" y1="80" x2="110" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="130" y1="80" x2="130" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="150" y1="80" x2="150" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="49" y1="77" x2="151" y2="77" style="stroke:black; stroke-width:8"/><circle cx="50" cy="61" r="6" style="stroke:black; fill:white; stroke-width:2"/><circle cx="70" cy="61" r="6" style="stroke:black; fill:white; stroke-width:2"/><circle cx="90" cy="110" r="8" style="fill:black"/><circle cx="110" cy="110" r="8" style="fill:black"/><circle cx="130" cy="90" r="8" style="fill:black"/><circle cx="150" cy="61" r="6" style="stroke:black; fill:white; stroke-width:2"/></svg>
-
-### Ukulele
-
-<svg width="80" height="100" viewBox="0 0 160 200"><text id="chordName" x="80" y="40" text-anchor="middle" style="font-size:36; font-weight:bold">Am</text><line x1="50" y1="80" x2="110" y2="80" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="50" y1="100" x2="110" y2="100" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="50" y1="120" x2="110" y2="120" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="50" y1="140" x2="110" y2="140" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="50" y1="160" x2="110" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="50" y1="80" x2="50" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="70" y1="80" x2="70" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="90" y1="80" x2="90" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line x1="110" y1="80" x2="110" y2="160" style="stroke:black; stroke-width:2; stroke-linecap:square"/><line id="nut" x1="49" y1="77" x2="111" y2="77" style="stroke:black; stroke-width:8"/><circle cx="50" cy="90" r="8" style="fill:black"/><circle cx="70" cy="61" r="6" style="stroke:black; fill:white; stroke-width:2"/><circle cx="90" cy="61" r="6" style="stroke:black; fill:white; stroke-width:2"/><circle cx="110" cy="61" r="6" style="stroke:black; fill:white; stroke-width:2"/></svg>
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/Rakefile

@@ -1,29 +1,30 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'chord_diagrams'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "chord_diagrams"
+require "standard/rake"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: [:spec, :standard]
 
 task sheets: %i[guitar ukulele]
 
 task :guitar do
-  html = ''
+  html = ""
 
   ChordDiagrams::GUITAR_FINGERINGS.keys.each do |name|
     html << ChordDiagrams.guitar_svg(name)
   end
 
-  File.open('guitar.html', 'w') { |file| file.write(html) }
+  File.open("guitar.html", "w") { |file| file.write(html) }
 end
 
 task :ukulele do
-  html = ''
+  html = ""
 
   ChordDiagrams::UKULELE_FINGERINGS.keys.each do |name|
     html << ChordDiagrams.ukulele_svg(name)
   end
 
-  File.open('ukulele.html', 'w') { |file| file.write(html) }
+  File.open("ukulele.html", "w") { |file| file.write(html) }
 end

data/chord_diagrams.gemspec

@@ -1,29 +1,29 @@
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'chord_diagrams/version'
+require "chord_diagrams/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'chord_diagrams'
-  spec.version       = ChordDiagrams::VERSION
-  spec.authors       = ['Brian Kelly']
-  spec.email         = ['bkelly@carbonfive.com']
+  spec.name = "chord_diagrams"
+  spec.version = ChordDiagrams::VERSION
+  spec.authors = ["Brian Kelly"]
+  spec.email = ["bkelly@carbonfive.com"]
 
-  spec.summary       = 'Generate Chord Diagrams for Guitar'
-  spec.description   = 'Generate Chord Diagrams for Guitar'
-  spec.homepage      = 'https://github.com/spilth/chord_diagrams'
-  spec.license       = 'MIT'
+  spec.summary = "Generate Chord Diagrams for Guitar and Ukulele"
+  spec.description = "Generate Chord Diagrams for Guitar and Ukulele"
+  spec.homepage = "https://github.com/spilth/chord_diagrams"
+  spec.license = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
-    spec.metadata['homepage_uri'] = spec.homepage
-    spec.metadata['source_code_uri'] = 'https://github.com/spilth/chord_diagrams'
+    spec.metadata["homepage_uri"] = spec.homepage
+    spec.metadata["source_code_uri"] = "https://github.com/spilth/chord_diagrams"
     # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
   else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
   end
 
   # Specify which files should be added to the gem when it is released.
@@ -31,13 +31,14 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'victor', '0.2.4'
-  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'
+  spec.add_dependency "victor", "0.3.2"
+  spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.8"
+  spec.add_development_dependency "nokogiri", "~> 1.11"
+  spec.add_development_dependency "standardrb"
 end

data/lib/chord_diagrams/fingerings.csv

@@ -44,6 +44,7 @@ Dsus4,xx0233,0230
 Esus4,022200,4400
 A7sus4,002030,0200
 G7sus4,353533,0213
+G+,x21003,332
 Am,002210,2000
 Bm,x24432,3222
 Cm,x35543,0333
@@ -88,6 +89,7 @@ Dm/F,10323x,2210
 Gm/Bb,x10333,0231
 A7/G,302020,0100
 G#dim,4564xx,1202
+Adim,x01212,23x3
 D#dim7,xx1212,2323
 G#dim7,456464,1212
 Daug,xx0332,3221

data/lib/chord_diagrams/fingerings.rb

@@ -1,10 +1,10 @@
-require 'csv'
+require "csv"
 
 module ChordDiagrams
   guitar_fingerings = {}
   ukulele_fingerings = {}
 
-  fingerings_file = File.join(File.expand_path(File.dirname(__FILE__)), 'fingerings.csv')
+  fingerings_file = File.join(__dir__, "fingerings.csv")
 
   CSV.foreach(fingerings_file, headers: true) do |row|
     guitar_fingerings[row[0]] = row[1] unless row[1].nil?

data/lib/chord_diagrams/version.rb

@@ -1,3 +1,3 @@
 module ChordDiagrams
-  VERSION = '0.0.8'.freeze
+  VERSION = "0.0.12".freeze
 end

data/lib/chord_diagrams.rb

@@ -1,6 +1,6 @@
-require 'chord_diagrams/version'
-require 'chord_diagrams/fingerings'
-require 'victor'
+require "chord_diagrams/version"
+require "chord_diagrams/fingerings"
+require "victor"
 
 module ChordDiagrams
   LINE_STYLE = {
@@ -10,8 +10,8 @@ module ChordDiagrams
   }.freeze
 
   class << self
-    def ukulele_svg(name, _fingering = nil)
-      svg = Victor::SVG.new template: :html, width: 80, height: 100, viewBox: '0 0 160 200'
+    def ukulele_svg(name, fingering = nil)
+      svg = Victor::SVG.new template: :minimal, width: 80, height: 100, viewBox: "0 0 160 200"
 
       ChordDiagrams.draw_ukulele_name(name, svg)
       ChordDiagrams.draw_ukulele_frets(svg)
@@ -29,7 +29,7 @@ module ChordDiagrams
     end
 
     def guitar_svg(name, fingering = nil)
-      svg = Victor::SVG.new template: :html, width: 100, height: 100, viewBox: '0 0 200 200'
+      svg = Victor::SVG.new template: :minimal, width: 100, height: 100, viewBox: "0 0 200 200"
 
       ChordDiagrams.draw_guitar_name(name, svg)
       ChordDiagrams.draw_guitar_frets(svg)
@@ -47,14 +47,14 @@ module ChordDiagrams
     end
 
     def draw_ukulele_name(name, svg)
-      svg.text name, id: 'chordName', x: 80, y: 40, text_anchor: :middle, style: {
+      svg.text name, id: "chordName", x: 80, y: 40, text_anchor: :middle, style: {
         font_size: 36,
         font_weight: :bold
       }
     end
 
     def draw_guitar_name(name, svg)
-      svg.text name, id: 'chordName', 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
       }
@@ -87,7 +87,7 @@ module ChordDiagrams
     def draw_guitar_missing_chord_diagram(name, svg)
       puts "Could't find fingerings for the Guitar chord '#{name}'"
 
-      svg.text '?', x: 102, y: 155, text_anchor: :middle, style: {
+      svg.text "?", x: 102, y: 155, text_anchor: :middle, style: {
         font_size: 96,
         font_weight: :bold,
         fill: :gray
@@ -95,9 +95,9 @@ module ChordDiagrams
     end
 
     def draw_ukulele_missing_chord_diagram(name, svg)
-      puts "Could't find fingerings for the Ukulele chord '#{name}'"
+      puts "Couldn't find fingerings for the Ukulele chord '#{name}'"
 
-      svg.text '?', x: 81, y: 155, text_anchor: :middle, style: {
+      svg.text "?", x: 81, y: 155, text_anchor: :middle, style: {
         font_size: 96,
         font_weight: :bold,
         fill: :gray
@@ -105,7 +105,7 @@ module ChordDiagrams
     end
 
     def draw_chord_diagram(fingerings, svg)
-      fingerings = fingerings.split('')
+      fingerings = fingerings.chars
 
       lowest_fret = fingerings.reject { |fret| fret.to_i < 1 }.min
       highest_fret = fingerings.reject { |fret| fret.to_i < 1 }.max
@@ -114,20 +114,18 @@ module ChordDiagrams
         draw_fret_number(lowest_fret, svg)
 
         fingerings = shift_guitar_fingerings(fingerings, lowest_fret)
+      elsif fingerings.size == 6
+        draw_guitar_nut(svg)
       else
-        if fingerings.size == 6
-          draw_guitar_nut(svg)
-        else
-          draw_ukulele_nut(svg)
-        end
+        draw_ukulele_nut(svg)
       end
 
       fingerings.each_with_index do |fingering, index|
         offset = 50 + (20 * index)
 
-        if fingering == 'x'
+        if fingering == "x"
           draw_muted_string(offset, svg)
-        elsif fingering == '0'
+        elsif fingering == "0"
           draw_open_string(offset, svg)
         else
           draw_fingered_string(fingering, offset, svg)
@@ -136,14 +134,14 @@ module ChordDiagrams
     end
 
     def draw_guitar_nut(svg)
-      svg.line id: 'nut', 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
       }
     end
 
     def draw_ukulele_nut(svg)
-      svg.line id: 'nut', x1: 49, y1: 77, x2: 111, y2: 77, style: {
+      svg.line id: "nut", x1: 49, y1: 77, x2: 111, y2: 77, style: {
         stroke: :black,
         stroke_width: 8
       }
@@ -169,12 +167,12 @@ module ChordDiagrams
     private
 
     def draw_fret_number(number, svg)
-      svg.text number, id: 'fretNumber', x: 37, y: 98, text_anchor: :end, style: {font_size: 24}
+      svg.text number, id: "fretNumber", x: 37, y: 98, text_anchor: :end, style: {font_size: 24}
     end
 
     def shift_guitar_fingerings(fingerings, lowest_fret)
       fingerings.map do |fingering|
-        if fingering != 'x' && fingering != '0'
+        if fingering != "x" && fingering != "0"
           fingering.to_i - lowest_fret.to_i + 1
         else
           fingering

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chord_diagrams
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.12
 platform: ruby
 authors:
 - Brian Kelly
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-20 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: victor
@@ -16,58 +16,72 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: standardrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Generate Chord Diagrams for Guitar
+description: Generate Chord Diagrams for Guitar and Ukulele
 email:
 - bkelly@carbonfive.com
 executables: []
@@ -124,8 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: Generate Chord Diagrams for Guitar
+summary: Generate Chord Diagrams for Guitar and Ukulele
 test_files: []