RubyGems - runeblog - Versions diffs - 0.2.40 → 0.2.45 - Mend

runeblog 0.2.40 → 0.2.45

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 (37) hide show

checksums.yaml +4 -4
data/bin/blog +4 -7
data/empty_view/themes/standard/blog/post_entry.lt3 +11 -10
data/empty_view/themes/standard/etc/blog.css.lt3 +6 -1
data/empty_view/themes/standard/navbar/faq.lt3 +1 -0
data/empty_view/themes/standard/navbar/navbar.lt3 +1 -0
data/empty_view/themes/standard/post/generate.lt3 +9 -4
data/empty_view/themes/standard/widgets/ad/ad.lt3 +8 -1
data/empty_view/themes/standard/widgets/ad/ad1.png +0 -0
data/empty_view/themes/standard/widgets/ad/ad2.png +0 -0
data/empty_view/themes/standard/widgets/ad/ad3.png +0 -0
data/empty_view/themes/standard/widgets/ad/ad4.png +0 -0
data/empty_view/themes/standard/widgets/bydates/bydates.rb +7 -3
data/empty_view/themes/standard/widgets/links/links.rb +28 -3
data/empty_view/themes/standard/widgets/news/news.rb +7 -3
data/empty_view/themes/standard/widgets/pages/pages.rb +10 -3
data/empty_view/themes/standard/widgets/pinned/pinned.rb +7 -3
data/empty_view/themes/standard/widgets/search/search.rb +7 -3
data/empty_view/themes/standard/widgets/sitemap/sitemap.rb +7 -3
data/empty_view/themes/standard/widgets/tag-cloud/tag-cloud.rb +7 -3
data/lib/default.rb +1 -4
data/lib/global.rb +8 -7
data/lib/helpers-blog.rb +15 -15
data/lib/liveblog.rb +47 -18
data/lib/logging.rb +17 -8
data/lib/post.rb +6 -6
data/lib/publish.rb +4 -4
data/lib/repl.rb +1 -0
data/lib/runeblog.rb +77 -47
data/lib/runeblog_version.rb +1 -1
data/lib/view.rb +2 -8
data/lib/xlate.rb +2 -2
data/test/austin.rb +157 -0
metadata +8 -5
data/empty_view/remote/widgets/links/list.data +0 -3
data/empty_view/remote/widgets/news/list.data +0 -4
data/empty_view/remote/widgets/pages/list.data +0 -4

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1460a49516637ecabe93e6ce0ac61ce81d8078b5e594d0cb89712ddec53348b7
-  data.tar.gz: be574f51016c5dfd67fbb2ff0bb5bb62872e8d1834c9cb1063d605bb0f8f732f
+  metadata.gz: a8bb9a39d611dfe53e5ef484072a68b6c28791563469f591c0ed0b1f2af8d19b
+  data.tar.gz: 3280e0cec145361c3422de113d54f1c54fa617993c96010a06604f8a81f9b2d3
 SHA512:
-  metadata.gz: f647aa5fd1f283ed65f3fd9c76c40ce23c2eb94312dfa7e8b82405c2a11e137ad6e7f70f8d9bce8c4de101a6cd02cbb1ab6c03b5d5c557e98fd0edcd782b48a9
-  data.tar.gz: e1ee53e25579b8643545006b17e5180f001c8a81867b73c232e97950fd247788284038e6b980b627c32c59e4fbdc5fdfc5dcdde1011b1282377a34caabe7134a
+  metadata.gz: dfa3e81153739ccbb5cbea452a33ba523141025df409cd2a33e55d03dd51b4c800a5e49e5fa102063dd71793187df5bed62e847e00bfa75b35dcbc35ed5c3ddf
+  data.tar.gz: 3b93280f1ac1a370d7ab7ff4f4c1fd28a4cba94af74ebdfb0fc59f21ea1081079786a39f8de9f75216205a256193e774bc379841e675e49600ca7748ed0e655b

data/bin/blog CHANGED

@@ -16,10 +16,9 @@ def get_started
   puts
   puts fx(<<-TEXT, :bold)
   Blog repo successfully created.
