runeblog 0.1.76 → 0.1.78

data/lib/post.rb

@@ -1,11 +1,13 @@
-require 'helpers-blog'
-# require 'runeblog'
+# require 'helpers-blog'
+require 'runeblog'
 require 'global'
 
 class RuneBlog::Post
 
   attr_reader :num, :title, :date, :views, :num, :slug
 
+  attr_accessor :meta, :blog, :draft
+
   include RuneBlog::Helpers
 
   def self.files(num, root)
@@ -15,6 +17,7 @@ class RuneBlog::Post
   end
   
   def self.load(post)
+    raise "Doesn't work right now"
     raise NoBlogAccessor if RuneBlog.blog.nil?
     # "post" is a slug
     pdir = RuneBlog.blog.view.dir + "/" + post
@@ -22,8 +25,8 @@ class RuneBlog::Post
     meta = nil
     Dir.chdir(pdir) do
       verify(File.exist?("metadata.txt") => "metadata.txt not found",
-             File.exist?("teaser.txt") => "teaser.txt not found",
-             File.exist?("body.txt") => "body.txt not found")
+             File.exist?("teaser.txt") => "teaser.txt not found")
+#            File.exist?("body.txt") => "body.txt not found")
       meta = read_config("metadata.txt")
       verify(meta.date  => "meta.date is nil",
              meta.views => "meta.views is nil",
@@ -32,26 +35,20 @@ class RuneBlog::Post
       meta.views = meta.views.split
       meta.tags = meta.tags.split
       meta.teaser = File.read("teaser.txt")
-      meta.body = File.read("body.txt")
+#     meta.body = File.read("body.txt")
     end
     meta
   end
 
-  def create_post_subtree(viewname = nil) 
-    # FIXME Doesn't really do anything - refactor
-    debug "=== create_post_subtree #{viewname.inspect}  pwd = #{Dir.pwd}"
-    # We are INSIDE views/myview/000n-mytitle dir now - FIXME later? how did that happen?
-    create_dir("assets")
-  end
-
-  def write_metadata(meta)
+  def write_metadata(meta)   # FIXME ???
     debug "=== write_metadata:"
     debug "-----\n#{meta.inspect}\n-----"
     fname2 = "metadata.txt"
     hash = meta.to_h
 
     File.write("teaser.txt", hash[:teaser])
-    File.write("body.txt", hash[:body])
+# STDERR.puts ">>>> #{__method__}: writing #{@live.body.size} bytes to #{Dir.pwd}/body.txt"
+#     File.write("body.txt", hash[:body])
     hash.delete(:teaser)
     hash.delete(:body)
 
@@ -67,48 +64,36 @@ class RuneBlog::Post
 
   def initialize
     @blog = RuneBlog.blog || raise(NoBlogAccessor)
+    @meta = OpenStruct.new
   end
 
-  def self.create(title, teaser = "", body = "")
-    debug "=== Post.create #{title.inspect}   pwd = #{Dir.pwd}"
+  def self.create(title:, teaser:, body:, pubdate: Time.now.strftime("%Y-%m-%d"),
+                  other_views:[])
     post = self.new
-    post.new_metadata(title.chomp, teaser.chomp, body.chomp)
-    post.create_draft
-    post.create_post_subtree
-    # post.build is not called here! It is called
-    # in runeblog.rb:create_new_post AFTER post.edit
-    post
-  end
-
-  def new_metadata(title, teaser = nil, body = nil)
-    verify(title.is_a?(String) => "Title #{title.inspect} is not a string")
-    meta = OpenStruct.new
-    meta.title = title
-    meta.teaser ||= teaser
-    meta.body   ||= body
-    meta.pubdate = Time.now.strftime("%Y-%m-%d")
-    meta.date = meta.pubdate  # fix later
-    meta.views = [@blog.view.to_s]
-    meta.tags = []
     # ONLY place next_sequence is called!
-    meta.num   = @blog.next_sequence
-    @blog.make_slug(meta)  # adds to meta
-    @meta = meta
-  end
-
-  def create_draft
-# FIXME obsolete
-# STDERR.puts "-- create_draft: teaser = #{@meta.teaser.inspect} body = #{@meta.body.inspect}"
-    viewhome = @blog.view.publisher.url
-    html = RuneBlog.post_template(title: @meta.title, date: @meta.pubdate, 
-               view: @meta.view, teaser: @meta.teaser, body: @meta.body,
-               views: @meta.views, tags: @meta.tags, home: viewhome)
-    srcdir = "#{@blog.root}/drafts/"
+    num = post.meta.num   = post.blog.next_sequence
+
+    # 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.tags = []
+    post.blog.make_slug(post.meta)  # adds to meta
+
+    # create_draft
+    viewhome = post.blog.view.publisher.url
+    meta = post.meta
+    text = RuneBlog.post_template(num: meta.num, title: meta.title, date: meta.pubdate, 
+               view: meta.view, teaser: meta.teaser, body: meta.body,
+               views: meta.views, tags: meta.tags, home: viewhome)
+    srcdir = "#{post.blog.root}/drafts/"
+    vpdir = "#{post.blog.root}/drafts/"
     verify(Dir.exist?(srcdir) => "#{srcdir} not found",
-           @meta.slug.is_a?(String) => "slug #{@meta.slug.inspect} is invalid")
-    fname  = @meta.slug + ".lt3"
-    @draft = srcdir + fname
-    dump(html, @draft)
+           meta.slug.is_a?(String) => "slug #{meta.slug.inspect} is invalid")
+    fname  = meta.slug + ".lt3"
+    post.draft = srcdir + fname
+    dump(text, post.draft)
+    return post
   end
 
   def edit
@@ -120,32 +105,31 @@ class RuneBlog::Post
     error(err)
   end 
 
-  def build
-    debug "=== build"
-    views = @meta.views
+  def build   # THIS CODE WILL GO AWAY
+    post = self
+    views = post.meta.views
     text = File.read(@draft)
-# STDERR.puts "-- build: draft = #{@draft.inspect}"
-    livetext = Livetext.new(STDOUT)
-    Livetext.parameters = [@blog, @meta.num, livetext]
-    meta = livetext.process_text(text)
-    raise RuneBlog::LivetextError(@draft) if meta.nil?
 
-    meta.num = File.basename(@draft).to_i
-    # FIXME what if title changes? slug should change?
-    meta.views = views  # FIXME
+@blog.generate_post(@draft)
+return
 
-    meta.views.each do |view_name|   
+STDERR.puts "-- Post#build starts in #{Dir.pwd} ..."
+
+    @meta.views.each do |view_name|   
       # Create dir using slug (index.html, metadata?)
-      vdir = "#{@blog.root}/views/#{view_name}/"
-      dir = vdir + meta.slug + "/"
-      create_dir(dir) unless Dir.exist?(dir)
-      Dir.chdir(dir) do
-        create_post_subtree(view_name)  # unless existing??
-        system("cp body.txt index.html")
-        @blog.generate_index(view_name)
+      dir = "#{@blog.root}/views/#{view_name}/posts/"
+      pdir = dir + meta.slug + "/"
+      create_dir(pdir) unless Dir.exist?(pdir)
+      Dir.chdir(pdir) do
+        title_name  = pdir + (meta.slug + ".lt3").sub(/^\d{4}-/, "")
+        dump(text, title_name)
+        cmd = "livetext #{title_name} >#{title_name.sub(/.lt3$/, ".html")}"
+STDERR.puts "---  In #{pdir}"
+STDERR.puts "---  cmd = #{cmd}\n "
+        system(cmd)
       end
     end
-    meta
+    @meta
   rescue => err
     p err
     puts err.backtrace.join("\n")

data/lib/publish.rb

@@ -1,4 +1,4 @@
-require 'helpers-blog'
+# require 'helpers-blog'
 # require 'runeblog'
 require 'global'
 

data/lib/repl.rb

@@ -39,9 +39,10 @@ module RuneBlog::REPL
   def cmd_config(arg, testing = false)
     check_empty(arg)
     dir = @blog.view.dir
+# FIXME bad path
     items = ["publish", 
              "themes/standard/blogview.lt3", 
-             "themes/standard/post/index.lt3"] 
+             "themes/standard/post-index.lt3"] 
     num, fname = STDSCR.menu(title: "Edit file:", items: items)
     edit_file("#{dir}/#{fname}")
   end
@@ -248,8 +249,28 @@ module RuneBlog::REPL
     end
 
     file = files.first
-    result = edit_file("#{@blog.root}/drafts/#{file}")
-    @blog.rebuild_post(file)
+    draft = "#{@blog.root}/drafts/#{file}"
+    result = edit_file(draft)
+
+STDERR.puts "Calling gp: pwd = #{Dir.pwd}  draft = #{draft}"
+puts
+
+    @blog.generate_post(draft)
+return
+
+# NEW code...
+    view = @blog.view
+    # livetext source > naked post 9999-slug (dir?)
+    draft = @blog.root + "/drafts/#{file}"
+#   theme = "#{@blog.view.dir}/themes/standard"
+#   src = "#{theme}/post-index.lt3"
+    
+    system("cp #{draft} #{src}") # terms are confusing
+    file2 = file.sub(/.lt3$/, ".html")
+    Dir.chdir(theme) do 
+      system("livetext index.lt3 >#{file2}")
+    end
+#   @blog.rebuild_post(file)
     @out
   end
 

data/lib/runeblog.rb

@@ -9,14 +9,18 @@ require 'view'
 require 'publish'
 require 'post'
 
+# ::Home = Dir.pwd unless defined?(::Home)
+
 ###
 
 class RuneBlog
  
   DotDir     = ".blogs"
-  ConfigFile = "#{DotDir}/config"
+  ConfigFile = "config"
   GemData    = RuneBlog::Path + "/../data"
 
+# ::Home     = Dir.pwd
+
   make_exception(:FileNotFound,      "File $1 was not found")
   make_exception(:BlogRepoAlreadyExists, "Blog repo $1 already exists")
   make_exception(:CantAssignView,    "$1 is not a view")
@@ -41,34 +45,6 @@ class RuneBlog
 
   include Helpers
 
-=begin
-  timestamps
-	  filename (cf with real file)
-		
-	themes
-	  standard
-		  head.lt3
-	  	meta.lt3
-    	global.lt3
-	  	assets/
-	  	blog/
-			  [kill assets?]
-				sidebar/
-				  ad.lt3
-					calendar.lt3
-					news.lt3
-					tag_cloud.lt3
-				_postentry
-				generate.lt3
-				index.lt3
-				meta.lt3
-				navbar.lt3
-	  	post/
-			  generate.lt3
-				head.lt3
-				index.lt3
-=end
-
   def self.create_new_blog_repo(first_view, dir = ".blogs/data")
     raise ArgumentError unless dir.is_a?(String) && ! dir.empty?
     root_dir = Dir.pwd + "/" + dir
@@ -89,12 +65,24 @@ class RuneBlog
     puts err.backtrace.join("\n")
   end
 
-  def initialize   # assumes existing blog
+  def initialize(top = true)   # at top? always assumes existing blog
     # Crude - FIXME later - 
     # What views are there? Publishing, etc.
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
-    @root, @view_name, @editor = 
-      read_config(ConfigFile, :root, :current_view, :editor)
+    $_blog = self            # Dumber still?
+    dir = ""
+    unless top
+      md = Dir.pwd.match(%r[.*.blogs])
+      dir = md[0]
+    end
+    file = dir.empty? ? ConfigFile : dir + "/" + ConfigFile
+    errmsg = "No config file! file = #{file.inspect}  dir = #{Dir.pwd}" 
+    raise errmsg unless File.exist?(file)
+# Hmm. current_view doesn't belong?
+    @root, @view_name, @editor = read_config(file, :root, :current_view, :editor)
+    md = Dir.pwd.match(%r[.*/views/(.*?)/])
+    @view_name = md[1] if md
+# STDERR.puts "---- vname = #@view_name"
     @views = get_views
     @view = str2view(@view_name)
     @sequence = get_sequence
@@ -102,6 +90,17 @@ class RuneBlog
     @post_tags = []
   end
 
+  def inspect
+    str = "[["
+    ivars = ["@root", "@sequence"]   # self.instance_variables
+    ivars.each do |iv| 
+      val = self.instance_variable_get(iv)
+      str << "#{iv} = #{val}  "
+    end
+    str << "]]"
+    str
+  end
+
   def view?(name)
     raise ArgumentError unless name.is_a?(String) && ! name.empty?
     views.any? {|x| x.name == name }
@@ -117,16 +116,23 @@ class RuneBlog
     @views.find {|x| x.name == str }
   end
 
+  def _set_publisher
+    file = @view.dir + "/publish"
+    @view.publisher = nil
+    return unless File.exist?(file)
+    @view.publisher = RuneBlog::Publishing.new(read_config(file))
+  end
+
   def view=(arg)
     case arg
       when RuneBlog::View
         @view = arg
-        @view.publisher = RuneBlog::Publishing.new(read_config(@view.dir + "/publish"))
+        _set_publisher
       when String
         new_view = str2view(arg)
         raise NoSuchView(arg) if new_view.nil?
         @view = new_view
-        @view.publisher = RuneBlog::Publishing.new(read_config(@view.dir + "/publish"))
+        _set_publisher
       else 
         raise CantAssignView(arg.class.to_s)
     end
@@ -142,7 +148,7 @@ class RuneBlog
     @sequence
   end
 
-  def viewdir(v = nil)
+  def viewdir(v = nil)   # delete?
     v = str2view(v) if v.is_a?(String)
     raise ArgumentError unless v.nil? || v.is_a?(RuneBlog::View)
     v ||= @view
@@ -150,11 +156,10 @@ class RuneBlog
   end
 
   def self.exist?
-    Dir.exist?(DotDir) && File.exist?(ConfigFile)
+    Dir.exist?(DotDir) && File.exist?(DotDir + "/" + ConfigFile)
   end
 
   def create_view(arg)
-    debug "=== create_view #{arg.inspect}"
     raise ArgumentError unless arg.is_a?(String) && ! arg.empty?
 
     names = self.views.map(&:to_s)
@@ -168,11 +173,12 @@ class RuneBlog
     Dir.chdir(vdir)
     x = RuneBlog::Default
     create_dir('themes')
-    create_dir("generated")
+#   create_dir("generated")
     create_dir('assets')
+    create_dir('posts')
 
     Dir.chdir("themes") { system("tar zxvf #{GemData}/standard.tgz >/dev/null 2>&1") }
-    system("cp themes/standard/blog/assets/* assets/")
+#   system("cp themes/standard/blog/assets/* assets/")
     
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
     dump(pub, "publish")
@@ -182,9 +188,6 @@ class RuneBlog
     view = RuneBlog::View.new(arg)
     self.view = view
     vdir = self.view.dir
-    dir0 = "#{vdir}/themes/standard/blog"
-    dir1 = "#{vdir}/generated"
-    system("livetext #{dir0}/generate.lt3 >#{dir1}/index.html 2>#{dir1}/errors.txt")
     dump("Initial creation", "last_published")
     Dir.chdir(up)
     @views << view
@@ -200,7 +203,7 @@ class RuneBlog
   end
 
   def view_files
-    vdir = self.viewdir
+    vdir = self.view.dir
     files = ["#{vdir}/index.html"]
     files += posts.map {|x| "#{vdir}/#{x}" }
     # Huh? 
@@ -215,14 +218,17 @@ class RuneBlog
     result
   end
 
-  def create_new_post(title, testing = false, teaser: nil, body: nil)
-# STDERR.puts "-- create_new_post: teaser = #{teaser.inspect} body = #{body.inspect}"
+  def create_new_post(title, testing = false, teaser: nil, body: nil, other_views: [])
     save = Dir.pwd
     Dir.chdir(self.view.dir)
-    post = Post.create(title, teaser, body)
+    # change to create_draft ?
+    post = Post.create(title: title, teaser: teaser, body: body, other_views: other_views)
     post.edit unless testing
     meta = post.build
     Dir.chdir(save)
+return meta.num
+    Dir.chdir(save)
+    meta.num = 999
     meta.num
   rescue => err
     puts err
@@ -240,7 +246,7 @@ class RuneBlog
   end
 
   def posts
-    dir = self.view.dir
+    dir = self.view.dir + "/posts"
     posts = Dir.entries(dir).grep(/^\d{4}/)
     posts
   end
@@ -259,8 +265,6 @@ class RuneBlog
   end
 
   def process_post(file)
-#   puts "    process_post #{file.inspect}   pwd = #{Dir.pwd}"
-    debug "=== process_post #{file.inspect}   pwd = #{Dir.pwd}"
     raise ArgumentError unless file.is_a?(String)
     path = @root + "/drafts/#{file}"
     raise FileNotFound(path) unless File.exist?(path)
@@ -275,18 +279,88 @@ class RuneBlog
   end
 
   def generate_index(view)
+# FIXME
     debug "=== generate_index view = #{view.to_s}"
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
 
     vdir = self.view.dir
     dir0 = "#{vdir}/themes/standard/blog"
-    dir1 = "#{vdir}/generated"
-    system("livetext #{dir0}/generate.lt3 >#{dir1}/index.html 2>#{dir1}/errors.txt")
+#   dir1 = "#{vdir}/generated"
+#   system("livetext #{dir0}/generate.lt3 >#{dir1}/index.html 2>#{dir1}/errors.txt")
   rescue => err
     error(err)
     exit
   end
 
+######## New code
+
+  def generate_view(view)
+  end
+
+  # Remember: A post in multiple views will trigger multiple
+  #   views needing to be rebuilt (and published)
+
+# generate a post:
+#   given draft 9999-title.lt3
+#   create VIEW/posts/9999-title/index.lt3
+# LATER: metadata!! or is it in head?
+#   Generate VIEW/posts/9999-title/head.lt3?
+#   livetext draft_wrapper_plain.lt3  >generated/posts/plain-title.html  # unframed
+#   livetext draft_generate.lt3       >generated/posts/real-title.html   # framed
+#   livetext draft_wrapper_perma.lt3  >generated/posts/perma-title.html  # permaframed
+#
+# Generate associated views:
+#   livetext ??/recent.lt3 >VIEW/working/recent.html
+#   livetext VIEW/blog/generate.lt3 ??
+
+  def generate_post(draft)
+    dir = File.dirname(draft)
+    fname = File.basename(draft)
+# STDERR.puts "--- gp01 dir/fname = #{dir}  #{fname}"
+    # FIXME dumb code
+    view_line = File.readlines(draft).grep(/^.views /)
+    raise "More than one .views call!" if view_line.size > 1
+    raise "No .views call!" if view_line.size < 1
+    view_line = view_line.first
+
+# STDERR.puts "--- gp01b view_line = #{view_line}"
+    views = view_line[7..-1].split
+    slug_dir = fname.sub(/.lt3$/, "")
+# STDERR.puts "--- gp02 preloop"
+    views.each do |view|
+# STDERR.puts "--- gp03 view = #{view}"
+      vdir = "#@root/views/#{view}"
+      dir = "#{vdir}/posts/#{slug_dir}/"
+STDERR.puts "--- gp03b vdir = #{vdir} dir = #{dir}"
+      Dir.mkdir(dir) unless Dir.exist?(dir)
+puts 
+#  --- gp04 system: cp /Users/Hal/Dropbox/files/runeblog/.blogs/data/drafts/0007-the-graffiti-wall.lt3 
+#                      /Users/Hal/Dropbox/files/runeblog/.blogs/data/around_austin/posts/0007-the-graffiti-wall.lt3/
+STDERR.puts "--- gp04 system: cp #{draft} #{dir}"
+STDERR.puts 
+      system("cp #{draft} #{dir}")
+      Dir.chdir(dir) do 
+STDERR.puts "--- gp05 into #{dir}: livetext #{draft} >#{draft}.html"
+        system("livetext #{draft} >#{draft}.html")
+        # copy from theme?
+        theme = vdir + "/themes/standard"
+        files = ["blog-generate.lt3", "blog-index.lt3", "global.lt3", "blog-head.lt3", "meta.lt3", "navbar.lt3"]
+        files = files.map {|x| theme + "/" + x }
+STDERR.puts "---- Files = #{files.inspect}"
+        files.each do |f| 
+STDERR.puts "---- cp #{f} ."
+          system("cp #{f} .")
+        end
+STDERR.puts "---- Files copied from theme"
+        system("livetext blog-generate.lt3 >bgen.html")
+STDERR.puts "---- Files went thru livetext"
+      end
+      # create framed pure slug (where?)
+    end
+  end
+
+########
+
   def relink
     self.views.each {|view| generate_index(view) }
   end
@@ -369,7 +443,8 @@ class RuneBlog
   end
 
   def make_slug(meta)
-    check_meta(meta, "makeslug")
+#   check_meta(meta, "makeslug")
+#   meta.num = 9999   # FIXME
     raise ArgumentError unless meta.title.is_a?(String)
     label = '%04d' % meta.num   # FIXME can do better
     slug0 = meta.title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')