RubyGems - runeblog - Versions diffs - 0.2.27 → 0.2.32 - Mend

runeblog 0.2.27 → 0.2.32

Files changed (11) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 631b81f8592a8997e7d8c6fee1fc2f71a03e97e42d33e64e221e9971d08319ec
-  data.tar.gz: 64b2c372f7d4f4c1d3cfa7fdd19c178087e0444f712773cb523e990ec220cf5b
+  metadata.gz: 1504fe8e39cd4ed6b42b0b6a9a8b1189d6a67b8b78c5e7a62031027f6ab10259
+  data.tar.gz: cfc166148ecf09d303e355fa2770b07f8affe79743fa5ad2d554f8d3411063d5
 SHA512:
-  metadata.gz: a27f9f6fd7c8859bacfd7ad112918bfebd416e436b4852523b41f449311ae63cab5d085830947022f87fa1a3c2d70b639e0e5d672176e3fcdbc2ff461cc3effa
-  data.tar.gz: 16eebca900c51bbadbb9ebaa14832b5a91375f726db789c50e9aad188be2f853859bc7dbf8a31798ec79735bae150eccf2a9cbf97c68cff5656af686acc26f26
+  metadata.gz: 9f3a7d4e429cd06e79bb213ed7fe79062117ba52d1a2238e55f2ed68ae88d23b0781190a7e27b7e3894650bbb1a79ebae33598f87ecd76368d4071fcd656296a
+  data.tar.gz: 4550b4d5f419d096b0ebf98574d7c6f8277bad4821730df88dbb8b404132f13fcf5bccb6b56e3cb7430c1ca19fe6c5562b6285470d6674f3c8bd7c65370d3ff3

data/empty_view.tgz CHANGED

Binary file

data/lib/liveblog.rb CHANGED

@@ -37,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
@@ -292,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>
@@ -542,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>
@@ -579,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)
@@ -586,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 CHANGED

@@ -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 CHANGED

@@ -39,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)
@@ -52,11 +52,11 @@ class RuneBlog::Publishing
     log!(enter: __method__, args: [files, assets])
     dir = @docroot/@path
     view_name = @blog.view.name
-    viewpath = dir/view_name
+    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 CHANGED

@@ -91,26 +91,18 @@ module RuneBlog::REPL
   def cmd_publish(arg, testing = false)
 # Future Hal says please refactor this
-STDERR.puts :CP1
     puts unless testing
-STDERR.puts :CP2
     reset_output
-STDERR.puts :CP3
     check_empty(arg)
-STDERR.puts :CP4
     unless @blog.view.can_publish?
-STDERR.puts :CP5
       msg = "Can't publish... see globals.lt3"
       puts msg unless testing
       output! msg
       return @out
     end
-STDERR.puts :CP6
     # Need to check dirty/clean status first
     dirty, all, assets = @blog.view.publishable_files
-STDERR.puts [dirty, all, assets].inspect
-sleep 8
     files = dirty
     if dirty.empty?
       puts fx("\n  No files are out of date." + " "*20, :bold)

data/lib/runeblog.rb CHANGED

@@ -118,7 +118,7 @@ class RuneBlog
         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
@@ -297,7 +297,7 @@ class RuneBlog
     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 =
@@ -336,12 +336,12 @@ class RuneBlog
     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
-STDERR.puts other_views.inspect
+    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
@@ -401,6 +401,8 @@ STDERR.puts other_views.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 CHANGED

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

data/lib/view.rb CHANGED

@@ -41,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/make_blog.rb CHANGED

@@ -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 20
+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 CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.2.32
 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