gly 0.0.3 → 0.0.4

data/tests/examples.rb

@@ -1,11 +1,9 @@
-# test-suite dynamically created from examples in subfolders
-
 require_relative 'test_helper'
 
-# Each test case is defined by a pair of files
-# in directories examples/given and examples/expected
-# which define what is an expected gabc result of a single-score
-# gly file.
+# Examples are medium-level tests (not unittests, not end-to-end tests)
+# testing parser and convertor at the same time.
+# Each test case is defined by a pair of a gly and gabc file
+# in directories examples/*/given and examples/*/expected.
 class TestExamples < GlyTest
   def self.example_test_case(given_file, expected_file)
     # filename without extension
@@ -14,15 +12,37 @@ class TestExamples < GlyTest
     define_method "test_#{case_name}" do
       expected = File.read expected_file
       File.open given_file do |fr|
-        given = gly_process(fr).string
+        # the method transform is 'deferred'
+        # for implementation in subclasses
+        given = transform fr
         assert_equal expected, given
       end
     end
   end
+end
 
+# conversion gly -> gabc
+class TestGlyExamples < TestExamples
   here = File.dirname __FILE__
   Dir.glob(File.join(here, 'examples/gly/given/*.gly')).each do |given|
     expected = given.sub('/given', '/expected').sub('.gly', '.gabc')
     example_test_case given, expected
   end
+
+  def transform(fr)
+    gly_process(fr).string
+  end
+end
+
+# conversion gabc -> gly
+class TestGlyfyExamples < TestExamples
+  here = File.dirname __FILE__
+  Dir.glob(File.join(here, 'examples/glyfy/given/*.gabc')).each do |given|
+    expected = given.sub('/given', '/expected').sub('.gabc', '.gly')
+    example_test_case given, expected
+  end
+
+  def transform(fr)
+    glyfy_process(fr).string
+  end
 end

data/tests/examples/gly/expected/block_lyrics.gabc

@@ -1,2 +1,2 @@
 %%
-a(i) a(i)
+i(a) i(a)

data/tests/examples/gly/expected/block_lyrics.gabc~

@@ -0,0 +1,2 @@
+%%
+a(i) a(i)

data/tests/examples/gly/expected/block_music.gabc

@@ -0,0 +1,2 @@
+%%
+a(i) a(i)

data/tests/examples/gly/expected/block_music.gabc~

@@ -0,0 +1,4 @@
+\lyrics
+a a
+\music
+i i

data/tests/examples/gly/expected/blocks.gabc

@@ -0,0 +1,3 @@
+nabc-lines: 1;
+%%
+(c4) Non(g|pu) di(gj|pe)co(h|pu) ti(hg|cl)bi,(f|pu) Pe(gh|pe)tre,(g|pu) (,)

data/tests/examples/gly/expected/differentia_final.gabc

@@ -0,0 +1,2 @@
+%%
+A(a)men.(a) (::)

data/tests/examples/gly/expected/empty_lyric_syllable.gabc

@@ -0,0 +1,2 @@
+%%
+(c4) (h) A(hih)men(gh)

data/tests/examples/gly/expected/empty_lyric_syllable.gabc~

@@ -0,0 +1 @@
+(c4) (h) A(hih)men(gh)

data/tests/examples/gly/expected/explicit_lyrics.gabc

@@ -1,2 +1,2 @@
 %%
- a(a)
+a(a)

data/tests/examples/gly/expected/header_colon.gabc

@@ -0,0 +1,3 @@
+name: value: with colon;
+user-notes: value; with semicolon;
+%%

data/tests/examples/gly/expected/header_colon.gabc~

@@ -0,0 +1,3 @@
+name: value: with colon
+user-notes: value; with semicolon
+%%

data/tests/examples/gly/expected/header_empty.gabc

@@ -0,0 +1,2 @@
+name: ;
+%%

data/tests/examples/gly/expected/header_empty.gabc~

@@ -0,0 +1,2 @@
+name:;
+%%

data/tests/examples/gly/expected/nabc.gabc

@@ -0,0 +1,3 @@
+nabc-lines: 1;
+%%
+a(a|pu)men.(a|pu)

data/tests/examples/gly/expected/no_clef.gabc

@@ -0,0 +1,2 @@
+%%
+a(a)men(a)

data/tests/examples/gly/expected/no_clef.gabc~

@@ -0,0 +1 @@
+a a

data/tests/examples/gly/expected/real1.gabc~

@@ -0,0 +1,15 @@
+% id: f3b;
+book: CAO 3907;
+% cao-number: 3907;
+mode: 8;
+annotation: ad Ben.;
+annotation: VIII g;
+nabc-lines: 1;
+%%
+c4 g|pu gj|pe h|pu hg|cl f|pu gh|pe g|pu ,
+g|pu g|pu h>|cl g|vi f|pu gh|pe h|vi ,
+j|vi ji|cl- hg|cl- h|pu gf|pu h ji|pe hg|vi e|vi fg|pe g|pu ::
+\lyrics
+Non di -- co ti -- bi, Pe -- tre,
+di -- mit -- tén -- di sép -- ti -- es,
+sed us -- que sep -- tu -- a -- gí -- es sép -- ti -- es.

data/tests/examples/gly/expected/unsingables.gabc

@@ -0,0 +1,2 @@
+%%
+la(a) (,) la(a) (`) la(a) (:) la(a) (;) la(a) (;3) la(a) (:') la(a) (::) la(a) (::z) la(a) (::Z) la(a)

data/tests/examples/gly/expected/unsingables.gabc~

@@ -0,0 +1,2 @@
+%%
+la(a) (,) la(a) (`) la(a) (:) la(a) (;) la(a) (;3) la(a) (::) la(a) (::z) la(a) (::Z) la(a)

data/tests/examples/gly/given/block_lyrics.gly~

@@ -0,0 +1,3 @@
+a a
+\lyrics
+i i

data/tests/examples/gly/given/block_music.gly

@@ -0,0 +1,4 @@
+\lyrics
+a a
+\music
+i i

data/tests/examples/gly/given/blocks.gly

@@ -0,0 +1,6 @@
+\score
+nabc-lines: 1
+\music
+c4 g|pu gj|pe h|pu hg|cl f|pu gh|pe g|pu ,
+\lyrics
+Non di -- co ti -- bi, Pe -- tre,

data/tests/examples/gly/given/differentia_final.gly

@@ -0,0 +1,5 @@
+% this test catches a regression - space wasn't added
+% before the last differentia which resulted in an undesired
+% hyphen after the last lyrics syllable.
+a a ::
+A -- men.

data/tests/examples/gly/given/differentia_final.gly~

@@ -0,0 +1,2 @@
+a a ::
+A -- men.

data/tests/examples/gly/given/empty_lyric_syllable.gly

@@ -0,0 +1,2 @@
+c4 h hih gh
+! A -- men

data/tests/examples/gly/given/empty_lyric_syllable.gly~

@@ -0,0 +1,2 @@
+h hih gh
+! A -- men

data/tests/examples/gly/given/header_colon.gly

@@ -0,0 +1,3 @@
+% header value with colon and semicolon
+name: value: with colon
+user-notes: value; with semicolon

data/tests/examples/gly/given/header_colon.gly~

@@ -0,0 +1,4 @@
+% header value with colon and semicolon
+name: value: with colon
+user-notes: value; with semicolon
+a a

data/tests/examples/gly/given/header_empty.gly

@@ -0,0 +1 @@
+name:

data/tests/examples/gly/given/header_empty.gly~

@@ -0,0 +1,2 @@
+name: Nativitas gloriosae
+office-part: laudes, 1. ant.

data/tests/examples/gly/given/nabc.gly

@@ -0,0 +1,3 @@
+nabc-lines: 1
+\m a|pu a|pu
+a -- men.

data/tests/examples/gly/given/nabc.gly~

@@ -0,0 +1,2 @@
+\m a|pu a|pu
+a -- men.

data/tests/examples/gly/given/no_clef.gly

@@ -0,0 +1,2 @@
+a a
+a -- men

data/tests/examples/gly/given/no_clef.gly~

@@ -0,0 +1 @@
+a a

data/tests/examples/gly/given/real1.gly~

@@ -0,0 +1,18 @@
+\score
+id: f3b
+book: CAO 3907
+cao-number: 3907
+mode: 8
+annotation: ad Ben.
+annotation: VIII g
+nabc-lines: 1
+% based on http://gregorianik.uni-regensburg.de/#id/785
+% phrasing JP
+\music
+c4 g|pu gj|pe h|pu hg|cl f|pu gh|pe g|pu ,
+g|pu g|pu h>|cl g|vi f|pu gh|pe h|vi ,
+j|vi ji|cl- hg|cl- h|pu gf|pu h ji|pe hg|vi e|vi fg|pe g|pu ::
+\lyrics
+Non di -- co ti -- bi, Pe -- tre,
+di -- mit -- tén -- di sép -- ti -- es,
+sed us -- que sep -- tu -- a -- gí -- es sép -- ti -- es.

data/tests/examples/gly/given/unsingables.gly

@@ -0,0 +1,2 @@
+a , a ` a : a ; a ;3 a :' a :: a ::z a ::Z a
+\l la la la la la la la la la la

data/tests/examples/gly/given/unsingables.gly~

@@ -0,0 +1,2 @@
+a , a ` a : a ; a ;3 a :: a ::z a ::Z a
+\l la la la la la la la la la

data/tests/examples/glyfy/expected/header.gly

@@ -0,0 +1,3 @@
+\score
+name: Nativitas gloriosae
+office-part: laudes, 1. ant.

data/tests/examples/glyfy/expected/header.gly~

@@ -0,0 +1,2 @@
+name: Nativitas gloriosae
+office-part: laudes, 1. ant.

data/tests/examples/glyfy/expected/simple.gly

@@ -0,0 +1,3 @@
+\score
+c4 ghg f.g. ::
+A -- men.

data/tests/examples/glyfy/expected/simple.gly~

@@ -0,0 +1,2 @@
+%%
+(c4) A(ghg)men.(f.g.) (::)

data/tests/examples/glyfy/given/header.gabc

@@ -0,0 +1,3 @@
+name: Nativitas gloriosae;
+office-part: laudes, 1. ant.;
+%%

data/tests/examples/glyfy/given/simple.gabc

@@ -0,0 +1,2 @@
+%%
+(c4) A(ghg)men.(f.g.) (::)

data/tests/examples/parser/markup_after_header.gly

@@ -0,0 +1,4 @@
+\header
+title: Psalmodia complementaris
+
+\markup\section{series I (ad Tertiam)}

data/tests/examples/parser/markups.gly

@@ -0,0 +1,10 @@
+\markup Perhaps
+
+\markup
+Ave
+Caesar
+
+\markup
+Ave Crux
+
+spes unica

data/tests/examples/parser/markups.gly~

@@ -0,0 +1,5 @@
+\markup Hi
+
+\markup
+Ave
+Caesar

data/tests/examples/parser/score_markup_order.gly

@@ -0,0 +1,19 @@
+\score
+id: a
+
+% "inline" markup
+\markup a
+
+\score
+id: b
+
+% "block" markup
+\markup
+b
+
+% second markup immediately following
+\markup
+c
+
+\score
+id: c

data/tests/examples/parser/score_markup_order.gly~

@@ -0,0 +1,13 @@
+\score
+id: a
+
+\markup a
+
+\score
+id: b
+
+\markup
+b
+
+\score
+id: c

data/tests/parser.rb

@@ -0,0 +1,51 @@
+require_relative 'test_helper'
+
+class TestParser < GlyTest
+  def test_markup_after_header
+    doc = parse_example 'examples/parser/markup_after_header.gly'
+    assert_equal 1, doc.header.size
+    assert doc.header.has_key?('title')
+  end
+
+  def test_markups
+    doc = parse_example 'examples/parser/markups.gly'
+
+    assert doc.scores.empty?
+
+    assert_equal "Perhaps", doc.content[0].text
+    assert_equal "Ave\nCaesar", doc.content[1].text
+    assert_equal "Ave Crux\n\nspes unica", doc.content[2].text
+  end
+
+  def test_score_markup_order
+    doc = parse_example 'examples/parser/score_markup_order.gly'
+
+    assert_equal 6, doc.content.size
+
+    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::Score, doc.content[2]
+    assert_equal 'b', doc.content[2].headers['id']
+
+    assert_instance_of Gly::Markup, doc.content[3]
+    assert_equal 'b', doc.content[3].text
+
+    assert_instance_of Gly::Markup, doc.content[4]
+    assert_equal 'c', doc.content[4].text
+
+    assert_instance_of Gly::Score, doc.content[5]
+    assert_equal 'c', doc.content[5].headers['id']
+  end
+
+  def parse_example(path)
+    doc = nil
+    File.open expand_test_path(path) do |fr|
+      doc = Gly::Parser.new.parse(fr)
+    end
+    doc
+  end
+end

data/tests/parser.rb~

@@ -0,0 +1,12 @@
+require_relative 'test_helper'
+
+class TestParser < GlyTest
+  def test_markup_after_header
+    doc = nil
+    File.open expand_test_path('examples/parser/markup_after_header.gly') do |fr|
+      doc = Gly::Parser.new.parse(fr)
+    end
+    assert_equal 1, doc.header.size
+    assert_equal 'title', doc.header.keys.first
+  end
+end