-  You can create views with the command: new view
-  Create a post within the current view: new post
-  You can't publish until you set up the publish file
-    via the config command.
+  For help, type h or help.
+  Create views with: new view
+  Create a post (within current view): new post
 TEXT
 end
@@ -55,9 +54,7 @@ if ! RuneBlog.exist?
   print fx("\n  No blog repo found. Create new one? (y/n): ", :bold)
   response = gets.chomp
   if response.downcase == "y"
-    print fx("\n Enter default view name: ", :bold)
-    view_name = gets.chomp
-    RuneBlog.create_new_blog_repo(view_name)
+    RuneBlog.create_new_blog_repo
     get_started
   else
     exit

data/empty_view/themes/standard/blog/post_entry.lt3 CHANGED

@@ -4,18 +4,19 @@
 . --------------------------------------------------
 <div class="post">
-  <table width=100%>
+  <table width=100% cellpadding=7>
     <tr>
-      <td width=12% valign=top>
-        <span class="post-date mt-1 mb-1">
-          <b>#{date}</b>
-        </span>
+      <td width=14% valign=top align=right style="margin-top: -1px;">
+<!--        <span class="post-date mt-1 mb-1" style="margin-top: 3px; text-align: right"> -->
+          <font size=-1><b>#{date}</b></font>
+<!--        </span> -->
       </td>
-      <td> <!--        <span class="post-title-box"> -->
-          <span class="post-title-text"><a href="#{url}">#{title}</a></span>
-          <b>#{teaser_text}</b>
-          <br>
-          <a style="text-decoration: none" href="#{url}"><small>Keep reading...</small></a></p> <!--        </span>  -->
+      <td>
+        <!--        <span class="post-title-box"> -->
+          <span class="post-title-text"><a href="#{url}" style="margin-top: -5px">#{title}</a></span>
+          <b>#{teaser_text}</b>&nbsp;&nbsp;
+          <a style="text-decoration: none" href="#{url}"><small>Keep reading...</small></a>
+        <!--        </span>  -->
       </td>
     </tr>
   </table>

data/empty_view/themes/standard/etc/blog.css.lt3 CHANGED

@@ -24,7 +24,6 @@
 \.post-title-text a {
   color: $post.text.color;
   font-size: $post.text.size;
-# float: right;
   display: block;
   text-decoration: none;
 }
@@ -41,3 +40,9 @@
   text-align: top;
 }
+. not used?
+\.thumbnail img {
+    max-height: 100%;
+    max-width: 100%;
+}

data/empty_view/themes/standard/navbar/faq.lt3 ADDED

	@@ -0,0 +1 @@
1	+ .include ../widgets/pages/faq.lt3

data/empty_view/themes/standard/navbar/navbar.lt3 CHANGED

@@ -12,5 +12,6 @@
   index   Home
   about   About
   contact Contact
+  faq     FAQ
 .end

data/empty_view/themes/standard/post/generate.lt3 CHANGED

@@ -5,10 +5,8 @@
 . --------------------------------------------------
 .mixin liveblog
 <html>
-  <!-- Editing this file is not recommended.   -->
-  <!-- It was generated from $File on $$date.  -->
+  <!-- Generated from $File on $$date; editing not recommended.   -->
 .seek global.lt3
 .include vars.lt3
@@ -18,13 +16,20 @@ og:title    $title
 description $teaser
 .end
+<body>
 <section class="post">
   <div class="entry-content">
+    <table border=0 width=100%><tr>
+      <td align=left valign=bottom><h2 class="post-title">$title</h2></td>
+      <td align=right valign=top><font size=-5><br></font>$longdate</td>
+    </tr></table><hr>
     $.copy guts.html
   </div>
 </section>
 <br>
-<a href="javascript:history.go(-1)">[Back]</a>
+<hr>
+.post_trailer
 </body>
 </html>

data/empty_view/themes/standard/widgets/ad/ad.lt3 CHANGED

@@ -1,15 +1,22 @@
 . In real life, ads won't work this way...
