glyph 0.5.2 → 0.5.3.1

data/spec/macros/macros_spec.rb

@@ -18,16 +18,16 @@ describe "Macro:" do
 	it "anchor" do
 		interpret "this is a #[test|test]."
 		doc = @p.document
-		doc.output.should == "this is a <a id=\"test\">test</a>."
-		doc.bookmarks[:test].should == Glyph::Bookmark.new({:file => nil, :title => 'test', :id => :test})
-		lambda { interpret "this is a #[test|test]. #[test|This won't work!]"; @p.document }.should raise_error
+		expect(doc.output).to eq("this is a <a id=\"test\">test</a>.")
+		expect(doc.bookmarks[:test]).to eq(Glyph::Bookmark.new({:file => nil, :title => 'test', :id => :test}))
+		expect { interpret "this is a #[test|test]. #[test|This won't work!]"; @p.document }.to raise_error
 	end
 
 	it "section, chapter, header" do
 		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">
+		expect(doc.output.gsub(/\n|\t/, '')).to eq(%{<div class="chapter">
 					<h2 id="h_1" class="toc">Chapter X</h2>... 
 					<div class="section">
 					<h3 id="sec-y" class="toc">Section Y</h3>... 
@@ -36,8 +36,8 @@ describe "Macro:" do
 						</div>
 					</div>
 				</div>
-		}.gsub(/\n|\t/, '')
-		doc.bookmark?(:"sec-y").should == Glyph::Bookmark.new({:id => :"sec-y", :title => "Section Y", :file => nil})
+		}.gsub(/\n|\t/, ''))
+		expect(doc.bookmark?(:"sec-y")).to eq(Glyph::Bookmark.new({:id => :"sec-y", :title => "Section Y", :file => nil}))
 	end
 
 	it "document, head, style" do
@@ -52,14 +52,14 @@ describe "Macro:" do
 				<meta name="copyright" content="#{Glyph["document.author"]}" />
 				<meta name="generator" content="Glyph v#{Glyph::VERSION} (http://www.h3rald.com/glyph)" />
 				<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-				<style type=\"text/css\">#main {  background-color: blue;  margin: 12px; }</style>
+				<style type=\"text/css\">#main {  background-color: #0000ff;  margin: 12px; }</style>
 			</head>
 		</html>
 		}
 		interpret "document[head[style[test.sass]]]"
-		@p.document.output.gsub(/\n|\t/, '').should == doc.gsub(/\n|\t/, '')
+		expect(@p.document.output.gsub(/\n|\t/, '')).to eq(doc.gsub(/\n|\t/, ''))
 		interpret "document[head[style[test.scss]]]"
-		@p.document.output.gsub(/\n|\t/, '').should == doc.gsub(/\n|\t/, '')
+		expect(@p.document.output.gsub(/\n|\t/, '')).to eq(doc.gsub(/\n|\t/, ''))
 	end	
 
 	it "style should link files by absolute or relative path in Lite mode" do
@@ -73,21 +73,21 @@ describe "Macro:" do
 				<meta name="copyright" content="#{Glyph["document.author"]}" />
 				<meta name="generator" content="Glyph v#{Glyph::VERSION} (http://www.h3rald.com/glyph)" />
 				<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-				<style type=\"text/css\">#main {  background-color: blue;  margin: 12px; }</style>
+				<style type=\"text/css\">#main {  background-color: #0000ff;  margin: 12px; }</style>
 			</head>
 		</html>
 		}.gsub(/\n|\t/, '')
 		Glyph.lite_mode = true
 		Dir.chdir Glyph::PROJECT
 		interpret "document[head[style[styles/test.sass]]]"
-		@p.document.output.gsub(/\n|\t/, '').should == result
+		expect(@p.document.output.gsub(/\n|\t/, '')).to eq(result)
 	end
 
 	it "style should import and link stylesheets" do
 		Glyph['document.styles'] = 'import'
-		output_for("head[style[default.css]]").match(/@import url\("styles\/default\.css"\)/).blank?.should == false
+		expect(output_for("head[style[default.css]]").match(/@import url\("styles\/default\.css"\)/).blank?).to eq(false)
 		Glyph['document.styles'] = 'link'
