guitar_pro_parser 0.0.2 → 0.0.3

data/lib/guitar_pro_parser/guitar_pro_helper.rb

@@ -12,6 +12,7 @@ module GuitarProHelper
                '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.00' => 5.0,
                'FICHIER GUITAR PRO v5.10' => 5.1 }
 
   NOTES = %w(C C# D D# E F F# G G# A A# B)

data/lib/guitar_pro_parser/io/reader.rb

@@ -17,12 +17,12 @@ module GuitarProParser
       @song.triplet_feel = @input.read_boolean if @version < 5.0
       read_lyrics if @version >= 4.0
 
-      if @version >= 5.0
+      if @version > 5.0
         @song.master_volume = @input.read_integer 
         @input.skip_integer
+        11.times { |n| @song.equalizer[n] = @input.read_byte }
       end
-
-      11.times { |n| @song.equalizer[n] = @input.read_byte } if @version >= 5.0
+      
       read_page_setup if @version >= 5.0
       read_tempo
       read_key
@@ -82,7 +82,7 @@ module GuitarProParser
       @song.subtitle = @input.read_chunk
       @song.artist = @input.read_chunk
       @song.album = @input.read_chunk
-      @song.lyricist = @input.read_chunk if @version > 5.0
+      @song.lyricist = @input.read_chunk if @version >= 5.0
       @song.composer = @input.read_chunk
       @song.copyright = @input.read_chunk
       @song.transcriber = @input.read_chunk
@@ -159,7 +159,7 @@ module GuitarProParser
     def read_tempo
       @song.tempo = @input.read_chunk if @version >= 5.0
       @song.bpm = @input.read_integer
-      @input.skip_byte if @version >= 5.0
+      @input.skip_byte if @version > 5.0
     end
 
     def read_key

data/lib/guitar_pro_parser/note.rb

@@ -2,24 +2,89 @@ module GuitarProParser
 
   class Note
 
-    attr_accessor :type,
-                  :time_independent_duration,
-                  :accentuated,
-                  :ghost,
-                  :dynamic,
-                  :fret,
-                  :fingers,
-                  :vibrato,
-                  :grace,
-                  :let_ring,
-                  :hammer_or_pull,
-                  :trill,
-                  :bend,
-                  :staccato,
-                  :palm_mute,
-                  :harmonic,
-                  :tremolo,
-                  :slide
+    # Type of note: normal, tie or dead (see GuitarProHelper::NOTE_TYPES)
+    attr_accessor :type
+    
+    # Time independent duration data from version 4 of the format.
+    # TODO: It is parsed but I don't know if it's used correctly
+    attr_accessor :time_independent_duration 
+
+    # (Boolean) Is this note accentuated?
+    attr_accessor :accentuated
+
+    # (Boolean) Is this note a ghost note?
+    attr_accessor :ghost
+
+    # Note dynamic. Default is 'f' (see GuitarProHelper::NOTE_DYNAMICS)
+    attr_accessor :dynamic
+
+    # Fret
+    attr_accessor :fret
+
+    # (Hash) Left and right fingering. E.g.:
+    #   { left: :middle, right: :thumb }
+    # See fingers in GuitarProHelper::FINGERS
+    attr_accessor :fingers
+
+    # (Boolean) Has this note vibrato effect?
+    attr_accessor :vibrato
+
+    # (Hash) Grace note. E.g.:
+    #   { fret: 2, 
+    #     dynamic: 'ff',
+    #     transition: :hammer, # see GuitarProHelper::GRACE_NOTE_TRANSITION_TYPES
+    #     duration: 32, # see GuitarProHelper::GRACE_NOTE_DURATIONS
+    #     dead: false,
+    #     position: :before_the_beat # or :on_the_beat }
+    # nil by default
+    attr_accessor :grace
+
+    # (Boolean) Has this note let ring effect?
+    attr_accessor :let_ring
+
+    # (Boolean) Has this note hammer on or pull off effect?
+    attr_accessor :hammer_or_pull
+
+    # (Hash) Trill effect. E.g.:
+    #   { fret: 7, 
+    #     period: 16 # see GuitarProHelper::TRILL_PERIODS }
+    # nil by default
+    attr_accessor :trill
+
+    # (Hash) Bend effect. E.g.:
+    #   { type: :bend, # See GuitarProHelper::BEND_TYPES
+    #     height: 100, # Bend height. It is 100 per tone and goes by quarter tone.
+    #     points: # List of points used to display the bend
+    #     [ 
+    #       { time: 0, 
+    #         pitch_alteration: 0, # The same rules as for height
+    #         vibrato_type: :none }, # See GuitarProHelper::BEND_VIBRATO_TYPES
+    #       { time: 60, pitch_alteration: 100, vibrato_type: :none }
+    #     ]
+    #   }
+    # nil by default
+    attr_accessor :bend
+
+    # (Boolean) Has this note stacatto effect?
+    attr_accessor :staccato
+
+    # (Boolean) Has this note palm mute effect?
+    attr_accessor :palm_mute
+
+    # (Hash) Harmonic of the note. E.g.:
+    #   { type: :artificial}
+    # Full list of harmonic types see in GuitarProHelper::HARMONIC_TYPES
+    # nil by default
+    attr_accessor :harmonic
+
+    # (Hash) Tremolo effect. E.g.:
+    #   { speed: 16 } # See GuitarProHelper::TREMOLO_PICKING_SPEEDS
+    # nil by default
+    attr_accessor :tremolo
+
+    # Slide effect. List of slides see in GuitarProHelper::SLIDE_TYPES
+    # nil by default
+    attr_accessor :slide
 
     def initialize
       @type = :normal
@@ -29,7 +94,6 @@ module GuitarProParser
       @dynamic = 'f'
       @fret = 0
       @fingers = { left: nil, right: nil }
-
       @vibrato = false
       @grace = nil
       @let_ring = false

data/lib/guitar_pro_parser/version.rb

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

data/spec/lib/guitar_pro_parser/song_spec.rb

@@ -10,7 +10,7 @@ describe GuitarProParser::Song do
     its(:copyright) { should == 'Copyright' }
     its(:transcriber) { should == 'Transcriber' }
     its(:instructions) { should == 'Instructions' }
-    its(:notices) { should include('Notice 1', 'Notice 2', 'Notice 3') }
+    its(:notices) { should == 'Notice 1/nNotice 2/nNotice 3' }
     its(:master_volume) { should == 100 }
     its(:tempo) { should == 'Moderate' }
     its(:bpm) { should == 120 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guitar_pro_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler