RubyGems - BuildMaster - Versions diffs - 0.9.1 → 1.0.6 - Mend

BuildMaster 0.9.1 → 1.0.6

Files changed (174) hide show

data/test/buildmaster/{tc_source_file_handler.rb → site/tc_source_file_handler.rb} RENAMED

@@ -1,9 +1,9 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", '..', "lib", 'buildmaster')
 require 'spec'
-require 'buildmaster'
 require 'webrick'
-require 'source_file_handler'
+require 'site/source_file_handler'
+require 'cotta'
 module BuildMaster
@@ -11,8 +11,9 @@ context 'SourceFileHandler' do
   attr_reader :path_info
   specify 'should_be_able_to_find_source' do
-    server = WEBrick::HTTPServer.new(:Port => 2000)
-    dir = File.dirname(__FILE__)
+    server = WEBrick::HTTPServer.new(:Port => 2001)
+    current_file = Cotta.file(__FILE__)
+    dir = current_file.parent
     spec = SiteSpec.new
     spec.template =<<TEMPLATE
 <html xmlns="http://www.w3.org/1999/xhtml"
@@ -24,13 +25,13 @@ context 'SourceFileHandler' do
   </body>
 </html>
 TEMPLATE
-    spec.content_dir = File.join(dir, 'site', 'content')
-    spec.output_dir = File.join(dir, 'output')
+    spec.content_dir = dir.dir('content').path
+    spec.output_dir = dir.dir('output').path
     file_handler = SourceFileHandler.new(server, spec)
-    @path_info = '/markdown.html'
+    @path_info = '/markdown.markdown'
     file_handler.service(self, self)
     document = REXML::Document.new(self['body'])
-    REXML::XPath.first(document, '/html/head/title').text.should_equal 'Title'
+    REXML::XPath.first(document, '/html/head/title').text.should == 'Title'
   end
   def []=(name, value)

data/test/buildmaster/site/tc_template_builder.rb CHANGED

@@ -1,9 +1,9 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'buildmaster')
 require 'spec'
 require 'rexml/xpath'
-require 'buildmaster/site/template_builder'
-require 'buildmaster/tree_to_object'
+require 'site/template_builder'
+require 'common/tree_to_object'
 require 'yaml'
 module BuildMaster
@@ -12,7 +12,7 @@ context 'Template Builder' do
   specify 'should generate template document' do
     builder = TemplateBuilder.new
     document = builder.generate
-    REXML::XPath.first(document, '/html/head/title/*').name.should_equal 'include'
+    REXML::XPath.first(document, '/html/head/title/*').name.should == 'include'
     assert_css_path(document, 'buildmaster.css')
   end
@@ -22,15 +22,15 @@ context 'Template Builder' do
     builder.css_path = 'mycss.css'
     document = builder.generate
     first_child = REXML::XPath.first(document, '/html/head/title').children[0]
-    first_child.class.should_equal REXML::Text
-    first_child.value.should_equal 'Title Header - '
+    first_child.class.should == REXML::Text
+    first_child.value.should == 'Title Header - '
     assert_css_path(document, 'mycss.css')
   end
   specify 'test_should_have_logo_defaults' do
     builder = TemplateBuilder.new
-    builder.logo.path.should_equal nil
-    builder.logo.link.should_equal 'index.html'
+    builder.logo.path.should == nil
+    builder.logo.link.should == 'index.html'
   end
   specify 'test_should_generate_logo_and_link' do
@@ -40,9 +40,9 @@ context 'Template Builder' do
     document = builder.generate
     header = assert_first(document, '/html/body/div[@class="header"]')
     anchor_href = assert_first(header, 'a/template:href')
-    anchor_href.attributes['url'].should_equal 'main.html'
+    anchor_href.attributes['url'].should == 'main.html'
     img_href = assert_first(header, 'a/img/template:href')
-    img_href.attributes['url'].should_equal 'gif/logo.gif'
+    img_href.attributes['url'].should == 'gif/logo.gif'
   end
   specify 'test_should_build_left_menu' do
@@ -56,18 +56,18 @@ context 'Template Builder' do
     group.menu_item('Getting Started', 'doc/getting-started')
     document = builder.generate
     groups = REXML::XPath.match(document, '/html/body/div[@class="left"]/div[@class="MenuGroup"]')
-    groups.size.should_equal 2
+    groups.size.should == 2
     first_group = groups[0]
     header = assert_first(first_group, 'h1')
-    header.text.should_equal 'Software'
+    header.text.should == 'Software'
     items = REXML::XPath.match(first_group, 'ul/li')
-    items.size.should_equal 3
+    items.size.should == 3
     first_item = items[0]
     anchor = assert_first(first_item, 'template:link')
-    anchor.attributes['href'].should_equal 'download.html'
-    anchor.text.should_equal 'Download'
+    anchor.attributes['href'].should == 'download.html'
+    anchor.text.should == 'Download'
     more = items[2]
-    more.attributes['class'].should_equal 'More'
+    more.attributes['class'].should == 'More'
   end
   specify 'should_have_releases_info' do
@@ -79,14 +79,14 @@ context 'Template Builder' do
     releases.download_link = 'download.html'
     releases.versioning_link = 'versioning.html'
     document = builder.generate
-    REXML::XPath.first(document, '/html/body/template:when/div[@class="right"]/div/h1').text.should_equal 'Latest Versions'
+    REXML::XPath.first(document, '/html/body/template:when/div[@class="right"]/div/h1').text.should == 'Latest Versions'
   end
   specify 'should_have_no_release_info_if_not_assigned' do
     builder = TemplateBuilder.new
     builder.releases.download_link = nil
     document = builder.generate
-    REXML::XPath.match(document, '/html/body/template:when/div/*').size.should_equal 0
+    REXML::XPath.match(document, '/html/body/template:when/div/*').size.should == 0
   end
   specify 'should_read_from_yaml' do
@@ -116,16 +116,16 @@ menu_groups:
   more: doc/index.html
 CONTENT
     builder = TreeToObject.from_yaml(content, TemplateBuilder.new)
-    builder.title_header.should_equal 'BuilderMaster -'
-    builder.logo.path.should_equal 'logo.gif'
-    builder.logo.link.should_equal 'index.html'
+    builder.title_header.should == 'BuilderMaster -'
+    builder.logo.path.should == 'logo.gif'
+    builder.logo.link.should == 'index.html'
   end
   private
   def assert_css_path(document, expected)
     href = REXML::XPath.first(document, '/html/head/link/*')
-    href.name.should_equal 'href'
-     href.attributes['url'].should_equal expected
+    href.name.should == 'href'
+     href.attributes['url'].should == expected
   end
   def assert_first(xml_model, xpath)

data/test/buildmaster/site/tc_template_error.rb ADDED

@@ -0,0 +1,15 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'buildmaster')
+require 'site/template_error'
+require 'spec'
+context 'template error' do
+  specify 'format of exception' do
+    begin
+      raise BuildMaster::TemplateError.new('test'), 'message'
+      fail('error should have been raised')
+    rescue StandardError => error
+      $!.to_s.should == 'BuildMaster::TemplateError: message - test'
+    end
+  end
+end

data/test/buildmaster/{tc_template_runner.rb → site/tc_template_runner.rb} RENAMED

@@ -1,12 +1,13 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib", 'buildmaster')
 require 'rexml/xpath'
 require 'rexml/document'
 require 'spec'
 require 'pathname'
-require 'buildmaster/template_runner'
-require 'buildmaster/source_content'
-require 'buildmaster/templatelets'
+require 'site/template_runner'
+require 'site/source_content'
+require 'site/templatelets'
+require 'site/element_processor_by_name'
 module BuildMaster
 class NameTemplatelet
@@ -20,6 +21,10 @@ class NameTemplatelet
 end
 context 'TemplateRunnerTest' do
+    setup do
+      @templatelets = Hash.new
+    end
     specify 'process_element_in_document' do
       target_content = <<END
 <html>
@@ -45,11 +50,11 @@ END
       template_element = REXML::XPath.first(REXML::Document.new(template_content), "/html/p")
       source_xml = REXML::Document.new(source_content)
       source_element = REXML::XPath.first(source_xml, '/persons/person[@id="1"]')