+.include vars.lt3
 .set classname="btn btn-light float-right"
 .set card.title="Advertisement"
 .set card.text="Build your amazing website with blabla.com."
-.set extra="bg-dark text-white"
+. set extra="bg-dark text-white"
+<!-- "$ad.image" -->
 <div class="card $extra mb-3">
   <div class="card-body">
+<!--
     <h5 class="card-title">$card.title</h5>
     <p class="card-text">$card.text</p>
     <a href="javascript: void(0)" onclick="javascript:open_main('widgets/ad/ad.html')" class="$classname">Visit page</a>
+-->
+    <img style="max-height: 100%; max-width: 100%" src="$ad.image"></img>
   </div>
 </div>

data/empty_view/themes/standard/widgets/ad/ad1.png ADDED

Binary file

data/empty_view/themes/standard/widgets/ad/ad2.png ADDED

Binary file

data/empty_view/themes/standard/widgets/ad/ad3.png ADDED

Binary file

data/empty_view/themes/standard/widgets/ad/ad4.png ADDED

Binary file

data/empty_view/themes/standard/widgets/bydates/bydates.rb CHANGED

@@ -2,13 +2,17 @@
 class ::RuneBlog::Widget
   class Bydates
-    def self.build
+    def initialize(repo)
+      @blog = repo
     end
-    def self.edit_menu
+    def build
     end
-    def self.refresh
+    def edit_menu
+    end
+    def refresh
     end
   end
 end

data/empty_view/themes/standard/widgets/links/links.rb CHANGED

@@ -1,14 +1,39 @@
 # Custom code for 'links' widget
+require 'liveblog'
 class ::RuneBlog::Widget
   class Links
-    def self.build
+    Type = "links"
+    def initialize(repo)
+      @blog = repo
+    end
+    def build
+      input = "list.data"
+      lines = File.readlines(input)
+      data = lines.map! {|x| x.chomp.split(/, */, 3) }
+      css = "* { font-family: verdana }"
+      card_title = "External Links"  # FIXME
+      File.open("#{Type}-main.html", "w") do |f|
+        _html_body(f, css) do
+          f.puts "<h1>#{card_title}</h1><br><hr>"
+          url_ref = nil
+          data.each do |url, frameable, title|
+            url_ref = (frameable == "yes") ? "href = '#{url}'" : _blank(url)
+            css = "color: #8888FF; text-decoration: none; font-size: 21px"  # ; font-family: verdana"
+            f.puts %[<a style="#{css}" #{url_ref}>#{title}</a> <br>]
+          end
+        end
+      end
+      # remember -card also
     end
-    def self.edit_menu
+    def edit_menu
     end
-    def self.refresh
+    def refresh
     end
   end
 end

data/empty_view/themes/standard/widgets/news/news.rb CHANGED

@@ -2,13 +2,17 @@
 class ::RuneBlog::Widget
   class News
-    def self.build
+    def initialize(repo)
+      @blog = repo
     end
-    def self.edit_menu
+    def build
     end
-    def self.refresh
+    def edit_menu
+    end
+    def refresh
     end
   end
 end

data/empty_view/themes/standard/widgets/pages/pages.rb CHANGED

@@ -4,18 +4,25 @@
 class ::RuneBlog::Widget
   class Pages
-    def self.build
+    def initialize(repo)
+      @blog = repo
+    end
+    def build
+      # build child pages
       children = Dir["*.lt3"] - ["pages.lt3"]
       children.each do |child|
         dest = child.sub(/.lt3$/, ".html")
         xlate src: child, dst: dest  # , debug: true
       end
+      # build mainfile
+      # build cardfile
     end
-    def self.edit_menu
+    def edit_menu
     end
-    def self.refresh
+    def refresh
     end
   end
 end

data/empty_view/themes/standard/widgets/pinned/pinned.rb CHANGED

@@ -2,13 +2,17 @@
 class ::RuneBlog::Widget
   class Pinned
-    def self.build
+    def initialize(repo)
+      @blog = repo
     end
-    def self.edit_menu
+    def build
     end
-    def self.refresh
+    def edit_menu
+    end
+    def refresh
     end
   end
 end

data/empty_view/themes/standard/widgets/search/search.rb CHANGED

@@ -2,13 +2,17 @@
 class ::RuneBlog::Widget
   class Search
-    def self.build
+    def initialize(repo)
+      @blog = repo
     end
-    def self.edit_menu
+    def build
     end
-    def self.refresh
+    def edit_menu
+    end
+    def refresh
     end
   end
 end

data/empty_view/themes/standard/widgets/sitemap/sitemap.rb CHANGED

@@ -2,13 +2,17 @@
 class ::RuneBlog::Widget
   class Sitemap
-    def self.build
+    def initialize(repo)
+      @blog = repo
     end
-    def self.edit_menu
+    def build
     end
-    def self.refresh
+    def edit_menu
+    end
+    def refresh
     end
   end
 end

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

@@ -2,13 +2,17 @@
 class ::RuneBlog::Widget
   class TagCloud
-    def self.build
+    def initialize(repo)
+      @blog = repo
     end
-    def self.edit_menu
+    def build
     end
-    def self.refresh
+    def edit_menu
+    end
+    def refresh
     end
   end
 end

data/lib/default.rb CHANGED

@@ -5,7 +5,7 @@ class RuneBlog::Default
 def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_view",
                        teaser: "No teaser", body: "No body", tags: ["untagged"],
                        views: [], back: "javascript:history.go(-1)", home: "no url")
