runeblog 0.2.26 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72cd82f9c7134b97443bf105553f82e4520ecc3fee581a9a0543c1ea91cf82b
-  data.tar.gz: 31db4f83710a441e5a27305edba5c198e6e62138e2b40ae4c87131229b7033b5
+  metadata.gz: 24f0f2eb8b2b217131e1a0bf2c74edd38efd672161f4cfbbe2f32caca0f7198a
+  data.tar.gz: a356e607a4e20cf4e024995441966f42031f98ce58ef1bff1b616d3f44446cd2
 SHA512:
-  metadata.gz: 1a74945ef0c5a2bed46e70987895e1a5bd2886de6dde5a433a03b7e827f94aa6d5c2e16f577ee8f04edb76938b1285acb5f9236ebe970146524ab62e1c03504b
-  data.tar.gz: ef357bcfe3df3a79fe91dfc0287b319327bf403a6f26d402975a5b65a67febf72756cbd04a75c7e2489cc9ad3a54859f9e8576094236f147824f5de1450424da
+  metadata.gz: 23d9b96c624032f42f9928e376c3df6d075a548b4f53278c8adecc9c7379ab999b0d2c2964f867c9379fb78d0373863a5de57b52e8c12a3dfbca463f502b288e
+  data.tar.gz: 50b81e2e7db6e3f418600bf529fedd1353eeffb39a1bab6f58ed72641e244d4608c44c580864e9c420a6bdd3f39d40f3a8314b551197ef5d26bcee93366852c6

data/lib/helpers-blog.rb

@@ -67,17 +67,17 @@ module RuneBlog::Helpers
     vals
   end
 
-def put_config(root:, view:"test_view", editor: "/usr/local/bin/vim")
-  log!(enter: __method__, args: [root, view, editor])
-  Dir.mkdir(root) unless Dir.exist?(root)
-  Dir.chdir(root) do 
-    File.open("config", "w") do |cfg|
-      cfg.puts "root: #{root}"
-      cfg.puts "current_view: #{view}"
-      cfg.puts "editor: #{editor}"
-    end
-  end
-end 
+# def put_config(root:, view:"test_view", editor: "/usr/local/bin/vim")
+#   log!(enter: __method__, args: [root, view, editor])
+#   Dir.mkdir(root) unless Dir.exist?(root)
+#   Dir.chdir(root) do 
+#     File.open("config", "w") do |cfg|
+#       cfg.puts "root: #{root}"
+#       cfg.puts "current_view: #{view}"
+#       cfg.puts "editor: #{editor}"
+#     end
+#   end
+# end 
 
   def write_config(obj, file)
     log!(enter: __method__, args: [obj, file])
@@ -95,10 +95,10 @@ end
 
   def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
     log!(enter: __method__, args: [root, current_view, editor])
-    root = Dir.pwd + "/" + root
+    root = Dir.pwd/root
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
-    write_config(x, ".blogs/" + RuneBlog::ConfigFile)
+    write_config(x, root/RuneBlog::ConfigFile)
   end
 
   def new_sequence

data/lib/helpers-repl.rb

@@ -207,19 +207,6 @@ module RuneBlog::REPL
     error(err)
   end
 
-  def ask_publishing_info   # returns Publishing object
-    # user, server, root, path, protocol = "http"
-    puts "Please enter publishing data for view #{@blog.view}..."
-    user = ask("User: ")
-    root = ask("Doc root: ")
-    server = ask("Server: ")
-    path = ask("View path: ")
-    proto = ask("Protocol (ENTER for http): ")
-    [user, root, server, path, proto].each {|x| x.chomp! }
-    proto = "http" if proto.empty?
-    RuneBlog::Publishing.new(user, server, root, path, proto)
-  end
-
   def tags_for_view(vname = @blog.view)
     Dir.chdir(vname) do
       fname = "tagpool"

data/lib/liveblog.rb

@@ -13,7 +13,7 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   here = Dir.pwd
   dir = here
   loop { dir = Dir.pwd; break if File.exist?("config"); Dir.chdir("..") }
-  Dir.chdir(here)
+  Dir.chdir(here)     #  here??? or dir??
   @blog = RuneBlog.new(dir)
   @root = @blog.root
   @view = @blog.view
@@ -23,21 +23,6 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   @theme = @vdir/:themes/:standard
 end
 
