RubyGems - runeblog - Versions diffs - 0.3.02 → 0.3.07 - Mend

runeblog 0.3.02 → 0.3.07

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

checksums.yaml +4 -4
data/bin/blog +17 -16
data/data/features.txt +1 -1
data/empty_view/settings/features.txt +1 -1
data/empty_view/settings/recent.txt +5 -0
data/lib/helpers-blog.rb +13 -58
data/lib/helpers-repl.rb +3 -41
data/lib/liveblog.rb +7 -8
data/lib/lowlevel.rb +42 -8
data/lib/post.rb +16 -38
data/lib/repl.rb +111 -217
data/lib/runeblog.rb +30 -73
data/lib/runeblog_version.rb +1 -2
data/lib/view.rb +4 -0
data/test/austin.rb +6 -7
metadata +2 -2

data/lib/runeblog.rb CHANGED

@@ -75,15 +75,6 @@ class RuneBlog
   end
-  def _tmp_error(err)   # FIXME move to helpers
-    out = "/tmp/blog#{rand(100)}.txt"
-    File.open(out, "w") do |f|
-      f.puts err
-      f.puts err.backtrace.join("\n")
-    end
-    puts "Error: See #{out}"
-  end
   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?
@@ -122,6 +113,7 @@ class RuneBlog
     @root = Dir.pwd/root_rel
     write_repo_config(root: @root)   # ?? FIXME
     get_repo_config
+    read_features   # top level
     @views = retrieve_views
     self.view = File.read(@root/"data/VIEW").chomp
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
@@ -197,11 +189,20 @@ class RuneBlog
     _generate_settings
   end
+  # FIXME reconcile with _get_draft data
+  def read_metadata
+    meta = read_pairs!("metadata.txt")
+    meta.views = meta.views.split
+    meta.tags  = meta.tags.split
+    meta
+  end
   def _deploy_local(dir)
     log!(enter: __method__, args: [dir], level: 1)
     Dir.chdir(dir) do
-      views = _retrieve_metadata(:views)
-      views.each do |v|
+      meta = read_metadata
+      meta.views.each do |v|
         next unless _check_view?(v)
         system!("cp *html #@root/views/#{v}/remote", show: true)
       end
@@ -210,33 +211,6 @@ class RuneBlog
     _tmp_error(err)
   end
-  # FIXME reconcile with _get_draft data
-  def _retrieve_metadata(key)
-    key = key.to_s
-    lines = File.readlines("metadata.txt")
-    lines = lines.grep(/^#{key}: /)
-    case lines.size
-      when 0
-        result = nil  # not found
-      when 1
-        front = "#{key}: "
-        n = front.size
-        str = lines.first.chomp[n..-1]
-        case key
-          when "views", "tags"   # plurals
-            result = str.split
-        else
-          result = str
-        end
-    else
-      raise "Too many #{key} instances in metadata.txt!"
-    end
-    return result
-  rescue => err
-    _tmp_error(err)
-  end
   def process_post(sourcefile)
     log!(enter: __method__, args: [sourcefile], level: 2)
     nslug = sourcefile.sub(/.lt3/, "")
@@ -294,11 +268,15 @@ class RuneBlog
         @view = nil
       when RuneBlog::View
         @view = arg
+        read_features(@view)
+        @view.get_globals
         _set_publisher
       when String
         new_view = str2view(arg)
         raise NoSuchView(arg) if new_view.nil?
         @view = new_view
+        read_features(@view)
+        @view.get_globals
         _set_publisher
       else
         raise CantAssignView(arg.class.to_s)
@@ -374,6 +352,7 @@ class RuneBlog
     add_view(view_name)
     mark_last_published("Initial creation")
     system("cp #@root/data/global.lt3 #@root/views/#{view_name}/themes/standard/global.lt3")
+    @view.get_globals
   rescue => err
     _tmp_error(err)
   end
@@ -404,9 +383,8 @@ class RuneBlog
     posts = Dir.entries(dir_posts).grep(/^\d\d\d\d/).map {|x| dir_posts/x }
     posts.select! {|x| File.directory?(x) }
-    post = posts.select {|x| File.basename(x).to_i == postid }
-    raise "Error: More than one post #{postid}" if post.size > 1
-    postdir = post.first
+    posts = posts.select {|x| File.basename(x).to_i == postid }
+    postdir = exactly_one(posts)
     vp = RuneBlog::ViewPost.new(self.view, postdir)
     vp
   rescue => err
@@ -454,16 +432,18 @@ class RuneBlog
     return posts[0..19]  # return 20 at most
   end
-  def collect_recent_posts(file)
+  def collect_recent_posts(file = "recent.html")
     log!(enter: __method__, args: [file], level: 3)
+    vars = self.view.globals
     text = <<-HTML
       <html>
       <head><link rel="stylesheet" href="etc/blog.css"></head>
-      <body>
+      <body style="background-color: #{vars["recent.bgcolor"]}">
     HTML
     posts = _sorted_posts
     if posts.size > 0
-      wanted = [8, posts.size].min  # estimate how many we want?
+      # estimate how many we want
+      wanted = [vars["recent.count"].to_i, posts.size].min
       enum = posts.each
       entries = []
       wanted.times do
@@ -535,7 +515,7 @@ class RuneBlog
     log!(enter: __method__, args: [view], pwd: true, dir: true)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     @vdir = @root/:views/view
-    num = collect_recent_posts("recent.html")
+    num = collect_recent_posts
     return num
   rescue => err
     _tmp_error(err)
@@ -564,34 +544,10 @@ class RuneBlog
     # _tmp_error(err)
   end
-  def _get_draft_data(num, sym)
-    tag = prefix(num)
-    front = @blog.root/:drafts/tag
-    files = Dir[front + "*"]
-    raise "No draft #{num} found" if files.empty?
-    raise "Too many files found for #{num}!" if files.size > 1
-    file = files.first
-    lines = File.readlines(file)
-    case sym
-      when :views
-        view_line = lines.grep(/^.views /)
-        raise "More than one .views call in #{draft}" if view_line.size > 1
-        raise "No .views call in #{draft}" if view_line.size < 1
-        view_line = view_line.first
-        views = view_line[7..-1].split
-        return views.uniq
-    else
-      raise "Unknown symbol #{sym.inspect}"
-    end
-  end
   def _get_views(draft)
     log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
-    view_line = File.readlines(draft).grep(/^.views /)
-    raise "More than one .views call in #{draft}" if view_line.size > 1
-    raise "No .views call in #{draft}" if view_line.size < 1
-    view_line = view_line.first
+    view_line = exactly_one(File.readlines(draft).grep(/^.views /))
     views = view_line[7..-1].split
     views.uniq
   rescue => err
@@ -622,10 +578,11 @@ class RuneBlog
     pnum = nslug[0..3]                 # 0001
     Dir.chdir(pdraft) do
       excerpt = File.read("teaser.txt")
-      date = _retrieve_metadata(:date)
+      meta = read_metadata
+      date = meta.date
       longdate = ::Date.parse(date).strftime("%B %e, %Y")
-      title = _retrieve_metadata(:title)
-      tags = _retrieve_metadata(:tags)
+      title = meta.title
+      tags = meta.tags
       # FIXME simplify
       vars = <<~LIVE
         .set post.num = #{pnum}

data/lib/runeblog_version.rb CHANGED

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 class RuneBlog
-  VERSION = "0.3.02"
+  VERSION = "0.3.07"
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)
@@ -46,5 +46,4 @@ def prefix(num)
   "#{'%04d' % num.to_i}"
 end
 end

data/lib/view.rb CHANGED

@@ -14,6 +14,10 @@ class RuneBlog::View
     @publisher = RuneBlog::Publishing.new(name)
     @can_publish = true  # FIXME
     @blog.view = self
+    get_globals
+  end
+  def get_globals
     gfile = @blog.root/"views/#{name}/themes/standard/global.lt3"
     return unless File.exist?(gfile)  # Hackish!! how is View.new called from create_view??

data/test/austin.rb CHANGED

@@ -31,7 +31,7 @@ end
 @fake_date = Date.today - 20
 def make_post(x, title, teaser, body, views=[])
-  debug "      make_post #{bold(title)}"
+  debug "  make_post #{bold(title)}"
   pubdate = @fake_date.strftime("%Y-%m-%d")
   @fake_date += (rand(2) + 1)
   x.create_new_post(title, true, teaser: teaser, body: body, views: views,
@@ -53,8 +53,8 @@ puts
 debug bold("Generating test blog...")
 system("rm -rf .blogs")
-RuneBlog.create_new_blog_repo(".blogs")
-x = RuneBlog.new(".blogs")
+RuneBlog.create_new_blog_repo # (".blogs")
+x = RuneBlog.new  # (".blogs")
 debug("create_view: #{bold('around_austin')}")
 x.create_view("around_austin")   # FIXME remember view title!
@@ -72,7 +72,7 @@ File.open(vfile, "w") {|f| f.puts vars }
 ####
-debug("-- change_view: #{bold('around_austin')}")
+debug("change_view: #{bold('around_austin')}")
 x.change_view("around_austin")    # 1 2 7 8 9
 make_post(x, "What's at Stubbs...", <<-EXCERPT, <<-BODY)
@@ -142,11 +142,10 @@ But I first heard of them
 in 2005.
 BODY
-debug
-debug "** generate_index #{bold("around_austin")}"
+debug "generate_index #{bold("around_austin")}"
 x.generate_index("around_austin")
-debug("** generate_view: #{bold('around_austin')}")
+debug("generate_view: #{bold('around_austin')}")
 x.generate_view("around_austin")
 debug bold("...finished.\n")

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.02
+  version: 0.3.07
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext