guitar_pro_parser 0.0.3 → 0.0.4

data/README.md

@@ -19,10 +19,6 @@ Or install it yourself as:
 
 ## Usage
   
-  Require the library:
-
-    require 'guitar_pro_parser'
-
   Read the file:
 
     song = GuitarProParser.read_file('path_to_file')
@@ -70,3 +66,5 @@ Or install it yourself as:
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+If you have a tab that couldn't be read or is read incorrectly, please send it to immaculate.pine@gmail.com or create an issue on Github with description of bug.

data/guitar_pro_parser.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Alexander Borovykh"]
   spec.email         = ["immaculate.pine@gmail.com"]
   spec.description   = %q{Gem for reading Guitar Pro files}
-  spec.summary       = %q{It is a gem that allows to read Guitar Pro files. Now it supports Guitar Pro 4 and 5 files. Version 3 should work but is not tested at all.}
+  spec.summary       = %q{This gem allows to read Guitar Pro files. Now it supports Guitar Pro 4 and 5 files. Version 3 should work but is not tested at all.}
   spec.homepage      = "https://github.com/ImmaculatePine/guitar_pro_parser"
   spec.license       = "MIT"
 

data/lib/guitar_pro_parser/guitar_pro_helper.rb

@@ -47,7 +47,11 @@ module GuitarProHelper
   TREMOLO_PICKING_SPEEDS = { '3' => 32, '2' => 16, '1' => 8 }
   
   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_GP5 = { '0'=>0, '1'=>1, '2'=>2, 
+                          '4'=>3, '8'=>4, '16'=>5, 
+                          '17'=>[1, 5], '18'=>[2, 5], '20'=>[5, 3],
+                          '24'=>[5, 4], '32'=>6, '33'=>[1, 6], 
+                          '34'=>[2, 6] ,'36'=>[6, 3], '40'=>[6,4] }
   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]
@@ -66,19 +70,6 @@ module GuitarProHelper
   CHORD_TONALITIES = [:perfect, :diminished, :augmented]
   
 
-  # Macros to create boolean instance variables' getters like this:
-  #   attr_boolean :complete
-  # generates
-  #   complete?
-  # method that returns @complete instance variable
-  def attr_boolean(*variables)
-    variables.each do |variable|
-      define_method("#{variable}?") do
-        instance_variable_get("@#{variable}")
-      end
-    end
-  end
-
   # Converts note's digit representation to its string equivalent:
   # 0 for C0, 1 for C#0, etc.
   def GuitarProHelper.digit_to_note(digit)

data/lib/guitar_pro_parser/io/reader.rb

@@ -683,7 +683,7 @@ module GuitarProParser
       @input.skip_short_integer if @version < 5.0 && note.time_independent_duration
 
       note.dynamic = GuitarProHelper::NOTE_DYNAMICS.fetch(@input.read_byte - 1) if has_dynamic
-      note.fret = @input.read_byte
+      note.fret = @input.read_byte if has_type
 
       if has_fingering
         left_finger = @input.read_signed_byte
@@ -753,11 +753,15 @@ module GuitarProParser
 
         if has_slide
           value = @input.read_signed_byte.to_s
+          slides = []
+          
           if @version >= 5.0
-            note.slide = GuitarProHelper::SLIDE_TYPES.fetch(GuitarProHelper::MAP_SLIDE_TYPES_GP5.fetch(value))
+            slides = *GuitarProHelper::MAP_SLIDE_TYPES_GP5.fetch(value)
           else
-            note.slide = GuitarProHelper::SLIDE_TYPES.fetch(GuitarProHelper::MAP_SLIDE_TYPES_GP4.fetch(value))
+            slides = *GuitarProHelper::MAP_SLIDE_TYPES_GP4.fetch(value)
           end
+
+          note.slide = slides.map { |item| GuitarProHelper::SLIDE_TYPES.fetch(item) }
         end
 
         read_harmonic(note) if has_harmonic

data/lib/guitar_pro_parser/note.rb

@@ -82,7 +82,9 @@ module GuitarProParser
     # nil by default
     attr_accessor :tremolo
 
-    # Slide effect. List of slides see in GuitarProHelper::SLIDE_TYPES
+    # (Array) Slide effects. List of slides see in GuitarProHelper::SLIDE_TYPES.
+    # This attribute is array because Guitar Pro 5 supports multiple slides per note
+    # like :slide_in_from_below and :slide_out_and_upwards at once.
     # nil by default
     attr_accessor :slide
 

data/lib/guitar_pro_parser/version.rb

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

data/spec/lib/guitar_pro_parser/note_spec.rb

@@ -49,32 +49,32 @@ describe GuitarProParser::Note do
 
     context 'legato slide' do
       test_note :legato_slide
-      its(:slide) { should == :legato_slide }
+      its(:slide) { should == [:legato_slide] }
     end
 
     context 'shift slide' do
       test_note :shift_slide
-      its(:slide) { should == :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 }
+      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 }
+      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 }
+      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 }
+      its(:slide) { should == [:slide_out_and_upwards] }
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guitar_pro_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,8 +126,8 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: It is a gem that allows to read Guitar Pro files. Now it supports Guitar
-  Pro 4 and 5 files. Version 3 should work but is not tested at all.
+summary: This gem allows to read Guitar Pro files. Now it supports Guitar Pro 4 and
+  5 files. Version 3 should work but is not tested at all.
 test_files:
 - spec/lib/guitar_pro_parser/bar_settings_spec.rb
 - spec/lib/guitar_pro_parser/beat_spec.rb