glyph 0.4.2 → 0.5.0

data/spec/macros/core_spec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+# encoding: utf-8
 
 describe "Macro:" do
 
@@ -15,26 +15,22 @@ describe "Macro:" do
 
 	it "snippet" do
 		define_em_macro
-		interpret "Testing a snippet: &[test]."
+		interpret "&:[test|This is a \nTest snippet]Testing a snippet: &[test]."
 		@p.document.output.should == "Testing a snippet: This is a \nTest snippet."
 		interpret("Testing &[wrong].")
 		@p.document.output.should == "Testing [SNIPPET 'wrong' NOT PROCESSED]." 
-		Glyph::SNIPPETS[:a] = "this is a em[test] &[b]"
-		Glyph::SNIPPETS[:b] = "and another em[test]"
-		text = "TEST: &[a]"
+		text = "&:[b|and another em[test]]&:[a|this is a em[test] &[b]]TEST: &[a]"
 		interpret text
 		@p.document.output.should == "TEST: this is a <em>test</em> and another <em>test</em>"
 		# Check snippets with links
-		Glyph::SNIPPETS[:c] = "This is a link to something afterwards: =>[#other]"
-		text = "Test. &[c]. #[other|Test]."
+		text = "&:[c|This is a link to something afterwards: =>[#other]]Test. &[c]. #[other|Test]."
 		output_for(text).should == %{Test. This is a link to something afterwards: <a href="#other">Test</a>. <a id="other">Test</a>.}
 	end
 
 	it "snippet:" do
 		interpret("&[t1] - &:[t1|Test #1] - &[t1]")
 		@p.document.output.should == "[SNIPPET 't1' NOT PROCESSED] -  - Test #1"
-		Glyph::SNIPPETS[:t1].should == "Test #1"
-		Glyph::SNIPPETS.delete :t1
+		@p.document.snippet?(:t1).should == "Test #1"
 	end
 
 	it "condition" do
@@ -56,8 +52,6 @@ describe "Macro:" do
 		@p.document.output.should == ""
 		interpret("?[not[match[$[document.source]|/^docu/]]|em[test]]")
 		@p.document.output.should == ""
-		# Invalid regexp
-		lambda { interpret("?[match[$[document.source]|document]em[test]]").document.output }.should raise_error
 		interpret "?[%[lite?]|test]"
 		@p.document.output.should == ""
 		interpret "?[%[!lite?]|test]"
@@ -121,7 +115,7 @@ This is a test.
 	it "include should assume .glyph as the default extension" do
 		file_copy Glyph::SPEC_DIR/'files/article.glyph', Glyph::PROJECT/'text/article.glyph'
 		output_for("include[article]").gsub(/\n|\t/, '').should == %{<div class="section">
-Test -- Test Snippet
+改善 Test -- Test Snippet
 
 </div>}.gsub(/\n|\t/, '')
 	end
@@ -136,6 +130,16 @@ Test -- Test Snippet
 		output_for("include[test.rb]day[]").should == Time.now.day.to_s	
 	end
 
+	it "load" do
+		text1 = %{section[@title[...]]}
+		text2 = %{Time.now.day}
+		file_write Glyph::PROJECT/"test1.glyph", text1
+		file_write Glyph::PROJECT/"test2.rb", text2
+		output_for("load[test/test1.glyph]").should == "[FILE 'test/test1.glyph' NOT FOUND]"
+		output_for("load[test1.glyph]").should == text1
+		output_for("load[test2.rb]").should == text2
+	end
+
 
 	it "escape" do
 		define_em_macro
@@ -183,18 +187,26 @@ Test -- Test Snippet
 		Glyph::MACROS[:test].should == Glyph::MACROS[:em]
 	end
 
-	it "rewrite:" do
+	it "define:" do
 		define_em_macro
-		interpret("rewrite:[rw_test|em[{{0}}\\.em[{{a}}]]]").process
-		output_for("rw_test[test @a[em[A!]]]").should == "<em>test<em><em>A!</em></em></em>"
-		output_for("rw_test[]").should == "<em><em></em></em>"
+		interpret("def:[def_test|em[{{0}}\\/em[{{a}}]]]").process
+		output_for("def_test[test @a[em[A!]]]").should == "<em>test<em><em>A!</em></em></em>"
+		output_for("def_test[]").should == "<em><em></em></em>"
 	end
 
-	it "rewrite should detect mutual definitions" do
-		define_em_macro
-		lambda do
-			interpret("rw:[rw_test2|em[rw_test2[{{0}}]]]").process
-		end.should raise_error(Glyph::MacroError)
+	it "define should support recursion" do
+		fact = %{
+			def:[fact|
+				?[
+					eq[{{0}}|0]|1|
+						multiply[
+							{{0}} | fact[subtract[{{0}}|1]]
+						]
+					]
+				]
+			fact[5]
+		}
+		output_for(fact).strip.should == "120"
 	end
 
 	it "output?" do
@@ -207,4 +219,125 @@ Test -- Test Snippet
 		output_for("?[output?[html|web]|YES!|NO...]").should == "NO..."
 	end
 
+	it "let, attribute, attribute:" do
+		test = %{
+			let[
+				@a[1]
+				@b[1]
+				-- @[a]@[b] --
+			]
+		}
+		nested_test = %{
+			section[
+				@title[test]
+				let[
+					-- @[title]@[unknown] --
+				]
+			]
+		}
+		set_test = %{
+			section[
+				@title[test]
+				em[-- @[title]@:[title|changed!]@[title] --]
+				let[
+					@a[1]
+					em[@:[title|changed again!]-- @[title] --]
+				]
+			]
+		}
+		invalid_set = %{@:[test|1]}
+		invalid_macro = %{=>@[test]}
+		output_for(test).should match("-- 11 --")
+		output_for(nested_test).should match("-- test --")
+		output_for(set_test).should match("-- testchanged! --")
+		output_for(set_test).should match("-- changed again! --")
+		lambda { output_for(invalid_set)}.should raise_error(Glyph::MacroError, "Undeclared attribute 'test'")
+		lambda { output_for(invalid_macro) }.should raise_error
+		# Set same attribute
+		text = %{
+			let[
+				@a[-]
+				em[
+					@:[a|s/concat[@[a]|--]]
+					@[a]
+				]
+			]
+		}
+		output_for(text).strip.should match("---")
+	end
+
+	it "add, multiply, subtract" do
+		output_for("add[2|2]").should == "4"
+		output_for("add[1|2|3|4]").should == "10"
+		output_for("add[1|2|-3]").should == "0"
+		output_for("add[a|1|2]").should == "3"
+		output_for("add[a|test]").should == "0"
+		lambda { output_for("add[1]").should == "1"}.should raise_error
+		lambda { output_for("add[]").should == "1"}.should raise_error
+		output_for("subtract[2|2]").should == "0"
+		output_for("subtract[1|2|3|4]").should == "-8"
+		output_for("subtract[1|2|-3]").should == "2"
+		output_for("subtract[a|1|2]").should == "-3"
+		output_for("subtract[a|test]").should == "0"
+		lambda { output_for("subtract[1]").should == "1"}.should raise_error
+		lambda { output_for("subtract[]").should == "1"}.should raise_error
+		output_for("multiply[2|2]").should == "4"
+		output_for("multiply[1|2|3|4]").should == "24"
+		output_for("multiply[1|2|-3]").should == "-6"
+		output_for("multiply[a|1|2]").should == "0"
+		output_for("multiply[a|test]").should == "0"
+		lambda { output_for("multiply[1]").should == "1"}.should raise_error
+		lambda { output_for("multiply[]").should == "1"}.should raise_error
+	end
+
+	it "s" do
+		lambda { output_for("s/each[test]") }.should raise_error
+		lambda { output_for("s/gsub[]") }.should raise_error
+		output_for("s/gsub[string|/ri/|i]").should == "sting"
+		output_for("s/match[test|/EST/i]").should == "est"
+		output_for("s/upcase[test]").should == "TEST"
+		output_for("s/insert[hell|4|o]").should == "hello"
+		output_for("s/slice[test]").should == ""
+	end
+
+	it "lt, lte, gt, gte" do
+		lambda { output_for("lt[1|2|3]")}.should raise_error
+		output_for("lt[2|7]").should == "true"
+		output_for("gt[2|7]").should == ""
+		output_for("gte[2|2]").should == "true"
+		output_for("lte[2|2]").should == "true"
+		output_for("gt[aaa|2]").should == "true"
+	end
+
+	it "while" do
+		text = %{
+			let[
+				@count[5]
+				@text[-]
+				while[gt[@[count]|0]|
+					@:[text|s/concat[@[text]|test-]]					
+					@:[count|subtract[@[count]|1]]
+				]
+				@[text]
+			]
+		}
+		output_for(text).strip.should == "-test-test-test-test-test-"
+	end
+
+	it "fragment" do
+		text = "... ##[id1|test fragment #1] ... ##[id2|test fragment #2]"
+	 	interpret text
+		@p.document.fragments.should == {:id1 => "test fragment #1", :id2 => "test fragment #2"}	
+		@p.document.output.should == "... test fragment #1 ... test fragment #2"
+		lambda { output_for "##[id1|test] -- fragment[id1|test]" }.should raise_error
+		lambda { output_for "##[id1]" }.should raise_error
+	end
+
+it "embed" do
+	text = "... <=[id2] ##[id1|test fragment #1] ... ##[id2|test fragment #2] <=[id1]"
+	output_for(text).should == "... test fragment #2 test fragment #1 ... test fragment #2 test fragment #1"
+end	
+
+
+
 end	

data/spec/macros/filters_spec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+# encoding: utf-8
 
 describe "Filter Macros" do
 

data/spec/macros/html5_spec.rb

@@ -76,11 +76,10 @@ describe "Macro:" do
 	it "figure (html5)" do
 		interpret "figure[@alt[ligature]ligature.jpg|Ligature]"
 		@p.document.output.gsub(/\t|\n/, '').should == %{
-			<figure>
-			<img src="images/ligature.jpg" alt="ligature" />
-			<figcaption>Ligature</figcaption>
-			</figure>
-		}.gsub(/\n|\t/, '')
+			<figure alt=\"ligature\">
+				<img src=\"images/ligature.jpg\" />
+				<figcaption>Ligature</figcaption>
+			</figure>}.gsub(/\n|\t/, '')
 	end
 
 	it "draftcomment, todo (html5)" do

data/spec/macros/macros_spec.rb

@@ -138,7 +138,7 @@ describe "Macro:" do
 
 	it "image should link files by absolute or relative path in Lite mode" do
 		result = %{
-			<img alt="-" src="images/ligature.jpg" width="90%" height="90%" />
+			<img src="images/ligature.jpg" width="90%" height="90%" />
 		}.gsub(/\n|\t/, '')
 		Glyph.lite_mode = true
 		Dir.chdir Glyph::PROJECT
@@ -151,17 +151,16 @@ describe "Macro:" do
 	it "figure" do
 		interpret "figure[@alt[ligature]ligature.jpg|Ligature]"
 		@p.document.output.gsub(/\t|\n/, '').should == %{
-			<div class="figure">
-			<img src="images/ligature.jpg" alt="ligature" />
-			<div class="caption">Ligature</div>
-			</div>
-		}.gsub(/\n|\t/, '')
+			<div class=\"figure\" alt=\"ligature\">
+				<img src=\"images/ligature.jpg\" />
+				<div class=\"caption\">Ligature</div>
+			</div>}.gsub(/\n|\t/, '')
 	end
 
 	it "fig should link files by absolute or relative path in Lite mode" do
 		result = %{
 			<div class="figure">
-			<img alt="-" src="images/ligature.jpg" />
+			<img src="images/ligature.jpg" />
 			<div class="caption">Ligature</div>
 			</div>
 		}.gsub(/\n|\t/, '')

data/spec/macros/web5_spec.rb

@@ -17,7 +17,7 @@ describe "Macro:" do
 	end
 
 	it "section (topic)" do
-		interpret("contents[section[@src[a/web1.glyph]@title[Test]]]")
+		interpret("section[section[@src[a/web1.glyph]@title[Test]]]")
 		topic = @p.document.topics[0]
 		topic[:contents].match(/<article>/).blank?.should == false
 	end
@@ -26,7 +26,7 @@ describe "Macro:" do
 		Glyph.run! 'generate:web5'
 		web1 = Glyph.file_load(Glyph::PROJECT/'output/web5/a/web1.html')
 		web2 = Glyph.file_load(Glyph::PROJECT/'output/web5/a/b/web2.html')
