glyph 0.2.0 → 0.3.0

data/spec/macros/textile_spec.rb

@@ -36,11 +36,11 @@ Testing:
 	
 	it "should be embeddable in section macros" do
 		text1 = 
-%{textile[section[header[Test]
+%{textile[section[@title[Test]
 #@textile
 ]]}
 		text2 = 
-%{textile[section[header[Test]#@textile
+%{textile[section[@title[Test]#@textile
 ]]}
 		result =
 %{<div class="section">
@@ -48,67 +48,9 @@ Testing:
 #@html
 </div>}
 		filter(text1).should == result
-		filter(text2).gsub(/<\/h2>/, "</h2>\n").should == result
+		filter(text2).gsub(/<\/h2>/, "</h2>").should == result
 	end
 
-	######################################
-	
-	it "should be embeddable in td macros" do
-		text0 =
-%{<table>
-<tr>
-<td>
-#@textile
-</td>
-</tr>
-</table>
-}
-		text1 =
-%{textile[table[
-	tr[td[#@textile]]
-]]}
-		text2 =
-%{textile[table[
-	tr[
-		td[#@textile]
-	]
-]]}
-		text3 =
-%{textile[table[
-	tr[
-		td[
-#@textile
-		]
-	]
-]]}
-		text4 = %{textile[table[
-	tr[
-		td[This is a _test_.]
-	]
-]]}
-		result = 
-%{<table>
-<tr>
-<td>
-#@html
-</td>
-</tr>
-</table>}
-		result2 = 
-%{<table>
-<tr>
-<td>
-<p>This is a <em>test</em>.</p>
-</td>
-</tr>
-</table>}
-		filter(text1).should == result
-		filter(text2).should == result
-		filter(text3).should == result
-		##### Check inline textile
-		filter(text4).should == result2
-	end
-	
 	######################################
 
 	it "should be embeddable in box macros" do
@@ -177,33 +119,33 @@ Testing:
 </div>
 </div>}
 		text1 = %{textile[
-			section[header[Test]
+			section[@title[Test]
 #@textile
-			code[#{code}]
+			codeblock[#{code}]
 ]]}
 		text2 = %{textile[
-			section[header[Test]
+			section[@title[Test]
 #@textile
-			code[#{code}
+			codeblock[#{code}
 		]
 	]
 ]}
 		text3 = %{textile[
-			section[header[Test]
+			section[@title[Test]
 #@textile
-			code[
+			codeblock[
 #{code}]
 ]]}
 		text4 = %{textile[
-			section[header[Test]
+			section[@title[Test]
 #@textile
-			code[
+			codeblock[
 #{code}
 ]]]}
 		text5 = %{textile[
-			section[header[Test]
+			section[@title[Test]
 #@textile
-			code[
+			codeblock[
 #{code}
 	]
 	]]}

data/spec/macros/xml_spec.rb

@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe "Glyph Language" do
+
+	before do
+		create_project
+	end
+
+	after do
+		reset_quiet
+		language('glyph')
+		delete_project
+	end
+
+	it "should support XML fallback by default" do
+		Glyph.run 'load:all'
+		output_for(%{
+			i[test]
+			code[
+			test
+			]
+		}).gsub(/\s+/, '').should == %{
+		<i>test</i>
+				<code>
+					test
+				</code>}.gsub(/\s+/, '')
+	end
+
+	it "should support XML macros" do
+		language('xml')
+		output_for("pre[code[test]]").should == "<pre>\n<code>test</code>\n</pre>"
+	end
+
+	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>
+		}.strip
+	end
+
+	it "should detect invalid characters for XML elements and attributes" do
+		language('xml')
+		lambda  { interpret("!&test[test]").document }.should raise_error
+		output_for("span[@class[test]@.[test]test]").should == %{<span class="test">test</span>}
+	end
+
+	it "should notify the user that a macro is not found for invalid elements if xml_fallback is enabled" do
+		# Assuming language.options.xml_fallback = true
+		language('glyph')
+		lambda { interpret("*a[test]").document }.should raise_error(Glyph::MacroError, "Unknown macro '*a'")
+	end	
+
+	it "should not render blacklisted tags" do
+		language('xml')
+		text = %{
+			object[test]
+			applet[test]
+      base[test]
+      basefont[test]
+      embed[test]
+      frame[test]
+      frameset[test]
+      iframe[test]
+      isindex[test]
+			test[test]
+      meta[test]
+      noframes[test]
+      noscript[test]
+      object[test]
+      param[test]
+      title[tesy]
+		}
+		output_for(text).gsub(/\s/, '').should == "<test>test</test>"
+	end
+
+end	

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ end
 
 require "glyph"
 
-Glyph[:quiet] = true
+Glyph['system.quiet'] = true
 
 def create_project_dir
 	Glyph::PROJECT.mkpath
@@ -22,7 +22,7 @@ end
 
 def reset_quiet
 	Glyph.reset
-	Glyph[:quiet] = true
+	Glyph['system.quiet'] = true
 end
 
 def create_project
@@ -32,15 +32,15 @@ def create_project
 	Glyph.run! 'project:create', Glyph::PROJECT.to_s
 	file_copy Glyph::SPEC_DIR/'files/container.textile', Glyph::PROJECT/'text/container.textile'
 	(Glyph::PROJECT/'text/a/b/c').mkpath
-	file_copy Glyph::SPEC_DIR/'files/included.textile', Glyph::PROJECT/'text/a//b/c/included.textile'
-	file_copy Glyph::SPEC_DIR/'files/markdown.markdown', Glyph::PROJECT/'text/a//b/c/markdown.markdown'
+	file_copy Glyph::SPEC_DIR/'files/included.textile', Glyph::PROJECT/'text/a/b/c/included.textile'
+	file_copy Glyph::SPEC_DIR/'files/markdown.markdown', Glyph::PROJECT/'text/a/b/c/markdown.markdown'
 	file_copy Glyph::SPEC_DIR/'files/document.glyph', Glyph::PROJECT/'document.glyph'
 	file_copy Glyph::SPEC_DIR/'files/test.sass', Glyph::PROJECT/'styles/test.sass'
 	file_copy Glyph::SPEC_DIR/'files/ligature.jpg', Glyph::PROJECT/'images/ligature.jpg'
 end
 
 def delete_project_dir
- 	return unless	Glyph::PROJECT.exist?
+	return unless	Glyph::PROJECT.exist?
 	Glyph::PROJECT.children.each do |f|
 		FileUtils.rmtree f if f.directory? 
 		FileUtils.rm f if f.file?
@@ -61,9 +61,9 @@ def run_command(cmd)
 	old_stderr = $stderr
 	$stdout = out
 	$stderr = out 
-	Glyph[:quiet] = false
+	Glyph['system.quiet'] = false
 	GLI.run cmd
-	Glyph[:quiet] = true
+	Glyph['system.quiet'] = true
 	$stdout = old_stdout
 	$stderr = old_stderr
 	out.string
@@ -75,22 +75,33 @@ end
 
 def define_em_macro
 	Glyph.macro :em do
-		%{<em>#{@value}</em>}
+		%{<em>#{value.to_s.strip}</em>}
 	end
 end
 
 def define_ref_macro
 	Glyph.macro :ref do
-		%{<a href="#{params[0]}">#{params[1]}</a>}
+		%{<a href="#{parameter(0).to_s.strip}">#{parameter(1).to_s.strip}</a>}
 	end
 end
 
+def language(set)
+	reset_quiet
+	Glyph.run 'load:config'
+	Glyph['language.set'] = set
+	Glyph.run 'load:macros'
+end
+
 def interpret(text)
 	@p = Glyph::Interpreter.new(text)
 end
 
+def output_for(text)
+	Glyph::Interpreter.new(text).document.output
+end
+
 def create_tree(text)
-	GlyphLanguageParser.new.parse text 
+	Glyph::Interpreter.new(text).parse
 end
 
 def create_doc(tree)
@@ -100,3 +111,32 @@ end
 def filter(text)
 	Glyph.filter text
 end
+
+def text_node(value, options={})
+	Glyph::TextNode.new.from({:value => value}.merge options)
+end
+
+def escape_node(value, options={})
+	Glyph::EscapeNode.new.from({:value => value, :escaped => true})
+end
+
+def document_node
+	Glyph::DocumentNode.new.from({:name => "--".to_sym})
+end
+
+def a_node(name, options={})
+	Glyph::AttributeNode.new.from({
+		:name => :"#{name}", 
+		:escape => false}.merge(options))
+end
+
+def p_node(n)
+	Glyph::ParameterNode.new.from({:name => :"#{n}"})
+end
+
+def macro_node(name, options={})
+	Glyph::MacroNode.new.from({
+		:name => name.to_sym, 
+		:escape => false
+	}.merge options)
+end

data/spec/tasks/load_spec.rb

@@ -35,13 +35,24 @@ describe "load" do
 		Glyph::MACROS[:"#"].blank?.should == false
 	end
 
+	it "[macros] should be able to load only core macros" do
+		language 'core'
+		output_for("$:[language.set|glyph]").blank?.should == true
+		Glyph['language.set'].should == 'glyph'
+	end
+	
+	it "[macros] should be able to load only filter macros" do
+		language 'filters'
+		output_for("textile[*test*]").should == "<p><strong>test</strong></p>"
+	end
+
 	it "[config] should load configuration files and apply overrides" do
         Glyph.config_refresh
 		lambda { Glyph.run! 'load:config'}.should_not raise_error
-		Glyph[:quiet] = true
+		Glyph['system.quiet'] = true
 		Glyph::PROJECT_CONFIG.blank?.should == false
 		Glyph::SYSTEM_CONFIG.blank?.should == false
-		Glyph['structure.headers'].class.to_s.should == "Array"
+		Glyph['system.structure.headers'].class.to_s.should == "Array"
 	end
 
 end

data/styles/default.css

@@ -31,7 +31,7 @@ body {
 }
 
 /* Structure */
-.titlepage {
+.halftitlepage, .titlepage {
 	margin: auto;
 	text-align: center;
 }
@@ -41,7 +41,7 @@ body {
 	line-height: 1.5em;
 	margin-bottom: 0.2em;
 }
-.titlepage h2 {
+.halftitlepage h2, .titlepage h2 {
 	font-size: 1.1em;
 	font-style: italic;
 	font-weight: bold;
@@ -128,6 +128,13 @@ sup {
 	background: #EEE;
 	color: #1F1F1F;
 }
+.note>p, 
+.important>p, 
+.tip>p, 
+.caution>p {
+	margin: 0;
+	padding: 0;
+}	
 .note-title {
 	font-weight: bold;
 	margin-right: 1em;
@@ -197,8 +204,13 @@ code, pre {
 	font-size: 0.75em;
 }
 pre{
-	margin: 1em;
-	padding: 1em;
+	border: 1px solid #cecece;
+	padding: 0.5em;
+	background: #ededed;
+}
+span.line-numbers{
+	margin: 0;
+	padding: 3px;
 }
 
 pre>code {
@@ -214,11 +226,11 @@ td>div.code, td>code {
 }
 
 /* FONTS */
+
 body {
-	font-family: "Book Antiqua", "Times New Roman", "Serif";
+	font-family: "Gentium Book Basic", "Book Antiqua", "Times New Roman", "Serif";
 }
 
 code, pre {
 	font-family: "Droid Sans Mono", "Consolas", "Monaco", "Courier", "Monospace";
 }
-

data/styles/pagination.css

@@ -1,21 +1,3 @@
-/* FONTS */
-
-@font-face {
-	font-family: "Serif"
-	src: local("Book Antiqua")
-}
-
-@font-face {
-	font-family: "Monospace"
-	src: local("Droid Sans Mono")
-}
-body {
-	font-family: "Book Antiqua", "Times New Roman", "Serif";
-}
-
-code, pre {
-	font-family: "Droid Sans Mono", "Consolas", "Monaco", "Courier", "Monospace";
-}
 @page {
 	size: A4;
 	margin: 40pt 30pt 40pt 30pt;
@@ -187,7 +169,7 @@ h2 {
 	page-break-before: always;
 }
 
-.titlepage h2 {
+.halftitlepage h2, .titlepage h2 {
 	page-break-before: avoid;
 }
 

data/tasks/generate.rake

@@ -4,13 +4,13 @@ namespace :generate do
 
 	desc "Process source"
 	task :document => ["load:all"] do
-		Glyph.info "Parsing '#{Glyph['document.source']}'..."
 		if Glyph.lite? then
 			text = file_load Pathname.new(Glyph['document.source'])
 		else
 			text = file_load Glyph::PROJECT/Glyph['document.source']
 		end
-		interpreter = Glyph::Interpreter.new text, :source => "file: #{Glyph['document.source']}"
+		interpreter = Glyph::Interpreter.new text, :source => {:name => "#{Glyph['document.source']}"}, :info => true
+		interpreter.parse
 		Glyph.info "Processing..."
 		interpreter.process
 		Glyph.info "Post-processing..."