GTP 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c95f11dd3b8984c35d4a5689256f044d63efd63b
-  data.tar.gz: 2f350da3f47500d24a2a9467b6f9d004b9dc6a44
+  metadata.gz: 8d8eba62e7b71222363d9f060eb808954bee07ce
+  data.tar.gz: 79297fcde52b4477433147640578fd6314a73c17
 SHA512:
-  metadata.gz: f5b9655918545ae36cf5c75948c70e89030226cf52638b1d1905051a1c5adfaba7ab98cee2322a76856e40a7d9f8047a936ef97a214adddb96f2a7a15ff3f680
-  data.tar.gz: 14165f6937a8825c3bea4fb3be97a6d660101ed45eeb6d349a72b3999cbb9ca1813e92a543cf69f2c0ff1c6b9e48fbf9379b28f80a4ac64448a1601affc56a91
+  metadata.gz: 30d4fb18ace3b3c305e0469740dad0ee601818d18f00a327a1ba0c31aeb9818c38f1ecfabca77fe64a855fcf10b87b22da0673613e38e75af0f70cdde056ac61
+  data.tar.gz: abf9b6886082ad66cd1d5d077ebaaf2598c1001d8e0e95ef95e30bbcf88a3d1fb5b057c0270532cf535a316e8445d9be48303bb0e0f7356153ac61fd7034d2f9

data/lib/GTP/gp4.rb

@@ -21,6 +21,13 @@ module GTP
       parse_version
       parse_info
       parse_lyrics
+      parse_tempo
+      parse_key
+      parse_octave
+      parse_midi_channels # <----- PARSE ME PLEASE!!!
+      parse_number_of_measures
+      parse_number_of_tracks
+      parse_measures
     end
 
     def fix_header header
@@ -114,7 +121,7 @@ module GTP
 
       for n in 1..self.num_measures do
 
-        header = fix_header read_byte.to_s(2)
+        header = fix_header @reader.read_byte.to_s(2)
         numerator = nil
         denominator = nil
         begin_repeat = nil
@@ -125,11 +132,11 @@ module GTP
         double_bar = nil
 
         if header[0] == "1"
-          numerator = read_byte
+          numerator = @reader.read_byte
         end
 
         if header[1] == "1"
-          denominator = read_byte
+          denominator = @reader.read_byte
         end
 
         if header[2] == "1"
@@ -137,20 +144,20 @@ module GTP
         end
 
         if header[3] == "1"
-          end_repeat = read_byte
+          end_repeat = @reader.read_byte
         end
 
         if header[4] == "1"
-          num_alt_ending = read_byte
+          num_alt_ending = @reader.read_byte
         end
 
         if header[5] == "1"
           marker_name = @reader.read_string
-          marker_color = read_integer
+          marker_color = @reader.read_integer
         end
 
         if header[6] == "1"
-          tonality = read_byte
+          tonality = @reader.read_byte
           @reader.increment_offset 1
         end
 

data/lib/GTP/version.rb

@@ -1,6 +1,6 @@
 module GTP
   MAJOR = 0
   MINOR = 1
-  PATCH = 1
+  PATCH = 2
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 end

data/test/lib/GTP/gp4_test.rb

@@ -3,18 +3,13 @@ require "test_helper"
 module GTP
   describe GP4 do
 
-    it "must read the file version" do
-      parser = GP4.new "test/tabs/test.gp4"
-      parser.parse_version
+    let(:parser) { GP4.new "test/tabs/test.gp4" }
+    before { parser.call }
 
-      # p parser.version
+    it "must read the file version" do
       parser.version.must_match %r/FICHIER GUITAR PRO v4./
     end
 
-    let(:parser) { GP4.new "test/tabs/test.gp4" }
-
-    before { parser.call }
-
     describe 'tablature info' do
       it "must read the tablature info" do
         parser.title.must_equal "Title"
@@ -44,13 +39,6 @@ module GTP
 
     describe "Other information" do
       it "about the piece" do
-        parser.parse_tempo
-        parser.parse_key
-        parser.parse_octave
-        parser.parse_midi_channels # <----- PARSE ME PLEASE!!!
-        parser.parse_number_of_measures
-        parser.parse_number_of_tracks
-
         parser.tempo.must_equal 120
         parser.key.must_equal 1
         parser.octave.must_equal 0
@@ -62,58 +50,45 @@ module GTP
 
     describe "Serialization" do
       it "must serialize as json" do
-        parser.to_json.must_equal "{\"score\":{\"info\":{\"version\":\"FICHIER GUITAR PRO v4.06\",\"title\":\"Title\",\"subtitle\":\"Subtitle\",\"artist\":\"Artist\",\"album\":\"Album\",\"author\":\"Author\",\"copyright\":\"Copyright\"},\"tempo\":null,\"key\":null,\"num_track\":null,\"num_measures\":null}}"
+        parser.to_json.must_equal "{\"score\":{\"info\":{\"version\":\"FICHIER GUITAR PRO v4.06\",\"title\":\"Title\",\"subtitle\":\"Subtitle\",\"artist\":\"Artist\",\"album\":\"Album\",\"author\":\"Author\",\"copyright\":\"Copyright\"},\"tempo\":120,\"key\":1,\"num_track\":1,\"num_measures\":2}}"
       end
     end
 
-    # describe "Measures" do
-    #   first_measure = Measure.new
-    #   second_measure = Measure.new
-
-    #   before do
-    #     parser.parse_version
-    #     parser.parse_info
-    #     parser.parse_lyrics
-    #     parser.parse_tempo
-    #     parser.parse_key
-    #     parser.parse_octave
-    #     parser.parse_midi_channels
-    #     parser.parse_number_of_measures
-    #     parser.parse_number_of_tracks
-
-    #     first_measure.numerator = 4
-    #     first_measure.denominator = 4
-    #     first_measure.begin_repeat = true
-    #     first_measure.end_repeat = nil
-    #     first_measure.num_alt_ending = nil
-    #     first_measure.marker_name = nil
-    #     first_measure.marker_color = nil
-    #     first_measure.tonality = 1
-    #     first_measure.double_bar = nil
-
-    #     second_measure.numerator = 7
-    #     second_measure.denominator = 8
-    #     second_measure.begin_repeat = nil
-    #     second_measure.end_repeat = nil
-    #     second_measure.num_alt_ending = nil
-    #     second_measure.marker_name = nil
-    #     second_measure.marker_color = nil
-    #     second_measure.tonality = nil
-    #     second_measure.double_bar = nil
-
-    #   end
-
-    #   it "must get the tab measures" do
-    #     parser.parse_measures
+    describe "Measures" do
+      first_measure = Measure.new
+      second_measure = Measure.new
+
+      before do
+        first_measure.numerator = 4
+        first_measure.denominator = 4
+        first_measure.begin_repeat = true
+        first_measure.end_repeat = nil
+        first_measure.num_alt_ending = nil
+        first_measure.marker_name = nil
+        first_measure.marker_color = nil
+        first_measure.tonality = 1
+        first_measure.double_bar = nil
+
+        second_measure.numerator = 7
+        second_measure.denominator = 8
+        second_measure.begin_repeat = nil
+        second_measure.end_repeat = nil
+        second_measure.num_alt_ending = nil
+        second_measure.marker_name = nil
+        second_measure.marker_color = nil
+        second_measure.tonality = nil
+        second_measure.double_bar = nil
+      end
 
-    #     expected_measures = Array.new
-    #     expected_measures.push(first_measure)
-    #     expected_measures.push(second_measure)
+      it "must get the tab measures" do
+        parser.parse_measures
 
-    #     # require "pry"; binding.pry
+        expected_measures = Array.new
+        expected_measures.push(first_measure)
+        expected_measures.push(second_measure)
 
-    #     parser.measures.must_equal expected_measures
-    #   end
-    # end
+        parser.measures.must_equal expected_measures
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: GTP
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Thiago Rocha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler