guitar_pro_parser 0.0.1 → 0.0.2

data/lib/guitar_pro_parser/bar.rb

@@ -2,17 +2,12 @@ module GuitarProParser
   
   # This class represents bars as containers of notes.
   #
-  # == Attributes
-  #
-  # All attributes are read-only
-  #
-  # * +voices+     (hash)  Voices of this bar.
-  #                        Guitar Pro 5 files has :lead and :bass voices.
-  #                        Guitar Pro 4 and less files has only :lead voice.
-  #
-  #
   class Bar
 
+    # Hash of voices of this bar.
+    # Guitar Pro 5 files has :lead and :bass voices.
+    # Guitar Pro 4 and less files has only :lead voice.
+    # Each voice is array of beats.
     attr_accessor :voices
 
     def initialize

data/lib/guitar_pro_parser/bar_settings.rb

@@ -4,7 +4,7 @@ module GuitarProParser
   #
   # == Attributes
   #
-  # *+new_time_signature+*                  (hash)      Info about new time signature in format 
+  # * +new_time_signature+                  (hash)      Info about new time signature in format 
   #                                                     { numerator: 4, denominator: 4, beam_eight_notes_by_values: [2, 2, 2, 2] }
   #                                                     or nil if doesn't present
   #

data/lib/guitar_pro_parser/chord_diagram.rb

@@ -2,12 +2,49 @@ module GuitarProParser
 
   class ChordDiagram
     
-    attr_accessor :name, :start_fret, :frets
+    attr_accessor :name,
+                  :base_fret,
+                  :frets,
+                  :display_as,
+                  :root,
+                  :type
+
+    # Determines if the chord goes until the ninth, the eleventh, or the thirteenth.
+    attr_accessor :nine_eleven_thirteen
+    
+    attr_accessor :bass,
+                  :tonality,
+                  :add,
+                  :fifth_tonality,
+                  :ninth_tonality,
+                  :eleventh_tonality,
+                  :barres,
+                  :intervals,
+                  :fingers,
+                  :display_fingering
 
     def initialize
       @name = ''
-      @start_fret = 0
+      @base_fret = 0
       @frets = []
+      @display_as = :sharp
+      @root = nil
+      @type = 'M'
+      @nine_eleven_thirteen = 0
+      @bass = nil
+      @tonality = :perfect
+      @add = false
+      @fifth_tonality = :perfect
+      @ninth_tonality = :perfect
+      @eleventh_tonality = :perfect
+      @barres = []
+      @intervals = []
+      @fingers = []
+      @display_fingering = false
+    end
+
+    def add_barre(fret, start_string, end_string)
+      @barres << { fret: fret, start_string: start_string, end_string: end_string }
     end
 
   end

data/lib/guitar_pro_parser/guitar_pro_helper.rb

@@ -1,5 +1,19 @@
 module GuitarProHelper
 
+  # Possible versions of Guitar Pro file
+  VERSIONS = { 'FICHIER GUITARE PRO v1' => 1.0,
+               'FICHIER GUITARE PRO v1.01' => 1.01,
+               'FICHIER GUITARE PRO v1.02' => 1.02,
+               'FICHIER GUITARE PRO v1.03' => 1.03,
+               'FICHIER GUITARE PRO v1.04' => 1.04,
+               'FICHIER GUITAR PRO v2.20'  => 2.2,
+               'FICHIER GUITAR PRO v2.21'  =>2.21,
+               'FICHIER GUITAR PRO v3.00' => 3.0,
+               'FICHIER GUITAR PRO v4.00' => 4.0,
+               'FICHIER GUITAR PRO v4.06' => 4.06,
+               'FICHIER GUITAR PRO L4.06' => 4.06,
+               'FICHIER GUITAR PRO v5.10' => 5.1 }
+
   NOTES = %w(C C# D D# E F F# G G# A A# B)
   VOICES = [:lead, :bass]
   FINGERS = [:thumb, :index, :middle, :ring, :pinky]
@@ -33,10 +47,23 @@ module GuitarProHelper
   
   SLIDE_TYPES = [:no_slide, :shift_slide, :legato_slide, :slide_out_and_downwards, :slide_out_and_upwards, :slide_in_from_below, :slide_in_from_above]
   MAP_SLIDE_TYPES_GP5 = { '0'=>0, '1'=>1, '2'=>2, '4'=>3, '8'=>4, '16'=>5, '32'=>6 }
-  MAP_SLIDE_TYPES_GP4 = { '-2'=>0, '-1'=>1, '0'=>2, '1'=>3, '2'=>4, '3'=>5, '4'=>6 }
-  
+  MAP_SLIDE_TYPES_GP4 = { '-2'=>6, '-1'=>5, '0'=>0, '1'=>1, '2'=>2, '3'=>3, '4'=>4 }
+
   HARMONIC_TYPES = [:none, :natural, :artificial, :tapped, :pinch, :semi]
-  TRILL_PERIODS = [4, 8, 16]
+  TRILL_PERIODS = { '1' => 4, '2' => 8, '3' => 16 }
+  CHORD_TYPES = %w(M 7 7M 6 m m7 m7M m6 sus2 sus4 7sus2 7sus4 dim aug 5)
+  NINE_ELEVEN_THIRTEEN = [0, 9, 11, 13]
+
+  # Strange moment here. In format specification is written:
+  #   0: perfect
+  #   1: augmented
+  #   2: diminished
+  # But actually (after tests) it seems to be:
+  #   0: perfect
+  #   1: diminished
+  #   2: augmented
+  CHORD_TONALITIES = [:perfect, :diminished, :augmented]
+  
 
   # Macros to create boolean instance variables' getters like this:
   #   attr_boolean :complete

data/lib/guitar_pro_parser/io/reader.rb

@@ -69,9 +69,8 @@ module GuitarProParser
     def read_version
       length = @input.read_byte
       version_string = @input.read_string length
-      # TODO: Change a way to get value from string
-      version_string['FICHIER GUITAR PRO v'] = ''
-      @version = version_string.to_f
+      # TODO: Raise exception for unsupported or wrong versions here
+      @version = GuitarProHelper::VERSIONS.fetch(version_string)
       @song.version = @version
 
       # Skip first 31 bytes that are reserved for version data
@@ -273,7 +272,7 @@ module GuitarProParser
         bits = @input.read_bitmask
         bits.count.times { |i| bars_settings.alternate_endings << (i+1) if bits[i] }
       else
-          bars_settings.alternate_endings << @input.read_byte
+        bars_settings.alternate_endings << @input.read_byte
       end
     end
 
@@ -398,7 +397,7 @@ module GuitarProParser
       beat.rest = GuitarProHelper::REST_TYPES.fetch(@input.read_byte.to_s) if is_rest
       beat.duration = GuitarProHelper::DURATIONS.fetch(@input.read_signed_byte.to_s)
       beat.tuplet = @input.read_integer if is_tuplet
-      read_chord_diagram(track) if has_chord_diagram
+      read_chord_diagram(beat, track.strings.count) if has_chord_diagram
       beat.text = @input.read_chunk if has_text
       read_beat_effects(beat) if has_effects
       read_mix_table(beat) if has_mix_table_change 
@@ -439,19 +438,84 @@ module GuitarProParser
       end
     end
 
-    def read_chord_diagram(track)
+    def read_chord_diagram(beat, strings_count)
       beat.chord_diagram = ChordDiagram.new
 
-      format = @input.read_byte
-      
-      if format == 0 # Guitar Pro 3 format
+      format = @input.read_bitmask
+      if format[0] == false # Guitar Pro 3 format
         beat.chord_diagram.name = @input.read_chunk
-        beat.chord_diagram.start_fret = @input.read_integer
-        unless beat.chord_diagram.start_fret.zero?
-          track.strings.count.times { beat.chord_diagram.frets << @input.read_integer }
+        beat.chord_diagram.base_fret = @input.read_integer
+        unless beat.chord_diagram.base_fret.zero?
+          strings_count.times { beat.chord_diagram.frets << @input.read_integer }
         end
-      else # Guitar Pro 4 format
-        @input.increment_offset(105) # TODO: Write reading logic here
+      else # Guitar Pro 4 and 5 format
+        beat.chord_diagram.display_as = @input.read_boolean ? :sharp : :flat
+        @input.increment_offset(3)
+
+        root = @input.read_byte
+        beat.chord_diagram.root = GuitarProHelper::NOTES[root] unless root == 12
+
+        beat.chord_diagram.type = GuitarProHelper::CHORD_TYPES[@input.read_byte]
+        beat.chord_diagram.nine_eleven_thirteen = GuitarProHelper::NINE_ELEVEN_THIRTEEN.fetch(@input.read_byte)
+
+        bass = @input.read_integer
+        beat.chord_diagram.bass = GuitarProHelper::NOTES[bass] if bass >= 0
+
+        beat.chord_diagram.tonality = GuitarProHelper::CHORD_TONALITIES[@input.read_integer]
+        beat.chord_diagram.add = @input.read_boolean
+
+        name_length = @input.read_byte
+        beat.chord_diagram.name = @input.read_string(name_length)
+        @input.increment_offset(20 - name_length) if name_length < 20
+
+        @input.increment_offset(2)
+        beat.chord_diagram.fifth_tonality = GuitarProHelper::CHORD_TONALITIES[@input.read_byte]
+        beat.chord_diagram.ninth_tonality = GuitarProHelper::CHORD_TONALITIES[@input.read_byte]
+        beat.chord_diagram.eleventh_tonality = GuitarProHelper::CHORD_TONALITIES[@input.read_byte]
+
+        beat.chord_diagram.base_fret = @input.read_integer
+
+        strings_count.times { beat.chord_diagram.frets << @input.read_integer }        
+        (7 - strings_count).times { @input.skip_integer }
+
+        barres_count = @input.read_byte
+        barres_frets = []
+        barres_starts = []
+        barres_ends = []
+        5.times { barres_frets << @input.read_byte }
+        5.times { barres_starts << @input.read_byte }
+        5.times { barres_ends << @input.read_byte }
+        barres_count.times do |i| 
+          beat.chord_diagram.add_barre(barres_frets[i],
+                                       barres_starts[i],
+                                       barres_ends[i])
+        end
+
+        # TODO: I don't know why but it looks inverted
+        beat.chord_diagram.intervals << 1 if @input.read_byte == 0x01
+        beat.chord_diagram.intervals << 3 if @input.read_byte == 0x01
+        beat.chord_diagram.intervals << 5 if @input.read_byte == 0x01
+        beat.chord_diagram.intervals << 7 if @input.read_byte == 0x01
+        beat.chord_diagram.intervals << 9 if @input.read_byte == 0x01
+        beat.chord_diagram.intervals << 11 if @input.read_byte == 0x01
+        beat.chord_diagram.intervals << 13 if @input.read_byte == 0x01
+        @input.skip_byte
+
+        strings_count.times do |i|
+          finger_id = @input.read_signed_byte
+          finger = nil
+          if finger_id == -2
+            finger = :unknown
+          elsif finger_id == -1
+            finger = :no
+          else
+            finger = GuitarProHelper::FINGERS[finger_id]
+          end
+          beat.chord_diagram.fingers << finger
+        end
+        @input.increment_offset(7 - strings_count) if strings_count < 7
+
+        beat.chord_diagram.display_fingering = @input.read_boolean
       end
     end
 
@@ -622,11 +686,11 @@ module GuitarProParser
       note.fret = @input.read_byte
 
       if has_fingering
-        left_finger = @input.read_byte
-        right_finger = @input.read_byte
+        left_finger = @input.read_signed_byte
+        right_finger = @input.read_signed_byte
 
-        note.add_left_hand_finger(FINGERS.fetch(left_finger)) unless left_finger == -1
-        note.add_right_hand_finger(FINGERS.fetch(right_finger)) unless right_finger == -1
+        note.add_left_hand_finger(GuitarProHelper::FINGERS.fetch(left_finger)) unless left_finger == -1
+        note.add_right_hand_finger(GuitarProHelper::FINGERS.fetch(right_finger)) unless right_finger == -1
       end
 
       # Ignore time-independed duration data for Guitar Pro 5
@@ -688,16 +752,19 @@ module GuitarProParser
         note.add_tremolo(GuitarProHelper::TREMOLO_PICKING_SPEEDS.fetch(@input.read_byte.to_s)) if has_tremolo
 
         if has_slide
-          value = @input.read_byte.to_s
-          # TODO: Check if there is difference between GP4 and GP5
-          note.slide = GuitarProHelper::SLIDE_TYPES.fetch(GuitarProHelper::MAP_SLIDE_TYPES_GP5.fetch(value))
+          value = @input.read_signed_byte.to_s
+          if @version >= 5.0
+            note.slide = GuitarProHelper::SLIDE_TYPES.fetch(GuitarProHelper::MAP_SLIDE_TYPES_GP5.fetch(value))
+          else
+            note.slide = GuitarProHelper::SLIDE_TYPES.fetch(GuitarProHelper::MAP_SLIDE_TYPES_GP4.fetch(value))
+          end
         end
 
         read_harmonic(note) if has_harmonic
 
         if has_trill
           fret = @input.read_byte
-          period = GuitarProHelper::TRILL_PERIODS.fetch(@input.read_byte)
+          period = GuitarProHelper::TRILL_PERIODS.fetch(@input.read_byte.to_s)
           note.add_trill(fret, period)
         end
       end

data/lib/guitar_pro_parser/song.rb

@@ -3,69 +3,108 @@ require 'guitar_pro_parser/io/reader'
 module GuitarProParser
   
   # This class represents the content of Guitar Pro file.
-  # It can be initialized by path to .gp[3,4,5] file. The it will automatically parse its data.
+  # It can be initialized by path to .gp[3,4,5] file. Then it will automatically parse its data.
   # Or it can be just instantiated with default values of the attributes.
   #
-  # == Attributes
-  #
-  #
-  # * +version+       (float)   Version of Guitar Pro
-  # * +title+         (string)
-  # * +subtitle+      (string)
-  # * +artist+        (string)
-  # * +album+         (string)
-  # * +lyricist+      (string)  Author of lyrics (>= 5.0 only)
-  # * +composer+      (string)  Author of music
-  # * +copyright+     (string)
-  # * +transcriber+   (string)  Author of tabulature
-  # * +instructions+  (string)
-  # * +notices+       (array)   Array of notices (each notice is a string)
-  # * +triplet_feel+  (boolean) Shuffle rhythm feel (< 5.0 only)
-  # * +lyrics_track+  (integer) Associated track for the lyrics (>= 4.0 only)
-  # * +lyrics+        (array)   Lyrics data represented as array of hashes with 5 elements
-  #                             (for lyrics lines from 1 to 5). Each line has lyrics' text 
-  #                             and number of bar where it starts: {text: "Some text", bar: 1}
-  #                             (>= 4.0 only)
-  # * +master_volume+ (integer) Master volume (value from 0 - 200, default is 100) (>= 5.0 only)
-  # * +equalizer+     (array)   Array of equalizer settings. 
-  #                             Each one is represented as number of increments of .1dB the volume for 
-  #                             32Hz band is lowered
-  #                             60Hz band is lowered
-  #                             125Hz band is lowered
-  #                             250Hz band is lowered
-  #                             500Hz band is lowered
-  #                             1KHz band is lowered
-  #                             2KHz band is lowered
-  #                             4KHz band is lowered
-  #                             8KHz band is lowered
-  #                             16KHz band is lowered
-  #                             overall volume is lowered (gain)
-  # * +page_setup+    (object)  Object of PageSetup class that contains data about page setup (>= 5.0 only)
-  # * +tempo+         (string)  Tempo as string
-  # * +bpm+           (integer) Tempo as beats per minute
-  # * +key+           (integer) #TODO: convert digit to something readable (has different format for GP3 and GP4/5)
-  # * +octave+        (integer) (>= 4.0 only)
-  # * +channels+      (array)   Table of midi channels. There are 4 ports and 16 channels, the channels are stored in this order: 
-  #                             port1/channel1  - port1/channel2 ... port1/channel16 - port2/channel1 ...
-  # * +musical_directions+ (hash) Hash of musical directions definitions. 
-  #                               Each symbol is represented as the bar number at which it is placed.
-  #                               If the symbol is not presented its value is nil.
-  #                               There is full list of supported symbols in GuitarProHelper::MUSICAL_DIRECTIONS array (>= 5.0 only)
-  # * +master_reverb+  (integer) Selected master reverb setting (in Score information, value from 0 to 60) (>= 5.0 only) #TODO represent as names
-  # * +bars_settings+  (array)   Array of settings of bars. Doesn't represent bars as containers for notes (look at Bar class for it)
-  # * +tracks+         (array)   Array of tracks
-  #
   class Song
 
     include GuitarProHelper
 
-    attr_accessor :version, :title, :subtitle, :artist, :album, :lyricist, :composer, :copyright, 
-                  :transcriber, :instructions, :notices, :triplet_feel, :lyrics_track, :lyrics,
-                  :master_volume, :equalizer, :page_setup, :tempo, :bpm, :key, :octave, :channels,
-                  :musical_directions, :master_reverb, :bars_settings, :tracks
+    # Guitar Pro version
+    attr_accessor :version
+
+    # Song information
+    attr_accessor :title, :subtitle, :artist, :album, :lyricist,
+                  :composer, :copyright, :transcriber, :instructions
+
+    # Array of notices
+    attr_accessor :notices
+
+    # (Boolean) Shuffle rhythm feel. < 5.0 only. 
+    # In version 5 of the format it is true when
+    # there is at least 1 bar with triplet feel.
+    attr_accessor :triplet_feel
+
+    # Associated track for the lyrics (>= 4.0 only)    
+    attr_accessor :lyrics_track
+
+    # Lyrics represented as array of hashes with 5 elements
+    # (for lyrics lines from 1 to 5). 
+    # Each line has lyrics' text and number of bar where it starts
+    #   {text: "Some text", bar: 1}
+    # (>= 4.0 only)
+    attr_accessor :lyrics
+
+    # Master volume (value from 0 - 200, default is 100) (>= 5.0 only)
+    attr_accessor :master_volume
+
+    # Array of equalizer settings. 
+    # Each one is represented as number of increments of .1dB the volume for 
+    # * 32Hz band is lowered
+    # * 60Hz band is lowered
+    # * 125Hz band is lowered
+    # * 250Hz band is lowered
+    # * 500Hz band is lowered
+    # * 1KHz band is lowered
+    # * 2KHz band is lowered
+    # * 4KHz band is lowered
+    # * 8KHz band is lowered
+    # * 16KHz band is lowered
+    # * overall volume is lowered (gain)
+    attr_accessor :equalizer
+
+    # (PageSetup) Data about page setup such as paddings, width, height, etc. (>= 5.0 only)
+    attr_accessor :page_setup
 
+    # (String) Tempo text
+    attr_accessor :tempo
+
+    # Tempo as beats per minute
+    attr_accessor :bpm
+
+    # Key (signature) at the beginning of the piece. 
+    # It is encoded as:
+    # * ...
+    # * -1: F (b)
+    # * 0: C
+    # * 1: G (#)
+    # * 2: D (##)
+    # * ...
+    # TODO: convert digit to something readable
+    attr_accessor :key
+
+    # Octave. Default value is 0. 
+    # It becomes 8 if the sheet is to be played one octave higher (8va).
+    attr_accessor :octave
+
+    # Table of midi channels. There are 4 ports and 16 channels, the channels are stored in this order:
+    # port1/channel1  - port1/channel2 ... port1/channel16 - port2/channel1 ...
+    # in array with the format:
+    #   [[1,2,...16], [1,2,...16], [1,2,...16], [1,2,...16]]
+    attr_accessor :channels
+
+    # (Hash) Musical directions definitions. 
+    # Each symbol is represented as the bar number at which it is placed.
+    # If the symbol is not presented its value is nil.
+    # There is full list of supported symbols in GuitarProHelper::MUSICAL_DIRECTIONS array (>= 5.0 only)
+    attr_accessor :musical_directions
+
+    # Selected master reverb setting (in Score information, value from 0 to 60) (>= 5.0 only)
+    # TODO: Represent as names
+    attr_accessor :master_reverb
+
+    # Array of settings of bars. Doesn't represent bars as containers for notes (look at Bar class for it)
+    attr_accessor :bars_settings
+
+    # Array of tracks
+    attr_accessor :tracks
+
+    # Initializes new Song instance.
+    # Parameters:
+    # (String) +file_path+ Path to file to read. If is not specified default song instance will be created.
+    # (Boolean) +headers_only+ Read only headers information from file if true (much faster than reading every note)
     def initialize(file_path = nil, headers_only = false)
-      # Initialize variables by default values
+      @version = 5.1
       @title = ''
       @title = ''
       @subtitle = ''
@@ -90,11 +129,10 @@ module GuitarProParser
       @channels = []
       @musical_directions = Hash[GuitarProHelper::MUSICAL_DIRECTIONS.collect { |elem| [elem, nil] }]
       @master_reverb = 0
-
       @bars_settings = []
       @tracks = []
 
-      # Read data from file
+      # Read data from file if it is specified
       Reader.new(self, file_path, headers_only) unless file_path.nil?
     end
 

data/lib/guitar_pro_parser/version.rb

@@ -1,3 +1,3 @@
 module GuitarProParser
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/lib/guitar_pro_parser/beat_spec.rb

@@ -20,7 +20,7 @@ describe GuitarProParser::Beat do
       test_beat :first
 
       its(:dotted) { should == false }
-      its(:chord_diagram) { should be_nil }
+      its(:chord_diagram) { should be_kind_of GuitarProParser::ChordDiagram }
       its(:tuplet) { should be_nil }
       its(:rest) { should be_nil }
 

data/spec/lib/guitar_pro_parser/chord_diagram_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe GuitarProParser::ChordDiagram do
+
+  shared_examples 'any Guitar Pro version' do
+    context 'F#m11/9-' do
+      subject { song.tracks[0].bars[0].get_beat(0).chord_diagram }
+      its(:name) { should == 'F#m11/9-' }
+      its(:base_fret) { should == 1 }
+      its(:frets) { should == [3, 2, 4, 2, 0, 2] }
+      its(:display_as) { should == :sharp }
+      its(:root) { should == 'F#' }
+      its(:type) { should == 'm' }
+      its(:nine_eleven_thirteen) { should == 11 }
+      its(:bass) { should == 'F#' }
+      its(:tonality) { should == :perfect }
+      its(:add) { should == false }
+      its(:fifth_tonality) { should == :perfect }
+      its(:ninth_tonality) { should == :diminished }
+      its(:eleventh_tonality) { should == :perfect }
+      its(:barres) { should == [{ fret: 2, start_string: 1, end_string: 4 }] }
+      its(:intervals) { should == [13] }
+      its(:fingers) { should == [:ring, :middle, :pinky, :middle, :no, :index] }
+      its(:display_fingering) { should == true }
+    end
+
+    context 'Asus2add13' do
+      subject { song.tracks[0].bars[0].get_beat(4).chord_diagram }
+      its(:name) { should == 'Asus2add13' }
+      its(:base_fret) { should == 1 }
+      its(:frets) { should == [2, 0, 2, 2, 2, -1] }
+      its(:display_as) { should == :sharp }
+      its(:root) { should == 'A' }
+      its(:type) { should == 'sus2' }
+      its(:nine_eleven_thirteen) { should == 13 }
+      its(:bass) { should == 'B' }
+      its(:tonality) { should == :perfect }
+      its(:add) { should == true }
+      its(:fifth_tonality) { should == :perfect }
+      its(:ninth_tonality) { should == :perfect }
+      its(:eleventh_tonality) { should == :perfect }
+      its(:barres) { should == [] }
+      its(:intervals) { should == [7, 9, 11] }
+      its(:fingers) { should == [:pinky, :no, :ring, :middle, :index, :no] }
+      its(:display_fingering) { should == true }
+    end
+
+     context 'C7M13+/9-/11-' do
+      subject { song.tracks[0].bars[1].get_beat(0).chord_diagram }
+      its(:name) { should == 'C7M13+/9-/11-' }
+      its(:base_fret) { should == 8 }
+      its(:frets) { should == [9, 11, 9, 9, 10, 8] }
+      its(:display_as) { should == :sharp }
+      its(:root) { should == 'C' }
+      its(:type) { should == '7M' }
+      its(:nine_eleven_thirteen) { should == 13 }
+      its(:bass) { should == 'C' }
+      its(:tonality) { should == :augmented }
+      its(:add) { should == false }
+      its(:fifth_tonality) { should == :perfect }
+      its(:ninth_tonality) { should == :diminished }
+      its(:eleventh_tonality) { should == :diminished }
+      its(:barres) { should == [{ fret: 9, start_string: 1, end_string: 4 }] }
+      its(:intervals) { should == [] }
+      its(:fingers) { should == [:middle, :pinky, :middle, :middle, :ring, :index] }
+      its(:display_fingering) { should == true }
+    end
+  end
+
+  context 'Guitar Pro 5' do
+    subject(:song) { GuitarProParser::Song.new test_tab_path 5 }
+    it_behaves_like 'any Guitar Pro version'
+  end
+
+  context 'Guitar Pro 4' do
+    subject(:song) { GuitarProParser::Song.new test_tab_path 4 }
+    it_behaves_like 'any Guitar Pro version'
+  end
+  
+   
+end

data/spec/lib/guitar_pro_parser/note_spec.rb

@@ -1,19 +1,27 @@
 require 'spec_helper'
 
-# TODO: Rewrite these test when it will be possible to read all the beats and notes.
+# TODO: It would be nice to add more tests for notes and test :bass voice
 
 def test_note(type)
-  refs = {
-    first: [0, '5']
+  notes = {
+    first: [0, 0, 0, '5'],
+    legato_slide: [0, 15, 0, '2'],
+    shift_slide: [0, 15, 2, '2'],
+    slide_in_from_below: [0, 15, 4, '2'],
+    slide_in_from_above: [0, 15, 5, '2'],
+    slide_out_and_downwards: [0, 15, 6, '2'],
+    slide_out_and_upwards: [0, 15, 7, '2'],
   }
-  beat_number = refs.fetch(type).fetch(0)
-  string_number = refs.fetch(type).fetch(1)
-  subject { song.tracks[0].bars[0].get_beat(beat_number).strings[string_number] }
+  note = notes.fetch(type)
+  track_number = note[0]
+  bar_number = note[1]
+  beat_number = note[2]
+  string_number = note[3]
+  subject { song.tracks[track_number].bars[bar_number].get_beat(beat_number).strings[string_number] }
 end
 
 describe GuitarProParser::Note do
 
-
   shared_examples 'any Guitar Pro version' do
     
     context 'note of the 1 beat, 1 bar, 1 track' do
@@ -39,6 +47,36 @@ describe GuitarProParser::Note do
       its(:trill) { should be_nil }
     end
 
+    context 'legato slide' do
+      test_note :legato_slide
+      its(:slide) { should == :legato_slide }
+    end
+
+    context 'shift slide' do
+      test_note :shift_slide
+      its(:slide) { should == :shift_slide }
+    end
+
+    context 'slide in from below' do
+      test_note :slide_in_from_below
+      its(:slide) { should == :slide_in_from_below }
+    end
+
+    context 'slide in from above' do
+      test_note :slide_in_from_above
+      its(:slide) { should == :slide_in_from_above }
+    end
+
+    context 'slide out and downwards' do
+      test_note :slide_out_and_downwards
+      its(:slide) { should == :slide_out_and_downwards }
+    end
+
+    context 'slide out and upwards' do
+      test_note :slide_out_and_upwards
+      its(:slide) { should == :slide_out_and_upwards }
+    end
+
   end
 
   context 'Guitar Pro 5' do
@@ -50,6 +88,5 @@ describe GuitarProParser::Note do
     subject(:song) { GuitarProParser::Song.new test_tab_path 4 }
     it_behaves_like 'any Guitar Pro version'
   end
-  
    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guitar_pro_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - spec/lib/guitar_pro_parser/bar_settings_spec.rb
 - spec/lib/guitar_pro_parser/beat_spec.rb
 - spec/lib/guitar_pro_parser/channel_spec.rb
+- spec/lib/guitar_pro_parser/chord_diagram_spec.rb
 - spec/lib/guitar_pro_parser/guitar_pro_helper_spec.rb
 - spec/lib/guitar_pro_parser/io/input_stream_spec.rb
 - spec/lib/guitar_pro_parser/note_spec.rb
@@ -131,6 +132,7 @@ test_files:
 - spec/lib/guitar_pro_parser/bar_settings_spec.rb
 - spec/lib/guitar_pro_parser/beat_spec.rb
 - spec/lib/guitar_pro_parser/channel_spec.rb
+- spec/lib/guitar_pro_parser/chord_diagram_spec.rb
 - spec/lib/guitar_pro_parser/guitar_pro_helper_spec.rb
 - spec/lib/guitar_pro_parser/io/input_stream_spec.rb
 - spec/lib/guitar_pro_parser/note_spec.rb