runeblog 0.2.35 → 0.2.40

data/empty_view/themes/standard/widgets/tag-cloud/pieces/main-tail.lt3

@@ -0,0 +1,4 @@
+.include ../local_vars.lt3
+. Material (if any) to go after main data
+  </body>
+</html> 

data/empty_view/themes/standard/widgets/tag-cloud/tag-cloud.lt3

@@ -1,12 +1,3 @@
 .mixin liveblog
 
-.tag_cloud
-https://google.com/,btn btn-dark m-1,Programming
-https://google.com/,btn btn-danger m-1,Science Fiction
-https://google.com/,btn btn-light m-1,Art
-https://google.com/,btn btn-dark m-1,Robotics
-https://google.com/,btn btn-warning m-1,Food and Travel
-https://google.com/,btn btn-light m-1,DIY Hacks
-https://google.com/,btn btn-info m-1,Surfing
-.end
-
+<h3>Currently nothing here -- not implemented</h3)

data/empty_view/themes/standard/widgets/tag-cloud/tag-cloud.rb

@@ -0,0 +1,14 @@
+# Custom code for 'tag-cloud' widget
+
+class ::RuneBlog::Widget
+  class TagCloud
+    def self.build
+    end
+
+    def self.edit_menu
+    end
+
+    def self.refresh
+    end
+  end
+end

data/lib/helpers-repl.rb

@@ -40,7 +40,9 @@ module RuneBlog::REPL
      "list assets"       => :cmd_list_assets,
      "lsa"               => :cmd_list_assets,
 
-     "delete >postid"        => :cmd_remove_post,
+     "pages"             => :cmd_pages,
+
+     "delete >postid"    => :cmd_remove_post,
      "undel $postid"     => :cmd_undelete_post,
 
      "edit $postid"      => :cmd_edit_post,
@@ -103,7 +105,7 @@ module RuneBlog::REPL
     end
     meth = found || :cmd_INVALID
     params = cmd if meth == :cmd_INVALID
-puts "choose: #{[meth, params].inspect}"
+# puts "choose: #{[meth, params].inspect}"
     [meth, params]
   end
 

data/lib/liveblog.rb

@@ -45,7 +45,7 @@ def dropcap
 p:first-child:first-letter {
   color: #0000ff;
   float: left;
-  font-family: Georgia;
+  font-family: Verdana;
   font-size: 75px;
   line-height: 60px;
   padding-top: 4px;
@@ -142,7 +142,7 @@ def inset
   end
   lr = _args.first
   wide = _args[1] || "25"
-  _passthru "<div style='float:#{lr}; width: #{wide}%; padding:8px; padding-right:12px; font-family:verdana'>"
+  _passthru "<div style='float:#{lr}; width: #{wide}%; padding:8px; padding-right:12px'>"   # ; font-family:verdana'>"
   _passthru '<b><i>'
   _passthru box
   _passthru_noline '</i></b></div>'
@@ -319,6 +319,29 @@ def recent_posts    # side-effect
   HTML
 end
 
+def _make_class_name(app)
+  if app =~ /[-_]/
+    words = app.split(/[-_]/)
+    name = words.map(&:capitalize).join
+  else
+    name = app.capitalize
+  end
+  return name
+end
+
+def _load_local(widget)
+  Dir.chdir("widgets/#{widget}") do
+    rclass = _make_class_name(widget)
+    found = (require("./#{widget}") if File.exist?("#{widget}.rb"))
+    code = found ? ::RuneBlog::Widget.class_eval(rclass) : nil
+    code
+  end
+rescue => err
+  STDOUT.puts err
+  STDOUT.puts err.backtrace.join("\n")
+  exit
+end
+
 def sidebar
   if _args.include? "off"
     _body { }  # iterate, do nothing
@@ -331,17 +354,25 @@ def sidebar
     wtag = :widgets/tag
     raise "Can't find #{wtag}" unless Dir.exist?(wtag)
     tcard = "#{tag}-card.html"
-    if File.exist?(wtag/"SUBFILES")
-      children = Dir[wtag/"*.lt3"] - [wtag/tag+".lt3"]
-      children.each do |child|
-        dest = child.sub(/.lt3$/, ".html")
-        xlate src: child, dst: dest  # , debug: true
-      end
-    end
+
+    code = _load_local(tag)
+    code && Dir.chdir(wtag) { code.build }
+
+#    if File.exist?(wtag/"SUBFILES")
+#      children = Dir[wtag/"*.lt3"] - [wtag/tag+".lt3"]
+#      children.each do |child|
+#        dest = child.sub(/.lt3$/, ".html")
+#        xlate src: child, dst: dest  # , debug: true
+#      end
+#    end
     xlate cwd: wtag, src: tag, dst: tcard  # , debug: true
     _include_file wtag/tcard
   end
   _out %[</div>]
+rescue => err
+  puts "err = #{err}"
+  puts err.backtrace.join("\n")
+  exit
 end
 
 def stylesheet
@@ -606,12 +637,44 @@ def page_type(tag, title)
   end
 end
 
+def _write_main_pages(mainfile, pairs, card_title, tag)
+  local = _local_tag?(tag)
+  pieces = @blog.view.dir/"themes/standard/widgets"/tag/:pieces
+  main_head = xlate! cwd: pieces, src: "main-head.lt3"
+  main_tail = xlate! cwd: pieces, src: "main-tail.lt3"
+  # ^ make into methods in pages.rb or whatever?
+                    
+  File.open("#{mainfile}.html", "w") do |f|
+    f.puts main_head
+    pairs.each do |file, title| 
+      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: 21px"   # ; font-family: verdana"
+      f.puts %[<a style="#{css}" #{url_ref}>#{title}</a> <br>]
+    end
+    f.puts main_tail
+  end
+end
+
 def _write_main(mainfile, pairs, card_title, tag)
   log!(str: "Creating #{mainfile}.html", pwd: true)
+
+  if tag == "pages"   # temporary experiment
+    _write_main_pages(mainfile, pairs, card_title, tag)
+    return
+  end
+
   local = _local_tag?(tag)
+  setvar "card.title", card_title
+  css = "* { font-family: verdana }"
   File.open("#{mainfile}.html", "w") do |f|
-    _html_body(f) do
-      f.puts "<h1>#{card_title}</h1>"
+    _html_body(f, css) do
+      f.puts "<h1>#{card_title}</h1><br><hr>"
       pairs.each do |file, title| 
         type, title = page_type(tag, title)
         title = title.gsub(/\\/, "")  # kludge
@@ -620,7 +683,7 @@ def _write_main(mainfile, pairs, card_title, tag)
           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"
+        css = "color: #8888FF; text-decoration: none; font-size: 21px"  # ; font-family: verdana"
         f.puts %[<a style="#{css}" #{url_ref}>#{title}</a> <br>]
       end
     end

data/lib/publish.rb

@@ -10,16 +10,6 @@ class RuneBlog::Publishing
   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
-    # 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] }

data/lib/repl.rb

@@ -36,28 +36,40 @@ module RuneBlog::REPL
     @out
   end
 
-  def cmd_config(arg, testing = false)
+  def cmd_pages(arg, testing = false)
     check_empty(arg)
-    dir = @blog.view.dir
-    items = ["themes/standard/blogview.lt3", "themes/standard/post-index.lt3"] 
-    num, fname = STDSCR.menu(title: "Edit file:", items: items)
-    edit_file("#{dir}/#{fname}")
-  end
-
-  # Currently not used
-  def cmd_customize(arg, testing = false)
-    # add extra views? add tags?
-    puts "\n  This is still buggy.\n "
-    return
-
-    avail_tags = all_tags
-    tags = STDSCR.multimenu(items: avail_tags)
-    @blog.post_tags = tags
-  end
-  
-  def cmd_tags(arg, testing = false)
-    Dir.chdir(@blog.root + "/views/" + @blog.view.name)
-    edit_file("tagpool")
+    dir = @blog.view.dir/"themes/standard/widgets/pages"
+    # Assume child files already generated (and list.data??)
+    data = dir/"list.data"
+    lines = File.readlines(data)
+    hash = {}
+    lines.each do |line|
+      url, name = line.chomp.split(",")
+      source = url.sub(/.html$/, ".lt3")
+      hash[name] = source
+    end
+    new_item = "[New page]"
+    num, fname = STDSCR.menu(title: "Edit page:", items: hash.keys + [new_item])
+    return if fname.nil?
+    if fname == new_item
+      print "Page title:  "
+      title = RubyText.gets
+      title.chomp!
+      print "File name (.lt3): "
+      fname = RubyText.gets
+      fname << ".lt3" unless fname.end_with?(".lt3")
+      fhtml = fname.sub(/.lt3$/, ".html")
+      File.open(data, "a") {|f| f.puts "#{fhtml},#{title}" }
+      new_file = dir/fname
+      File.open(new_file, "w") do |f|
+        f.puts "<h1>#{title}</h1>\n\n\n "
+        f.puts ".backlink"
+      end
+      edit_file(new_file)
+    else
+      target = hash[fname]
+      edit_file(dir/target)
+    end
   end
 
   def cmd_import(arg, testing = false)
@@ -143,6 +155,7 @@ module RuneBlog::REPL
       n = viewnames.find_index(@blog.view.name)
       name = @blog.view.name
       k, name = STDSCR.menu(title: "Views", items: viewnames, curr: n) unless testing
+      return if name.nil?
       @blog.view = name
       output name + "\n"
       puts "\n  ", fx(name, :bold), "\n" unless testing

data/lib/runeblog.rb

@@ -60,7 +60,6 @@ class RuneBlog
     raise BlogRepoAlreadyExists if Dir.exist?(root)
     create_dirs(root)
     Dir.chdir(root) do
-      system!("cp #{RuneBlog::Path}/../empty_view.tgz .")
       create_dirs(:drafts, :views, :posts)
       new_sequence
     end
@@ -218,7 +217,7 @@ class RuneBlog
 
   def mark_last_published(str)
     log!(enter: __method__, args: [str])
-    dump(str, "last_published")
+    dump(str, "#{self.view.dir}/last_published")
   end
 
   def add_view(view_name)
@@ -253,8 +252,8 @@ class RuneBlog
     log!(enter: __method__, args: [view_name])
     check_valid_new_view(view_name)
     make_empty_view_tree(view_name)
-    mark_last_published("Initial creation")
     add_view(view_name)
+    mark_last_published("Initial creation")
   end
 
   def delete_view(name, force = false)
@@ -394,13 +393,15 @@ class RuneBlog
 
   def generate_view(view)  # huh?
     log!(enter: __method__, args: [view])
-    generate_index(view)   # recent posts (recent.html)
+#   generate_index(view)   # recent posts (recent.html)
     vdir = @root/:views/view
     @theme = @root/:views/view/:themes/:standard
     xlate cwd: vdir/"themes/standard/etc",
           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"
+    generate_index(view)   # recent posts (recent.html)
+#   ^ HERE
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
   rescue => err
     puts err
@@ -455,8 +456,8 @@ class RuneBlog
       rem = w.sub(/themes.standard/, "remote")
       create_dirs(rem)
       files = Dir[w/"*"]
-      next unless files.any? {|x| x =~ /html$/ }
-      system!("cp #{w}/*html #{rem}")
+      files = files.select {|x| x =~ /(html|css)$/ }
+      files.each {|file| system!("cp #{file} #{rem}") }
     end
   end
 
@@ -494,7 +495,8 @@ class RuneBlog
     views = _get_views(draft)
     views.each do |view| 
       _handle_post(draft, view)
-      generate_view(view)  # FIXME leads to inefficiency?
+#     generate_view(view)  # FIXME leads to inefficiency?
+#     ^ HERE
     end
   end
 

data/lib/runeblog_version.rb

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

data/lib/view.rb

@@ -61,7 +61,7 @@ class RuneBlog::View
 
   def recent?(file)
     log!(enter: __method__, args: [file])
-    File.mtime(file) > File.mtime("#{dir()}/last_published")
+    File.mtime(file) > File.mtime("#{self.dir()}/last_published")
   rescue
     true
   end

data/lib/xlate.rb

@@ -35,3 +35,8 @@ LEXT = ".lt3"
     end
   end
 
+  def xlate!(cwd: Dir.pwd, src:, copy: nil, debug: false, force: false)
+    output = "/tmp/xlate-#{File.basename(src).sub(/.lt3$/, "")}"
+    xlate cwd: cwd, src: src, dst: output, debug: debug, force: force
+    File.read(output + ".html")  # return all content as string
+  end

data/test/make_blog.rb

@@ -22,9 +22,9 @@ def debug(str = "")
   t = Time.now
   time = t.to_f.to_s
   n = time.index(".")
-  msec = time[n..-1]
+  msec = time[n..(n+2)]
   time = t.strftime("%H:%M:%S") + msec
-  STDERR.puts "#{'%-16s' % time}  #{str}"
+  STDERR.puts "#{'%-11s' % time}  #{str}"
 end
 
 def make_post(x, title, teaser, body, views=[])
@@ -46,6 +46,8 @@ end
 
 #  "Main"...
 
+t0 = Time.now
+
 puts bold("\nGenerating test blog...")
 
 system("rm -rf .blogs")
@@ -55,6 +57,19 @@ x = RuneBlog.new(".blogs")
 debug("create_view: #{bold('around_austin')}")
 x.create_view("around_austin")   # FIXME remember view title!
 
+#### FIXME later!!
+vars = <<-VARS
+
+.variables
+blog       Around Austin
+blog.desc  The view from downtown...
+.end
+VARS
+File.open(".blogs/views/around_austin/themes/standard/global.lt3", "a") do |f|
+  f.puts vars
+end
+####
+
 debug("create_view: #{bold('computing')}")
 x.create_view("computing")
 
@@ -170,6 +185,12 @@ debug
 debug("** generate_view: #{bold('around_austin')}")
 x.generate_view("around_austin")
 x.change_view("around_austin")
+debug
 
 puts bold("...finished.\n")
 
+t1 = Time.now
+
+elapsed = t1 - t0
+puts "\nElapsed: #{'%3.2f' % elapsed} secs\n "
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.35
+  version: 0.2.40
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-13 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -61,10 +61,14 @@ files:
 - "./README.md"
 - "./runeblog.gemspec"
 - bin/blog
+- bin/mkwidget
 - empty_view/assets/sky2.jpg
+- empty_view/remote/assets/GIT_IS_DUMB
+- empty_view/remote/etc/GIT_IS_DUMB
+- empty_view/remote/navbar/GIT_IS_DUMB
+- empty_view/remote/permalink/GIT_IS_DUMB
 - empty_view/remote/widgets/links/list.data
 - empty_view/remote/widgets/news/list.data
-- empty_view/remote/widgets/pages/SUBFILES
 - empty_view/remote/widgets/pages/list.data
 - empty_view/themes/standard/README
 - empty_view/themes/standard/blog/generate.lt3
@@ -85,21 +89,103 @@ files:
 - empty_view/themes/standard/post/permalink.lt3
 - empty_view/themes/standard/widgets/README
 - empty_view/themes/standard/widgets/ad/ad.lt3
-- empty_view/themes/standard/widgets/calendar/calendar.lt3
+- empty_view/themes/standard/widgets/bydates/README
+- empty_view/themes/standard/widgets/bydates/bydates.lt3
+- empty_view/themes/standard/widgets/bydates/bydates.rb
+- empty_view/themes/standard/widgets/bydates/card.css
+- empty_view/themes/standard/widgets/bydates/custom.rb
+- empty_view/themes/standard/widgets/bydates/local-vars.lt3
+- empty_view/themes/standard/widgets/bydates/main.css
+- empty_view/themes/standard/widgets/bydates/pieces/card-head.lt3
+- empty_view/themes/standard/widgets/bydates/pieces/card-tail.lt3
+- empty_view/themes/standard/widgets/bydates/pieces/main-head.lt3
+- empty_view/themes/standard/widgets/bydates/pieces/main-tail.lt3
+- empty_view/themes/standard/widgets/links/README
+- empty_view/themes/standard/widgets/links/card.css
+- empty_view/themes/standard/widgets/links/custom.rb
 - empty_view/themes/standard/widgets/links/links.lt3
+- empty_view/themes/standard/widgets/links/links.rb
 - empty_view/themes/standard/widgets/links/list.data
+- empty_view/themes/standard/widgets/links/local-vars.lt3
+- empty_view/themes/standard/widgets/links/main.css
+- empty_view/themes/standard/widgets/links/pieces/card-head.lt3
+- empty_view/themes/standard/widgets/links/pieces/card-tail.lt3
+- empty_view/themes/standard/widgets/links/pieces/main-head.lt3
+- empty_view/themes/standard/widgets/links/pieces/main-tail.lt3
+- empty_view/themes/standard/widgets/news/README
+- empty_view/themes/standard/widgets/news/card.css
+- empty_view/themes/standard/widgets/news/custom.rb
 - empty_view/themes/standard/widgets/news/list.data
+- empty_view/themes/standard/widgets/news/local-vars.lt3
+- empty_view/themes/standard/widgets/news/main.css
 - empty_view/themes/standard/widgets/news/news.lt3
+- empty_view/themes/standard/widgets/news/news.rb
+- empty_view/themes/standard/widgets/news/pieces/card-head.lt3
+- empty_view/themes/standard/widgets/news/pieces/card-tail.lt3
+- empty_view/themes/standard/widgets/news/pieces/main-head.lt3
+- empty_view/themes/standard/widgets/news/pieces/main-tail.lt3
 - empty_view/themes/standard/widgets/pages/README
-- empty_view/themes/standard/widgets/pages/SUBFILES
+- empty_view/themes/standard/widgets/pages/card.css
+- empty_view/themes/standard/widgets/pages/custom.rb
 - empty_view/themes/standard/widgets/pages/disclaim.lt3
 - empty_view/themes/standard/widgets/pages/faq.lt3
-- empty_view/themes/standard/widgets/pages/generated.lt3
 - empty_view/themes/standard/widgets/pages/like-dislike.lt3
 - empty_view/themes/standard/widgets/pages/list.data
+- empty_view/themes/standard/widgets/pages/local-vars.lt3
+- empty_view/themes/standard/widgets/pages/local.rb
+- empty_view/themes/standard/widgets/pages/main.css
 - empty_view/themes/standard/widgets/pages/other-stuff.lt3
 - empty_view/themes/standard/widgets/pages/pages.lt3
+- empty_view/themes/standard/widgets/pages/pages.rb
+- empty_view/themes/standard/widgets/pages/pieces/card-head.lt3
+- empty_view/themes/standard/widgets/pages/pieces/card-tail.lt3
+- empty_view/themes/standard/widgets/pages/pieces/main-head.lt3
+- empty_view/themes/standard/widgets/pages/pieces/main-tail.lt3
+- empty_view/themes/standard/widgets/pinned/README
+- empty_view/themes/standard/widgets/pinned/card.css
+- empty_view/themes/standard/widgets/pinned/custom.rb
+- empty_view/themes/standard/widgets/pinned/local-vars.lt3
+- empty_view/themes/standard/widgets/pinned/main.css
+- empty_view/themes/standard/widgets/pinned/pieces/card-head.lt3
+- empty_view/themes/standard/widgets/pinned/pieces/card-tail.lt3
+- empty_view/themes/standard/widgets/pinned/pieces/main-head.lt3
+- empty_view/themes/standard/widgets/pinned/pieces/main-tail.lt3
+- empty_view/themes/standard/widgets/pinned/pinned.lt3
+- empty_view/themes/standard/widgets/pinned/pinned.rb
+- empty_view/themes/standard/widgets/search/README
+- empty_view/themes/standard/widgets/search/card.css
+- empty_view/themes/standard/widgets/search/custom.rb
+- empty_view/themes/standard/widgets/search/local-vars.lt3
+- empty_view/themes/standard/widgets/search/main.css
+- empty_view/themes/standard/widgets/search/pieces/card-head.lt3
+- empty_view/themes/standard/widgets/search/pieces/card-tail.lt3
+- empty_view/themes/standard/widgets/search/pieces/main-head.lt3
+- empty_view/themes/standard/widgets/search/pieces/main-tail.lt3
+- empty_view/themes/standard/widgets/search/search.lt3
+- empty_view/themes/standard/widgets/search/search.rb
+- empty_view/themes/standard/widgets/sitemap/README
+- empty_view/themes/standard/widgets/sitemap/card.css
+- empty_view/themes/standard/widgets/sitemap/custom.rb
+- empty_view/themes/standard/widgets/sitemap/local-vars.lt3
+- empty_view/themes/standard/widgets/sitemap/main.css
+- empty_view/themes/standard/widgets/sitemap/pieces/card-head.lt3
+- empty_view/themes/standard/widgets/sitemap/pieces/card-tail.lt3
+- empty_view/themes/standard/widgets/sitemap/pieces/main-head.lt3
+- empty_view/themes/standard/widgets/sitemap/pieces/main-tail.lt3
+- empty_view/themes/standard/widgets/sitemap/sitemap.lt3
+- empty_view/themes/standard/widgets/sitemap/sitemap.rb
+- empty_view/themes/standard/widgets/tag-cloud/OLD-example.lt3
+- empty_view/themes/standard/widgets/tag-cloud/README
+- empty_view/themes/standard/widgets/tag-cloud/card.css
+- empty_view/themes/standard/widgets/tag-cloud/custom.rb
+- empty_view/themes/standard/widgets/tag-cloud/local-vars.lt3
+- empty_view/themes/standard/widgets/tag-cloud/main.css
+- empty_view/themes/standard/widgets/tag-cloud/pieces/card-head.lt3
+- empty_view/themes/standard/widgets/tag-cloud/pieces/card-tail.lt3
+- empty_view/themes/standard/widgets/tag-cloud/pieces/main-head.lt3
+- empty_view/themes/standard/widgets/tag-cloud/pieces/main-tail.lt3
 - empty_view/themes/standard/widgets/tag-cloud/tag-cloud.lt3
+- empty_view/themes/standard/widgets/tag-cloud/tag-cloud.rb
 - lib/Javascript.stuff
 - lib/default.rb
 - lib/global.rb