runeblog 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bba11b6d6405c00ce558d4eef26ebc40059734a0fd479e1de01c01bc0bad3b0
-  data.tar.gz: a94636937502e82d06701b0d4da8743c1c82e256e36362ab577e0f3223a85923
+  metadata.gz: b73212927ead8c75fce2cb37c6aa6cb8494b9c6b72b43bf75536c91c00c0600e
+  data.tar.gz: f13337605c83dca1916cf942a2d9b572c64fabd8a6ef2a6a06274c793717ed2d
 SHA512:
-  metadata.gz: d6678b23a3729c19d53769d5715a7912072203c6e935da741ae418531dfca531d017839f3c05f708ed21b0705b232b3d6b69f0855814dbf8a5f7c41738a22a43
-  data.tar.gz: 25e8b7feed31831f4dba88c33f8f4377bb48715a59310bc66ec1b5f4d5c77cc9fb8d1b2ecd452d1fbd19e5343ba2a140b54d540d5107bd4347fd3b3aa6778d33
+  metadata.gz: 8b3f0b41497bc7046b785f8e96f2ba78c5865e459d762c408145cea38ca014c8671652336ceadc58c6892afdea0b68c933b8c216f0e1375ac103e92fac82510e
+  data.tar.gz: f5b43e1afef44c9a4e7f61a965ad538ab780de79bc61a3f66f215c7f9f7e26b3842077ca6f4411f1c692029330ecce4f50afc8ead4daea8ec71301cd82b946f8

data/lib/liveblog.rb

@@ -89,6 +89,9 @@ def post_trailer
   perma = _var("publish.proto") + "://" + _var("publish.server") +
           "/" + _var("publish.path") + "/" + _var("post.aslug") + 
           ".html"
+Livetext::Vars.each_pair do |k,v|
+  STDERR.puts "#{k}: #{v.inspect}" unless k.is_a? Symbol
+end
   tags = _var("post.tags")
   taglist = tags.empty? ? "" : "Tags: #{tags}"
 
@@ -140,7 +143,7 @@ def backlink
 end
 
 def code
-  lines = _body_text
+  lines = _body # _text
   _out "<font size=+1><pre>\n#{lines}\n</pre></font>"
 end
 
@@ -434,7 +437,7 @@ end
 
 def teaser
   raise "'post' was not called" unless @meta
-  text = _body_text
+  text = _body.join("\n")
   @meta.teaser = text
   setvar :teaser, @meta.teaser
   if _args[0] == "dropcap"   # FIXME doesn't work yet!

data/lib/repl.rb

@@ -6,6 +6,8 @@ require 'pathmagic'
 make_exception(:PublishError,  "Error during publishing")
 make_exception(:EditorProblem, "Could not edit $1")
 
+Signal.trap("INT") { puts "Don't  :)" }
+
 module RuneBlog::REPL
   def edit_file(file, vim: "")
 #   STDSCR.saveback
@@ -183,7 +185,6 @@ module RuneBlog::REPL
   end
 
   def cmd_publish
-# Future Hal says please refactor this
     puts
     unless @blog.view.can_publish?
       msg = "Can't publish... see global.lt3"

data/lib/runeblog.rb

@@ -18,6 +18,30 @@ require 'pathmagic'
 
 ###
 
+module ErrorChecks
+  def check_nonempty_string(str)
+    confirm(ExpectedString, str.inspect, str.class) { str.is_a?(String) && ! str.empty? }
+  end
+
+  def check_view_parameter(view)
+    confirm(ExpectedView, view, view.class) { view.is_a?(String) || view.is_a?(RuneBlog::View) }
+  end
+
+  def check_integer(num)
+    confirm(ExpectedInteger, num, num.class) { num.is_a? Integer }
+  end
+
+  def confirm(exception, *args, &block)
+    # raise if block is NOT true
+    raise send(exception.to_s, *args) if ! block.call
+  end
+
+  def check_error(exception, *args, &block)
+    # raise if block IS true
+    raise send(exception.to_s, *args) if block.call
+  end
+end
+
 class RuneBlog
  
   DotDir     = ".blogs"
