wtf_chord 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff26ad0548f061f6982cfa47df59f0ffff78b136
-  data.tar.gz: 073b2e5c14ac65a19c6aa806f97467c618f10145
+  metadata.gz: b01a7a811a348cefa9b4e05c67d4ae4cb4af5f20
+  data.tar.gz: 814e86e9e218ab85ec3605bdf72c99bb632c22d3
 SHA512:
-  metadata.gz: 40326155782d5c90b1e99f6b1e0d117d06d6c6b10139636fe7d27bcc5a9207c72073a205298e870405fd5af1aee6865ffb8271d80c3e47b940d86a65d54ca74b
-  data.tar.gz: 33d25bb0f14caaa21278dfdce45ef553656c29a77eb29bab409c80910e3f7f5c2aeeb97e5b99f580c2f2949d4ca2c1359594ce80d0798bdc7fadde366ceac4ca
+  metadata.gz: ff5fe7b9623c92b26d74c01cccfda962196affa8a6e171975d39b91828cce3080e31ed3bc29d2fd208030c3ed47847b8a692367ef40ffe1f1bfda72f12ddb516
+  data.tar.gz: f9fbcb0adc02b779dc665cafef34466c4cf569e79eb0a8636e0c5e689e3c59f271b51f62fd75d05bb64ae21a6c9d0d1118ba273cb039d0127a25136a1bc70a6e

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+## 0.5.0 / 2016-08-17
+
+* 2 major features
+  * Support chords with bass string mods (like Am/G)
+  * Add extra_complexity modifier
+
+* 1 bug fixes:
+  * Fix fingering equality
+
+* Add CHANGELOG.md

data/lib/wtf_chord/chord.rb

@@ -3,26 +3,39 @@ require 'wtf_chord/fingerings_generator'
 
 module WTFChord
   class Chord
-    attr_reader :pitch, :steps, :notes, :name
+    BASS_MATCH = /(?<=[\\\/])[A-H][b#]?(?=$)/
+
+    attr_reader :pitch, :steps, :notes, :name, :bass
 
     def initialize(note, name)
       @pitch = note.is_a?(Pitch) ? note : WTFChord.note(note)
       @name  = "#{@pitch.key}#{name}".freeze
       @steps = Array(WTFChord.rules[name])
       @notes = @steps.map { |dist| (@pitch + dist).note }.tap(&:uniq!)
-    end
 
-    def inspect
-      "#{name} (#{@notes.map(&:key) * ' - '})"
+      BASS_MATCH.match(@name) do |m|
+        @bass = WTFChord.note(m[0]).note
+      end
     end
 
     def fingerings(limit = nil)
-      limit ||= 5
-      FingeringsGenerator.new(self).call[0, limit]
+      FingeringsGenerator.new(self).call[0, limit || 5]
     end
 
     def third_tone
-      @third_tone ||= @notes[@steps.index(7) || -1]
+      @third_tone ||= @notes[@steps.size > 3 ? 2 : -1]
+    end
+
+    def bass?
+      !!@bass
+    end
+
+    def original_bass
+      @notes[0]
+    end
+
+    def inspect
+      "#{name} (#{@notes.map(&:key) * ' - '})"
     end
   end
 end

data/lib/wtf_chord/complexity_counter.rb

@@ -28,7 +28,7 @@ module WTFChord
         end
       end
 
-      base_rate
+      base_rate + @fingering.extra_complexity
     end
 
     private

data/lib/wtf_chord/fingering.rb

@@ -4,15 +4,18 @@ require 'wtf_chord/formatter'
 
 module WTFChord
   class Fingering < Fretboard
+    attr_accessor :extra_complexity
+
     def initialize(guitar, fingers = nil)
       @capo      = guitar.capo
       @strings   = guitar.strings.map(&:dup)
+      @extra_complexity = 0.0
       set_fingers(fingers) if fingers.is_a?(Array)
       yield(self) if block_given?
     end
 
     def code
-      @code ||= strings.map(&:code).pack("c*")
+      strings.map(&:code).pack("c*")
     end
 
     def == other
@@ -23,6 +26,14 @@ module WTFChord
       end
     end
 
+    def eql?(other)
+      super || self == other
+    end
+
+    def hash
+      strings.map(&:code).hash
+    end
+
     def complexity
       complexity_counter.rate
     end
@@ -43,6 +54,14 @@ module WTFChord
       @strings.reject(&:dead?)
     end
 
+    def find_used_string_for(note)
+      used = used_strings
+      if idx = used.index(note)
+        string = used[idx]
+        yield(strings.index(string), string)
+      end
+    end
+
     def min_fret
       holded_strings.min.fret
     end

data/lib/wtf_chord/fingerings_generator.rb

@@ -16,10 +16,11 @@ module WTFChord
       (0...MAX_FRET).each do |from|
         to = from + MAX_DIST
         generate(from...to) do |variant|
-          fingerings << variant if filter_variant(variant)
+          fingerings << set_bass(variant) if filter_variant(variant)
         end
       end
 
+      fingerings.uniq!
       fingerings.sort_by!(&:complexity)
     end
 
@@ -66,6 +67,35 @@ module WTFChord
       end
     end
 
+    def set_bass(variant)
+      if bass?
+        variant.find_used_string_for(original_bass) do |idx, bass_string|
+          try_set_bass_on(variant, idx) or begin
+            4.times do |i|
+              next if i == idx
+              if try_set_bass_on(variant, i)
+                bass_string.dead
+                break
+              end
+            end
+          end
+        end
+      end
+
+      variant
+    end
+
+    def try_set_bass_on(variant, idx)
+      bass_string = variant.strings[idx].dup
+      distance = bass_string.distance_to(bass)
+
+      if distance >= 0 && distance < 5 && (distance - variant.min_fret) > -3
+        variant.extra_complexity += 0.5 if distance < variant.min_fret
+        variant.strings[idx].hold_on(distance)
+        true
+      end
+    end
+
     def all_notes?(used_notes)
       notes.all? { |n| used_notes.include?(n) }
     end

data/lib/wtf_chord/guitar_string.rb

@@ -48,6 +48,13 @@ module WTFChord
       dead? ? -1 : to_i
     end
 
+    def distance_to(pitch)
+      pos = 0
+      opened = dup.open
+      pos += 1 while (opened + pos) != pitch
+      pos
+    end
+
     def <=> other
       return if dead?
       case other

data/lib/wtf_chord/pitch.rb

@@ -46,6 +46,10 @@ module WTFChord
       move -amount
     end
 
+    def -@
+      -to_i
+    end
+
     def to_i
       (@octave * 12) + @note.position
     end

data/lib/wtf_chord/version.rb

@@ -1,3 +1,3 @@
 module WTFChord
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wtf_chord
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -83,6 +83,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile