ParsedScore -> Score

igneus · Mar 6, 2016 · 982d5d9 · 982d5d9
1 parent 31a9eda
commit 982d5d9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/lib/gly.rb b/lib/gly.rb
@@ -3,7 +3,7 @@ module Gly; end
 %w(parser
 exceptions
 gabc_convertor
-parsed_score
+score
 headers
 lyrics
 markup

diff --git a/lib/gly/document.rb b/lib/gly/document.rb
@@ -24,7 +24,7 @@ def initialize
     def <<(score)
       @content << score
 
-      if score.is_a? ParsedScore
+      if score.is_a? Score
         @scores << score
 
         sid = score.headers['id']

diff --git a/lib/gly/gabc_convertor.rb b/lib/gly/gabc_convertor.rb
@@ -1,7 +1,7 @@
 require 'stringio'
 
 module Gly
-  # takes ParsedScore, translates it to gabc
+  # takes Score, translates it to gabc
   class GabcConvertor
     def convert(score, out=StringIO.new)
       score.headers.each_pair do |key,value|

diff --git a/lib/gly/parser.rb b/lib/gly/parser.rb
@@ -34,7 +34,7 @@ def parse_str(str)
 
     def parse_io(io)
       @doc = Document.new
-      @score = ParsedScore.new
+      @score = Score.new
 
       if io.respond_to? :path
         @doc.path = io.path
@@ -48,7 +48,7 @@ def parse_io(io)
         # keywords specifying line or block type
         elsif new_score? line
           push_score
-          @score = ParsedScore.new
+          @score = Score.new
           @current_block = :score
         elsif header_start? line
           push_score
@@ -188,7 +188,7 @@ def parse_default(line)
     end
 
     def push_score
-      if @score.is_a?(ParsedScore) && !@score.empty?
+      if @score.is_a?(Score) && !@score.empty?
         begin
           @doc << @score
         rescue ArgumentError => ex

diff --git a/lib/gly/parsed_score.rb → lib/gly/score.rb b/lib/gly/parsed_score.rb → lib/gly/score.rb
@@ -1,6 +1,6 @@
 module Gly
   # result of a gly score parsing
-  class ParsedScore
+  class Score
     def initialize
       @headers = Headers.new
       @lyrics = Lyrics.new

diff --git a/tests/parser.rb b/tests/parser.rb
@@ -22,13 +22,13 @@ def test_score_markup_order
 
     assert_equal 6, doc.content.size
 
-    assert_instance_of Gly::ParsedScore, doc.content[0]
+    assert_instance_of Gly::Score, doc.content[0]
     assert_equal 'a', doc.content[0].headers['id']
 
     assert_instance_of Gly::Markup, doc.content[1]
     assert_equal 'a', doc.content[1].text
 
-    assert_instance_of Gly::ParsedScore, doc.content[2]
+    assert_instance_of Gly::Score, doc.content[2]
     assert_equal 'b', doc.content[2].headers['id']
 
     assert_instance_of Gly::Markup, doc.content[3]
@@ -37,7 +37,7 @@ def test_score_markup_order
     assert_instance_of Gly::Markup, doc.content[4]
     assert_equal 'c', doc.content[4].text
 
-    assert_instance_of Gly::ParsedScore, doc.content[5]
+    assert_instance_of Gly::Score, doc.content[5]
     assert_equal 'c', doc.content[5].headers['id']
   end