glyph 0.4.2 → 0.5.0

data/macros/xml.rb

@@ -1,33 +1,38 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
-macro "|xml|" do
-	begin
-		valid_xml_element
+macro :xml do
+	dispatch do |node|
+		name = node[:name]
+		valid_xml_element name
 		max_parameters 1
-	rescue Exception => e
-		if @node[:fallback] then
-			macro_error "Unknown macro '#{@node[:element]}'"
+		if Glyph["options.xml_blacklist"] && name.to_s.in?(Glyph['options.xml_blacklist']) then
+			""
 		else
-			raise
-		end
-	end
-	name = @node[:element]
- 	if Glyph["options.xml_blacklist"] && name.to_s.in?(Glyph['options.xml_blacklist']) then
-		""
-	else
-		attributes # evaluate attributes
-		xml_attributes = @node.children.select{|node| node.is_a?(Glyph::AttributeNode)}.
-			map do |e| 
-			if valid_xml_attribute(e[:name]) then
-				%|#{e[:name]}="#{e[:value]}"|
-			else
-				nil
-			end
+			attributes # evaluate attributes
+			xml_attributes = node.children.select{|n| n.is_a?(Glyph::AttributeNode)}.map do |e| 
+				if valid_xml_attribute(e[:name]) then
+					attr_v = e[:value].blank? ? e.evaluate(node, :attrs => true) : e[:value]
+					%|#{e[:name]}="#{attr_v}"|
+				else
+					nil
+				end
 			end.compact.join(" ")
 			xml_attributes = " "+xml_attributes unless xml_attributes.blank?