-		output_for("head[style[default.css]]").match(%{<link href="styles/default.css" rel="stylesheet" type="text/css" />}).blank?.should == false
+		expect(output_for("head[style[default.css]]").match(%{<link href="styles/default.css" rel="stylesheet" type="text/css" />}).blank?).to eq(false)
 		Glyph['document.styles'] = 'embed'
 	end
 
@@ -96,7 +96,7 @@ describe "Macro:" do
 		interpret file_load(Glyph::PROJECT/'document.glyph')
 		doc = @p.document
 		doc.output.gsub!(/\n|\t/, '')
-		doc.output.slice(/(.+?<\/div>)/, 1).should == %{
+		expect(doc.output.slice(/(.+?<\/div>)/, 1)).to eq(%{
 			<div class="contents">
 			<h2 class="toc-header" id="toc">Table of Contents</h2>
 			<ol class="toc">
@@ -104,7 +104,7 @@ describe "Macro:" do
 				<li class="section"><a href="#md">Markdown</a></li>
 			</ol>
 			</div>
-		}.gsub(/\n|\t/, '')
+		}.gsub(/\n|\t/, ''))
 	end
 
 	it "link" do
@@ -115,26 +115,26 @@ describe "Macro:" do
 			#[test_id2|Test #2]
 		}
 		interpret text
-		@p.document.output.gsub(/\n|\t/, '').should == %{
+		expect(@p.document.output.gsub(/\n|\t/, '')).to eq(%{
 			<a href="#test_id">Test #1</a>
 			<a href="#test_id2">Test #2</a>
 			<a id="test_id">Test #1</a>
 			<a id="test_id2">Test #2</a>
-		}.gsub(/\n|\t/, '')
+		}.gsub(/\n|\t/, ''))
 	end
 
 	it "fmi" do
 		interpret "fmi[this topic|#test] #[test|Test]"
-		@p.document.output.should == %{<span class="fmi">
+		expect(@p.document.output).to eq(%{<span class="fmi">
 			for more information on this topic, 
-			see <a href="#test">Test</a></span> <a id="test">Test</a>}.gsub(/\n|\t/, '')
+			see <a href="#test">Test</a></span> <a id="test">Test</a>}.gsub(/\n|\t/, ''))
 	end	
 
 	it "image" do
 		interpret "image[@width[90%]@height[90%]@alt[-]ligature.jpg]"
-		@p.document.output.gsub(/\t|\n/, '').should == %{
+		expect(@p.document.output.gsub(/\t|\n/, '')).to eq(%{
 			<img src="images/ligature.jpg" width="90%" height="90%" alt="-" />
-		}.gsub(/\n|\t/, '')
+		}.gsub(/\n|\t/, ''))
 	end
 
 	it "image should link files by absolute or relative path in Lite mode" do
@@ -144,18 +144,18 @@ describe "Macro:" do
 		Glyph.lite_mode = true
 		Dir.chdir Glyph::PROJECT
 		interpret "image[@width[90%]@height[90%]images/ligature.jpg]"
-		@p.document.output.gsub(/\t|\n/, '').should == result
+		expect(@p.document.output.gsub(/\t|\n/, '')).to eq(result)
 		interpret "image[@width[90%]@height[90%]#{Glyph::PROJECT}/images/ligature.jpg]"
-		@p.document.output.gsub(/\t|\n/, '').gsub(Glyph::PROJECT.to_s+'/', '').should == result
+		expect(@p.document.output.gsub(/\t|\n/, '').gsub(Glyph::PROJECT.to_s+'/', '')).to eq(result)
 	end
 
 	it "figure" do
 		interpret "figure[@alt[ligature]ligature.jpg|Ligature]"
-		@p.document.output.gsub(/\t|\n/, '').should == %{
+		expect(@p.document.output.gsub(/\t|\n/, '')).to eq(%{
 			<div class=\"figure\" alt=\"ligature\">
 				<img src=\"images/ligature.jpg\" />
 				<div class=\"caption\">Ligature</div>
-			</div>}.gsub(/\n|\t/, '')
+			</div>}.gsub(/\n|\t/, ''))
 	end
 
 	it "fig should link files by absolute or relative path in Lite mode" do
@@ -168,24 +168,24 @@ describe "Macro:" do
 		Glyph.lite_mode = true
 		Dir.chdir Glyph::PROJECT
 		interpret "figure[images/ligature.jpg|Ligature]"
-		@p.document.output.gsub(/\t|\n/, '').should == result
+		expect(@p.document.output.gsub(/\t|\n/, '')).to eq(result)
 		interpret "figure[#{Glyph::PROJECT}/images/ligature.jpg|Ligature]"
-		@p.document.output.gsub(/\t|\n/, '').gsub(Glyph::PROJECT.to_s+'/', '').should == result
+		expect(@p.document.output.gsub(/\t|\n/, '').gsub(Glyph::PROJECT.to_s+'/', '')).to eq(result)
 	end
 
 	it "draftcomment, todo" do
 		text1 = "dc[comment!]"
 		text2 = "![todo!]"
 		interpret text1
-		@p.document.output.should == ""
+		expect(@p.document.output).to eq("")
 		interpret text2
-		@p.document.output.should == ""
+		expect(@p.document.output).to eq("")
 		Glyph['document.draft'] = true
 		interpret text1
-		@p.document.output.should == %{<span class="comment"><span class="comment-pre"><strong>Comment:</strong> </span>comment!</span>}
+		expect(@p.document.output).to eq(%{<span class="comment"><span class="comment-pre"><strong>Comment:</strong> </span>comment!</span>})
 		interpret text2
-		@p.document.output.should == %{<span class="todo"><span class="todo-pre"><strong>TODO:</strong> </span>todo!</span>}
-		@p.document.todos.length.should == 1
+		expect(@p.document.output).to eq(%{<span class="todo"><span class="todo-pre"><strong>TODO:</strong> </span>todo!</span>})
+		expect(@p.document.todos.length).to eq(1)
 		Glyph['document.draft'] = false
 	end
 
@@ -210,7 +210,7 @@ describe "Macro:" do
       ]
       }
     end
-    output_for(container.call aliased).should == output_for(container.call normal)
+    expect(output_for(container.call aliased)).to eq(output_for(container.call normal))
   end
 
 end	

data/spec/macros/textile_spec.rb

@@ -47,8 +47,8 @@ Testing:
 <h2 id="h_1" class="toc">Test</h2>
 #@html
 </div>}
-		filter(text1).should == result
-		filter(text2).gsub(/<\/h2>/, "</h2>").should == result
+		expect(filter(text1)).to eq(result)
+		expect(filter(text2).gsub(/<\/h2>/, "</h2>")).to eq(result)
 	end
 
 	######################################
@@ -70,10 +70,10 @@ Testing:
 #@textile
 	]
 ]}
-		filter(box1).should == result
-		filter(box2).should == result
-		filter(box3).should == result
-		filter(box4).should == result
+		expect(filter(box1)).to eq(result)
+		expect(filter(box2)).to eq(result)
+		expect(filter(box3)).to eq(result)
+		expect(filter(box4)).to eq(result)
 	end
 	
 	######################################
@@ -93,10 +93,10 @@ Testing:
 #@textile
 	]
 ]}
-		filter(note1).should == result
-		filter(note2).should == result
-		filter(note3).should == result
-		filter(note4).should == result
+		expect(filter(note1)).to eq(result)
+		expect(filter(note2)).to eq(result)
+		expect(filter(note3)).to eq(result)
+		expect(filter(note4)).to eq(result)
 	end
 	
 	######################################
@@ -149,11 +149,11 @@ Testing:
 #{code}
 	]
 	]]}
-		filter(text1).should == result
-		filter(text2).should == result
-		filter(text3).should == result
-		filter(text4).should == result
-		filter(text5).should == result
+		expect(filter(text1)).to eq(result)
+		expect(filter(text2)).to eq(result)
+		expect(filter(text3)).to eq(result)
+		expect(filter(text4)).to eq(result)
+		expect(filter(text5)).to eq(result)
 	end
 
 end	

data/spec/macros/web5_spec.rb

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

data/spec/macros/web_spec.rb

@@ -16,47 +16,47 @@ describe "Macro:" do
 	end
 
 	it "section (topic)" do
-		lambda { output_for("section[@src[test]]") }.should raise_error(Glyph::MacroError, "Macro 'section' requires a 'title' attribute") 
+		expect { output_for("section[@src[test]]") }.to raise_error(Glyph::MacroError, "Macro 'section' requires a 'title' attribute") 
 		interpret("section[@src[a/web1.glyph]@title[Test]]")
 		topic = @p.document.topics[0]
-		topic.blank?.should == false 
-		topic[:id].should == :t_0 
-		topic[:title].should == "Test" 
-		topic[:src].should == "a/web1.glyph"
-		topic[:contents].match(/id="w1_3"/).blank?.should == false
+		expect(topic.blank?).to eq(false) 
+		expect(topic[:id]).to eq(:t_0) 
+		expect(topic[:title]).to eq("Test") 
+		expect(topic[:src]).to eq("a/web1.glyph")
+		expect(topic[:contents].match(/id="w1_3"/).blank?).to eq(false)
 		Glyph['document.output'] = 'html'
 		Glyph.run! 'load:macros'
-		output_for("contents[section[@src[a/web1.glyph]@title[Test]]]").match(/id="w1_3"/).blank?.should == false
+		expect(output_for("contents[section[@src[a/web1.glyph]@title[Test]]]").match(/id="w1_3"/).blank?).to eq(false)
 	end
 
 	it "navigation" do
 		Glyph.run! 'generate:web'
 		web1 = compact_html Glyph.file_load(Glyph::PROJECT/'output/web/a/web1.html')
 		web2 = compact_html 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">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