-		web1.match(%{<nav><a href="/index.html">Contents</a><a href="/a/b/web2.html">&rarr; Topic #2</a></nav>}).blank?.should == false
-		web2.match(%{<nav><a href="/a/web1.html">Topic #1 &larr;</a><a href="/index.html">Contents</a></nav>}).blank?.should == false
+		web1.match(%{<nav> | <a href="/index.html">Contents</a> | <a href="/a/b/web2.html">&rarr; Topic #2</a></nav>}).blank?.should == false
+		web2.match(%{<nav><a href="/a/web1.html">Topic #1</a> | <a href="/index.html">Contents</a> | </nav>}).blank?.should == false
 	end
 end	

data/spec/macros/web_spec.rb

@@ -33,27 +33,30 @@ describe "Macro:" do
 		Glyph.run! 'generate:web'
 		web1 = Glyph.file_load(Glyph::PROJECT/'output/web/a/web1.html')
 		web2 = Glyph.file_load(Glyph::PROJECT/'output/web/a/b/web2.html')
-		web1.match(%{<div class="navigation"><a href="/index.html">Contents</a><a href="/a/b/web2.html">&rarr; Topic #2</a></div>}).blank?.should == false
-		web2.match(%{<div class="navigation"><a href="/a/web1.html">Topic #1 &larr;</a><a href="/index.html">Contents</a></div>}).blank?.should == false
+		web1.match(%{<div class="navigation"> | <a href="/index.html">Contents</a> | <a href="/a/b/web2.html">Topic #2</a></div>}).blank?.should == false
+		web2.match(%{<div class="navigation"><a href="/a/web1.html">Topic #1</a> | <a href="/index.html">Contents</a> | </div>}).blank?.should == false
 	end
 
 	it "toc should only list topics" do
 		Glyph.run! 'generate:web'
 		index = Glyph.file_load(Glyph::PROJECT/'output/web/index.html')
 		index.match(%{<li class="section"><a href="#h_1">Web Document</a></li>}).blank?.should == true
-		index.match(%{href="/a/web1.html#h_2"}).blank?.should == false
-		index.match(%{href="/a/b/web2.html#h_6"}).blank?.should == false
+		index.match(%{href="/a/web1.html#h_3"}).blank?.should == false
+		index.match(%{href="/a/b/web2.html#h_7"}).blank?.should == false
+		web1 = Glyph.file_load(Glyph::PROJECT/'output/web/a/web1.html')
+    web1.should match(/<h2 id="t_0">Topic #1<\/h2>/) #  Headers are reset in each topic
 		delete_project
 		reset_quiet
 		create_web_project
 		Glyph['document.output'] = 'html'
 		Glyph.run! 'generate:html'
 		index = Glyph.file_load(Glyph::PROJECT/'output/html/test_project.html')
-		index.match(%{href="a/web1.html#h_2"}).blank?.should == true
-		index.match(%{href="a/b/web2.html#h_6"}).blank?.should == true
+    index.should match(%{<li class="section"><a href="#h_3">Topic #1</a></li><li><ol><li class="section"><a href="#h_4">Test #1a</a></li>})
+		index.match(%{href="a/web1.html#h_3"}).blank?.should == true
+		index.match(%{href="a/b/web2.html#h_7"}).blank?.should == true
 		index.match(%{<li class="section"><a href="#h_1">Web Document</a></li>}).blank?.should == false
 		index.match(%{href="#h_2"}).blank?.should == false
-		index.match(%{href="#h_7"}).blank?.should == false # Header numbers are different...
+		index.match(%{href="#h_8"}).blank?.should == false # Header numbers are different...
 	end
 
 end	

data/spec/macros/xml_spec.rb

@@ -35,7 +35,7 @@ describe "Glyph Language" do
 	it "should support XML attributes" do
 		language('xml')
 		output_for("span[@class[test] @style[color:red;] test...]").should == %{
-			<span class="test" style="color:red;">test...</span>
+			<span class="test" style="color:red;">  test...</span>
 		}.strip
 	end
 
@@ -48,7 +48,7 @@ describe "Glyph Language" do
 	it "should notify the user that a macro is not found for invalid elements if xml_fallback is enabled" do
 		# Assuming options.xml_fallback = true
 		language('glyph')
-		lambda { interpret("*a[test]").document }.should raise_error(Glyph::MacroError, "Unknown macro '*a'")
+		lambda { interpret("*a[test]").document }.should raise_error(Glyph::MacroError, "Invalid XML element '*a'")
 	end	
 
 	it "should not render blacklisted tags" do
@@ -74,4 +74,13 @@ describe "Glyph Language" do
 		output_for(text).gsub(/\s/, '').should == "<test>test</test>"
 	end
 
+	it "should work with macro composition" do
+		language('glyph')
+		output_for("xml/a[@test[...]xyz]").should == "<a test=\"...\">xyz</a>"
+		output_for("xml/a[@test[...]xml/b[test]]").should == "<a test=\"...\">\n<b>test</b>\n</a>"
+		output_for("xml/a[xml/b[test]xml/c[test]]").should == "<a>\n<b>test</b><c>test</c>\n</a>"
+		output_for("xml/a[xml/b[test]xml/c[@test[test_attr]test]]").should == "<a>\n<b>test</b><c test=\"test_attr\">test</c>\n</a>"
+		output_for("xml/a[xml/b[@test[true]]]").should == "<a>\n<b test=\"true\" />\n</a>"
+	end
+
 end	

data/spec/spec_helper.rb

@@ -62,16 +62,22 @@ end
 
 def delete_project 
 	delete_project_dir
-	Glyph::SNIPPETS.clear
+	Glyph::REPS.clear
 	Glyph::MACROS.clear
 	Glyph['document.source'] = 'document.glyph'
 	Glyph.document = nil
 end
 
-def run_command(cmd)
-	stdout_for do
-		GLI.run cmd
+def run_command(cmd, return_code=false)
+	result = 0
+	out = stdout_for do
+		result = GLI.run cmd
 	end
+	return_code ? result : out
+end
+
+def run_command_with_status(cmd)
+	run_command(cmd, true)
 end
 
 def stdout_for(&block)
@@ -90,7 +96,7 @@ def stdout_for(&block)
 end
 
 def run_command_successfully(cmd)
-	run_command(cmd).match(/error/) == nil
+	run_command(cmd, true) == 0
 end
 
 def define_em_macro

data/spec/tasks/generate_spec.rb

@@ -22,9 +22,44 @@ describe "generate" do
 		(Glyph::PROJECT/'output/html/test_project.html').exist?.should == true
 	end
 
+	it ":html5 should generate a standalone html document" do
+		Glyph['document.output'] = 'html5'
+		lambda { Glyph.run! 'generate:html5'}.should_not raise_error
+		(Glyph::PROJECT/'output/html5/test_project.html').exist?.should == true
+	end
+
+  it ":pdf_through_html should generate a pdf document through html" do
+		Glyph['document.output'] = 'pdf'
+    lambda { stdout_for { Glyph.run! 'generate:pdf_through_html'}}.should_not raise_error
+		(Glyph::PROJECT/'output/tmp/test_project.html').exist?.should == true
+		(Glyph::PROJECT/'output/pdf/test_project.pdf').exist?.should == true
+	end
+
+  it ":pdf_through_html5 should generate a pdf document through html5" do
+		Glyph['document.output'] = 'pdf'
+    lambda { stdout_for { Glyph.run! 'generate:pdf_through_html5'}}.should_not raise_error
+		(Glyph::PROJECT/'output/tmp/test_project.html').exist?.should == true
+		(Glyph::PROJECT/'output/pdf/test_project.pdf').exist?.should == true
+  end
+
+  it ":mobi should generate a mobi document" do
+		Glyph['document.output'] = 'mobi'
+    lambda { stdout_for { Glyph.run! 'generate:mobi'}}.should_not raise_error
+		(Glyph::PROJECT/'output/tmp/test_project.html').exist?.should == true
+		(Glyph::PROJECT/'output/mobi/test_project.mobi').exist?.should == true
+  end
+
+  it ":epub should generate an epub document" do
+		Glyph['document.output'] = 'epub'
+    #lambda { 
+			stdout_for { Glyph.run! 'generate:epub'}#}.should_not raise_error
+		(Glyph::PROJECT/'output/tmp/test_project.html').exist?.should == true
+		(Glyph::PROJECT/'output/epub/test_project.epub').exist?.should == true
+  end
+
 	it "should copy images" do
 		dir = (Glyph::PROJECT/'images/test').mkpath
-		file_copy Glyph::HOME/'spec/files/ligature.jpg', Glyph::PROJECT/'images/test' 
+		file_copy Glyph::HOME/'spec/files/ligature.jpg', Glyph::PROJECT/'images/test'
 		lambda { Glyph.run! 'generate:html' }.should_not raise_error
 		(Glyph::PROJECT/'output/html/images/test/ligature.jpg').exist?.should == true
 	end
@@ -56,10 +91,10 @@ describe "generate" do
 		lambda { Glyph.run! 'generate:web'}.should raise_error(RuntimeError, "You cannot have a 'styles' directory under your 'text' directory.")
 		reset_web.call
 		# check that the task can be run without errors
-		reset_web.call 
+		reset_web.call
 		Glyph["output.#{Glyph['document.output']}.base"] = "/test/"
-		#lambda { 
-			Glyph.run! 'generate:web' 
+		#lambda {
+			Glyph.run! 'generate:web'
 		#}.should_not raise_error
 		# check that images are copied
 		(Glyph::PROJECT/'output/web/images/ligature.jpg').exist?.should == true
@@ -69,7 +104,7 @@ describe "generate" do
 		# check that index.html is created
 		index = (Glyph::PROJECT/'output/web/index.html')
 		index.exist?.should == true
-		file_load(index).should match(/<li class="section"><a href="\/test\/a\/b\/web2.html#h_6">Topic #2<\/a>/)
+		file_load(index).should match(/<li class="section"><a href="\/test\/a\/b\/web2.html#h_7">Topic #2<\/a>/)
 	  #	check that topics are copied in the proper directories
 		web1 = (Glyph::PROJECT/'output/web/a/web1.html')
 		web1.exist?.should == true