@@ -33,10 +57,16 @@ class RuneBlog
   make_exception(:EditorProblem,         "Could not edit $1")
   make_exception(:NoSuchView,            "No such view: $1")
   make_exception(:NoBlogAccessor,        "Runeblog.blog is not set")
+  make_exception(:ExpectedString,        "Expected nonempty string but got $1 ($2)")
+  make_exception(:ExpectedView,          "Expected string or View object but got $1 ($2)")
+  make_exception(:ExpectedInteger,       "Expected integer but got $1 ($2)")
+
+  include ErrorChecks
 
   class << self
     attr_accessor :blog
     include Helpers
+    include ErrorChecks
   end
 
   attr_reader :views, :sequence
@@ -77,10 +107,11 @@ class RuneBlog
 
   def self.create_new_blog_repo(root_rel = ".blogs")
     log!(enter: __method__, args: [root_rel])
-    raise ArgumentError unless root_rel.is_a?(String) && ! root_rel.empty?
+    check_nonempty_string(root_rel)
     self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     repo_root = Dir.pwd/root_rel
-    raise BlogRepoAlreadyExists if Dir.exist?(repo_root)
+    check_error(BlogRepoAlreadyExists) { Dir.exist?(repo_root) }
+
     create_dirs(repo_root)
     Dir.chdir(repo_root) do
       create_dirs(:data, :config, :drafts, :views, :posts)
@@ -237,19 +268,21 @@ class RuneBlog
 
   def view?(name)
     log!(enter: __method__, args: [name], level: 3)
-    raise ArgumentError unless name.is_a?(String) && ! name.empty?
+    check_nonempty_string(name)
     views.any? {|x| x.name == name }
   end
 
   def view(name = nil)
     log!(enter: __method__, args: [name], level: 3)
-    raise ArgumentError unless name.nil? || (name.is_a?(String) && ! name.empty?)
-    name.nil? ? @view : str2view(name)
+    return @view if name.nil?
+
+    check_nonempty_string(name)
+    return str2view(name)
   end
 
   def str2view(str)
     log!(enter: __method__, args: [str], level: 3)
-    raise ArgumentError unless str.is_a?(String) && ! str.empty?
+    check_nonempty_string(str)  # redundant?
     @views.find {|x| x.name == str }
   end
 
@@ -273,7 +306,7 @@ class RuneBlog
         _set_publisher
       when String
         new_view = str2view(arg)
-        raise NoSuchView(arg) if new_view.nil?
+        check_error(NoSuchView, arg) { new_view.nil? }
         @view = new_view
         read_features(@view)
         @view.get_globals
@@ -299,9 +332,8 @@ class RuneBlog
 
   def viewdir(v = nil)   # delete?
     log!(enter: __method__, args: [v], level: 3)
-    v ||= @view
-    v = str2view(v) if v.is_a?(String)
-    raise ArgumentError unless v.nil? || v.is_a?(RuneBlog::View)
+    return @view if v.nil?
+    check_nonempty_string(v)
     return @root/:views/v
   end
 
@@ -336,14 +368,11 @@ class RuneBlog
 
   def check_valid_new_view(view_name)
     log!(enter: __method__, args: [view_name], level: 3)
-    raise ArgumentError unless view_name.is_a?(String)
-    raise ArgumentError if view_name.empty?
-    names = self.views.map(&:to_s)
-    bad = names.include?(view_name)
-    raise ViewAlreadyExists(view_name) if bad
+    check_nonempty_string(view_name)
     vdir = @root/:views/view_name
-    raise DirAlreadyExists(view_name) if Dir.exist?(vdir)
-    return true   # hm?
+    check_error(ViewAlreadyExists, view_name) { self.views.map(&:to_s).include?(view_name) }
+    check_error(DirAlreadyExists, view_name) { Dir.exist?(vdir) }
+    return true
   end
 
   def create_view(view_name)
