runeblog 0.0.87 → 0.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78b5f9479c76a98657e37683acc6c1ff61a8778c
-  data.tar.gz: 06714e9fac6d6e52c45961e9cf5ccdba773ee5ab
+  metadata.gz: 2485c69bacdd96352549d7d688d98292a3b841e5
+  data.tar.gz: 3fbda2ec8152df0927ba9906a80bb1cdb8414de7
 SHA512:
-  metadata.gz: e0d20ae7638af5393715a609649216f881d78c7294e794023ebc6066de22524b575a1ae7c6bd9b011be7f3a45a4e009ec46eadf71b74e1bad4f14d6838f48043
-  data.tar.gz: 7cf97dd85e1e258194a880243452abe327535f9325bc403863482079b866b8c0c09c4c1a5e00fbd77b73847b156d8b0dcf0b64568c72430d665c8f8e419f97f7
+  metadata.gz: 931274a4e11996a5ad5aefc614097fb22be07cdd3fe3773413e348a353f601af01af8b106b69f5fd0ab99772a111ffc25edebb40d59e3f3bb7d62c56105abf80
+  data.tar.gz: 1103e5ee904ed6410264418bb1d3d92854e3d6d4a85a84b33126dbcfb7dfdda691fe9025f2156561d18ca9099cb9da564ae29319b25dbb3d9ed14c73dd01fe36

data/lib/default.rb

@@ -44,7 +44,7 @@ PostTemplate = <<-'TEXT'  # interpolate later
 .teaser
 #{@meta.teaser}
 .end
-#{@meta.remainder}
+#{@meta.body}
 TEXT
 
 

data/lib/post.rb

@@ -13,6 +13,22 @@ class RuneBlog::Post
     result
   end
   
+  def self.load(post)
+    # FIXME weird logic here
+    raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
+    pdir = RuneBlog.blog.view.dir + "/" + post
+    meta = nil
+    Dir.chdir(pdir) do
+      meta = read_config("metadata.txt")
+      meta.date = Date.parse(meta.date)
+      meta.views = meta.views.split
+      meta.tags = meta.tags.split
+      meta.teaser = File.read("teaser.txt")
+      meta.body = File.read("body.txt")
+    end
+    meta
+  end
+
   def initialize(meta, view_name)
     # FIXME weird logic here
     raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
@@ -53,17 +69,15 @@ class RuneBlog::Post
     end
   rescue => err
     p err
-    err.backtrace.each {|x| puts x }
-    # error(err)
+    puts err.backtrace
   end
 
   private
 
   def create_post_subtree(vdir)
     create_dir("assets") 
-    dump(@meta.to_yaml, "metadata.yaml")
-    dump(@meta.teaser, "teaser.txt")
-    dump(@meta.remainder, "remainder.txt")
+#   dump(@meta.to_yaml, "metadata.yaml")
+    write_metadata(@meta)
     template = RuneBlog::Default::TeaserTemplate   # FIXME template into custom dir?
     text = interpolate(template)
     dump(text, "index.html")   # FIXME write_index ?
@@ -79,4 +93,26 @@ class RuneBlog::Post
   def tag(num)
     "#{'%04d' % num}"
   end
+
+def write_metadata(meta)
+  fname2 = "metadata.txt"
+  hash = meta.to_h
+  
+  File.write("teaser.txt", hash[:teaser])
+  File.write("body.txt", hash[:body])
+  hash.delete(:teaser)
+  hash.delete(:body)
+  
+  hash[:views] = hash[:views].join(" ")
+  hash[:tags]  = hash[:tags].join(" ")
+  
+  fields = [:title, :date, :pubdate, :views, :tags]
+  
+  f2 = File.new(fname2, "w")
+  fields.each do |fld|
+    f2.puts "#{fld}: #{hash[fld]}"
+  end
+  f2.close
+end
+
 end

data/lib/runeblog.rb

@@ -152,10 +152,10 @@ class RuneBlog
     result
   end
 
-# def create_new_post(title, testing = false, teaser = nil, remainder = nil)
+# def create_new_post(title, testing = false, teaser = nil, body = nil)
   def create_new_post(meta, testing = false)
     meta.teaser ||= "Teaser goes here."
-    meta.remainder ||= "Remainder of post goes here."
+    meta.body ||= "Remainder of post goes here."
     post = RuneBlog::Post.new(meta, @view.to_s)
     post.edit unless testing
     post.publish
@@ -222,7 +222,9 @@ class RuneBlog
     dir = vdir + @meta.slug + "/"
     create_dir(dir + "assets") 
     Dir.chdir(dir) do
-      dump(@meta.to_yaml, "metadata.yaml")
+#?    dump(@meta.to_yaml, "metadata.yaml")
+      dump(@meta.teaser, "teaser.txt")
+      dump(@meta.body, "body.txt")
       # FIXME make get_post_template method
       template = File.read("#{vdir}/custom/post_template.html")
       post = interpolate(template)
@@ -250,7 +252,17 @@ class RuneBlog
     @blogtail = interpolate(tail)
 
     # Output view
-    posts.map! {|post| YAML.load(File.read("#{vdir}/#{post}/metadata.yaml")) }
+#?  posts.map! {|post| YAML.load(File.read("#{vdir}/#{post}/metadata.yaml")) }
+    posts.map! do |post|
+      meta = nil
+      pdir = vdir + "/" + post
+      Dir.chdir(pdir) do
+        meta = read_config("metadata.txt")
+        meta.teaser = File.read("teaser.txt")
+        meta.body = File.read("body.txt")
+      end
+      meta  # block return
+    end
     File.open("#{vdir}/index.html", "w") do |f|
       f.puts @bloghead
       posts.each {|post| f.puts index_entry(view, post) }
@@ -258,6 +270,7 @@ class RuneBlog
     end
   rescue => err
     error(err)
+    exit
   end
 
   def relink
@@ -266,6 +279,7 @@ class RuneBlog
 
   def index_entry(view, meta)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
+    meta.slug ||= make_slug(meta.title)
     # FIXME clean up and generalize
     ref = "#{view}/#{meta.slug}/index.html"
     <<-HTML

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 class RuneBlog
-  VERSION = "0.0.87"
+  VERSION = "0.0.88"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

data/test/general.rb

@@ -190,6 +190,8 @@ class TestREPL < Minitest::Test
     system("ruby test/make_blog.rb")   # This is hellish, I admit
   end
 
+if File.exist?("testing.deploy")
+
   def test_016_can_deploy
     x = OpenStruct.new
     x.user, x.server, x.docroot, x.docroot, x.path, x.proto = 
@@ -219,6 +221,8 @@ class TestREPL < Minitest::Test
     assert result.nil?, "Expected to detect login error (bad server)"
   end
 
+end
+
   # later tests...
   # new view asks for deployment info and writes it
   #   (how to mimic user input? test some other way?)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.87
+  version: 0.0.88
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-21 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext