runeblog 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6afc0631f94efc48845844f2b77c27b4ab4ca80b
-  data.tar.gz: 34697e121079c1e08f62c1d3109681c4301f3853
+  metadata.gz: e1a775d7a2266cf324705bb43a5f4c0b027b4bbb
+  data.tar.gz: 6ccaa91f9b29cc0306096b71a9ed10177149a168
 SHA512:
-  metadata.gz: 2cec5abaa4ac6d55dd88bb3ade7b8c77b1570ea939614197308b3066e0c4e9e0865ffad610b0ec007f7921fa077272da325d771561a1ce583127b3b8c99ea01b
-  data.tar.gz: c04585d4b5ec9df5f058b8eb8f6603bf71f5e43bc39f11a759429e8efd7854d31b5054dfc1e6cd9e2a38e48093aeefa48f672a01f5bdf62ec60d68faad0c459b
+  metadata.gz: 7b8211572cf28798f56baf01c685800445b8bd7a876999a936116f8cf158f73da0bc3df8292668b65ac24d4f65ea235390b365939b95de84ac94c17dea324a3b
+  data.tar.gz: 05c70aeedfb2edcfa7b50977d452542f44d746544839a8d9183b7ec0e70c3a25e50228f0584064d201178b1da23ef5065840fc9cd5f24a7c10171573904b61c3

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.18   2017-05-06
+RuneBlog v 0.0.19   2017-05-06

data/lib/runeblog.rb

@@ -1,5 +1,5 @@
 class RuneBlog
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data"
@@ -139,11 +139,13 @@ end
 ### process_post
 
 def process_post(file)
-  lt ||= Livetext.new
+  @main ||= Livetext.new
 # puts "  Processing: #{Dir.pwd}/#{file}"
-  path = @config.root + "/src/#{file}"
-  lt.process_file(path)
-  @meta = lt.main.instance_eval { @meta }
+# path = @config.root + "/src/#{file}"
+  @meta = @main.process_file(file)
+  @meta.slug = make_slug(@meta.title, @config.sequence)
+# @meta = @main.instance_eval { @meta }
+p @meta
   @meta.slug = file.sub(/.lt3$/, "")
   @meta
 end
@@ -152,21 +154,23 @@ end
 
 def reload_post(file)
   @main ||= Livetext.new
-  @meta = process_post("#{@config.root}/src/#{file}")
+  process_post("#{@config.root}/src/#{file}")
+  @meta = @main.instance_eval { @meta }
   @meta.slug = file.sub(/.lt3$/, "")
   @meta
 end
 
 ### posting
 
-def posting(meta)
+def posting(view, meta)
+  ref = "#{view}/#{meta.slug}/index.html"
   <<-HTML
     <br>
     <font size=+1>#{meta.pubdate}&nbsp;&nbsp;</font>
-    <font size=+2 color=blue><a href=../#{"FAKEREF"} style="text-decoration: none">#{meta.title}</font></a>
+    <font size=+2 color=blue><a href=../#{ref} style="text-decoration: none">#{meta.title}</font></a>
     <br>
     #{meta.teaser}  
-    <a href=../#{"FAKEREF2"} style="text-decoration: none">Read more...</a>
+    <a href=../#{ref} style="text-decoration: none">Read more...</a>
     <br><br>
     <hr>
   HTML
@@ -179,30 +183,27 @@ def generate_index(view)
   vdir = "#{@config.root}/views/#{view}"
   posts = Dir.entries(vdir).grep /^\d\d\d\d/
   posts = posts.sort.reverse
+
   # Add view header/trailer
   @bloghead = File.read("#{vdir}/custom/blogheader.html") rescue ""
   @blogtail = File.read("#{vdir}/custom/blogtrailer.html") rescue ""
+
   # Output view
-  posts.map! do |post|
-    YAML.load(File.read("#{vdir}/#{post}/metadata.yaml"))
-  end
+  posts.map! {|post| YAML.load(File.read("#{vdir}/#{post}/metadata.yaml")) }
   out = @bloghead.dup
-  posts.each do |post|
-    out << posting(post)
-  end
+  posts.each {|post| out << posting(view, post) }
   out << @blogtail
-  File.open("#{vdir}/index.html", "w") do |f|
-    f.puts out
-  end
+  File.open("#{vdir}/index.html", "w") {|f| f.puts out }
 end
 
 ### link_post_view
 
 def link_post_view(view)
+  p @meta
   # Create dir using slug (index.html, metadata?)
   vdir = "#{@config.root}/views/#{view}"
   dir = "#{vdir}/#{@meta.slug}"
-  cmd = "mkdir -p #{dir}"
+  cmd = "mkdir -p #{dir}"    #-- FIXME what if this exists??
   puts "    Running: #{cmd}"
   system(cmd)
   File.write("#{dir}/metadata.yaml", @meta.to_yaml)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Hal Fulton