@@ -359,7 +388,7 @@ class RuneBlog
 
   def delete_view(name, force = false)
     log!(enter: __method__, args: [name, force])
-    raise ArgumentError unless name.is_a?(String) && ! name.empty?
+    check_nonempty_string(name)
     if force
       vname = @root/:views/name
       system!("rm -rf #{vname}")
@@ -521,7 +550,7 @@ class RuneBlog
 
   def change_view(view)
     log!(enter: __method__, args: [view], level: 3)
-    raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
+    check_view_parameter(view)
     File.write(@root/"data/VIEW", view)
     # write_repo_config
     self.view = view   # error checking?
@@ -529,7 +558,7 @@ class RuneBlog
 
   def generate_index(view)
     log!(enter: __method__, args: [view], pwd: true, dir: true)
-    raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
+    check_view_parameter(view)
     @vdir = @root/:views/view
     num = collect_recent_posts
     return num
@@ -701,7 +730,7 @@ class RuneBlog
 
   def remove_post(num)
     log!(enter: __method__, args: [num], level: 1)
-    raise ArgumentError unless num.is_a?(Integer)
+    check_integer(num)
     # FIXME update original draft .views
     tag = prefix(num)
     files = Find.find(self.view.dir).to_a
@@ -718,7 +747,7 @@ class RuneBlog
 
   def undelete_post(num)
     log!(enter: __method__, args: [num], level: 1)
-    raise ArgumentError unless num.is_a?(Integer)
+    check_integer(num)
     files = Find.find(@root/:views).to_a
     tag = prefix(num)
     list = files.select {|x| File.directory?(x) and x =~ /_#{tag}/ }
@@ -734,14 +763,14 @@ class RuneBlog
 
   def delete_draft(num)
     log!(enter: __method__, args: [num], level: 1)
-    raise ArgumentError unless num.is_a?(Integer)
+    check_integer(num)
     tag = prefix(num)
     system!("rm -rf #@root/drafts/#{tag}-*")
   end
 
   def make_slug(meta)
     log!(enter: __method__, args: [meta], level: 3)
-    raise ArgumentError unless meta.title.is_a?(String)
+    check_nonempty_string(meta.title)
     label = '%04d' % meta.num   # FIXME can do better
     slug0 = meta.title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
     str = "#{label}-#{slug0}"

data/lib/runeblog_version.rb

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)
@@ -30,14 +30,14 @@ end
 
 # Refactor, move stuff elsewhere?
 
-def make_exception(sym, str)
-  log!(enter: __method__, args: [sym, str], level: 3)
-  return if Object.constants.include?(sym)
-  Object.const_set(sym, StandardError.dup)
+def make_exception(sym, str, target_class = Object)
+  return if target_class.constants.include?(sym)
+
+  target_class.const_set(sym, StandardError.dup)
   define_method(sym) do |*args|
-    msg = str
+    msg = str.dup
     args.each.with_index {|arg, i| msg.sub!("$#{i+1}", arg) }
-    Object.class_eval(sym.to_s).new(msg)
+    target_class.class_eval(sym.to_s).new(msg)
   end
 end
 

data/lib/view.rb

@@ -42,24 +42,6 @@ class RuneBlog::View
     @name
   end
 
-  def publishable_files
-    log!(enter: __method__, level: 2)
-    vdir = dir()
-    remote = local_index()
-    files = [remote]
-    others = Dir.entries(vdir/:remote) - %w[. ..]
-    others.map! {|x| "#{vdir}/remote/#{x}" }
-
-    assets = Dir.entries("#{vdir}/assets") - %w[. ..]
-    assets.map! {|x| "#{vdir}/assets/#{x}" }
-    assets.reject! {|x| File.directory?(x) }
-#   assets.reject! {|x| ! recent?(x) }
-    files = files + others
-    all = files.dup
-    dirty = files.reject {|f| ! recent?(f) }
-    [dirty, all, assets]
-  end
-
   def can_publish?
     @can_publish
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext