lib/bloggit/generator.rb in bloggit-1.0.3 vs lib/bloggit/generator.rb in bloggit-1.0.7

@@ -72,11 +72,11 @@
         gen_page(page)
       end
 
       puts_if_verbose "Copying media files..."
       media_root = File.join(site.base_path, 'media')
-      FileUtils.cp_r media_root, cache_dir, :verbose=>false
+      FileUtils.cp_r media_root, cache_dir, :verbose=>false if File.exists?(media_root)
       
       puts_if_verbose "Copying '#{site.theme}' theme files..."
       create_folder 'theme'
       theme_root = File.join(site.base_path, 'themes', site.theme)
       theme_dirs = []
@@ -121,10 +121,11 @@
     
     # Individual object generators...
     
     def gen_post(post)
       ctx = {
+        'content' => post,
         'post' => post,
         'site' => @site
       }
       render_template :post, post.permalink, ctx
       puts_if_verbose "  - #{post.permalink}"
@@ -132,10 +133,11 @@
       report_error(post.permalink || '??')
     end
     
     def gen_page(page)
       ctx = {
+        'content' => page,
         'page' => page,
         'site' => @site
       }
       render_template :page, "#{page.slug}.html", ctx
       puts_if_verbose "  - #{page.permalink}"
@@ -236,10 +238,11 @@
     end
     
     def gen_atom_feed(posts, io_obj)
       tmpl = Template.from_text('')
       Template.folder_depth = 0
+      Template.force_absolute_path = true
 
       xml = Builder::XmlMarkup.new( :target=>io_obj, :indent=>2 )
       #xml.instruct! 'xml-stylesheet', :href=>'/stylesheets/atom.css', :type=>'text/css'
 
       xml.feed :xmlns=>'http://www.w3.org/2005/Atom' do
@@ -267,16 +270,18 @@
             # xml.summary entry.summary
             xml.content post.render_content(tmpl.render_binding), :type=>'html'
           end
         end
       end
+      
+      Template.force_absolute_path = false
     end
     
     def gen_rss_feed(posts, io_obj)
       tmpl = Template.from_text('')
       Template.folder_depth = 0
-
+      Template.force_absolute_path = true
       xml = Builder::XmlMarkup.new( :target=>io_obj, :indent=>2 )
       xml.instruct! :xml, :version=>"1.0" 
       xml.rss(:version=>"2.0"){
         xml.channel{
           xml.title( @site.title() )
@@ -293,9 +298,11 @@
                 xml.guid(site.absolute_path_to(post))
               end
             end
         }
       }
+      Template.force_absolute_path = false
+      
     end
   
   private
   
     def puts_if_verbose(msg='')
\ No newline at end of file