runeblog 0.1.95 → 0.1.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c34d3256b5ce72fd7a4186b283291940b673e03ca276ce0425baf4d25760f564
-  data.tar.gz: 9e375ccfa30089a4fa04f774c822a36dbf68b5e966cd208c6354b3e4a0fd8b9d
+  metadata.gz: 43e0f35e5c032653d07acda3b5cfcaf0ff06cb8fe53d77f32969e37447200c41
+  data.tar.gz: dd558ffa5a91dd1ef68cd4935517844cdf3c9deba18ff349d92b2f36e1fd790a
 SHA512:
-  metadata.gz: b50e6e90f95618fdcdfb5a717a9f845a00717f85204dc65dd76b60e4d98e2e05d3fb86517dca4c28f2cbcf8729e803deaf9c3c7309b4e0d4085ea823ec732311
-  data.tar.gz: 3b99520e51344079fcafd06b50ae0d6e5ffaf25d756dd9c8341f9ed367ad0b24692c27ffada0f2af874308e5de9a68d04fd9ec6b868a6d72f118d6f9b2a4b1b6
+  metadata.gz: 19161f1b4000f4ede35cb7c8393c1f8fcee3d0f190a61abe231ef098adedcaf99fc15ce7ccd2a7f983db924b05f110e279cf8c79417b61ee40bbdf9201c297b0
+  data.tar.gz: d06e92c711e868357b8c67f8da49dcddd7d2d983bd457675ac7c61c070fb5e1cfae2244d592327af6c1660b9fcaff05993cc80c90343af6c5d4476f493b5b0f4

data/lib/helpers-blog.rb

@@ -12,9 +12,16 @@ module RuneBlog::Helpers
     system("cp -r #{src}  #{dst}")
   end
 
+  def stale?(src, dst)
+    return true unless File.exist?(dst)
+    return true if File.mtime(src) > File.mtime(dst)
+    return false
+  end
+
   def livetext(src, dst)
     src << ".lt3" unless src.end_with?(".lt3")
     dst << ".html" unless dst.end_with?(".html")
+    return unless stale?(src, dst)
     system("livetext #{src} >#{dst}")
   end
 
@@ -65,7 +72,7 @@ module RuneBlog::Helpers
     vals
   end
 
-def put_config(root:, view:"test_view", editor: "/bin/vim")
+def put_config(root:, view:"test_view", editor: "/usr/local/bin/vim")
   Dir.mkdir(root) unless Dir.exist?(root)
   Dir.chdir(root) do 
     File.open("config", "w") do |cfg|

data/lib/liveblog.rb

@@ -451,7 +451,7 @@ def all_teasers
   end
   text << "</body></html>"
   File.write("recent.html", text)
-  _out %[<iframe style="width: 100vw;height: 100vh;position: relative;" src='recent.html' width=100% frameborder="0" allowfullscreen></iframe>]
+  _out %[<iframe id="main" style="width: 100vw;height: 100vh;position: relative;" src='recent.html' width=100% frameborder="0" allowfullscreen></iframe>]
 end
 
 def _post_lookup(postid)    # side-effect
@@ -578,6 +578,7 @@ end
 
 def navbar
   title = _var(:blog)
+
   open = <<-HTML
     <nav class="navbar navbar-expand-lg navbar-light bg-light">
       <a class="navbar-brand" href="index.html">#{title}</a>
@@ -590,7 +591,6 @@ def navbar
               aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
       </button>
-
       <div class="collapse navbar-collapse pull-right" 
            id="navbarSupportedContent">
         <ul class="navbar-nav mr-auto">
@@ -605,11 +605,14 @@ def navbar
   _out open
   _body do |line|
     href, cdata = line.chomp.strip.split(" ", 2)
