Fingertips-jewelry_portfolio 0.2.3 → 0.3.0

data/lib/jewelry_portfolio/template/html.rb

@@ -0,0 +1,18 @@
+require 'erb'
+
+class JewelryPortfolio
+  class Template
+    # This class is responsible for rendering a HTML template.
+    class HTML < Template
+      # Returns the repos ordered by name.
+      def repos
+        super.sort_by { |r| r.name }
+      end
+      
+      # Renders the HTML and returns the output.
+      def render
+        ERB.new(File.read(@file)).result(binding)
+      end
+    end
+  end
+end

data/test/fixtures/dr-nic-magic-awesome.gemspec_

@@ -2,6 +2,8 @@ Gem::Specification.new do |spec|
   spec.name = 'dr-nic-magic-awesome'
   spec.version = '1.0.0'
   
+  spec.date = Date.parse('2009-03-04')
+  
   spec.author = 'John Barnette'
   spec.email = 'jbarnette@example.com'
   

data/test/fixtures/feed_with_defaults.rb

@@ -0,0 +1 @@
+# nothing is overriden

data/test/fixtures/feed_with_defaults.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <id>http://alloy.github.com/</id>
+  <link href="http://alloy.github.com/feed.xml" rel="self"/>
+  <updated>TIME_NOW</updated>
+  <author>
+    <name>alloy</name>
+  </author>
+  <title>Code from alloy</title>
+  <subtitle>The Ruby libraries, from alloy, available as open-source projects</subtitle>
+  <entry>
+    <id>http://github.com/alloy/microgem/tree/master#0.2.0</id>
+    <updated>2009-03-04T00:00:00Z</updated>
+    <title>microgem 0.2.0</title>
+    <link href="http://github.com/alloy/microgem/tree/master"/>
+    <summary>MicroGem provides a simple naive replacement for the `gem install' command in the form of the `mgem' commandline utility.</summary>
+    <content>MicroGem provides a simple naive replacement for the `gem install' command in the form of the `mgem' commandline utility.</content>
+  </entry>
+  <entry>
+    <id>http://github.com/alloy/dr-nic-magic-awesome/tree/master#1.0.0</id>
+    <updated>2009-03-04T00:00:00Z</updated>
+    <title>dr-nic-magic-awesome 1.0.0</title>
+    <link href="http://github.com/alloy/dr-nic-magic-awesome/tree/master"/>
+    <summary>Magically fix your projects overnight!</summary>
+    <content>A gem which summons Dr. Nic to fix all your projects while you are cuddled underneath your blankie.</content>
+  </entry>
+</feed>

data/test/fixtures/feed_with_options.rb

@@ -0,0 +1,26 @@
+feed.title = 'Code from Eloy Duran (alloy)'
+feed.description = 'The Ruby libraries, from Eloy Duran, available as open-source projects'
+
+def feed.id_for_repo(repo)
+  "#{repo.name}-#{repo.version}"
+end
+
+def feed.updated_for_repo(repo)
+  'Right about NOW!'
+end
+
+def feed.title_for_repo(repo)
+  "#{repo.name.capitalize} (#{repo.version})"
+end
+
+def feed.link_for_repo(repo)
+  "http://google.com?q=#{repo.name}"
+end
+
+def feed.summary_for_repo(repo)
+  "#{repo.name.capitalize} is awesome!"
+end
+
+def feed.description_for_repo(repo)
+  summary_for_repo(repo)
+end

data/test/fixtures/feed_with_options.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <id>http://alloy.github.com/</id>
+  <link href="http://alloy.github.com/feed.xml" rel="self"/>
+  <updated>TIME_NOW</updated>
+  <author>
+    <name>alloy</name>
+  </author>
+  <title>Code from Eloy Duran (alloy)</title>
+  <subtitle>The Ruby libraries, from Eloy Duran, available as open-source projects</subtitle>
+  <entry>
+    <id>microgem-0.2.0</id>
+    <updated>Right about NOW!</updated>
+    <title>Microgem (0.2.0)</title>
+    <link href="http://google.com?q=microgem"/>
+    <summary>Microgem is awesome!</summary>
+    <content>Microgem is awesome!</content>
+  </entry>
+  <entry>
+    <id>dr-nic-magic-awesome-1.0.0</id>
+    <updated>Right about NOW!</updated>
+    <title>Dr-nic-magic-awesome (1.0.0)</title>
+    <link href="http://google.com?q=dr-nic-magic-awesome"/>
+    <summary>Dr-nic-magic-awesome is awesome!</summary>
+    <content>Dr-nic-magic-awesome is awesome!</content>
+  </entry>
+</feed>

data/test/fixtures/index.erb

@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <% repos.each do |repo| %>
+      <h1><%= repo.name %></h1>
+      <p><%= repo.description %></p>
+    <% end %>
+  </body>
+</html>

data/test/fixtures/index.html

@@ -0,0 +1,11 @@
+<html>
+  <body>
+    
+      <h1>dr-nic-magic-awesome</h1>
+      <p>A gem which summons Dr. Nic to fix all your projects while you are cuddled underneath your blankie.</p>
+    
+      <h1>microgem</h1>
+      <p>MicroGem provides a simple naive replacement for the `gem install' command in the form of the `mgem' commandline utility.</p>
+    
+  </body>
+</html>

data/test/fixtures/microgem.gemspec_

@@ -2,6 +2,8 @@ Gem::Specification.new do |spec|
   spec.name = 'microgem'
   spec.version = '0.2.0'
   
+  spec.date = Date.parse('2009-03-04')
+  
   spec.author = 'Eloy Duran'
   spec.email = 'eloy.de.enige@gmail.com'
   

data/test/fixtures/repos.yml

@@ -5,6 +5,7 @@
   gem: true
   name: dr-nic-magic-awesome
   summary: Magically fix your projects overnight!
+  updated_at: 2009-03-04 00:00:00 Z
   version: 1.0.0
 - !ruby/object:JewelryPortfolio::Repo 
   account: alloy
@@ -12,4 +13,5 @@
   gem: true
   name: microgem
   summary: MicroGem provides a simple naive replacement for the `gem install' command in the form of the `mgem' commandline utility.
+  updated_at: 2009-03-04 00:00:00 Z
   version: 0.2.0

data/test/jewelry_portfolio_test.rb

@@ -42,16 +42,30 @@ describe "JewelryPortfolio" do
     index.repos.map { |r| r.name }.should == %w{ dr-nic-magic-awesome microgem }
   end
   
-  it "should return the template" do
-    template = @portfolio.template
-    template.should.be.instance_of JewelryPortfolio::Template
-    template.template.should == File.join(@portfolio.index.path, 'template.html.erb')
-    template.repos.should == @portfolio.index.repos.to_a
+  it "should return the html template" do
+    template = @portfolio.html_template
+    template.should.be.instance_of JewelryPortfolio::Template::HTML
+    template.file.should == File.join(@portfolio.index.path, 'index.erb')
+    template.account.should == 'alloy'
+    template.repos.should == @portfolio.index.repos.to_a.sort_by { |r| r.name }
   end
   
-  it "should write out the template" do
+  it "should return the feed template" do
+    template = @portfolio.feed_template
+    template.should.be.instance_of JewelryPortfolio::Template::Feed
+    template.file.should == File.join(@portfolio.index.path, 'feed.rb')
+    template.account.should == 'alloy'
+    template.repos.should == @portfolio.index.repos.to_a.sort
+  end
+  
+  it "should write out the template and feed" do
+    time = Time.now
+    Time.stubs(:now).returns(time)
+    expected_feed = File.read(fixture('feed_with_options.xml')).gsub('TIME_NOW', time.iso8601)
+    
     @portfolio.render!
-    File.read(File.join(@portfolio.index.path, 'index.html')).should == File.read(fixture('template.html'))
+    File.read(File.join(@portfolio.index.path, 'index.html')).should == File.read(fixture('index.html'))
+    File.read(File.join(@portfolio.index.path, 'feed.xml')).should == expected_feed
   end
   
   it "should render, commit, and push the master branch" do
@@ -66,7 +80,9 @@ end
 describe "JewelryPortfolio, with a custom work_directory" do
   before do
     JewelryPortfolio::ReposIndex.any_instance.stubs(:load_pages_repo!)
-    JewelryPortfolio::Template.stubs(:new)
+    JewelryPortfolio::Template::HTML.stubs(:new)
+    JewelryPortfolio::Template::Feed.stubs(:new)
+    
     @portfolio = JewelryPortfolio.new('alloy')
   end
   

data/test/repo_test.rb

@@ -50,10 +50,11 @@ module SharedRepoSpecs
       it "should return itself serialized as YAML" do
         loaded_repo = YAML.load(@repo.to_yaml)
         
-        loaded_repo.name.should == @repo.name
-        loaded_repo.version.should == @repo.version
-        loaded_repo.summary.should == @repo.summary
+        loaded_repo.name.should        == @repo.name
+        loaded_repo.version.should     == @repo.version
+        loaded_repo.summary.should     == @repo.summary
         loaded_repo.description.should == @repo.description
+        loaded_repo.updated_at.should  == @repo.updated_at
       end
       
       it "should be valid with all necessary attributes set" do
@@ -74,6 +75,9 @@ end
 
 describe "JewelryPortfolio::Repo, when initialized without a gemspec" do
   before do
+    @time = Time.now
+    Time.stubs(:now).returns(@time)
+    
     @repo = JewelryPortfolio::Repo.new
     @repo.account = 'alloy'
     @repo.name = 'dr-nic-magic-awesome'
@@ -87,6 +91,11 @@ describe "JewelryPortfolio::Repo, when initialized without a gemspec" do
   it "should return that there's _no_ a gem for the repo" do
     @repo.gem?.should.be false
   end
+  
+  it "should return a new updated_at Time instance if there was no updated_at yet" do
+    @repo.updated_at.should == @time
+    @repo.instance_variable_get("@updated_at").should == @time
+  end
 end
 
 describe "JewelryPortfolio::Repo, when initialized with a gemspec" do
@@ -97,6 +106,10 @@ describe "JewelryPortfolio::Repo, when initialized with a gemspec" do
   
   include SharedRepoSpecs
   
+  it "should return the date from the gemspec" do
+    @repo.updated_at.should == Time.utc(@spec.date.year, @spec.date.month, @spec.date.day)
+  end
+  
   it "should return that there's a gem for the repo" do
     @repo.gem?.should.be true
   end
@@ -108,4 +121,16 @@ describe "JewelryPortfolio::Repo, when initialized with a gemspec" do
   it "should return the gem install command" do
     @repo.gem_install_command.should == "sudo gem install #{@repo.gem_name} -s http://gems.github.com"
   end
+end
+
+describe "JewelryPortfolio::Repo, when initialized from YAML" do
+  before do
+    @repo = YAML.load(fixture_read('repos.yml')).first
+  end
+  
+  include SharedRepoSpecs
+  
+  it "should return the date as it was serialized in the yaml" do
+    YAML.load(@repo.to_yaml).updated_at.should == @repo.updated_at
+  end
 end

data/test/repos_index_test.rb

@@ -44,11 +44,12 @@ describe "JewelryPortfolio::ReposIndex, in general, when the user specified a wo
     @index.repos_file.should == File.join(@index.path, 'repos.yml')
   end
   
-  it "should not pull from the remote pages repo when opening the repo" do
+  it "should not clean, fetch, and merge from the remote pages repo when opening the repo" do
     @index.instance_variable_set("@pages_repo", nil)
     
     Git.expects(:open).with(@index.path)
     Git::Base.any_instance.expects(:pull).never
+    Git::Base.any_instance.expects(:checkout).never
     @index.pages_repo
   end
 end
@@ -76,15 +77,20 @@ describe "JewelryPortfolio::ReposIndex, when working with a pages repo" do
     File.should.exist File.join(TMP_PAGES_REPO, 'repos.yml')
   end
   
-  it "should not create a new checkout if it already exists, but fetch and merge" do
-    @index.pages_repo # make sure it exists
+  it "should not create a new checkout if it already exists, but clean, fetch and merge" do
+    @index.pages_repo
+    File.open(@index.repos_file, 'w') { |f| f << 'updated' }
+    
+    # set @pages_repo to nil so the repo is re-opened the next we access it
     @index.instance_variable_set("@pages_repo", nil)
     
     Git.expects(:clone).never
-    Git::Base.any_instance.expects(:checkout).with('master')
+    #Git::Base.any_instance.expects(:checkout).with('.')
     Git::Base.any_instance.expects(:fetch).with('origin')
     Git::Base.any_instance.expects(:merge).with('origin/master')
     @index.pages_repo
+    
+    File.read(@index.repos_file).should.not == 'updated'
   end
   
   it "should create and checkout the `master' branch" do
@@ -106,10 +112,11 @@ describe "JewelryPortfolio::ReposIndex, when working with a pages repo" do
   
   it "should return an empty set if the repos.yml file does not exist yet" do
     FileUtils.rm(@index.repos_file)
+    Git::Base.any_instance.stubs(:checkout)
     @index.repos.should == Set.new
   end
   
-  it "should return a set of repos with their gemspecs" do
+  it "should return a set of repos" do
     FileUtils.rm_rf(TMP_PAGES_REPO)
     
     @index.repos.should == [
@@ -145,8 +152,10 @@ describe "JewelryPortfolio::ReposIndex, when working with a pages repo" do
     FileUtils.rm_rf(TMP_PAGES_REPO)
     @index.repos # make sure its loaded
     
-    repo = JewelryPortfolio::Repo.new('alloy', eval(fixture_read('dr-nic-magic-awesome.gemspec_').
-                                                gsub('dr-nic-magic-awesome', 'dr-nic-magic-awesome-v2')))
+    spec = eval(fixture_read('dr-nic-magic-awesome.gemspec_').
+                  gsub('dr-nic-magic-awesome', 'dr-nic-magic-awesome-v2'))
+    
+    repo = JewelryPortfolio::Repo.new('alloy', spec)
     
     assert_difference('repos_from_file.length', +1) do
       @index.add(repo)
@@ -159,7 +168,8 @@ describe "JewelryPortfolio::ReposIndex, when working with a pages repo" do
     FileUtils.rm_rf(TMP_PAGES_REPO)
     @index.repos # make sure its loaded
     
-    repo = JewelryPortfolio::Repo.new('alloy', eval(fixture_read('dr-nic-magic-awesome.gemspec_').gsub('1.0.0', '1.1.1')))
+    spec = eval(fixture_read('dr-nic-magic-awesome.gemspec_').gsub('1.0.0', '1.1.1'))
+    repo = JewelryPortfolio::Repo.new('alloy', spec)
     
     assert_no_difference('repos_from_file.length') do
       @index.add(repo)
@@ -170,8 +180,6 @@ describe "JewelryPortfolio::ReposIndex, when working with a pages repo" do
   
   it "should re-raise Git::GitExecuteErrors with the repo path prepended" do
     message = nil
-    @index.commit! 'clean'
-    
     begin
       @index.commit! 'error'
     rescue Git::GitExecuteError => e

data/test/template_test.rb

@@ -1,77 +1,210 @@
 require File.expand_path('../test_helper', __FILE__)
 
-describe "JewelryPortfolio::Template" do
+module SharedTemplateSpecs
+  def self.included(klass)
+    klass.class_eval do
+      it "should turn the repos set into an array" do
+        @template.repos.should.be.instance_of Array
+      end
+      
+      it "should raise a JewelryPortfolio::FileMissingError if the specified template does not exist" do
+        e = nil
+        begin
+          JewelryPortfolio::Template.new('/not/existing', 'alloy', @repos)
+        rescue JewelryPortfolio::Template::FileMissingError => e
+        end
+        
+        e.should.be.instance_of JewelryPortfolio::Template::FileMissingError
+        e.message.should == "Could not find template at path `/not/existing'"
+      end
+      
+      it "should return the path to the template file" do
+        @template.file.should == @file
+      end
+      
+      it "should return the view_path" do
+        @template.view_path.should == FIXTURE_PATH
+      end
+    end
+  end
+end
+
+describe "JewelryPortfolio::Template::HTML" do
   before do
     @repos = %w{ dr-nic-magic-awesome.gemspec_ microgem.gemspec_ }.
       map { |spec| JewelryPortfolio::Repo.new('alloy', fixture_eval(spec)) }
     
-    @page = JewelryPortfolio::Template.new(fixture('template'), @repos.to_set)
+    @file = fixture('index.erb')
+    @template = JewelryPortfolio::Template::HTML.new(@file, 'alloy', @repos.to_set)
   end
   
-  it "should turn the repos set into an array" do
-    @page.repos.should.be.instance_of Array
+  include SharedTemplateSpecs
+  
+  it "should render with the specified gem repos available as `repos'" do
+    File.stubs(:read).returns('<%= repos.inspect %>')
+    @template.render.should == @repos.sort_by { |r| r.name }.inspect
   end
   
-  it "should raise a JewelryPortfolio::FileMissingError if the specified template does not exist" do
-    e = nil
-    begin
-      JewelryPortfolio::Template.new('/not/existing/template', @repos)
-    rescue JewelryPortfolio::FileMissingError => e
-    end
+  it "should render the ERB template" do
+    @template.render.should == File.read(fixture('index.html'))
+  end
+  
+  it "should return the repos ordered by name" do
+    @template.repos.should == @repos.sort_by { |r| r.name }
+  end
+end
+
+describe "JewelryPortfolio::Template::Feed, in general" do
+  before do
+    @repos = %w{ dr-nic-magic-awesome.gemspec_ microgem.gemspec_ }.
+      map { |spec| JewelryPortfolio::Repo.new('alloy', fixture_eval(spec)) }
     
-    e.should.be.instance_of JewelryPortfolio::FileMissingError
-    e.message.should == "Could not find template at path `/not/existing/template.html.erb'"
+    @file = fixture('feed_with_defaults.rb')
+    @template = JewelryPortfolio::Template::Feed.new(@file, 'alloy', @repos.to_set)
+  end
+  
+  include SharedTemplateSpecs
+  
+  it "should return the feed id" do
+    @template.feed_id.should == 'http://alloy.github.com/'
   end
   
-  it "should return the path to the template" do
-    @page.template.should == fixture('template.html.erb')
+  it "should return the feed id with all lower case characters" do
+    @template.instance_variable_set("@account", 'Fingertips')
+    @template.feed_id.should == 'http://fingertips.github.com/'
   end
   
-  it "should return the repos" do
-    @page.repos.should == @repos
+  it "should return the feed url" do
+    @template.feed_url.should == 'http://alloy.github.com/feed.xml'
   end
   
-  it "should return the view_path" do
-    @page.view_path.should == FIXTURE_PATH
+  it "should return the repos ordered by updated_at" do
+    repos = @template.repos
+    
+    repos.last.stubs(:updated_at).returns(Time.now)
+    sleep 1.1
+    repos.first.stubs(:updated_at).returns(Time.now)
+    
+    @template.repos.should == @repos.sort
   end
   
-  it "should render with the specified gem repos available as `repos'" do
-    File.stubs(:read).returns('<%= repos.inspect %>')
-    @page.render.should == @repos.inspect
+  it "should return the repos ordered by version if updated_at is the same" do
+    repos = @template.repos
+    time = Time.now
+    
+    repos.each { |r| r.stubs(:updated_at).returns(time) }
+    
+    repos.first.version = '0.11.45'
+    repos.last.version = '1.2.3'
+    
+    @template.repos.should == @repos.sort
+  end
+end
+
+describe "JewelryPortfolio::Template::Feed, with defaults" do
+  before do
+    @repos = %w{ dr-nic-magic-awesome.gemspec_ microgem.gemspec_ }.
+      map { |spec| JewelryPortfolio::Repo.new('alloy', fixture_eval(spec)) }
+    @repo = @repos.first
+    
+    @file = fixture('feed_with_defaults.rb')
+    @template = JewelryPortfolio::Template::Feed.new(@file, 'alloy', @repos.to_set)
   end
   
-  it "should render an ERB partial with the specified local variables" do
-    @page.partial('repo', :repo => @repos.first).should ==
-      File.read(fixture('dr-nic-magic-awesome.html'))
+  it "should return the title" do
+    @template.title.should == 'Code from alloy'
   end
   
-  it "should render an ERB partial with the specified repo and make its spec available" do
-    @page.repo_partial(@repos.first).should ==
-      File.read(fixture('dr-nic-magic-awesome.html'))
+  it "should return the description" do
+    @template.description.should == 'The Ruby libraries, from alloy, available as open-source projects'
   end
   
-  it "should render an ERB partial with the specified repo and local variables" do
-    File.stubs(:read).returns('<%= "#{repo.name} #{extra_var}" %>')
-    @page.repo_partial(@repos.first, :extra_var => 'extra_var_value').should == "#{@repos.first.name} extra_var_value"
+  it "should return the `id' attribute for a repo" do
+    @template.id_for_repo(@repo).should == "#{@repo.url}##{@repo.version}"
   end
   
-  it "should render an ERB partial with nested partials" do
-    stubs_file_exists_and_returns('parent.html.erb', 'Hello <%= partial "nested1", :text => "world!" %>')
-    stubs_file_exists_and_returns('nested1.html.erb', '<%= text %> <%= partial "nested2", :text => "Wazzup?!" %>')
-    stubs_file_exists_and_returns('nested2.html.erb', '<%= text %>')
+  it "should return the `updated' attribute for a repo" do
+    @template.updated_for_repo(@repo).should == @repo.updated_at.iso8601
+  end
+  
+  it "should return the `title' attribute for a repo" do
+    @template.title_for_repo(@repo).should == "#{@repo.name} #{@repo.version}"
+  end
+  
+  it "should return the `link' attribute for a repo" do
+    @template.link_for_repo(@repo).should == @repo.url
+  end
+  
+  it "should return the `summary' attribute for a repo" do
+    @template.summary_for_repo(@repo).should == @repo.summary
+  end
+  
+  it "should return the `description' attribute for a repo" do
+    @template.description_for_repo(@repo).should == @repo.description
+  end
+  
+  it "should render the template" do
+    time = Time.now
+    Time.stubs(:now).returns(time)
+    expected = File.read(fixture('feed_with_defaults.xml')).gsub('TIME_NOW', time.iso8601)
+    
+    @template.render.should == expected
+  end
+end
+
+describe "JewelryPortfolio::Template::Feed, with overriden options from the template" do
+  before do
+    @repos = %w{ dr-nic-magic-awesome.gemspec_ microgem.gemspec_ }.
+      map { |spec| JewelryPortfolio::Repo.new('alloy', fixture_eval(spec)) }
+    @repo = @repos.first
     
-    @page.partial('parent').should == 'Hello world! Wazzup?!'
+    @file = fixture('feed_with_options.rb')
+    @template = JewelryPortfolio::Template::Feed.new(@file, 'alloy', @repos.to_set)
   end
   
-  it "should render the ERB template" do
-    @page.render.should == File.read(fixture('template.html'))
+  include SharedTemplateSpecs
+  
+  it "should return the title that was overriden" do
+    title = 'Code from Eloy Duran (alloy)'
+    @template.title = title
+    @template.title.should == title
+  end
+  
+  it "should return the description that was overriden" do
+    description = 'The Ruby libraries, from Eloy Duran, available as open-source projects'
+    @template.description = description
+    @template.description.should == description
+  end
+  
+  it "should return the `id' attribute for a repo" do
+    @template.id_for_repo(@repo).should == "#{@repo.name}-#{@repo.version}"
+  end
+  
+  it "should return the `updated' attribute for a repo" do
+    @template.updated_for_repo(@repo).should == 'Right about NOW!'
   end
   
-  private
+  it "should return the `title' attribute for a repo" do
+    @template.title_for_repo(@repo).should == "#{@repo.name.capitalize} (#{@repo.version})"
+  end
   
-  def stubs_file_exists_and_returns(fixture_name, data)
-    path = File.join(FIXTURE_PATH, fixture_name)
-    File.stubs(:exist?).with(path).returns(true)
-    File.stubs(:read).with(path).returns(data)
+  it "should return the `link' attribute for a repo" do
+    @template.link_for_repo(@repo).should == "http://google.com?q=#{@repo.name}"
+  end
+  
+  it "should return the `summary' attribute for a repo" do
+    @template.summary_for_repo(@repo).should == "#{@repo.name.capitalize} is awesome!"
+  end
+  
+  it "should return the `description' attribute for a repo" do
+    @template.description_for_repo(@repo).should == "#{@repo.name.capitalize} is awesome!"
+  end
+  
+  it "should render the template" do
+    time = Time.now
+    Time.stubs(:now).returns(time)
+    expected = File.read(fixture('feed_with_options.xml')).gsub('TIME_NOW', time.iso8601)
+    
+    @template.render.should == expected
   end
 end