-  log!(enter: __method__, args: [num, title, date, view, teaser, body, tags, views, back, home])
+  log!(enter: __method__, args: [num, title, date, view, teaser, body, tags, views, back, home], level: 3)
   viewlist = (views + [view.to_s]).join(" ")
   taglist = ".tags " + tags.join(" ")
 <<-TEXT
@@ -28,6 +28,3 @@ TEXT
 end
 end

data/lib/global.rb CHANGED

@@ -20,7 +20,7 @@ end
 # Refactor, move stuff elsewhere?
 def make_exception(sym, str)
-  log!(enter: __method__, args: [sym, str])
+  log!(enter: __method__, args: [sym, str], level: 3)
   return if Object.constants.include?(sym)
   Object.const_set(sym, StandardError.dup)
   define_method(sym) do |*args|
@@ -30,8 +30,9 @@ def make_exception(sym, str)
   end
 end
-  def system!(str)
-    log!(enter: __method__, args: [str])
+  def system!(str, show: false)
+    log!(enter: __method__, args: [str], level: 2)
+    STDERR.puts str if show
     rc = system(str)
     if rc
       return rc
@@ -44,12 +45,12 @@ end
   end
 def prefix(num)
-  log!(enter: __method__, args: [num])
+  log!(enter: __method__, args: [num], level: 3)
   "#{'%04d' % num.to_i}"
 end
 def check_meta(meta, where = "")
-  log!(enter: __method__, args: [meta, where])
+  log!(enter: __method__, args: [meta, where], level: 3)
   str =  "--- #{where}\n"
   str << "\ncheck_meta: \n" + caller.join("\n") + "\n  meta = #{meta.inspect}\n"
   str << "  title missing!\n" unless meta.title
@@ -62,14 +63,14 @@ def check_meta(meta, where = "")
 end
 def verify(hash)
-  log!(enter: __method__, args: [hash])
+  log!(enter: __method__, args: [hash], level: 3)
   hash.each_pair do |expr, msg|
     puts "<< #{msg}" unless expr
   end
 end
 def assure(hash)  # really the same as verify for now...
-  log!(enter: __method__, args: [hash])
+  log!(enter: __method__, args: [hash], level: 3)
   hash.each_pair do |expr, msg|
     puts "<< #{msg}" unless expr
   end

data/lib/helpers-blog.rb CHANGED

@@ -6,14 +6,14 @@ require 'xlate'
 module RuneBlog::Helpers
   def copy(src, dst)