-      runner = TemplateRunner.new(target_element, template_element,
-          SourceContent.new(Pathname.new('content'), source_element))
-      runner.templatelets['include'] = Include.new(self)
-      runner.process
-      REXML::XPath.first(REXML::Document.new(target_xml.to_s), '/html/h1/text()').value.strip.should_equal 'Name One'
+      @templatelets['include'] = Include.new(self)
+      runner = TemplateRunner.new(target_element, ElementProcessorByName.new(@templatelets),
+          SourceContent.new(Pathname.new('content'), source_element, nil))
+      runner.process template_element
+      REXML::XPath.first(REXML::Document.new(target_xml.to_s), '/html/h1/text()').value.strip.should == 'Name One'
     end
     specify 'should_use_templatelet_based_on_name' do
@@ -63,14 +68,14 @@ END
 </html>
 END
       template_document = REXML::Document.new(template_content)
-      runner = TemplateRunner.new(output, template_document,
-          SourceContent.new(Pathname.new('content/index.textile'), REXML::Document.new))
-      runner.templatelets['name'] = NameTemplatelet.new(self)
-      runner.process
-      @element_target.name.should_equal 'p'
-      @element_processed.name.should_equal 'name'
-      @element_processed.attributes['attribute'].should_equal 'value'
-      @element_processed.attributes['attribute2'].should_equal 'value2'
+      @templatelets['name'] = NameTemplatelet.new(self)
+      runner = TemplateRunner.new(output, ElementProcessorByName.new(@templatelets),
+          SourceContent.new(Pathname.new('content/index.textile'), REXML::Document.new, nil))
+      runner.process template_document
+      @element_target.name.should == 'p'
+      @element_processed.name.should == 'name'
+      @element_processed.attributes['attribute'].should == 'value'
+      @element_processed.attributes['attribute2'].should == 'value2'
     end
     def processed(target, element)

data/test/buildmaster/site/tc_templatelets.rb ADDED

@@ -0,0 +1,37 @@
+$:.unshift File.dirname(__FILE__)
+require 'templatelets/common_templatelet_test'
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib', 'buildmaster')
+require 'templatelets'
+require 'rexml/element'
+require 'spec'
+module BuildMaster
+context 'element class alternation' do
+  include HelperMethods
+  specify 'get attribute value' do
+    content = <<CONTENT
+<root>
+  <element name="value"/>
+</root>
+CONTENT
+    element = create_template_element(content, 'root/element')
+    element.attribute_value('name').should == 'value'
+  end
+  specify 'raise template error if value is not there' do
+    content = <<CONTENT
+<root>
+  <element/>
+</root>
+CONTENT
+    element = create_template_element(content, 'root/element')
+    Proc.new{element.attribute_value!('name')}.should_raise TemplateError
+  end
+end
+end

data/test/buildmaster/{tc_xtemplate.rb → site/tc_xtemplate.rb} RENAMED

@@ -1,11 +1,10 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib", 'buildmaster')
 require 'rexml/xpath'
 require 'spec'
-require 'buildmaster'
-require 'buildmaster/source_content'
-require 'buildmaster/cotta'
-require 'buildmaster/cotta/in_memory_system'
+require 'site/source_content'
+require 'cotta'
+require 'cotta/in_memory_system'
 module BuildMaster
@@ -28,7 +27,7 @@ context 'XTemplate' do
   </body>
 </html>
 CONTENT
-    template = template_file.read {|file| BuildMaster::XTemplate.new(file, Hash.new)}
+    template = BuildMaster::XTemplate.new(REXML::Document.new(template_file.load), Hash.new)
   end
   specify 'should_initialize_with_content' do
@@ -41,9 +40,9 @@ CONTENT
     <body>Body</body>
   </html>
 CONTENT
-    template = XTemplate.new(template_content, Hash.new)
-    xml_output = template.process(SourceContent.new(Pathname.new('content'), ''))
-    REXML::XPath.first(xml_output, '/html/body').text.should_equal 'Body'
+    template = XTemplate.new(REXML::Document.new(template_content), Hash.new)
+    xml_output = template.process(SourceContent.new(Pathname.new('content'), nil, nil))
+    REXML::XPath.first(xml_output, '/html/body').text.should == 'Body'
   end
   specify 'should_hook_up_templatelets' do
@@ -71,11 +70,11 @@ INCLUDE_CONTENT
   <body></body>
 </html>
 INCLUDE_SOURCE
-    template = XTemplate.new(template_content, load_templatelets)
-    xml_document = template.process(SourceContent.new(nil, source_content))
+    template = XTemplate.new(REXML::Document.new(template_content), load_element_processor)
+    xml_document = template.process(SourceContent.new(nil, source_content, nil))
     xml_output = REXML::Document.new(xml_document.to_s())
-    REXML::XPath.first(xml_output, '/html/head/title').text.should_equal 'BuildMaster - Index'
-    REXML::XPath.first(xml_output, '/html/body/ul/li').text.should_equal 'one'
+    REXML::XPath.first(xml_output, '/html/head/title').text.should == 'BuildMaster - Index'
+    REXML::XPath.first(xml_output, '/html/body/ul/li').text.should == 'one'
   end
   def what?(path)
@@ -86,8 +85,8 @@ INCLUDE_SOURCE
     return true
   end
-  def load_templatelets
-    return {'when' => When.new(self, self)}
+  def load_element_processor
+    ElementProcessorByName.new({'when' => When.new(self, self)})
   end
 end
 end

data/test/buildmaster/{template.xhtml → site/template.xhtml} RENAMED

File without changes

data/test/buildmaster/{templatelets → site/templatelets}/common_templatelet_test.rb RENAMED

@@ -1,14 +1,14 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "..", "..", "lib")
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", "..", '..', "lib", 'buildmaster')
 require 'rexml/xpath'
 require 'rexml/document'
 require 'spec'
-require 'buildmaster/site_spec'
-require 'buildmaster/source_content'
-require 'buildmaster/template_error'
-require 'buildmaster/templatelets'
-require 'buildmaster/cotta'
-require 'buildmaster/cotta/in_memory_system'
+require 'site/site_spec'
+require 'site/source_content'
+require 'site/template_error'
+require 'site/templatelets'
+require 'cotta'
+require 'cotta/in_memory_system'
 module BuildMaster
 module HelperMethods
@@ -24,5 +24,9 @@ module HelperMethods
     element.name=name
     return element
   end
+  def create_template_element(content, xpath)
+    REXML::XPath.first(REXML::Document.new(content), xpath)
+  end
 end
 end

data/test/buildmaster/{templatelets → site/templatelets}/tc_attribute.rb RENAMED

@@ -2,11 +2,6 @@ $:.unshift File.dirname(__FILE__)
 require 'common_templatelet_test'
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-require 'buildmaster/template_error'
-require 'buildmaster/templatelets/attribute'
 module BuildMaster
 class AttributeForTest
@@ -32,18 +27,27 @@ context 'AttributeTest' do
     target = create_element('a')
     template_element = create_attribute_element('attr-name', 'expression')
     expected_pathname = Pathname.new('/path')
-    @source_path = SourceContent.new(expected_pathname, nil)
+    @source_path = SourceContent.new(expected_pathname, nil, nil)
     templatelet.process(target, template_element, @source_path)
-    target.attributes['attr-name'].should_equal 'value'
-    @path_logged.should_equal expected_pathname
+    target.attributes['attr-name'].should == 'value'
+    @path_logged.path.should == expected_pathname
   end
   specify 'should_check_for_expression_responder' do
     target = create_element('a')
     template_element = create_attribute_element('name', 'eval')
-    source_path = SourceContent.new(Pathname.new('./'), create_element('name'))
+    source_path = SourceContent.new(Pathname.new('./'), create_element('name'), nil)
     attribute = Attribute.new(self)
-    lambda {attribute.process(target, template_element, source_path)}.should_raise TemplateError
+    Proc.new {attribute.process(target, template_element, source_path)}.should_raise TemplateError
+  end
+  specify 'shoul check properties as a backup' do
+    target = create_element('a')
+    template_element = create_attribute_element('name', 'property')
+    source_path = SourceContent.new(Pathname.new('./'), create_element('name'), nil)
+    attribute = Attribute.new(self, {'property' => 'value'})
+    attribute.process(target, template_element, @source_path)
+    target.attributes['name'].should == 'value'
   end
   def create_attribute_element(name, eval)

data/test/buildmaster/site/templatelets/tc_code.rb ADDED

@@ -0,0 +1,132 @@
+$:.unshift File.dirname(__FILE__)
+require 'common_templatelet_test'
+module BuildMaster
+context 'code template processsing' do
+  include HelperMethods
+  setup do
+    @cotta = Cotta.new(InMemorySystem.new)
+  end
+  specify 'generate <pre> tag with code class by default' do
+    template_content = <<CONTENT
+<html>
+<code source="samples/sample.rb" tag="sample"/>
+</html>
+CONTENT
+    content_path = 'doc/doc.html'
+    @cotta.file(content_path).parent.file('samples/sample.rb').save <<CONTENT
+#START sample
+# Normally you would put release script at the root of the project
+cotta = BuildMaster::Cotta.new
+root = cotta.file(__FILE__).parent
+# BuildMaster can look into svn files to figure out the svn information
+#END sample
+CONTENT
+    target = create_element('test')
+    template = create_template_element(template_content, '/html/code')
+    site_spec = SiteSpec.new('/root', @cotta);
+    code_processor = Code.new(site_spec)
+    code_processor.process(target, template, SourceContent.new('doc/doc.html', nil, @cotta.file(content_path)))
+    REXML::XPath.first(target, 'pre').attributes['class'].should == 'code'
+    REXML::XPath.first(target, 'pre').text.should == <<CONTENT
+# Normally you would put release script at the root of the project
+cotta = BuildMaster::Cotta.new
+root = cotta.file(__FILE__).parent
+# BuildMaster can look into svn files to figure out the svn information
+CONTENT
+  end
+  specify 'generate error if none found' do
+    template_content = <<CONTENT
+<html>
+<code source="samples/sample.rb" tag="sample"/>
+</html>
+CONTENT
+    content_path = 'doc/doc.html'
+    @cotta.file(content_path).parent.file('samples/sample.rb').save
+    target = create_element('test')
+    template = create_template_element(template_content, '/html/code')
+    site_spec = SiteSpec.new('/root', @cotta);
+    code_processor = Code.new(site_spec)
+    source = SourceContent.new('doc/doc.html', nil, @cotta.file(content_path))
+    Proc.new {code_processor.process(target, template, source)}.should_raise TemplateError
+  end
+  specify 'use PCDATA if no source specified' do
+    template_content = <<CONTENT
+<html>
+<code tag="sample">
+<![CDATA[
+module BuildMaster
+#START sample
+class test
+end
+#END sample
+end
+]]>
+</code>
+</html>
+CONTENT
+    content_path = 'doc/doc.html'
+    target = create_element('test')
+    template = create_template_element(template_content, '/html/code')
+    site_spec = SiteSpec.new('/root', @cotta);
+    code_processor = Code.new(site_spec)
+    code_processor.process(target, template, SourceContent.new('doc/doc.html', nil, @cotta.file(content_path)))
+    REXML::XPath.first(target, 'pre').attributes['class'].should == 'code'
+    REXML::XPath.first(target, 'pre').text.should == <<CONTENT
+class test
+end
+CONTENT
+  end
+  specify 'raise error if no source and no pcdata' do
+    template_content = <<CONTENT
+<html>
+<code tag="sample">
+</code>
+</html>
+CONTENT
+    content_path = 'doc/doc.html'
+    target = create_element('test')
+    template = create_template_element(template_content, '/html/code')
+    site_spec = SiteSpec.new('/root', @cotta);
+    code_processor = Code.new(site_spec)
+    source = SourceContent.new('doc/doc.html', nil, @cotta.file(content_path))
+    Proc.new{code_processor.process(target, template, source)}.should_raise TemplateError
+  end
+  specify 'generate syntax support' do
+    template_content = <<CONTENT
+<html>
+<code source="samples/sample.rb" tag="sample" syntax="ruby"/>
+</html>
+CONTENT
+    content_path = 'doc/doc.html'
+    @cotta.file(content_path).parent.file('samples/sample.rb').save <<CONTENT
+#START sample
+module BuildMaster
+class test
+end
+end
+#END sample
+CONTENT
+    target = create_element('test')
+    template = create_template_element(template_content, '/html/code')
+    site_spec = SiteSpec.new('/root', @cotta);
+    code_processor = Code.new(site_spec)
+    code_processor.process(target, template, SourceContent.new('doc/doc.html', nil, @cotta.file(content_path)))
+    REXML::XPath.first(target, 'pre').attributes['class'].should == 'code'
+    REXML::XPath.first(target, 'pre/span').attributes['class'].should == 'keyword'
+  end
+end
+end