runeblog 0.2.39 → 0.2.40

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,13 +319,21 @@ 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
-# STDERR.puts "loadCP1 widget = #{widget.inspect}  pwd = #{Dir.pwd}"
+    rclass = _make_class_name(widget)
     found = (require("./#{widget}") if File.exist?("#{widget}.rb"))
-# STDERR.puts "loadCP2 found = #{found}"
-    code = found ? ::RuneBlog::Widget.class_eval(widget.capitalize) : nil
-# STDERR.puts "loadCP3 code = #{code.inspect}"
+    code = found ? ::RuneBlog::Widget.class_eval(rclass) : nil
     code
   end
 rescue => err
@@ -646,7 +654,7 @@ def _write_main_pages(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
     f.puts main_tail
@@ -663,9 +671,10 @@ def _write_main(mainfile, pairs, card_title, tag)
 
   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
@@ -674,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/runeblog.rb

@@ -393,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
@@ -454,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
 
@@ -493,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.39"
+  VERSION = "0.2.40"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

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.39
+  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,6 +61,7 @@ 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
@@ -88,27 +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/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/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/card.css
 - 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/pages/pieces/main.css
+- 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

data/empty_view/themes/standard/widgets/calendar/calendar.lt3

@@ -1,6 +0,0 @@
-
-.card_iframe Calendar
-https://calendar.google.com/calendar/embed?src=en-gb.indian%23holiday%40group.v.calendar.google.com&ctz=Asia%2FKolkata
-height="350"
-.end
-

data/empty_view/themes/standard/widgets/pages/pieces/main.css

@@ -1 +0,0 @@
-