-    log!(enter: __method__, args: [src, dst])
+    log!(enter: __method__, args: [src, dst], level: 2)
     cmd = "cp #{src} #{dst} 2>/dev/null"
     rc = system!(cmd)
     puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
   end
   def copy!(src, dst)
-    log!(enter: __method__, args: [src, dst])
+    log!(enter: __method__, args: [src, dst], level: 2)
     cmd = "cp -r #{src} #{dst} 2>/dev/null"
     rc = system!(cmd)
     puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
@@ -36,7 +36,7 @@ module RuneBlog::Helpers
 #  end
   def read_config(file, *syms)
-    log!(enter: __method__, args: [file, *syms])
+    log!(enter: __method__, args: [file, *syms], level: 3)
     lines = File.readlines(file).map(&:chomp)
     obj = ::OpenStruct.new
     lines.each do |line|
@@ -61,7 +61,7 @@ module RuneBlog::Helpers
   end
   def try_read_config(file, hash)
-    log!(enter: __method__, args: [file, hash])
+    log!(enter: __method__, args: [file, hash], level: 3)
     return hash.values unless File.exist?(file)
     vals = read_config(file, *hash.keys)
     vals
@@ -80,7 +80,7 @@ module RuneBlog::Helpers
 # end
   def write_config(obj, file)
-    log!(enter: __method__, args: [obj, file])
+    log!(enter: __method__, args: [obj, file], level: 2)
     hash = obj.to_h
     File.open(file, "w") do |out|
       hash.each_pair {|key, val| out.puts "#{key}: #{val}" }
@@ -88,13 +88,13 @@ module RuneBlog::Helpers
   end
   def get_views   # read from filesystem
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     dirs = subdirs("#@root/views/").sort
     dirs.map {|name| RuneBlog::View.new(name) }
   end
   def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
-    log!(enter: __method__, args: [root, current_view, editor])
+    log!(enter: __method__, args: [root, current_view, editor], level: 3)
     root = Dir.pwd/root
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
@@ -102,21 +102,21 @@ module RuneBlog::Helpers
   end
   def new_sequence
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     dump(0, "sequence")
     version_info = "#{RuneBlog::VERSION}\nBlog created: #{Time.now.to_s}"
     dump(version_info, "VERSION")
   end
   def subdirs(dir)
-    log!(enter: __method__, args: [dir])
+    log!(enter: __method__, args: [dir], level: 3)
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs
   end
   def find_draft_slugs
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     files = Dir["#@root/drafts/**"].grep /\d{4}.*.lt3$/
     flagfile = "#@root/drafts/last_rebuild"
     last = File.exist?(flagfile) ? File.mtime(flagfile) : (Time.now - 86_400)
@@ -128,7 +128,7 @@ module RuneBlog::Helpers
   end
   def create_dirs(*dirs)
-    log!(enter: __method__, args: [*dirs])
+    log!(enter: __method__, args: [*dirs], level: 3)
     dirs.each do |dir|
       dir = dir.to_s  # symbols allowed
       next if Dir.exist?(dir)
@@ -139,27 +139,27 @@ module RuneBlog::Helpers
   end
   def interpolate(str, bind)
-    log!(enter: __method__, args: [str, bind])
+    log!(enter: __method__, args: [str, bind], level: 3)
     wrap = "<<-EOS\n#{str}\nEOS"
     eval wrap, bind
   end
   def error(err)  # Hmm, this is duplicated
-    log!(str: "duplicated method", enter: __method__, args: [err])
+    log!(str: "duplicated method", enter: __method__, args: [err], level: 2)
     str = "\n  Error: #{err}"
     puts str
     puts err.backtrace.join("\n")
   end
   def dump(obj, name)
-    log!(enter: __method__, args: [obj, name])
+    log!(enter: __method__, args: [obj, name], level: 3)
     File.write(name, obj)
   end
 end
 def dump(obj, name)      # FIXME scope
-  log!(str: "scope problem", enter: __method__, args: [obj, name])
+  log!(str: "scope problem", enter: __method__, args: [obj, name], level: 3)
   File.write(name, obj)
 end