runeblog 0.0.89 → 0.0.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 279af347657d41b3c002ff54d34e79eca6d93f22
-  data.tar.gz: b89b25911aec6c0079ac0ce05967a9b29e6a21e7
+  metadata.gz: c710eb461485a787b81a66475ec0144313f06981
+  data.tar.gz: 5f379efd477fdbe371d2f2d3b4fbc121bd504272
 SHA512:
-  metadata.gz: 24df9dac9012ad36e7f4ac843793503adb9a217248af435d13b2f970f0aa551c7aaa2c0d8faa24bd5a400996a9892d956d6eb2fecb05d522b0c75b1b0334c62e
-  data.tar.gz: 110379d1d0883963dfa1d45d4ecdf5d08991dd3617b716aa55fd8b2c038a6717c0d946685702637335fbd9280313c1dfe69a2d9fae2b97a333ba26d6b771706b
+  metadata.gz: aaa0d5996589b890c8ce475c9b8d4af6f1cfffc1b1b7ac1c8068b764a749cc0cb4784c06f3ee226cd45b1a51226be1674ac30a26e23fe2fed23d597065a45d7b
+  data.tar.gz: 3179248a5153bc8b920195d9acccf6cc9477166df289394662a29a0a3b0a3aff6a9179bf7846e94d7e777192f90f62fd7fa9d6f6121113ad4d01cd2203703acc

data/lib/runeblog.rb

@@ -96,6 +96,7 @@ class RuneBlog
   end
 
   def viewdir(v = nil)
+    v = str2view(v) if v.is_a?(String)
     raise ArgumentError unless v.nil? || v.is_a?(RuneBlog::View)
     v ||= @view
     @root + "/views/#{v}/"
@@ -144,7 +145,7 @@ class RuneBlog
     files.reject! {|f| File.mtime(f) < File.mtime("#{vdir}/last_deployed") }
   end
 
-  def files_by_id(id)
+  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}"
@@ -304,7 +305,9 @@ class RuneBlog
 
   def remove_post(num)
     raise ArgumentError unless num.is_a?(Integer)
-    list = files_by_id(num)
+    files = Find.find("#@root/views/").to_a
+    tag = "#{'%04d' % num.to_i}"
+    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| 
@@ -315,6 +318,21 @@ class RuneBlog
     true
   end
 
+  def undelete_post(num)
+    raise ArgumentError unless num.is_a?(Integer)
+    files = Find.find("#@root/views/").to_a
+    tag = "#{'%04d' % num.to_i}"
+    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"
+      system(cmd)
+    end
+    # FIXME - update index/etc
+    true
+  end
+
   def delete_draft(num)
     raise ArgumentError unless num.is_a?(Integer)
     tag = "#{'%04d' % num.to_i}"
@@ -323,7 +341,7 @@ class RuneBlog
 
   def post_exists?(num)
     raise ArgumentError unless num.is_a?(Integer)
-    list = files_by_id(num)
+    list = files_by_id(num)  # FIXME search under view dirs
     list.empty? ? nil : list
   end
 

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 class RuneBlog
-  VERSION = "0.0.89"
+  VERSION = "0.0.90"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

data/test/general.rb

@@ -186,8 +186,11 @@ class TestREPL < Minitest::Test
     out = cmd_kill("1  2 7")
     out = cmd_list_posts(nil)
     after = out.split("\n").length 
-    assert after == before - 3, "list_posts saw #{before} posts, now #{after} (not #{before-3})"
-    system("ruby test/make_blog.rb")   # This is hellish, I admit
+    expecting = before - 2
+    assert after == expecting, "list_posts saw #{before} posts, now #{after} (not #{expecting})"
+    @blog.undelete_post(1)
+    @blog.undelete_post(2)
+    @blog.undelete_post(7)
   end
 
 if File.exist?("testing.deploy")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.89
+  version: 0.0.90
 platform: ruby
 authors:
 - Hal Fulton