data/tests/run.rb

@@ -1,3 +1,4 @@
 require_relative 'examples'
 require_relative 'no_crash'
 require_relative 'string_helpers_test'
+require_relative 'parser'

data/tests/test_helper.rb

@@ -1,6 +1,11 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 require 'gly'
 
+begin
+  require 'grely'
+rescue LoadError
+end
+
 require 'minitest/autorun'
 
 require 'minitest/reporters'
@@ -14,4 +19,18 @@ class GlyTest < MiniTest::Test
     doc = Gly::Parser.new.parse(gly_io)
     Gly::GabcConvertor.new.convert(doc.scores[0])
   end
+
+  def glyfy_process(gabc_io)
+    unless defined? GabcParser
+      skip 'lygre not found, cannot run glyfy tests'
+    end
+
+    parsing_result = GabcParser.new.parse gabc_io.read
+    score = parsing_result.create_score
+    Gly::GlyConvertor.new.convert score
+  end
+
+  def expand_test_path(relative)
+    File.expand_path(relative, File.dirname(__FILE__))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gly
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jakub Pavlík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -46,7 +46,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/gly
-- bin/glyfy
 - lib/gly.rb
 - lib/gly.rb~
 - lib/gly/cli.rb
@@ -57,16 +56,22 @@ files:
 - lib/gly/document_gabc_convertor.rb~
 - lib/gly/document_ly_convertor.rb
 - lib/gly/document_ly_convertor.rb~
+- lib/gly/exceptions.rb
+- lib/gly/exceptions.rb~
 - lib/gly/gabc_convertor.rb
 - lib/gly/gabc_convertor.rb~
+- lib/gly/gly_convertor.rb
+- lib/gly/gly_convertor.rb~
+- lib/gly/glyfy_cli.rb~
 - lib/gly/headers.rb
 - lib/gly/headers.rb~
 - lib/gly/lister.rb
 - lib/gly/lister.rb~
 - lib/gly/lyrics.rb
 - lib/gly/lyrics.rb~
+- lib/gly/markup.rb
+- lib/gly/markup.rb~
 - lib/gly/options.rb~
-- lib/gly/parsed_score.rb
 - lib/gly/parsed_score.rb~
 - lib/gly/parser.rb
 - lib/gly/parser.rb~
@@ -74,17 +79,24 @@ files:
 - lib/gly/preview_builder.rb~
 - lib/gly/preview_generator.rb
 - lib/gly/preview_generator.rb~
+- lib/gly/score.rb
 - lib/gly/string_helpers.rb
 - lib/gly/string_helpers.rb~
 - lib/gly/templates/lualatex_document.tex
 - lib/gly/templates/lualatex_document.tex~
 - tests/examples.rb
-- tests/examples.rb~
 - tests/examples/gly/expected/block_lyrics.gabc
+- tests/examples/gly/expected/block_lyrics.gabc~
+- tests/examples/gly/expected/block_music.gabc
+- tests/examples/gly/expected/block_music.gabc~
+- tests/examples/gly/expected/blocks.gabc
+- tests/examples/gly/expected/differentia_final.gabc
 - tests/examples/gly/expected/differentiae.gabc
 - tests/examples/gly/expected/differentiae.gabc~
 - tests/examples/gly/expected/document_header.gabc
 - tests/examples/gly/expected/document_header.gabc~
+- tests/examples/gly/expected/empty_lyric_syllable.gabc
+- tests/examples/gly/expected/empty_lyric_syllable.gabc~
 - tests/examples/gly/expected/explicit_lyrics.gabc
 - tests/examples/gly/expected/explicit_lyrics.gabc~
 - tests/examples/gly/expected/explicit_music.gabc
@@ -92,10 +104,17 @@ files:
 - tests/examples/gly/expected/explicit_score.gabc
 - tests/examples/gly/expected/force_divisio_lyrics.gabc
 - tests/examples/gly/expected/header.gabc
+- tests/examples/gly/expected/header_colon.gabc
+- tests/examples/gly/expected/header_colon.gabc~
+- tests/examples/gly/expected/header_empty.gabc
+- tests/examples/gly/expected/header_empty.gabc~
 - tests/examples/gly/expected/header_unofficial.gabc
 - tests/examples/gly/expected/header_unofficial.gabc~
 - tests/examples/gly/expected/multiline.gabc
 - tests/examples/gly/expected/multiline_interlaced.gabc
+- tests/examples/gly/expected/nabc.gabc
+- tests/examples/gly/expected/no_clef.gabc
+- tests/examples/gly/expected/no_clef.gabc~
 - tests/examples/gly/expected/nonlyrical_lyrics.gabc
 - tests/examples/gly/expected/nonlyrical_lyrics.gabc~
 - tests/examples/gly/expected/notes_bracketted.gabc
@@ -103,38 +122,69 @@ files:
 - tests/examples/gly/expected/notes_only.gabc
 - tests/examples/gly/expected/notes_with_lyrics.gabc
 - tests/examples/gly/expected/notes_with_lyrics.gabc~
+- tests/examples/gly/expected/real1.gabc~
+- tests/examples/gly/expected/unsingables.gabc
+- tests/examples/gly/expected/unsingables.gabc~
 - tests/examples/gly/expected/unsyllabified_lyrics.gabc
 - tests/examples/gly/given/block_lyrics.gly
+- tests/examples/gly/given/block_lyrics.gly~
+- tests/examples/gly/given/block_music.gly
+- tests/examples/gly/given/blocks.gly
+- tests/examples/gly/given/differentia_final.gly
+- tests/examples/gly/given/differentia_final.gly~
 - tests/examples/gly/given/differentiae.gly
 - tests/examples/gly/given/differentiae.gly~
 - tests/examples/gly/given/document_header.gly
+- tests/examples/gly/given/empty_lyric_syllable.gly
+- tests/examples/gly/given/empty_lyric_syllable.gly~
 - tests/examples/gly/given/explicit_lyrics.gly
 - tests/examples/gly/given/explicit_music.gly
 - tests/examples/gly/given/explicit_music.gly~
 - tests/examples/gly/given/explicit_score.gly
 - tests/examples/gly/given/force_divisio_lyrics.gly
 - tests/examples/gly/given/header.gly
+- tests/examples/gly/given/header_colon.gly
+- tests/examples/gly/given/header_colon.gly~
+- tests/examples/gly/given/header_empty.gly
+- tests/examples/gly/given/header_empty.gly~
 - tests/examples/gly/given/header_unofficial.gly
 - tests/examples/gly/given/header_unofficial.gly~
 - tests/examples/gly/given/multiline.gly
 - tests/examples/gly/given/multiline_interlaced.gly
 - tests/examples/gly/given/multiline_interlaced.gly~
+- tests/examples/gly/given/nabc.gly
+- tests/examples/gly/given/nabc.gly~
+- tests/examples/gly/given/no_clef.gly
+- tests/examples/gly/given/no_clef.gly~
 - tests/examples/gly/given/nonlyrical_lyrics.gly
 - tests/examples/gly/given/nonlyrical_lyrics.gly~
 - tests/examples/gly/given/notes_bracketted.gabc~
 - tests/examples/gly/given/notes_bracketted.gly
 - tests/examples/gly/given/notes_only.gly
 - tests/examples/gly/given/notes_with_lyrics.gly
+- tests/examples/gly/given/real1.gly~
+- tests/examples/gly/given/unsingables.gly
+- tests/examples/gly/given/unsingables.gly~
 - tests/examples/gly/given/unsyllabified_lyrics.gly
 - tests/examples/gly/no_crash/document_header.gly~
 - tests/examples/gly/no_crash/multiple_scores.gly
 - tests/examples/gly/no_crash/multiple_scores.gly~
+- tests/examples/glyfy/expected/header.gly
+- tests/examples/glyfy/expected/header.gly~
+- tests/examples/glyfy/expected/simple.gly
+- tests/examples/glyfy/expected/simple.gly~
+- tests/examples/glyfy/given/header.gabc
+- tests/examples/glyfy/given/simple.gabc
+- tests/examples/parser/markup_after_header.gly
+- tests/examples/parser/markups.gly
+- tests/examples/parser/markups.gly~
+- tests/examples/parser/score_markup_order.gly
+- tests/examples/parser/score_markup_order.gly~
 - tests/no_crash.rb
-- tests/programmed_examples.rb~
+- tests/parser.rb
+- tests/parser.rb~
 - tests/run.rb
-- tests/run.rb~
 - tests/string_helpers_test.rb
-- tests/string_helpers_test.rb~
 - tests/test_helper.rb
 homepage: http://github.com/igneus/gly
 licenses:
@@ -156,9 +206,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Writer-friendly Gregorian notation format compiling to gabc
 test_files: []
-has_rdoc: