glyph 0.2.0 → 0.3.0

data/spec/macros/core_spec.rb

@@ -0,0 +1,195 @@
+#!/usr/bin/env ruby
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe "Macro:" do
+
+	before do
+		create_project
+		Glyph.run! 'load:all'
+	end
+
+	after do
+		Glyph.lite_mode = false
+		delete_project
+	end
+
+	it "snippet" do
+		define_em_macro
+		interpret "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]"
+		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]."
+		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
+	end
+
+	it "condition" do
+		define_em_macro
+		interpret("?[$[document.invalid]|em[test]]")
+		@p.document.output.should == ""
+		interpret("?[$[document.output]|em[test]]")
+		@p.document.output.should == "<em>test</em>"
+		interpret("?[not[eq[$[document.output]|]]|em[test]]")
+		@p.document.output.should == "<em>test</em>"
+		interpret %{?[
+				or[
+					eq[$[document.target]|htmls]|
+					not[eq[$[document.author]|x]]
+				]|em[test]]}
+		@p.document.output.should == "<em>test</em>"
+		# "false" should be regarded as false
+		interpret(%{?[%["test".blank?]|---]})
+		@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]"
+		@p.document.output.should == "test"
+		interpret "?[%[lite?]|%[\"test\"]]"
+		@p.document.output.should == ""
+		# Condition not satisfied...
+		interpret "?[%[lite?]|%[ Glyph\\['test_config'\\] = true ]]"
+		@p.document.output.should == ""
+		Glyph['test_config'].should_not == true
+		# Condition satisfied...
+		interpret "?[%[!lite?]|%[ Glyph\\['test_config'\\] = true ]]"
+		@p.document.output.should == "true"
+		Glyph['test_config'].should == true
+	end
+
+	it "comment" do
+		output_for("--[config:[some_random_setting|test]]").should == ""
+		Glyph[:some_random_setting].should == nil
+	end
+
+	it "include" do
+		Glyph["filters.by_extension"] = true
+		text = file_load(Glyph::PROJECT/'text/container.textile')
+		interpret text
+		@p.document.output.gsub(/\n|\t|_\d{1,3}/, '').should == %{
+			<div class="section">
+			<h2 id="h_1">Container section</h2>
+			This is a test.
+				<div class="section">
+				<h3 id="h_2">Test Section</h3>	
+				<p>&#8230;</p>
+				</div>
+			</div>
+		}.gsub(/\n|\t|_\d{1,3}/, '')
+	end
+
+	it "include should work in Lite mode" do
+		Glyph.lite_mode = true
+		result = %{<div class="section">
+<h2 id="h_1">Container section</h2>
+This is a test.
+	<div class="section">
+	<h3 id="h_2">Test Section</h3>
+		<p>&#8230;</p>
+	</div>
+
+</div>}.gsub(/\n|\t/, '')		
+		Dir.chdir Glyph::SPEC_DIR/"files"
+		text = file_load(Glyph::SPEC_DIR/"files/container.textile").gsub("a/b/c/", '')
+		Glyph.filter(text).gsub(/\n|\t/, '').should == result
+		Dir.chdir Glyph::PROJECT
+		Glyph.lite_mode = false
+	end
+
+	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
+
+</div>}.gsub(/\n|\t/, '')
+	end
+
+	it "include should evaluate .rb file in the context of Glyph" do
+		text = %{
+			macro :day do
+				Time.now.day
+			end
+		}
+		file_write Glyph::PROJECT/"lib/test.rb", text
+		output_for("include[test.rb]day[]").should == Time.now.day.to_s	
+	end
+
+
+	it "escape" do
+		define_em_macro
+		text = %{This is a test em[This can .[=contain test[macros em[test]]=]]}		
+		interpret text
+		@p.document.output.should == %{This is a test <em>This can contain test[macros em[test]]</em>}
+	end
+
+	it "ruby" do
+		interpret "2 + 2 = %[2+2]"
+		@p.document.output.should == %{2 + 2 = 4}
+		interpret "%[lite?]"
+		@p.document.output.should == %{false}
+		interpret "%[def test; end]"
+	end
+
+	it "config" do
+		Glyph["test.setting"] = "TEST"
+		interpret "test.setting = $[test.setting]"
+		@p.document.output.should == %{test.setting = TEST}
+	end
+	
+	it "config:" do
+		Glyph["test.setting"] = "TEST"
+		interpret "test.setting = $[test.setting]"
+		@p.document.output.should == %{test.setting = TEST}
+		interpret "test.setting = $:[test.setting|TEST2]$[test.setting]"
+		@p.document.output.should == %{test.setting = TEST2}
+		interpret("$:[test.setting]").process
+		Glyph['test.setting'].should == nil
+		Glyph['system.test'] = 1
+		interpret("$:[system.test|2]").process
+		Glyph['system.test'].should == 1
+	end
+
+	it "macro:" do
+		interpret '%:[e_macro|
+			"Test: #{value}"]e_macro[OK!]'
+		@p.document.output.should == "Test: OK!"
+	end
+
+	it "alias:" do
+		define_em_macro
+		interpret("alias:[test|em]").process
+		Glyph::MACROS[:test].should == Glyph::MACROS[:em]
+	end
+
+	it "rewrite:" 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>"
+	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)
+	end
+
+
+end	

data/spec/macros/filters_spec.rb

@@ -12,7 +12,7 @@ describe "Filter Macros" do
 	after do
 		delete_project
 	end
-	
+
 	it "should filter textile input" do
 		text = "textile[This is a _TEST_(TM).]"
 		interpret text
@@ -34,9 +34,43 @@ describe "Filter Macros" do
 - item 3
 
 etc.]"
-		interpret text
-		@p.document.output.gsub(/\n|\t/, '').should == 
-			"<p>This is a test:</p><ul><li>item 1</li><li>item 2</li><li>item 3</li></ul><p>etc.</p>"
+interpret text
+@p.document.output.gsub(/\n|\t|\s{2}/, '').should == 
+	"<p>This is a test:</p><ul><li>item 1</li><li>item 2</li><li>item 3</li></ul><p>etc.</p>"
 	end
 
+	it "highlight" do
+		cr = false
+		uv = false
+		begin
+			require 'coderay'
+			cr = true
+		rescue Exception
+		end
+		begin
+			require 'uv'
+			uv = true
+		rescue Exception
+		end
+		code = %{def test_method(a, b)
+				puts a+b
+			end}
+			cr_result = %{<div class=\"CodeRay\"> <div class=\"code\"><pre><span class=\"r\">def</span> 
+			<span class=\"fu\">test_method</span>(a, b) puts a+b <span class=\"r\">end</span></pre></div> </div>}
+			uv_result = %{<pre class=\"iplastic\"><span class=\"Keyword\">def</span> 
+			<span class=\"FunctionName\">test_method</span>(<span class=\"Arguments\">a<span class=\"Arguments\">,</span> b</span>) 
+			puts a<span class=\"Keyword\">+</span>b <span class=\"Keyword\">end</span> </pre>}
+			Glyph['filters.ultraviolet.theme'] = 'iplastic'
+			check = lambda do |hl, result|
+				Glyph["filters.highlighter"] = hl.to_sym
+				Glyph.debug_mode = true
+				interpret("highlight[=ruby|\n#{code}=]")
+				@p.document.output.gsub(/\s+/, ' ').strip.should == result.gsub(/\s+/, ' ').strip
+			end
+			Glyph['filters.ultraviolet.line_numbers'] = false
+			check.call 'ultraviolet', uv_result if uv
+			check.call 'coderay', cr_result if cr
+	end
+
+
 end	

data/spec/macros/macros_spec.rb

@@ -10,6 +10,7 @@ describe "Macro:" do
 
 	after do
 		Glyph.lite_mode = false
+		reset_quiet
 		delete_project
 	end
 
@@ -21,78 +22,16 @@ describe "Macro:" do
 		lambda { interpret "this is a #[test|test]. #[test|This won't work!]"; @p.document }.should raise_error(Glyph::MacroError)
 	end
 
-	it "snippet" do
-		define_em_macro
-		interpret "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]"
-		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]."
-		interpret text
-		@p.document.output.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
-	end
-
-	it "condition" do
-		define_em_macro
-		interpret("?[$[document.invalid]|em[test]]")
-		@p.document.output.should == ""
-		interpret("?[$[document.output]|em[test]]")
-		@p.document.output.should == "<em>test</em>"
-		interpret("?[not[eq[$[document.output]|]]|em[test]]")
-		@p.document.output.should == "<em>test</em>"
-		interpret %{?[
-				or[
-					eq[$[document.target]|htmls]|
-					not[eq[$[document.author]|x]]
-				]|em[test]]}
-		@p.document.output.should == "<em>test</em>"
-		# "false" should be regarded as false
-		interpret(%{?[%["test".blank?]|---]})
-		@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]"
-		@p.document.output.should == "test"
-		interpret "?[%[lite?]|%[\"test\"]]"
-		@p.document.output.should == ""
-		# Condition not satisfied...
-		interpret "?[%[lite?]|*[= %[ Glyph\\['test_config'\\] = true ] =]]"
-		@p.document.output.should == ""
-		Glyph['test_config'].should_not == true
-		# Condition satisfied...
-		interpret "?[%[!lite?]|*[= --[%[ Glyph\\['test_config'\\] = true ]] =]]"
-		@p.document.output.should == ""
-		Glyph['test_config'].should == true
-	end
-
 	it "section, chapter, header" do
-		text = "chapter[header[Chapter X] ... section[header[Section Y|sec-y] ... section[header[Another section] ...]]]"
+		text = "chapter[@title[Chapter X] ... section[@title[Section Y]@id[sec-y] ... section[@title[Another section] ...]]]"
 		interpret text
 		doc = @p.document
 		doc.output.gsub(/\n|\t/, '').should == %{<div class="chapter">
-					<h2 id="h_1">Chapter X</h2> ... 
+					<h2 id="h_1">Chapter X</h2>... 
 					<div class="section">
-					<h3 id="sec-y">Section Y</h3> ... 
+					<h3 id="sec-y">Section Y</h3>... 
 						<div class="section">
-						<h4 id="h_3">Another section</h4> ...
+						<h4 id="h_3">Another section</h4>...
 						</div>
 					</div>
 				</div>
@@ -100,29 +39,6 @@ describe "Macro:" do
 		doc.bookmark?(:"sec-y").should == {:id => :"sec-y", :title => "Section Y"} 
 	end
 
-	it "include" do
-		Glyph["filters.by_extension"] = true
-		text = file_load(Glyph::PROJECT/'text/container.textile')
-		interpret text
-		@p.document.output.gsub(/\n|\t|_\d{1,3}/, '').should == %{
-			<div class="section">
-			<h2 id="h_1">Container section</h2>
-			This is a test.
-				<div class="section">
-				<h3 id="h_2">Test Section</h3>	
-				<p>&#8230;</p>
-				</div>
-			</div>
-		}.gsub(/\n|\t|_\d{1,3}/, '')
-	end
-
-	it "include should not work in Lite mode" do
-		text = file_load(Glyph::PROJECT/'text/container.textile')
-		Glyph.lite_mode = true
-		lambda { interpret(text).document.output }.should raise_error Glyph::MacroError
-		Glyph.lite_mode = false
-	end
-
 	it "document, head, style" do
 		interpret "document[head[style[test.sass]]]"
 		@p.document.output.gsub(/\n|\t/, '').should == %{
@@ -134,7 +50,7 @@ describe "Macro:" do
 				<meta name="author" content="#{Glyph["document.author"]}" />
 				<meta name="copyright" content="#{Glyph["document.author"]}" />
 				<meta name="generator" content="Glyph v#{Glyph::VERSION} (http://www.h3rald.com/glyph)" />
-				<style type=\"text/css\">#main {  background-color: #0000ff; }</style>
+				<style type=\"text/css\">#main {  background-color: blue; }</style>
 			</head>
 		</html>
 		}.gsub(/\n|\t/, '')
@@ -150,7 +66,7 @@ describe "Macro:" do
 				<meta name="author" content="#{Glyph["document.author"]}" />
 				<meta name="copyright" content="#{Glyph["document.author"]}" />
 				<meta name="generator" content="Glyph v#{Glyph::VERSION} (http://www.h3rald.com/glyph)" />
-				<style type=\"text/css\">#main {  background-color: #0000ff; }</style>
+				<style type=\"text/css\">#main {  background-color: blue; }</style>
 			</head>
 		</html>
 		}.gsub(/\n|\t/, '')
@@ -162,35 +78,6 @@ describe "Macro:" do
 		@p.document.output.gsub(/\n|\t/, '').should == result
 	end
 
-	it "escape" do
-		define_em_macro
-		text = %{This is a test em[This can .[=contain test[macros em[test]]=]]}		
-		interpret text
-		@p.document.output.should == %{This is a test <em>This can contain test[macros em[test]]</em>}
-	end
-
-	it "ruby" do
-		interpret "2 + 2 = %[2+2]"
-		@p.document.output.should == %{2 + 2 = 4}
-		interpret "%[lite?]"
-		@p.document.output.should == %{false}
-		interpret "%[def test; end]"
-	end
-
-	it "config" do
-		Glyph["test.setting"] = "TEST"
-		interpret "test.setting = $[test.setting]"
-		@p.document.output.should == %{test.setting = TEST}
-	end
-	
-	it "config:" do
-		Glyph["test.setting"] = "TEST"
-		interpret "test.setting = $[test.setting]"
-		@p.document.output.should == %{test.setting = TEST}
-		interpret "test.setting = $:[test.setting|TEST2]$[test.setting]"
-		@p.document.output.should == %{test.setting = TEST2}
-	end
-
 	it "toc" do
 		file_copy Glyph::PROJECT/'../files/document_with_toc.glyph', Glyph::PROJECT/'document.glyph'
 		interpret file_load(Glyph::PROJECT/'document.glyph')
@@ -201,9 +88,6 @@ describe "Macro:" do
 			<h2 class="toc-header" id="h_toc">Table of Contents</h2>
 			<ol class="toc">
 				<li class=" section"><a href="#h_1">Container section</a></li>
-				<li><ol>
-					<li class=" section"><a href="#h_2">Test Section</a></li>
-				</ol></li>
 				<li class=" section"><a href="#md">Markdown</a></li>
 			</ol>
 			</div>
@@ -233,32 +117,30 @@ describe "Macro:" do
 			see <a href="#test">Test</a></span> <a id="test">Test</a>}.gsub(/\n|\t/, '')
 	end	
 
-	it "img" do
-		interpret "img[ligature.jpg|90%|90%]"
+	it "image" do
+		interpret "image[@width[90%]@height[90%]@alt[-]ligature.jpg]"
 		@p.document.output.gsub(/\t|\n/, '').should == %{
-			<img src="images/ligature.jpg" 
-			width="90%" height="90%" alt="-"/>
+			<img src="images/ligature.jpg" width="90%" height="90%" alt="-" />
 		}.gsub(/\n|\t/, '')
 	end
 
-	it "img should link files by absolute or relative path in Lite mode" do
+	it "image should link files by absolute or relative path in Lite mode" do
 		result = %{
-			<img src="images/ligature.jpg" 
-			width="90%" height="90%" alt="-"/>
+			<img alt="-" src="images/ligature.jpg" width="90%" height="90%" />
 		}.gsub(/\n|\t/, '')
 		Glyph.lite_mode = true
 		Dir.chdir Glyph::PROJECT
-		interpret "img[images/ligature.jpg|90%|90%]"
+		interpret "image[@width[90%]@height[90%]images/ligature.jpg]"
 		@p.document.output.gsub(/\t|\n/, '').should == result
-		interpret "img[#{Glyph::PROJECT}/images/ligature.jpg|90%|90%]"
+		interpret "image[@width[90%]@height[90%]#{Glyph::PROJECT}/images/ligature.jpg]"
 		@p.document.output.gsub(/\t|\n/, '').gsub(Glyph::PROJECT.to_s+'/', '').should == result
 	end
 
-	it "fig" do
-		interpret "fig[ligature.jpg|Ligature]"
+	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="-"/>
+			<img src="images/ligature.jpg" alt="ligature" />
 			<div class="caption">Ligature</div>
 			</div>
 		}.gsub(/\n|\t/, '')
@@ -267,15 +149,15 @@ describe "Macro:" do
 	it "fig should link files by absolute or relative path in Lite mode" do
 		result = %{
 			<div class="figure">
-			<img src="images/ligature.jpg" alt="-"/>
+			<img alt="-" src="images/ligature.jpg" />
 			<div class="caption">Ligature</div>
 			</div>
 		}.gsub(/\n|\t/, '')
 		Glyph.lite_mode = true
 		Dir.chdir Glyph::PROJECT
-		interpret "fig[images/ligature.jpg|Ligature]"
+		interpret "figure[images/ligature.jpg|Ligature]"
 		@p.document.output.gsub(/\t|\n/, '').should == result
-		interpret "fig[#{Glyph::PROJECT}/images/ligature.jpg|Ligature]"
+		interpret "figure[#{Glyph::PROJECT}/images/ligature.jpg|Ligature]"
 		@p.document.output.gsub(/\t|\n/, '').gsub(Glyph::PROJECT.to_s+'/', '').should == result
 	end
 
@@ -295,42 +177,4 @@ describe "Macro:" do
 		Glyph['document.draft'] = false
 	end
 
-	it "highlight" do
-		cr = false
-		uv = false
-		begin
-			require 'coderay'
-			cr = true
-		rescue Exception
-		end
-		begin
-			require 'uv'
-			uv = true
-		rescue Exception
-		end
-		code = %{def test_method(a, b)
-				puts a+b
-			end}
-		cr_result = %{<div class=\"CodeRay\"> <div class=\"code\"><pre> <span class=\"r\">def</span> 
-			<span class=\"fu\">test_method</span>(a, b) puts a+b <span class=\"r\">end</span></pre></div> </div>}
-		uv_result = %{<pre class=\"iplastic\"> <span class=\"Keyword\">def</span> 
-			<span class=\"FunctionName\">test_method</span>(<span class=\"Arguments\">a<span class=\"Arguments\">,</span> b</span>) 
-			puts a<span class=\"Keyword\">+</span>b <span class=\"Keyword\">end</span> </pre>}
-		Glyph['highlighters.ultraviolet.theme'] = 'iplastic'
-		check = lambda do |hl, result|
-			Glyph["highlighters.current"] = hl
-			Glyph.debug_mode = true
-			interpret("highlight[=ruby|\n#{code}=]")
-			@p.document.output.gsub(/\s+/, ' ').strip.should == result.gsub(/\s+/, ' ').strip
-		end
-		check.call 'ultraviolet', uv_result if uv
-		check.call 'coderay', cr_result if cr
-	end
-
-	it "macro:" do
-		interpret '%:[e_macro|
-			"Test: #@value"]e_macro[OK!]'
-		@p.document.output.should == "Test: OK!"
-	end
-
 end