-			end_first_tag = param(0) ? ">" : ""
-			end_tag = param(0) ? "</#{name}>" : " />"
-			contents = (@node.param(0)&0) && (@node.param(0)&0)[:element] ? "\n#{param(0)}\n" : param(0)
+			end_first_tag = node.param(0) ? ">" : ""
+			end_tag = node.param(0) ? "</#{name}>" : " />"
+			if node.param(0) then
+				param_0 = node.param(0)[:value].blank? ? node.param(0).evaluate(node, :params => true) : node.param(0)[:value]
+				if (node.param(0)&0) && (node.param(0)&0)[:name] then
+					contents = "\n#{param_0}\n" 
+				else
+					contents = param_0
+				end
+			else
+				# no parameters
+				contents = ""
+			end
 			%{<#{name}#{xml_attributes}#{end_first_tag}#{contents}#{end_tag}}
+		end
 	end
 end

data/spec/config.yml

@@ -0,0 +1,7 @@
+--- 
+:a: 1
+:b: 
+  :b1: 1111
+  :b2: 2222
+  :b3: 
+    :b12: 2222

data/spec/files/article.glyph

@@ -1,5 +1,5 @@
 $:[document.author|Test]
 &:[test|Test Snippet]
-section[
-	$[document.author] -- &[test]
+§[
+  改善 $[document.author] -- &[test]
 ]

data/spec/files/web_doc.glyph

@@ -5,14 +5,18 @@ document[
 	]
 	body[
 		toc[]
-		contents[
+		section[
 			section[
 				@title[Web Document]
 ...
-				section[
-					@src[a/web1.glyph]
-					@title[Topic #1]
-				]
+        section[
+          @title[Another section]
+Some text...
+				   section[
+					  @src[a/web1.glyph]
+					  @title[Topic #1]
+			  	]
+        ]
 				section[
 					@src[a/b/web2.glyph]
 					@title[Topic #2]

data/spec/lib/commands_spec.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
+
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
 require 'glyph/commands'
 
@@ -12,6 +14,11 @@ describe "glyph" do
 		reset_quiet
 		delete_project
 	end
+  
+  it "[-v] should pront the program name and version and quit" do
+    run_command(["-v"]).should == "Glyph v#{Glyph::VERSION}\n\n"
+    run_command(["-v", "compile"]).should == "Glyph v#{Glyph::VERSION}\n\n"
+  end
 
 	it "[init] should create a project in the current directory" do
 		delete_project
@@ -22,8 +29,8 @@ describe "glyph" do
 
 	it "[config] should read configuration settings" do
 		create_project
-		run_command_successfully(["config", "-g"]).should == false
-		run_command(["config", "document.html.filter_target"]).match(/html/m).should_not == nil
+		run_command_with_status(["config", "-g"]).should == -10
+		run_command(["config", "document.output"]).match(/html/m).should_not == nil
 	end
 
 	it "[config] should write configuration settings" do
@@ -41,7 +48,6 @@ describe "glyph" do
 		Glyph::PROJECT_CONFIG.get('another.test').should_not == "something else"
 		Glyph::GLOBAL_CONFIG.read
 		Glyph::GLOBAL_CONFIG.get('another.test').should == "something else"
-		run_command_successfully(["config", "-g", "yet.another.test", "something else", "extra argument"]).should == false
 		(Glyph::SPEC_DIR/'.glyphrc').unlink
 	end
 
@@ -143,16 +149,17 @@ describe "glyph" do
 		Pathname.new('article.html').exist?.should == true
 		file_load('article.html').gsub(/\t|\n/, '').should == %{
 			<div class="section">
-				Test -- Test Snippet
+				改善 Test -- Test Snippet
 			</div>
 		}.gsub(/\t|\n/, '')
-		Glyph.enable 'generate:html'
 		(Glyph::PROJECT/'article.html').unlink
 		Glyph['document.output'] = 'pdf'
 		src = Glyph::PROJECT/'article.html'
 		out = Glyph::PROJECT/'article.pdf'
 		generate_pdf = lambda do |gen|
+			Glyph.enable 'generate:html'
 			Glyph.enable 'generate:pdf'
+			Glyph.enable 'generate:pdf_through_html'
 			Glyph['output.pdf.generator'] = gen
 			run_command_successfully(["compile", "article.glyph"]).should == true
 			src.exist?.should == true
@@ -184,8 +191,7 @@ describe "glyph" do
 		out = file_load Glyph::PROJECT/'output/html/test_project.html'
 		out.should == %{<div class="section">
 <h2 id="h_1">Test</h2>
-<span class="todo"><span class="todo-pre"><strong>TODO:</strong> </span>Correct errors in file 'errors.glyph'</span>
-<span class="todo"><span class="todo-pre"><strong>TODO:</strong> </span>Correct errors in file 'syntax_error.glyph'</span>
+
 
 </div>}
 		res.match("error: #{err}").should == nil
@@ -233,10 +239,8 @@ test_project - Outline
 		out = run_command(["stats", "-ms"])
 		total_macros = (Glyph::MACROS.keys - Glyph::ALIASES[:by_alias].keys).uniq.length
 		out.should match "-- Total Macro Definitions: #{total_macros}" 
-		out.should match "-- Unused Snippets: test"
 		out = run_command(["stats"])
 		out.should match "-- Total Macro Definitions: #{total_macros}" 
-		out.should_not match "-- Unused Snippets: test"
 		out.should match "-- Total Unreferenced Bookmarks: 3"
 		out = run_command(["stats", "-lb", "--bookmark=md"])
 		out.should match "-- Unreferenced Bookmarks: h_1, h_2, md" 

data/spec/lib/config_spec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+# encoding: utf-8
 
 describe Glyph::Config do
 
@@ -14,7 +14,7 @@ describe Glyph::Config do
 	end
 
 	after(:all) do
-		@config_path.delete
+		@config_path.delete rescue nil
 	end
 
 	it "should load a YAML configuration file" do

data/spec/lib/document_spec.rb

@@ -149,5 +149,15 @@ describe Glyph::Document do
 		reset_quiet
 	end
 
+	it "should store fragments" do
+		delete_project
+		create_project
+		Glyph.run! "load:all"
+		doc = create_doc create_tree("testing ##[frag1|fragments!] -- ##[frag2|another fragment]")
+		doc.analyze
+		doc.fragments.should == {:frag1 => "fragments!", :frag2 => "another fragment"}
+		reset_quiet
+	end
+
 end
 

data/spec/lib/glyph_spec.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
 describe Glyph do
 
@@ -50,15 +49,18 @@ describe Glyph do
 	it "should provide a compile method to compile files in lite mode" do
 		reset_quiet
 		file_copy Glyph::PROJECT/'../files/article.glyph', Glyph::PROJECT/'article.glyph'
-		lambda { Glyph.compile Glyph::PROJECT/'article.glyph' }.should_not raise_error
+		#lambda { 
+			Glyph.debug_mode = true
+			Glyph.compile Glyph::PROJECT/'article.glyph' 
+		#}.should_not raise_error
 		(Glyph::PROJECT/'article.html').exist?.should == true
 	end
 
-	it "should provide a reset method to remove config overrides, reenable tasks, clear macros and snippets." do
+	it "should provide a reset method to remove config overrides, reenable tasks, clear macros and reps" do
 		Glyph['test_setting'] = true
 		Glyph.reset
-		Glyph::SNIPPETS.length.should == 0
 		Glyph::MACROS.length.should == 0
+		Glyph::REPS.length.should == 0
 		Glyph['test_setting'].should == nil
 	end
 
@@ -69,14 +71,14 @@ describe Glyph do
 		lambda { output_for("include[test.glyph]")}.should raise_error Glyph::MacroError
 		lambda {output_for("config:[test|true]")}.should raise_error Glyph::MacroError
 		lambda { output_for("ruby[Time.now]")}.should raise_error Glyph::MacroError
-		lambda { output_for("rw:[a|section[{{0}}]]")}.should raise_error Glyph::MacroError
+		lambda { output_for("def:[a|section[{{0}}]]")}.should raise_error Glyph::MacroError
 		Glyph.safe_mode = false
 	end
 
-	it "should rewrite macros using Glyph syntax" do
+	it "should define macros using Glyph syntax" do
 		define_em_macro
-		Glyph.rewrite :test_rw_macro, %{em[{{0}} -- {{a}}]}
-		output_for("test_rw_macro[@a[!]?]").should == "<em>? -- !</em>"
+		Glyph.define :test_def_macro, %{em[{{0}} -- {{a}}]}
+		output_for("test_def_macro[@a[!]?]").should == "<em>? -- !</em>"
 	end
 
 	it "should store alias information" do
@@ -93,4 +95,24 @@ describe Glyph do
 		Glyph.macro_alias?(:"#").should == true
 	end
 
+	it "should store macro representations" do
+		delete_project_dir
+		create_project_dir
+		Glyph.macro :test_rep do
+		end
+		Glyph.macro_alias :test_rep_alias  => :test_rep
+		Glyph.rep :test_rep do |data|
+			"TEST - #{data[:a]}"
+		end
+		Glyph::REPS[:test_rep].call(:a => 1).should == "TEST - 1" 
+		Glyph::REPS[:test_rep_alias].call(:a => 1).should == "TEST - 1" 
+	end
+
+	it "should load reps for a given output" do
+		Glyph.reps_for(:html)
+		Glyph::REPS[:section].should_not be_blank
+		Glyph::REPS[:link].should_not be_blank
+		Glyph::REPS[:"=>"].should_not be_blank
+	end
+
 end

data/spec/lib/macro_spec.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
 describe Glyph::Macro do
 
@@ -220,13 +219,49 @@ describe Glyph::Macro do
 		Glyph.macro :test_int do
 			interpret "- #{value} -"
 		end
-		text1 = "em[test\\\\\\.\\[...\\\\\\.\\]]" # test\\\.\[\\\.\]
-		text2 = "em[=test\\\\\\.[...\\\\\\.]=]"  # test\\\.[\\\.]
-		text3 = "test_int[em[=test\\\\\\.[...\\\\\\.]=]]"
+		text1 = "em[test\\\\\\/\\[...\\\\\\/\\]]" # test\\\/\[\\\/\]
+		text2 = "em[=test\\\\\\/[...\\\\\\/]=]"  # test\\\/[\\\/]
+		text3 = "test_int[em[=test\\\\\\/[...\\\\\\/]=]]"
 		out = "<em>test\\[...\\]</em>"
 		output_for(text1).should == out
 		output_for(text2).should == out
 		output_for(text3).should == "- #{out} -"
 	end
 
+	it "should render representations" do
+		Glyph.macro :em_with_rep do
+			@data[:value] = value
+			render
+		end
+		Glyph.rep :em_with_rep do |data|
+			%{<em>!#{data[:value]}!</em>}
+		end
+		output_for("em_with_rep[testing...]").should == "<em>!testing...!</em>"
+		Glyph::Macro.new({}).render(:em_with_rep, :value => "test").should == "<em>!test!</em>"
+	end
+
+	it "should perform dispatching" do
+		Glyph.macro :dispatcher do
+			dispatch do |node|
+				"dispatched: #{node[:name]}" if node[:name] == :em
+			end
+		end
+		Glyph.macro :another_macro do
+			"...#{value}"
+		end
+		define_em_macro
+		output_for("dispatcher[em[test]]").should == "dispatched: em"
+		output_for("dispatcher[em[@attr[test]]]").should == "dispatched: em"
+		output_for("dispatcher[...|em[@attr[test]]]").should == "..." # Dispatcher macros should only take one parameter
+		output_for("dispatcher[another_macro[test]]").should == "...test"
+		output_for("dispatcher[another_macro[another_macro[test]]]").should == "......test"
+	end
+
+	it "should apply text with placeholders to macro data" do
+		Glyph.macro :data do
+			apply "{{1}} {{a}} {{0}}" 
+		end
+		output_for("data[@a[is]a test|This]").should == "This is a test"
+	end
+
 end

data/spec/lib/macro_validators_spec.rb

@@ -36,8 +36,7 @@ describe Glyph::Macro::Validators do
 	end
 
 	it "should check for mutual inclusion" do
-		Glyph::SNIPPETS[:inc] = "Test &[inc]"
-		lambda {interpret("&[inc] test").document}.should raise_error(Glyph::MutualInclusionError)
+		interpret("&:[inc|Test &[inc]]&[inc] test").document.output.should == "Test [SNIPPET 'inc' NOT PROCESSED] test"
 	end
 
 	it "should validate XML elements" do
@@ -48,13 +47,13 @@ describe Glyph::Macro::Validators do
 
 	it "should validate XML attributes" do
 		language 'xml'
-		output_for("test[test @.test[test]]").should == "<test>test</test>"
+		output_for("test[test @.test[test]]").should == "<test>test </test>"
 	end
 
 	it "should validate required attributes" do
 		Glyph['document.output'] = 'web'
 		Glyph.run! 'load:macros'
-		lambda { output_for("contents[section[@src[test]]]") }.should raise_error(Glyph::MacroError, "Macro 'section' requires a 'title' attribute")
+		lambda { output_for("section[section[@src[test]]]") }.should raise_error(Glyph::MacroError, "Macro 'section' requires a 'title' attribute")
 	end
 
 	it "should validate if a macro is within another one" do

data/spec/lib/parser_spec.rb

@@ -243,4 +243,11 @@ Contents]
 		parse_text(text).should == tree
 	end
 
+	it "should allow macro composition" do
+		parse_text("test[...|a/b/c[...]]").should == parse_text("test[...|a[b[c[...]]]]")
+		parse_text(" /test[...]").should == parse_text(" test[...]")
+		parse_text(" test/[...]").should == parse_text(" test[...]")
+		parse_text("a/b/c[=test[...]=]").should == parse_text("a[b[c[=test[...]=]]]")
+	end
+
 end

data/spec/lib/reporter_spec.rb

@@ -84,6 +84,7 @@ describe Glyph::Reporter do
 	end
 
 	it "should display stats for a single snippet" do
+		stats :snippets
 		stats :snippet, :test
 		out = stdout_for { rep.display }
 		out.should match "-- Total Used Instances: 2"

data/spec/lib/syntax_node_spec.rb

@@ -83,12 +83,6 @@ describe Glyph::MacroNode do
 		@n.expand({}).should == "--test:test--"
 	end
 
-	it "should resolve to an XML element" do
-		reset_quiet
-		@n.expand({}) rescue nil # |xml| macro not defined
-		@n[:element].should == "test"
-	end
-
 	it "should retrieve parameter nodes easily" do
 		@n.parameter(0).should == @p
 		@n.parameters.should == [@p]
@@ -106,6 +100,46 @@ describe Glyph::MacroNode do
 		@p.parent[:escape] = true
 		@p.to_s.should == "test"
 		@p.contents.should == ".[=test=]"
+		###
+		n = macro_node(:test)
+		a = a_node(:a)
+		a[:escape] = true
+		a << text_node("alias[test\\|test1]")
+		n << a
+		a.to_s.should == "@a[=alias[test\\|test1]=]"
+		a.contents.should == ".[=alias[test\\|test1]=]"
+	end
+
+	it "should perform macro dispatching" do
+		dispatch_proc = lambda do |node|
+			"dispatched: #{node[:name]}"
+		end
+		Glyph.macro :test_macro do
+			"--test macro--"
+		end
+		# Parent dispatcher via parameter
+		d = macro_node :dispatcher
+		d[:dispatch] = dispatch_proc
+		p = p_node 0
+		m = macro_node :test_macro
+		p << m
+		d << p
+		m.expand({}).should == "dispatched: test_macro"
+		# Parent dispatcher via attribute
+		d = macro_node :dispatcher
+		d[:dispatch] = dispatch_proc
+		a = a_node :attr1
+		m = macro_node :test_macro
+		a << m
+		d << a
+		m.expand({}).should == "dispatched: test_macro"
+		# No dispatcher
+		d = macro_node :no_dispatcher
+		a = a_node :attr1
+		m = macro_node :test_macro
+		a << m
+		d << a
+		m.expand({}).should == "--test macro--"
 	end
 	
 end