glyph 0.1.0 → 0.2.0

data/spec/macros/textile_spec.rb

@@ -0,0 +1,217 @@
+#!/usr/bin/env ruby
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe "Textile Markup" do
+
+	before do
+		@textile = 
+%{This is a _test_:
+* item A
+* item B
+* item C
+
+<div class="test">_hello!_
+</div>
+Testing:
+# A
+# B
+# C}
+		@html = 
+%{<p>This is a <em>test</em>:</p>
+<ul>
+	<li>item A</li>
+	<li>item B</li>
+	<li>item C</li>
+</ul>
+<div class="test"><em>hello!</em></div>
+<p>Testing:</p>
+<ol>
+	<li>A</li>
+	<li>B</li>
+	<li>C</li>
+</ol>}
+	end
+
+	######################################
+	
+	it "should be embeddable in section macros" do
+		text1 = 
+%{textile[section[header[Test]
+#@textile
+]]}
+		text2 = 
+%{textile[section[header[Test]#@textile
+]]}
+		result =
+%{<div class="section">
+<h2 id="h_1">Test</h2>
+#@html
+</div>}
+		filter(text1).should == result
+		filter(text2).gsub(/<\/h2>/, "</h2>\n").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
+		result = 
+%{<div class="box">
+<div class="box-title">This is a <em>test</em></div>
+#@html
+</div>}
+		box1 = %{textile[box[This is a _test_|#@textile]]}
+		box2 = %{textile[box[This is a _test_|
+#@textile]
+]}
+		box3 = %{textile[box[
+		This is a _test_|
+			#@textile]]}
+		box4 =  %{textile[box[This is a _test_|
+#@textile
+	]
+]}
+		filter(box1).should == result
+		filter(box2).should == result
+		filter(box3).should == result
+		filter(box4).should == result
+	end
+	
+	######################################
+
+	it "should be embeddable in note macros" do
+				result = 
+%{<div class="note">
+<p><span class="note-title">Note</span>#{@html.sub(/^<p>/, '')}
+</div>}
+		note1 = %{textile[note[#@textile]]}
+		note2 = %{textile[note[
+#@textile]
+]}
+		note3 = %{textile[note[
+			#@textile]]}
+		note4 =  %{textile[note[
+#@textile
+	]
+]}
+		filter(note1).should == result
+		filter(note2).should == result
+		filter(note3).should == result
+		filter(note4).should == result
+	end
+	
+	######################################
+	
+	it "should not interfere with the code macro" do
+		code = 
+%{<div class="test">
+<p><em>Test: </em> Paragraph.</p>
+</div>}
+		result = 
+%{<div class="section">
+<h2 id="h_1">Test</h2>
+#@html
+<div class="code">
+<pre>
+<code>
+#{code.gsub(/>/, '&gt;').gsub(/</, '&lt;')}
+</code>
+</pre>
+</div>
+</div>}
+		text1 = %{textile[
+			section[header[Test]
+#@textile
+			code[#{code}]
+]]}
+		text2 = %{textile[
+			section[header[Test]
+#@textile
+			code[#{code}
+		]
+	]
+]}
+		text3 = %{textile[
+			section[header[Test]
+#@textile
+			code[
+#{code}]
+]]}
+		text4 = %{textile[
+			section[header[Test]
+#@textile
+			code[
+#{code}
+]]]}
+		text5 = %{textile[
+			section[header[Test]
+#@textile
+			code[
+#{code}
+	]
+	]]}
+		filter(text1).should == result
+		filter(text2).should == result
+		filter(text3).should == result
+		filter(text4).should == result
+		filter(text5).should == result
+	end
+
+end	

data/spec/spec_helper.rb

@@ -6,23 +6,29 @@ require "stringio"
 module Glyph; end
 
 begin
-	unless Glyph.const_defined? :TEST_MODE then
-		Glyph::TEST_MODE = true
+	unless Glyph.const_defined? :MODE then
+		Glyph::MODE = {:debug => false, :lite => false, :test => true} 
 	end
-rescue Exception => e
+rescue
 end
 
 require "glyph"
 
-Glyph.config_override :quiet, true
+Glyph[:quiet] = true
 
 def create_project_dir
 	Glyph::PROJECT.mkpath
 end
 
+def reset_quiet
+	Glyph.reset
+	Glyph[:quiet] = true
+end
+
 def create_project
-	enable_all_tasks
+	reset_quiet
 	create_project_dir
+	return if Glyph.lite?
 	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
@@ -33,20 +39,20 @@ def create_project
 	file_copy Glyph::SPEC_DIR/'files/ligature.jpg', Glyph::PROJECT/'images/ligature.jpg'
 end
 
-def enable_all_tasks
-	Rake::Task.tasks.each {|t| t.reenable }
-end
-
 def delete_project_dir
-	FileUtils.rm_rf Glyph::PROJECT.to_s
+ 	return unless	Glyph::PROJECT.exist?
+	Glyph::PROJECT.children.each do |f|
+		FileUtils.rmtree f if f.directory? 
+		FileUtils.rm f if f.file?
+	end
 end
 
 def delete_project 
 	delete_project_dir
 	Glyph::SNIPPETS.clear
 	Glyph::MACROS.clear
-	Glyph.config_override 'document.source', 'document.glyph'
-	Glyph.instance_eval { remove_const :DOCUMENT rescue nil }
+	Glyph['document.source'] = 'document.glyph'
+	Glyph.document = nil
 end
 
 def run_command(cmd)
@@ -55,9 +61,9 @@ def run_command(cmd)
 	old_stderr = $stderr
 	$stdout = out
 	$stderr = out 
-	Glyph.config_override :quiet, false
+	Glyph[:quiet] = false
 	GLI.run cmd
-	Glyph.config_override :quiet, true
+	Glyph[:quiet] = true
 	$stdout = old_stdout
 	$stderr = old_stderr
 	out.string
@@ -75,7 +81,7 @@ end
 
 def define_ref_macro
 	Glyph.macro :ref do
-		%{<a href="#{@params[0]}">#{@params[1]}</a>}
+		%{<a href="#{params[0]}">#{params[1]}</a>}
 	end
 end
 
@@ -90,3 +96,7 @@ end
 def create_doc(tree)
 	Glyph::Document.new tree, {} 
 end
+
+def filter(text)
+	Glyph.filter text
+end

data/spec/tasks/generate_spec.rb

@@ -10,10 +10,10 @@ describe "generate" do
 	after do
 		delete_project
 	end
-	
-	it ":document should generate Glyph::DOCUMENT" do
+
+	it ":document should generate Glyph.document" do
 		lambda { Glyph.run! 'generate:document'}.should_not raise_error
-		Glyph::DOCUMENT.structure.children.length.should > 0
+		Glyph.document.structure.children.length.should > 0
 	end
 
 	it ":html should generate a standalone html document" do

data/spec/tasks/load_spec.rb

@@ -22,6 +22,13 @@ describe "load" do
 		Glyph::SNIPPETS[:test].blank?.should == false
 	end
 
+	it "[snippets] should not load snippets.xml in Lite mode" do
+		Glyph.lite_mode = true
+		lambda { Glyph.run! 'load:snippets'}.should_not raise_error
+		Glyph::SNIPPETS[:test].blank?.should == true
+		Glyph.lite_mode = false
+	end
+
 	it "[macros] should load macro definitions" do
 		lambda { Glyph.run! 'load:macros'}.should_not raise_error
 		Glyph::MACROS[:note].blank?.should == false
@@ -29,9 +36,12 @@ describe "load" do
 	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::PROJECT_CONFIG.blank?.should == false
 		Glyph::SYSTEM_CONFIG.blank?.should == false
-		cfg('structure.headers').class.to_s.should == "Array"
+		Glyph['structure.headers'].class.to_s.should == "Array"
 	end
 
 end

data/spec/tasks/project_spec.rb

@@ -18,9 +18,6 @@ describe "project:create" do
 	it "[create] should create a new project if an existing empty directory is supplied" do
 		lambda { Glyph.run! 'project:create', Glyph::PROJECT }.should_not raise_error
 		(Glyph::PROJECT/'lib').exist?.should == true
-		(Glyph::PROJECT/'lib/tasks').exist?.should == true
-		(Glyph::PROJECT/'lib/macros').exist?.should == true
-		(Glyph::PROJECT/'lib/macros/html').exist?.should == true
 		(Glyph::PROJECT/'document.glyph').exist?.should == true
 		(Glyph::PROJECT/'config.yml').exist?.should == true
 		(Glyph::PROJECT/'text').exist?.should == true

data/styles/coderay.css

@@ -0,0 +1,121 @@
+.CodeRay {
+  background-color: #f8f8f8;
+  border: 1px solid silver;
+  font-family: 'Courier New', 'Terminal', monospace;
+  color: #000;
+}
+.CodeRay pre { margin: 0px; }
+
+span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
+
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
+table.CodeRay td { padding: 2px 4px; vertical-align: top; }
+
+.CodeRay .line_numbers, .CodeRay .no {
+  background-color: #def;
+  color: gray;
+  text-align: right;
+}
+.CodeRay .line_numbers a:target, .CodeRay .no a:target { color: blue; }
+.CodeRay .line_numbers .highlighted, .CodeRay .no .highlighted { color: red; }
+.CodeRay .no { padding: 0px 4px; }
+.CodeRay .code { width: 100%; }
+.CodeRay .code pre { overflow: auto; }
+
+.CodeRay .debug { color:white ! important; background:blue ! important; }
+
+.CodeRay .an { color:#007 }
+.CodeRay .at { color:#f08 }
+.CodeRay .av { color:#700 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c  { color:#888; }
+.CodeRay .c .dl { color:#444; }
+.CodeRay .c .ch { color:#444; }
+
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#B06; font-weight:bold }
+.CodeRay .cm { color:#A08; font-weight:bold }
+.CodeRay .co { color:#036; font-weight:bold }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .de { color:#B0B; }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .dt { color:#34b }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e  { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#C00; font-weight:bold }
+.CodeRay .fl { color:#60E; font-weight:bold }
+.CodeRay .fu { color:#06B; font-weight:bold }
+.CodeRay .gv { color:#d70; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i  { color:#00D; font-weight:bold }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { background-color: hsla(0,0%,0%,0.1); color: black }
+.CodeRay .il .idl { font-weight: bold; color: #666 }
+.CodeRay .idl { font-weight: bold; color: #666; }
+
+.CodeRay .im { color:#f00; }
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:#33B }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .ns { color:#707; font-weight:bold }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .op { }
+.CodeRay .pc { color:#058; font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579; }
+.CodeRay .ps { color:#00C; font-weight:bold }
+.CodeRay .pt { color:#074; font-weight:bold }
+.CodeRay .r, .kw  { color:#080; font-weight:bold }
+
+.CodeRay .ke { color: #808; }
+.CodeRay .ke .dl { color: #606; }
+.CodeRay .ke .ch { color: #80f; }
+.CodeRay .vl { color: #088; }
+
+.CodeRay .rx { background-color:hsla(300,100%,50%,0.1); color:#808 }
+.CodeRay .rx .k { }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu  { color:#404; font-weight: bold }
+
+.CodeRay .s { background-color:hsla(0,100%,50%,0.1); color: #D20; }
+.CodeRay .s .k { }
+.CodeRay .s .ch { color: #b0b; }
+.CodeRay .s .dl { color: #710; }
+
+.CodeRay .sh { background-color:hsla(120,100%,50%,0.1); color:#2B2 }
+.CodeRay .sh .k { }
+.CodeRay .sh .dl { color:#161 }
+
+.CodeRay .sy { color:#A60 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v  { color:#036 }
+.CodeRay .xt { color:#444 }
+
+.CodeRay .ins { background: #afa; }
+.CodeRay .del { background: #faa; }
+.CodeRay .chg { color: #aaf; background: #007; }
+.CodeRay .head { color: #f8f; background: #505 }
+.CodeRay .head .filename { color: white; }
+
+.CodeRay .ins .ins { color: #080; font-weight:bold }
+.CodeRay .del .del { color: #800; font-weight:bold }
+.CodeRay .chg .chg { color: #66f; }
+.CodeRay .head .head { color: #f4f; }
+