-## FIXME - livetext is duplicated from helpers-blog
-#
-#  def livetext(src, dst=nil, cwd=Dir.pwd)
-#    Dir.chdir(cwd) do 
-#      src += ".lt3" unless src.end_with?(".lt3")
-#      if dst
-#        dst += ".html" unless dst.end_with?(".html")
-#      else
-#        dst = src.sub(/.lt3$/, "")
-#      end
-#      return unless stale?(src, dst)
-#      system("livetext #{src} >#{dst}")
-#    end
-#  end
-
 ##################
 # "dot" commands
 ##################
@@ -52,6 +37,27 @@ def backlink
   _out %[<br><a href="javascript:history.go(-1)">[Back]</a>]
 end
 
+def dropcap
+  # Bad form: adds another HEAD
+  _out <<-HTML
+<head>
+<style>
+p:first-child:first-letter {
+  color: #0000ff;
+  float: left;
+  font-family: Georgia;
+  font-size: 75px;
+  line-height: 60px;
+  padding-top: 4px;
+  padding-right: 8px;
+  padding-left: 3px;
+}
+</style>
+</head>
+HTML
+  _out " "
+end
+
 def quote
   _passthru "<blockquote>"
   _passthru _body
@@ -307,7 +313,7 @@ end
 def recent_posts    # side-effect
   _out <<-HTML
     <div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">
-      <iframe id="main" style="width: 100vw; height: 100vh; position: relative;" 
+      <iframe id="main" style="width: 70vw; height: 100vh; position: relative;" 
        src='recent.html' width=100% frameborder="0" allowfullscreen>
       </iframe>
     </div>
@@ -557,24 +563,17 @@ def _write_card(cardfile, mainfile, pairs, card_title, tag, relative: true)
     local = _local_tag?(tag)
     pairs.each do |file, title| 
       url = file
-      yesno = "yes"
-      yesno, title = title.split(/, */) if title =~ /^[yes|no]/   # FIXME please!
-
-      case [yesno, local]
-        when ["yes", false]             # can iframe, remote file
-          url_ref = "href='#{file}'"
-        when ["yes", true]              # can iframe, local file
-          url_ref = _widget_card(file, tag)
-        when ["no", false]              # CAN'T iframe, remote file
-          url_ref = _blank(file)
-        when ["no", true]               # CAN'T iframe, local file (possible?)
-          url_ref = _blank(file)
+      type, title = page_type(tag, title)
+      case type
+        when :local;   url_ref = _widget_main(file, tag)  # local always frameable
+        when :frame;   url_ref = _main(file)              # remote, frameable
+        when :noframe; url_ref = _blank(file)             # remote, not frameable
       end
-
       anchor = %[<a #{url_ref}>#{title}</a>]
       wrapper = %[<li class="list-group-item">#{anchor}</li>]
       f.puts wrapper
     end
+    _include_file cardfile+".html"
     f.puts <<-EOS
           </div>
         </div>
@@ -594,6 +593,20 @@ def _local_tag?(tag)
   end
 end
 
+def page_type(tag, title)
+  yesno = "yes"
+  yesno, title = title.split(/, */) if title =~ /^[yes|no]/
+  local = _local_tag?(tag)
+  frameable = (yesno == "yes")
+  if local
+    return [:local, title]
+  elsif frameable 
+    return [:frame, title]
+  else
+    return [:noframe, title]
+  end
+end
+
 def _write_main(mainfile, pairs, card_title, tag)
   log!(str: "Creating #{mainfile}.html", pwd: true)
   local = _local_tag?(tag)
@@ -601,17 +614,12 @@ def _write_main(mainfile, pairs, card_title, tag)
     _html_body(f) do
       f.puts "<h1>#{card_title}</h1>"
       pairs.each do |file, title| 
-        yesno = "yes"
-        yesno, title = title.split(/, */) if title =~ /^[yes|no]/   # FIXME please!
-        case [yesno, local]
-          when ["yes", false]             # can iframe, remote file
-            url_ref = "href='#{file}'"
-          when ["yes", true]              # can iframe, local file
-            url_ref = _widget_main(file, tag)
-          when ["no", false]              # CAN'T iframe, remote file
-            url_ref = _blank(file)
-          when ["no", true]               # CAN'T iframe, local file (possible?)
-            url_ref = _blank(file)
+        type, title = page_type(tag, title)
+        title = title.gsub(/\\/, "")  # kludge
+        case type
+          when :local;   url_ref = _widget_main(file, tag)  # local always frameable
+          when :frame;   url_ref = "href = '#{file}'"       # local always frameable
+          when :noframe; url_ref = _blank(file)             # local always frameable
         end
         css = "color: #8888FF; text-decoration: none; font-size: 24px; font-family: verdana"
         f.puts %[<a style="#{css}" #{url_ref}>#{title}</a> <br>]

data/lib/post.rb

@@ -63,8 +63,8 @@ class RuneBlog::Post
   end
 
   def self.create(title:, teaser:, body:, pubdate: Time.now.strftime("%Y-%m-%d"),
-                  other_views:[])
-    log!(enter: __method__, args: [title, teaser, body, pubdate, other_views])
+                  views:[])
+    log!(enter: __method__, args: [title, teaser, body, pubdate, views])
     post = self.new
     # NOTE: This is the ONLY place next_sequence is called!
     num = post.meta.num   = post.blog.next_sequence
@@ -72,7 +72,8 @@ class RuneBlog::Post
     # new_metadata
     post.meta.title, post.meta.teaser, post.meta.body, post.meta.pubdate = 
       title, teaser, body, pubdate
-    post.meta.views = [post.blog.view.to_s] + other_views
+    post.meta.views = [post.blog.view.to_s] + views
+# STDERR.puts "Post.create: views = #{views.inspect}"
     post.meta.tags = []
     post.blog.make_slug(post.meta)  # adds to meta
 

data/lib/publish.rb

@@ -7,18 +7,27 @@ class RuneBlog::Publishing
   BadRemoteLogin = Exception.new("Can't login remotely")
   BadRemotePerms = Exception.new("Bad remote permissions")
 
-  def initialize(*params)
-    log!(enter: __method__, args: [*params])
+  def initialize(view)
+    log!(enter: __method__, args: [view.to_s])
     @blog = RuneBlog.blog
-    # Clunky...
-    if params.size == 1 && params[0].is_a?(OpenStruct)
-      obj = params[0]
-      array = obj.to_h.values_at(:user, :server, :docroot, 
-                                 :path, :proto)
-      @user, @server, @docroot, @path, @proto = *array
-    else
-      @user, @server, @docroot, @path, @proto = *params
-    end
+#     # Clunky...
+#     if params.size == 1 && params[0].is_a?(OpenStruct)
+#       obj = params[0]
+#       array = obj.to_h.values_at(:user, :server, :docroot, 
+#                                  :path, :proto)
+#       @user, @server, @docroot, @path, @proto = *array
+#     else
+#       @user, @server, @docroot, @path, @proto = *params
+#     end
+    # find a better way?
+    gfile = @blog.root/:views/view/"themes/standard/global.lt3"
+    data = File.readlines(gfile)
+    grab = ->(var) { data.grep(/^#{var} /).first.chomp.split(" ", 2)[1] }
+    @user    = grab.call("publish.user")
+    @server  = grab.call("publish.server")
+    @docroot = grab.call("publish.docroot")
+    @path    = grab.call("publish.path")
+    @proto   = grab.call("publish.proto")
   end
 
   def to_h
@@ -30,7 +39,7 @@ class RuneBlog::Publishing
   def url
     log!(enter: __method__)
     vname = @blog.view.name # .gsub(/_/, "\\_")
-    url = "#@proto://#@server/#@path/#{vname}"
+    url = "#@proto://#@server/#@path"  # /#{vname}"
   end
 
   def system!(str)
@@ -43,11 +52,11 @@ class RuneBlog::Publishing
     log!(enter: __method__, args: [files, assets])
     dir = @docroot/@path
     view_name = @blog.view.name
-    viewpath = dir/view_name
-    result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}") 
+    viewpath = dir # /view_name
+#   result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}") 
     result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}/assets") 
     files.each do |file|
-      dest = "#@user@#@server:" + dir/view_name
+      dest = "#@user@#@server:" + dir  # /view_name
       file.gsub!(/\/\//, "/")  # weird... :-/
       cmd = "scp -r #{file} #{dest} >/dev/null 2>/tmp/wtf"
       debug "cmd = #{cmd.inspect}  - see /tmp/wtf"

data/lib/repl.rb

@@ -39,10 +39,7 @@ module RuneBlog::REPL
   def cmd_config(arg, testing = false)
     check_empty(arg)
     dir = @blog.view.dir
-# FIXME bad path
-    items = ["publish", 
-             "themes/standard/blogview.lt3", 
-             "themes/standard/post-index.lt3"] 
+    items = ["themes/standard/blogview.lt3", "themes/standard/post-index.lt3"] 
     num, fname = STDSCR.menu(title: "Edit file:", items: items)
     edit_file("#{dir}/#{fname}")
   end
@@ -98,8 +95,9 @@ module RuneBlog::REPL
     reset_output
     check_empty(arg)
     unless @blog.view.can_publish?
-      puts "Can't publish without entries in #{@blog.view.name}/publish" unless testing
-      output! "Can't publish without entries in #{@blog.view.name}/publish"
+      msg = "Can't publish... see globals.lt3"
+      puts msg unless testing
+      output! msg
       return @out
     end
 
@@ -179,12 +177,6 @@ module RuneBlog::REPL
     reset_output
     @blog.create_view(arg)
     @blog.change_view(arg)
-    resp = yesno("Add publishing/hosting info now? (Y/N): ")
-    if resp
-      @blog.view.publisher = ask_publishing_info
-      out = @blog.view.dir + "/publish"
-      write_config(@blog.view.publisher, out)
-    end
     @out
   rescue ViewAlreadyExists
     puts 'Blog already exists'

data/lib/runeblog.rb

@@ -64,7 +64,10 @@ class RuneBlog
       create_dirs(:drafts, :views, :posts)
       new_sequence
     end
-    put_config(root: root)
+#   put_config(root: root)
+    x = OpenStruct.new
+    x.root, x.current_view, x.editor = root, "test_view", "/usr/bin/vim "   # dumb - FIXME later
+    write_config(x, root/ConfigFile)
     @blog = self.new(root)
     @blog.create_view("test_view")
     @blog
@@ -101,16 +104,13 @@ class RuneBlog
   def _deploy_local(dir)
     log!(enter: __method__, args: [dir])
     Dir.chdir(dir) do
-#     views = File.readlines("metadata.txt").grep(/^views: /).first[7..-1].split
       views = _retrieve_metadata(:views)
-STDERR.puts "---- deploy: views = #{views.inspect}"
       views.each {|v| system!("cp *html #@root/views/#{v}/remote") }
     end
   end
 
   def _retrieve_metadata(key)
     key = key.to_s
-STDERR.puts "--- retrieve:  key = #{key.inspect}"
     lines = File.readlines("metadata.txt")
     lines = lines.grep(/^#{key}: /)
     case lines.size
@@ -118,7 +118,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
         result = nil  # not found
       when 1
         front = "#{key}: "
-        n = front.size + 1
+        n = front.size
         str = lines.first.chomp[n..-1]
         case key
           when "views", "tags"   # plurals
@@ -172,10 +172,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
 
   def _set_publisher
     log!(enter: __method__)
-    file = @view.dir/:publish
-    @view.publisher = nil
-    return unless File.exist?(file)
-    @view.publisher = RuneBlog::Publishing.new(read_config(file))
+    @view.publisher = RuneBlog::Publishing.new(@view.to_s)  # FIXME refactor
   end
 
   def view=(arg)
@@ -219,15 +216,6 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     Dir.exist?(DotDir) && File.exist?(DotDir/ConfigFile)
   end
 
-  def make_dummy_publish_file(view_name)
-    log!(enter: __method__, args: [view_name])
-    vdir = @root/:views/view_name
-    pub = [:user, :server, :docroot, :path, :proto]
-    pub = pub.map {|x| x.to_s + ": undefined" }
-    pub = pub.join("\n") + "\n"
-    dump(pub, vdir/:publish)
-  end
-
   def mark_last_published(str)
     log!(enter: __method__, args: [str])
     dump(str, "last_published")
@@ -267,7 +255,6 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     log!(enter: __method__, args: [view_name])
     check_valid_new_view(view_name)
     make_empty_view_tree(view_name)
-    make_dummy_publish_file(view_name)
     mark_last_published("Initial creation")
     add_view(view_name)
   end
@@ -310,7 +297,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     id = slug.to_i
     text = nil
     post_entry_name = @theme/"blog/post_entry.lt3"
-    xlate src: post_entry_name, dst: "/tmp/post_entry.html", debug: true
+    xlate src: post_entry_name, dst: "/tmp/post_entry.html" # , debug: true
     @_post_entry ||= File.read("/tmp/post_entry.html")
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text = 
@@ -349,11 +336,12 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     File.write(@vdir/:remote/file, text)
   end
 
-  def create_new_post(title, testing = false, teaser: nil, body: nil, other_views: [])
-    log!(enter: __method__, args: [title, testing, teaser, body, other_views])
+  def create_new_post(title, testing = false, teaser: nil, body: nil, views: [])
+    log!(enter: __method__, args: [title, testing, teaser, body, views])
     meta = nil
+    views = views + [self.view.to_s]
     Dir.chdir(@root/:posts) do
-      post = Post.create(title: title, teaser: teaser, body: body, other_views: other_views)
+      post = Post.create(title: title, teaser: teaser, body: body, views: views)
       post.edit unless testing
       post.build
       meta = post.meta
@@ -394,7 +382,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     x = OpenStruct.new
     x.root, x.current_view, x.editor = @root, view.to_s, @editor   # dumb - FIXME later
-    write_config(x, ConfigFile)
+    write_config(x, @root/ConfigFile)
     self.view = view   # error checking?
   end
 
@@ -413,6 +401,8 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
           src: "blog.css.lt3", copy: vdir/"remote/etc/blog.css" # , debug: true
     xlate cwd: vdir/"themes/standard",
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
+    copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
+
   end
 
   def _get_views(draft)

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.26"
+  VERSION = "0.2.31"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/lib/view.rb

@@ -12,12 +12,8 @@ class RuneBlog::View
     raise NoBlogAccessor if RuneBlog.blog.nil?
     @blog = RuneBlog.blog
     @name = name
-    @can_publish = false
-    pub_file = @blog.root + "/views/#@name/publish"
-    if File.exist?(pub_file) && File.size(pub_file) != 0
-      @publisher = RuneBlog::Publishing.new(read_config(pub_file))
-      @can_publish = true
-    end
+    @publisher = RuneBlog::Publishing.new(name)
+    @can_publish = true  # FIXME
   end
 
   def dir
@@ -45,7 +41,8 @@ class RuneBlog::View
     vdir = dir()
     remote = local_index()
     files = [remote]
-    others = Dir.entries(vdir + "/remote").map {|x| "#{vdir}/remote/#{x}" }
+    others = Dir.entries(vdir/:remote) - %w[. ..]
+    others.map! {|x| "#{vdir}/remote/#{x}" }
 
     assets = Dir.entries("#{vdir}/assets") - %w[. ..]
     assets.map! {|x| "#{vdir}/assets/#{x}" }

data/test/general_test.rb

@@ -219,7 +219,7 @@ class TestREPL < Minitest::Test
     @blog.undelete_post(7)
   end
 
-if File.exist?("testing.publish")
+if File.exist?("testing.publish")  # FIXME!!!
 
   def xtest_016_can_publish
 #   puts __method__

data/test/make_blog.rb

@@ -29,7 +29,7 @@ end
 
 def make_post(x, title, teaser, body, views=[])
   debug "      make_post #{bold(title)}"
-  x.create_new_post(title, true, teaser: teaser, body: body, other_views: views)
+  x.create_new_post(title, true, teaser: teaser, body: body, views: views)
   views.each do |view| 
     debug
     debug "** generate_index #{bold(view)}"
@@ -46,7 +46,7 @@ end
 
 #  "Main"...
 
-puts Time.now
+puts bold("\nGenerating test blog...")
 
 system("rm -rf .blogs")
 RuneBlog.create_new_blog_repo(".blogs")
@@ -116,8 +116,32 @@ x.change_view("around_austin")
 make_post(x, "The graffiti wall", <<-EXCERPT, <<-BODY)
 RIP, Hope Gallery
 EXCERPT
+.dropcap
+
 It's been a while since I was there. They say it was torn down
 while I wasn't looking.
+
+This fake entry is a long one so as to demonstrate both drop-caps
+(above) and an inset quote. Blah blah blah. Lorem ipsum dolor and
+a partridge in a pear tree.
+
+Wherever you go, there you are. Last night I saw upon the stair
+a little man who was not there. He wasn't there again today; I
+wish, I wish he'd go away.
+
+As far as we know, our computer has never had an undetected error.
+And never let it be denied that pobbles are happier without their
+toes. And may your snark never be a boojum.
+
+Contact light. Houston, this is Tranquility Base. The Eagle has
+landed. That's one small step for (a) man, one giant leap for 
+mankind.
+.inset left
+On a clean disk, you can seek forever.
+.end
+
+Pity this busy monster, manunkind, not. Pity rather... Listen:
+There's a hell of a universe next door; let's go.
 BODY
 
 make_post(x, "The Waller Creek project", <<-EXCERPT, <<-BODY)
@@ -145,5 +169,7 @@ BODY
 debug
 debug("** generate_view: #{bold('around_austin')}")
 x.generate_view("around_austin")
+x.change_view("around_austin")
+
+puts bold("...finished.\n")
 
-debug

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.26
+  version: 0.2.31
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2019-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext