lib/runeblog.rb in runeblog-0.0.95 vs lib/runeblog.rb in runeblog-0.0.96

@@ -2,11 +2,11 @@
 require 'livetext'
 require 'global'
 require 'helpers-blog'
 require 'default'
 require 'view'
-require 'deploy'
+require 'publish'
 require 'post'
 require 'version'
 
 
 ###
@@ -55,11 +55,11 @@
     puts err.backtrace
   end
 
   def initialize   # assumes existing blog
     # Crude - FIXME later - 
-    # What views are there? Deployment, etc.
+    # What views are there? Publishing, etc.
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     @root, @view_name, @editor = 
       read_config(ConfigFile, :root, :current_view, :editor)
     @views = get_views
     @view = str2view(@view_name)
@@ -83,16 +83,16 @@
 
   def view=(arg)
     case arg
       when RuneBlog::View
         @view = arg
-        @view.deployer = read_config(@view.dir + "/deploy")
+        @view.publisher = read_config(@view.dir + "/publish")
       when String
         new_view = str2view(arg)
         raise NoSuchView(arg) if new_view.nil?
         @view = new_view
-        @view.deployer = read_config(@view.dir + "/deploy")
+        @view.publisher = read_config(@view.dir + "/publish")
       else 
         raise CantAssignView(arg.class.to_s)
     end
   end
 
@@ -128,15 +128,15 @@
     Dir.chdir(dir)
     x = RuneBlog::Default
     create_dir('custom')
     create_dir('assets')
     # FIXME dump method??
-    dump("", "deploy")
+    dump("", "publish")
     dump(x::BlogHeader, "custom/blog_header.html")
     dump(x::BlogTrailer, "custom/blog_trailer.html")
     dump(x::PostTemplate, "custom/post_template.html")
-    dump("Initial creation", "last_deployed")
+    dump("Initial creation", "last_published")
     Dir.chdir(up)
     @views << RuneBlog::View.new(arg)
   end
 
   def delete_view(name, force = false)
@@ -150,11 +150,11 @@
   def view_files
     vdir = @blog.viewdir
     files = ["#{vdir}/index.html"]
     files += posts.map {|x| "#{vdir}/#{x}" }
     # Huh? 
-    files.reject! {|f| File.mtime(f) < File.mtime("#{vdir}/last_deployed") }
+    files.reject! {|f| File.mtime(f) < File.mtime("#{vdir}/last_published") }
   end
 
   def files_by_id(id)   # FIXME get rid of this later
     raise ArgumentError unless id.is_a?(Integer)
     files = Find.find(self.view.dir).to_a
@@ -167,11 +167,11 @@
   def create_new_post(meta, testing = false)
     meta.teaser ||= "Teaser goes here."
     meta.body ||= "Remainder of post goes here."
     post = RuneBlog::Post.new(meta, @view.to_s)
     post.edit unless testing
-    post.publish
+    post.build
     post.num
   rescue => err
     puts err # error(err)
   end
 
@@ -217,22 +217,22 @@
     @meta
   rescue => err
     error(err)
   end
 
-  def publish_post(meta)
+  def link_post_all_views(meta)
     meta.views.each {|view| link_post_view(view) }
 #   assets = find_all_assets(@meta.assets, views)
     nil
   rescue => err
     error(err)
   end
 
   def link_post_view(view)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     # Create dir using slug (index.html, metadata?)
-    vdir = self.viewdir(view)
+    vdir = self.viewdir(view) # FIXME
     dir = vdir + @meta.slug + "/"
     create_dir(dir + "assets") 
     Dir.chdir(dir) do
       dump(@meta.teaser, "teaser.txt")
       dump(@meta.body, "body.txt")
@@ -305,10 +305,10 @@
   end
 
   def rebuild_post(file)
     raise ArgumentError unless file.is_a?(String)
     @meta = process_post(file)
-    publish_post(@meta)       # FIXME ??
+    link_post_all_views(@meta)       # FIXME ??
   rescue => err
     error(err)
   end
 
   def remove_post(num)