lib/runeblog.rb in runeblog-0.0.93 vs lib/runeblog.rb in runeblog-0.0.94

@@ -1,8 +1,8 @@
 require 'find'
 require 'livetext'
-require 'skeleton'
+require 'global'
 require 'helpers-blog'
 require 'default'
 require 'view'
 require 'deploy'
 require 'post'
@@ -156,11 +156,11 @@
   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
-    tag = "#{'%04d' % id}"
+    tag = prefix(id)
     result = files.grep(/#{tag}-/)
     result
   end
 
 # def create_new_post(title, testing = false, teaser = nil, body = nil)
@@ -173,13 +173,13 @@
     post.num
   rescue => err
     puts err # error(err)
   end
 
-  def edit_initial_post(file)
-    sourcefile "#@root/src/#{file}"
-    result = system("#@editor #{sourcefile} +8")
+  def edit_initial_post(file, testing = false)
+    sourcefile = "#@root/src/#{file}"
+    result = system("#@editor #{sourcefile} +8") unless testing
     raise EditorProblem(sourcefile) unless result
     nil
   rescue => err
     error(err)
   end
@@ -312,12 +312,12 @@
     error(err)
   end
 
   def remove_post(num)
     raise ArgumentError unless num.is_a?(Integer)
-    files = Find.find("#@root/views/").to_a
-    tag = "#{'%04d' % num.to_i}"
+    tag = prefix(num)
+    files = Find.find(self.view.dir).to_a
     list = files.select {|x| File.directory?(x) and x =~ /#{tag}/ }
     return nil if list.empty?
     dest = list.map {|f| f.sub(/(?<num>\d{4}-)/, "_\\k<num>") }
     list.each.with_index do |src, i| 
       cmd = "mv #{src} #{dest[i]} 2>/dev/null"
@@ -328,11 +328,11 @@
   end
 
   def undelete_post(num)
     raise ArgumentError unless num.is_a?(Integer)
     files = Find.find("#@root/views/").to_a
-    tag = "#{'%04d' % num.to_i}"
+    tag = prefix(num)
     list = files.select {|x| File.directory?(x) and x =~ /_#{tag}/ }
     return nil if list.empty?
     dest = list.map {|f| f.sub(/_(?<num>\d{4}-)/, "\\k<num>") }
     list.each.with_index do |src, i| 
       cmd = "mv #{src} #{dest[i]} 2>/dev/null"
@@ -342,10 +342,10 @@
     true
   end
 
   def delete_draft(num)
     raise ArgumentError unless num.is_a?(Integer)
-    tag = "#{'%04d' % num.to_i}"
+    tag = prefix(num)
     system("rm -rf #@root/src/#{tag}-*")
   end
 
   def post_exists?(num)
     raise ArgumentError unless num.is_a?(Integer)