+# <!-- href="javascript:void(0);" onClick="urlChange('www.mypdf.com/test.pdf')" -->
     if first
       first = false
       _out %[<li class="nav-item active"> <a class="nav-link" href="#{href}">#{cdata}<span class="sr-only">(current)</span></a> </li>]
     else
-      _out %[<li class="nav-item"> <a class="nav-link" href="#{href}">#{cdata}</a> </li>]
+      href = "navbar/#{href}"
+      href_click = %[href="javascript:void(0)" onclick="javascript:open_main('#{href}')"]
+      _out %[<li class="nav-item"> <a class="nav-link" #{href_click}>#{cdata}</a> </li>]
     end
   end
   _out close

data/lib/repl.rb

@@ -1,15 +1,16 @@
-# require 'runeblog'
+require 'runeblog'
 require 'global'
 require 'ostruct'
 require 'helpers-repl'  # FIXME structure
 
 make_exception(:PublishError,  "Error during publishing")
-# make_exception(:EditorProblem, "Could not edit $1")
+make_exception(:EditorProblem, "Could not edit $1")
 
 module RuneBlog::REPL
 
   def edit_file(file)
     result = system("#{@blog.editor} #{file}")
+STDERR.puts "editor = #{@blog.editor} FILE = #{file}"
     raise EditorProblem(file) unless result
     sleep 0.1
     STDSCR.clear

data/lib/runeblog.rb

@@ -177,7 +177,8 @@ class RuneBlog
       x = RuneBlog::Default
       copy!("#{Themes}", "themes")
       create_dirs(:assets, :posts)
-      create_dirs(:staging, "remote/permalink")
+      create_dirs(:staging, "remote/permalink", "remote/navbar")
+      livetext "themes/standard/etc/blog.css.lt3", "themes/standard/etc/blog.css"   # simplify this
       copy!("themes/standard/*", "staging/")
       copy!("themes/standard/etc", "remote/")
       copy!("themes/standard/assets", "remote/")
@@ -185,8 +186,6 @@ class RuneBlog
       pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
       dump(pub, "publish")
 
-      # Add to global.lt3 here?  FIXME
-
       view = RuneBlog::View.new(arg)
       self.view = view
       vdir = self.view.dir
@@ -212,14 +211,6 @@ class RuneBlog
     files.reject! {|f| File.mtime(f) < File.mtime("#{vdir}/last_published") }
   end
 
-  def files_by_id(id)   # FIXME get rid of this later
-    raise ArgumentError unless id.is_a?(Integer)
-    files = Find.find(self.view.dir).to_a
-    tag = prefix(id)
-    result = files.grep(/#{tag}-/)
-    result
-  end
-
   def post_lookup(postid)    # side-effect?
     # .. = templates, ../.. = views/thisview
     slug = title = date = teaser_text = nil
@@ -278,11 +269,10 @@ class RuneBlog
     text << "</body></html>"
     File.write(file, text) # FIXME ???
     iframe_text = <<-HTML
-      <iframe style="width: 100vw;height: 100vh;position: relative;" 
+      <iframe name="main" style="width: 100vw;height: 100vh;position: relative;" 
               src='recent.html' width=100% frameborder="0" allowfullscreen>
       </iframe>
     HTML
-    # _out iframe_text # FIXME ??
   end
 
   def create_new_post(title, testing = false, teaser: nil, body: nil, other_views: [])
@@ -409,6 +399,7 @@ class RuneBlog
           livetext "post/permalink.lt3", "../remote/permalink/#{html}"
           collect_recent_posts("recent.html")
           copy("recent.html", "../remote")
+          copy!("navbar/*html", "../remote/navbar/")
           livetext "blog/generate",  "../remote/index"
         end
       end
@@ -424,7 +415,7 @@ class RuneBlog
     check_meta(meta, "index_entry1")
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     check_meta(meta, "index_entry2")
-    self.make_slug(meta)    # RuneBlog#index_entry
+    self.make_slug(meta)
     check_meta(meta, "index_entry3")
     # FIXME clean up and generalize
     ref = "#{view}/#{meta.slug}/index.html"
@@ -489,12 +480,6 @@ class RuneBlog
     system("rm -rf #@root/drafts/#{tag}-*")
   end
 
-  def post_exists?(num)
-    raise ArgumentError unless num.is_a?(Integer)
-    list = files_by_id(num)  # FIXME search under view dirs
-    list.empty? ? nil : list
-  end
-
   def make_slug(meta)
     raise ArgumentError unless meta.title.is_a?(String)
     label = '%04d' % meta.num   # FIXME can do better

data/lib/runeblog_version.rb

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

data/themes/standard/blog/head.lt3

@@ -1,5 +1,6 @@
 <head>
 .include etc/externals.lt3
+.include etc/misc.js
 
 . fix/remove later
 .head  

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

@@ -1,16 +1,5 @@
 .nopara
-
-.variables
-post_title_color  #010101
-post_title_size   28px
-
-post_text_color   #0101a1
-post_text_size    22px
-
-post_date_color   #9a9a9a
-post_date_size    15px
-.end
-
+.include themes/standard/global.lt3
 
 \.post-title a {
   color: $post_title_color;

data/themes/standard/etc/misc.js

@@ -0,0 +1,6 @@
+<script>
+function open_main(url) {
+    var site = url+'?toolbar=0&amp;navpanes=0&amp;scrollbar=0';
+    document.getElementById('main').src = site;
+}
+</script>

data/themes/standard/global.lt3

@@ -7,6 +7,15 @@ charset     utf-8
 site        rubyhacker.com
 url         localhost:4000//
 locale      en_US
+
+post_title_color  #010101
+post_title_size   28px
+
+post_text_color   #0101a1
+post_text_size    22px
+
+post_date_color   #9a9a9a
+post_date_size    15px
 .end
 
 .  Maybe move publish info here?

data/themes/standard/navbar/about.html

@@ -1,4 +1,6 @@
-<section class="post">
+    <div class="content container-fluid mt-4">
+      <div class="row">
   <h1>About me</h1>
   Blah blah blah...
-</section>
+      </div>
+    </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.95
+  version: 0.1.96
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-15 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -82,10 +82,10 @@ files:
 - themes/standard/blog/head.lt3
 - themes/standard/blog/index.lt3
 - themes/standard/blog/post_entry.lt3
-- themes/standard/etc/blog.css
 - themes/standard/etc/blog.css.lt3
 - themes/standard/etc/externals.lt3
 - themes/standard/etc/favicon.ico
+- themes/standard/etc/misc.js
 - themes/standard/global.lt3
 - themes/standard/navbar/about.html
 - themes/standard/navbar/navbar.lt3

data/themes/standard/etc/blog.css

@@ -1,34 +0,0 @@
-# include variables before this file?
-
-.post-title a {
-  color: #010101;
-  font-size: 28px;
-  float: right;
-  display: inline-block;
-  text-align: top;
-  text-decoration: none;
-}
-
-.post-title a:hover {
-  text-decoration: none;
-}
-
-.post-title-text a {
-  color: #0101a1;
-  font-size: 22px; 
-# float: right;
-  display: block;
-  text-decoration: none;
-}
-
-.post-title-text a:hover {
-  text-decoration: none;
-}
-
-.post-date {
-  color: #9a9a9a;
-  font-size: 15px;
-  display: block;
-  float: left;
-  text-align: top;
-}