runeblog 0.0.93 → 0.0.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d401049bff7f80d13c2708674608b2c2c418d77e
-  data.tar.gz: 0a8dead9268c46004a4a31d8977724d119adabeb
+  metadata.gz: b8720cc6cf31c380400565dcc8868cd9ac9f6d72
+  data.tar.gz: ca565aeecf8cd0532f2bdd415923fab0240400d1
 SHA512:
-  metadata.gz: d0d9364fa2a1dc901ebd178fa7f5b7544ec519ee756dcad417cdcb7542cbed97129f3e2b814025b12e884feb5e9142a74bc03c2f64b9b946d68a5f0771cc4a46
-  data.tar.gz: 4f47211d17dab06700c3afd9f956c3f20b0b9ccd7f6b69d1fcdd2cded31efd6f1d68d2ab47059a102c983b4dca19094c4c63ca8fe8f685a5a639b6215d1c4eb3
+  metadata.gz: 0c923e9f2283b3bbd51852f421821243c526b98d880fd12b7061d8dcba41254d0b7bbfb1b43fadf8ff302d516bb68466f406a260b5969b0d0b0829e7da8e8224
+  data.tar.gz: 87c4b6432312db1c69bde589df6df01913829a4e7b54f6d064b6cc0ceaa5c8360176da304ad8e8602c9f482193dc13c8b5755017f15acb984d6c05f88748f08c

data/lib/{skeleton.rb → global.rb}

@@ -27,3 +27,7 @@ def make_exception(sym, str)
   end
 end
 
+def prefix(num)
+  "#{'%04d' % num.to_i}"
+end
+

data/lib/helpers-repl.rb

@@ -32,6 +32,7 @@ module RuneBlog::REPL
      "lsd"               => :cmd_list_drafts,
 
      "rm $postid"        => :cmd_remove_post,
+     "undel $postid"     => :cmd_undelete_post,
 
      "kill >postid"      => :cmd_kill, 
 
@@ -179,7 +180,7 @@ module RuneBlog::REPL
 
   def import(arg = nil)
 #   open_blog unless @blog
-
+    raise "Not implemented at present..."
     arg = nil if arg == ""
     arg ||= ask("Filename: ")  # check validity later
     name = arg

data/lib/post.rb

@@ -11,7 +11,7 @@ class RuneBlog::Post
 
   def self.files(num, root)
     files = Find.find(root).to_a
-    result = files.grep(/#{tag(num)}-/)
+    result = files.grep(/#{prefix(num)}-/)
     result
   end
   
@@ -86,34 +86,30 @@ class RuneBlog::Post
 
   def make_slug(postnum = nil)
     postnum ||= @blog.next_sequence
-    num = tag(postnum)   # FIXME can do better
+    num = prefix(postnum)   # FIXME can do better
     slug = @title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
     [postnum, "#{num}-#{slug}"]
   end
 
-  def tag(num)
-    "#{'%04d' % num}"
-  end
-
-def write_metadata(meta)
-  fname2 = "metadata.txt"
-  hash = meta.to_h
-  
-  File.write("teaser.txt", hash[:teaser])
-  File.write("body.txt", hash[:body])
-  hash.delete(:teaser)
-  hash.delete(:body)
-  
-  hash[:views] = hash[:views].join(" ")
-  hash[:tags]  = hash[:tags].join(" ")
-  
-  fields = [:title, :date, :pubdate, :views, :tags]
-  
-  f2 = File.new(fname2, "w")
-  fields.each do |fld|
-    f2.puts "#{fld}: #{hash[fld]}"
+  def write_metadata(meta)
+    fname2 = "metadata.txt"
+    hash = meta.to_h
+    
+    File.write("teaser.txt", hash[:teaser])
+    File.write("body.txt", hash[:body])
+    hash.delete(:teaser)
+    hash.delete(:body)
+    
+    hash[:views] = hash[:views].join(" ")
+    hash[:tags]  = hash[:tags].join(" ")
+    
+    fields = [:title, :date, :pubdate, :views, :tags]
+    
+    f2 = File.new(fname2, "w")
+    fields.each do |fld|
+      f2.puts "#{fld}: #{hash[fld]}"
+    end
+    f2.close
   end
-  f2.close
-end
 
 end

data/lib/repl.rb

@@ -274,6 +274,7 @@ module RuneBlog::REPL
   
        #{red('rm ID            ')} Remove a post
        #{red('kill ID ID ID... ')} Remove multiple posts
+       #{red('undelete ID      ')} Undelete a post
        #{red('edit ID          ')} Edit a post
   
        #{red('preview          ')} Look at current (local) view in browser

data/lib/runeblog.rb

@@ -1,6 +1,6 @@
 require 'find'
 require 'livetext'
-require 'skeleton'
+require 'global'
 require 'helpers-blog'
 require 'default'
 require 'view'
@@ -158,7 +158,7 @@ class RuneBlog
   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
@@ -175,9 +175,9 @@ class RuneBlog
     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
@@ -314,8 +314,8 @@ class RuneBlog
 
   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>") }
@@ -330,7 +330,7 @@ class RuneBlog
   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>") }
@@ -344,7 +344,7 @@ class RuneBlog
 
   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
 

data/lib/version.rb

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

data/test/general.rb

@@ -246,14 +246,10 @@ end  # conditional tests
   end
 
   def test_023_exception_view_already_exists
-    assert_raises(ViewAlreadyExists) { @blog.view = 'alpha_view' }
+    assert_raises(ViewAlreadyExists) { @blog.create_view('alpha_view') }
   end
 
-  def test_024_exception_cant_edit_file
-    assert_raises(EditorProblem) { @blog.edit_initial_post(999) }
-  end
-
-  def xtest_025_exception_livetext_error   # FIXME Doesn't work! Change Livetext
+  def xtest_024_exception_livetext_error   # FIXME Doesn't work! Change Livetext
     testfile = "testfile.lt3"
     path = @blog.root + "/src/" + testfile
     cmd = "echo .no_such_command > #{path}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.93
+  version: 0.0.94
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -43,12 +43,12 @@ files:
 - bin/blog
 - lib/default.rb
 - lib/deploy.rb
+- lib/global.rb
 - lib/helpers-blog.rb
 - lib/helpers-repl.rb
 - lib/post.rb
 - lib/repl.rb
 - lib/runeblog.rb
-- lib/skeleton.rb
 - lib/version.rb
 - lib/view.rb
 - test/general.rb