+		expect(web1.match(%{<div class="navigation"> | <a href="/index.html">Contents</a> | <a href="/a/b/web2.html">Topic #2</a></div>}).blank?).to eq(false)
+		expect(web2.match(%{<div class="navigation"><a href="/a/web1.html">Topic #1</a> | <a href="/index.html">Contents</a> | </div>}).blank?).to eq(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_3"}).blank?.should == false
-		index.match(%{href="/a/b/web2.html#h_7"}).blank?.should == false
+		expect(index.match(%{<li class="section"><a href="#h_1">Web Document</a></li>}).blank?).to eq(true)
+		expect(index.match(%{href="/a/web1.html#h_3"}).blank?).to eq(false)
+		expect(index.match(%{href="/a/b/web2.html#h_7"}).blank?).to eq(false)
 		web1 = Glyph.file_load(Glyph::PROJECT/'output/web/a/web1.html')
-    web1.should match(/<h2 id="t_0" class="toc">Topic #1<\/h2>/) #  Headers are reset in each topic
+    expect(web1).to match(/<h2 id="t_0" class="toc">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 = compact_html Glyph.file_load(Glyph::PROJECT/'output/html/test_project.html')
-    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_8"}).blank?.should == false # Header numbers are different...
+    expect(index).to 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>})
+		expect(index.match(%{href="a/web1.html#h_3"}).blank?).to eq(true)
+		expect(index.match(%{href="a/b/web2.html#h_7"}).blank?).to eq(true)
+		expect(index.match(%{<li class="section"><a href="#h_1">Web Document</a></li>}).blank?).to eq(false)
+		expect(index.match(%{href="#h_2"}).blank?).to eq(false)
+		expect(index.match(%{href="#h_8"}).blank?).to eq(false) # Header numbers are different...
 	end
 
 end	

data/spec/macros/xml_spec.rb

@@ -15,40 +15,40 @@ describe "Glyph Language" do
 
 	it "should support XML fallback by default" do
 		Glyph.run 'load:all'
-		output_for(%{
+		expect(output_for(%{
 			i[test]
 			code[
 			test
 			]
-		}).gsub(/\s+/, '').should == %{
+		}).gsub(/\s+/, '')).to eq(%{
 		<i>test</i>
 				<code>
 					test
-				</code>}.gsub(/\s+/, '')
+				</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>"
+		expect(output_for("pre[code[test]]")).to eq("<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 == %{
+		expect(output_for("span[@class[test] @style[color:red;] test...]")).to eq(%{
 			<span class="test" style="color:red;">  test...</span>
-		}.strip
+		}.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>}
+		expect  { interpret("!&test[test]").document }.to raise_error
+		expect(output_for("span[@class[test]@.[test]test]")).to eq(%{<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 options.xml_fallback = true
 		language('glyph')
-		lambda { interpret("*a[test]").document }.should raise_error(Glyph::MacroError, "Invalid XML element '*a'")
+		expect { interpret("*a[test]").document }.to raise_error(Glyph::MacroError, "Invalid XML element '*a'")
 	end	
 
 	it "should not render blacklisted tags" do
@@ -71,16 +71,16 @@ describe "Glyph Language" do
       param[test]
       title[tesy]
 		}
-		output_for(text).gsub(/\s/, '').should == "<test>test</test>"
+		expect(output_for(text).gsub(/\s/, '')).to eq("<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>"
+		expect(output_for("xml/a[@test[...]xyz]")).to eq("<a test=\"...\">xyz</a>")
+		expect(output_for("xml/a[@test[...]xml/b[test]]")).to eq("<a test=\"...\">\n<b>test</b>\n</a>")
+		expect(output_for("xml/a[xml/b[test]xml/c[test]]")).to eq("<a>\n<b>test</b><c>test</c>\n</a>")
+		expect(output_for("xml/a[xml/b[test]xml/c[@test[test_attr]test]]")).to eq("<a>\n<b>test</b><c test=\"test_attr\">test</c>\n</a>")
+		expect(output_for("xml/a[xml/b[@test[true]]]")).to eq("<a>\n<b test=\"true\" />\n</a>")
 	end
 
 end	

data/spec/tasks/generate_spec.rb

@@ -13,64 +13,64 @@ describe "generate" do
 	end
 
 	it ":document should generate Glyph.document" do
-		lambda { Glyph.run! 'generate:document'}.should_not raise_error
-		Glyph.document.structure.children.length.should > 0
+		expect { Glyph.run! 'generate:document'}.not_to raise_error
+		expect(Glyph.document.structure.children.length).to be > 0
 	end
 
 	it ":html should generate a standalone html document" do
-		lambda { Glyph.run! 'generate:html'}.should_not raise_error
-		(Glyph::PROJECT/'output/html/test_project.html').exist?.should == true
+		expect { Glyph.run! 'generate:html'}.not_to raise_error
+		expect((Glyph::PROJECT/'output/html/test_project.html').exist?).to eq(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
+		expect { Glyph.run! 'generate:html5'}.not_to raise_error
+		expect((Glyph::PROJECT/'output/html5/test_project.html').exist?).to eq(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
+    expect { stdout_for { Glyph.run! 'generate:pdf_through_html'}}.not_to raise_error
+		expect((Glyph::PROJECT/'output/tmp/test_project.html').exist?).to eq(true)
+		expect((Glyph::PROJECT/'output/pdf/test_project.pdf').exist?).to eq(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
+    expect { stdout_for { Glyph.run! 'generate:pdf_through_html5'}}.not_to raise_error
+		expect((Glyph::PROJECT/'output/tmp/test_project.html').exist?).to eq(true)
+		expect((Glyph::PROJECT/'output/pdf/test_project.pdf').exist?).to eq(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
+    expect { stdout_for { Glyph.run! 'generate:mobi'}}.not_to raise_error
+		expect((Glyph::PROJECT/'output/tmp/test_project.html').exist?).to eq(true)
+		expect((Glyph::PROJECT/'output/mobi/test_project.mobi').exist?).to eq(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
+		expect((Glyph::PROJECT/'output/tmp/test_project.html').exist?).to eq(true)
+		expect((Glyph::PROJECT/'output/epub/test_project.epub').exist?).to eq(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'
-		lambda { Glyph.run! 'generate:html' }.should_not raise_error
-		(Glyph::PROJECT/'output/html/images/test/ligature.jpg').exist?.should == true
+		expect { Glyph.run! 'generate:html' }.not_to raise_error
+		expect((Glyph::PROJECT/'output/html/images/test/ligature.jpg').exist?).to eq(true)
 	end
 
 	it "should copy styles if necessary" do
 		Glyph['document.styles'] = 'import'
 		require 'sass'
 		file_write Glyph::PROJECT/'document.glyph', "head[style[default.css]\nstyle[test.sass]]"
-		lambda { Glyph.run! 'generate:html' }.should_not raise_error
-		(Glyph::PROJECT/'output/html/styles/default.css').exist?.should == true
-		(Glyph::PROJECT/'output/html/styles/test.css').exist?.should == true
+		expect { Glyph.run! 'generate:html' }.not_to raise_error
+		expect((Glyph::PROJECT/'output/html/styles/default.css').exist?).to eq(true)
+		expect((Glyph::PROJECT/'output/html/styles/test.css').exist?).to eq(true)
 	end
 
 	it ":web should generate multiple html documents" do
@@ -85,10 +85,10 @@ describe "generate" do
 	  # check that the user didn't create a styles or images directory under /text
 		reset_web.call
 		(Glyph::PROJECT/'text/images').mkdir
-		lambda { Glyph.run! 'generate:web'}.should raise_error(RuntimeError, "You cannot have an 'images' directory under your 'text' directory.")
+		expect { Glyph.run! 'generate:web'}.to raise_error(RuntimeError, "You cannot have an 'images' directory under your 'text' directory.")
 		reset_web.call
 		(Glyph::PROJECT/'text/styles').mkdir
-		lambda { Glyph.run! 'generate:web'}.should raise_error(RuntimeError, "You cannot have a 'styles' directory under your 'text' directory.")
+		expect { Glyph.run! 'generate:web'}.to 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
@@ -97,23 +97,23 @@ describe "generate" do
 			Glyph.run! 'generate:web'
 		#}.should_not raise_error
 		# check that images are copied
-		(Glyph::PROJECT/'output/web/images/ligature.jpg').exist?.should == true
+		expect((Glyph::PROJECT/'output/web/images/ligature.jpg').exist?).to eq(true)
 		# check that stylesheets are copied
-		(Glyph::PROJECT/'output/web/styles/default.css').exist?.should == true
-		(Glyph::PROJECT/'output/web/styles/test.css').exist?.should == true
+		expect((Glyph::PROJECT/'output/web/styles/default.css').exist?).to eq(true)
+		expect((Glyph::PROJECT/'output/web/styles/test.css').exist?).to eq(true)
 		# check that index.html is created
 		index = (Glyph::PROJECT/'output/web/index.html')
-		index.exist?.should == true
-		compact_html(file_load(index)).should match(/<li class="section"><a href="\/test\/a\/b\/web2.html#h_7">Topic #2<\/a>/)
+		expect(index.exist?).to eq(true)
+		expect(compact_html(file_load(index))).to 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
+		expect(web1.exist?).to eq(true)
 		web2 = (Glyph::PROJECT/'output/web/a/b/web2.html')
-		web2.exist?.should == true
+		expect(web2.exist?).to eq(true)
 		# Check that placeholders are replaced correctly and that links are valid
-		file_load(web2).match(/<a href="\/test\/a\/web1\.html#w1_3">Test #1b<\/a>/).blank?.should == false
-		file_load(web1).match(/<a href="\/test\/a\/b\/web2\.html#w2_1">Test #2a<\/a>/).blank?.should == false
-		file_load(web1).match(/<a href="#w1_3">Test #1b<\/a>/).blank?.should == false
+		expect(file_load(web2).match(/<a href="\/test\/a\/web1\.html#w1_3">Test #1b<\/a>/).blank?).to eq(false)
+		expect(file_load(web1).match(/<a href="\/test\/a\/b\/web2\.html#w2_1">Test #2a<\/a>/).blank?).to eq(false)
+		expect(file_load(web1).match(/<a href="#w1_3">Test #1b<\/a>/).blank?).to eq(false)
 	end