runeblog 0.2.99 → 0.3.05

data/lib/runeblog.rb

@@ -40,7 +40,7 @@ class RuneBlog
   end
 
   attr_reader :views, :sequence
-  attr_accessor :root, :editor
+  attr_accessor :root, :editor, :features
   attr_accessor :view  # overridden
 
   attr_accessor :post_views, :post_tags, :dirty_views
@@ -75,15 +75,6 @@ class RuneBlog
 
   end
 
-  def _tmp_error(err)   # FIXME move to helpers
-    out = "/tmp/blog#{rand(100)}.txt"
-    File.open(out, "w") do |f|
-      f.puts err
-      f.puts err.backtrace.join("\n")
-    end
-    puts "Error: See #{out}"
-  end
-
   def self.create_new_blog_repo(root_rel = ".blogs")
     log!(enter: __method__, args: [root_rel])
     raise ArgumentError unless root_rel.is_a?(String) && ! root_rel.empty?
@@ -120,8 +111,9 @@ class RuneBlog
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
 
     @root = Dir.pwd/root_rel
-    write_repo_config(root: @root)
+    write_repo_config(root: @root)   # ?? FIXME
     get_repo_config
+    read_features   # top level
     @views = retrieve_views
     self.view = File.read(@root/"data/VIEW").chomp
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
@@ -134,16 +126,67 @@ class RuneBlog
     @post_tags = []
   end
 
+  def complete_file(name, vars, hash)
+    debugging = vars.nil?
+    return if hash.empty?
+    text = File.read(name)
+    if vars.nil?   # FIXME dumbest hack ever?
+      vars = {}
+      hash.values.each {|val| vars[val] = val }
+    end
+
+    hash.each_pair {|key, var| text.gsub!(key, vars[var]) }
+    File.write(name, text)
+  end
+
+  def _generate_settings(view = nil)
+    vars = read_vars("#@root/data/universal.lt3")
+    hash = {/AUTHOR/  => "view.author",
+            /SITE/    => "view.site",
+            /FONT/    => "font.family",
+            /CHARSET/ => :charset,
+            /LOCALE/  => :locale}
+
+    # rubytext.txt - LATER
+    # complete_file(settings/"rubytext.txt", {}
+
+    if view
+      settings = @root/view/"settings"
+      ### ??? Where to get hash of view-specific vars?
+
+      # features.txt - handle specially
+      fname = settings/"features.txt"
+
+      # view.txt
+      complete_file(settings/"view.txt", 
+                        /AUTHOR/   => "view.author",
+                        /TITLE/    => "view.title",
+                        /SUBTITLE/ => "view.subtitle",
+                        /SITE/     => "view.site")
+
+      # publish.txt
+      complete_file(settings/"publish.txt", 
+                        /USER/    => "publish.user",
+                        /SERVER/  => "publish.server",
+                        /DOCROOT/ => "publish.docroot",
+                        /PATH/    => "publish.path",
+                        /PROTO/   => "publish.proto")
+                
+      # recent.txt - SKIP THIS?
+      complete_file(settings/"recent.txt",  {})
+    end
+  end
+
   def _generate_global
     vars = read_vars("#@root/data/universal.lt3")
     gfile = "#@root/data/global.lt3"
-    global = File.read(gfile)
-    global.gsub!(/AUTHOR/,  vars["author"])
-    global.gsub!(/SITE/,    vars["site"])
-    global.gsub!(/FONT/,    vars["font.family"])
-    global.gsub!(/CHARSET/, vars["charset"])
-    global.gsub!(/LOCALE/,  vars["locale"])
-    File.write(gfile, global)
+    hash = {/AUTHOR/  => "univ.author",
+            /SITE/    => "univ.site",
+            /FONT/    => "font.family",
+            /CHARSET/ => :charset,
+            /LOCALE/  => :locale}
+    complete_file(gfile, vars, hash)
+    _generate_settings
   end
 
   def _deploy_local(dir)
@@ -151,10 +194,7 @@ class RuneBlog
     Dir.chdir(dir) do
       views = _retrieve_metadata(:views)
       views.each do |v| 
-        unless self.view?(v)
-          puts "#{fx("Warning:", :red)} #{fx(v, :bold)} is not a view"
-          next
-        end
+        next unless _check_view?(v)
         system!("cp *html #@root/views/#{v}/remote", show: true)
       end
     end
@@ -162,6 +202,8 @@ class RuneBlog
     _tmp_error(err)
   end
 
+  # FIXME reconcile with _get_draft data
+
   def _retrieve_metadata(key)
     key = key.to_s
     lines = File.readlines("metadata.txt")
@@ -244,11 +286,15 @@ class RuneBlog
         @view = nil
       when RuneBlog::View
         @view = arg
+        read_features(@view)
+        @view.get_globals
         _set_publisher
       when String
         new_view = str2view(arg)
         raise NoSuchView(arg) if new_view.nil?
         @view = new_view
+        read_features(@view)
+        @view.get_globals
         _set_publisher
       else 
         raise CantAssignView(arg.class.to_s)
@@ -324,6 +370,7 @@ class RuneBlog
     add_view(view_name)
     mark_last_published("Initial creation")
     system("cp #@root/data/global.lt3 #@root/views/#{view_name}/themes/standard/global.lt3")
+    @view.get_globals
   rescue => err
     _tmp_error(err)
   end
@@ -404,16 +451,18 @@ class RuneBlog
     return posts[0..19]  # return 20 at most
   end
 
-  def collect_recent_posts(file)
+  def collect_recent_posts(file = "recent.html")
     log!(enter: __method__, args: [file], level: 3)
+    vars = self.view.globals
     text = <<-HTML
       <html>
       <head><link rel="stylesheet" href="etc/blog.css"></head>
-      <body>
+      <body style="background-color: #{vars["recent.bgcolor"]}">
     HTML
     posts = _sorted_posts
     if posts.size > 0
-      wanted = [8, posts.size].min  # estimate how many we want?
+      # estimate how many we want
+      wanted = [vars["recent.count"].to_i, posts.size].min
       enum = posts.each
       entries = []
       wanted.times do
@@ -485,7 +534,7 @@ class RuneBlog
     log!(enter: __method__, args: [view], pwd: true, dir: true)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     @vdir = @root/:views/view
-    num = collect_recent_posts("recent.html")
+    num = collect_recent_posts
     return num
   rescue => err
     _tmp_error(err)
@@ -506,7 +555,7 @@ class RuneBlog
                call: ".nopara"
     copy!("#{vdir}/themes/standard/banner/*", "#{vdir}/remote/banner/")  # includes navbar/
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
-# rebuild widgets
+    # rebuild widgets?
     copy_widget_html(view)
   rescue => err
     STDERR.puts err
@@ -514,6 +563,27 @@ class RuneBlog
     # _tmp_error(err)
   end
 
+  def _get_draft_data(num, sym)
+    tag = prefix(num)
+    front = @blog.root/:drafts/tag
+    files = Dir[front + "*"]
+    raise "No draft #{num} found" if files.empty?
+    raise "Too many files found for #{num}!" if files.size > 1
+    file = files.first
+    lines = File.readlines(file)
+    case sym
+      when :views
+        view_line = lines.grep(/^.views /)
+        raise "More than one .views call in #{draft}" if view_line.size > 1
+        raise "No .views call in #{draft}" if view_line.size < 1
+        view_line = view_line.first
+        views = view_line[7..-1].split
+        return views.uniq 
+    else
+      raise "Unknown symbol #{sym.inspect}"
+    end
+  end
+
   def _get_views(draft)
     log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
@@ -603,6 +673,8 @@ class RuneBlog
     log!(enter: __method__, args: [draft, view_name], level: 2)
     # break into separate methods?
 
+    return unless _check_view?(view_name)
+
     fname = File.basename(draft)       # 0001-this-is-a-post.lt3
     nslug = fname.sub(/.lt3$/, "")     # 0001-this-is-a-post
     aslug = nslug.sub(/\d\d\d\d-/, "") # this-is-a-post
@@ -632,30 +704,16 @@ class RuneBlog
     _tmp_error(err)
   end
 
+  def _check_view?(view)
+    flag = self.view?(view)
+    puts "  Warning: '#{view}' is not a view" unless flag
+    flag
+  end
+
   def generate_post(draft, force = false)
     log!(enter: __method__, args: [draft], level: 1)
     views = _get_views(draft)
-    views.each do |view| 
-      unless self.view?(view)
-        puts "Warning: '#{view}' is not a view"
-        next
-      end
-      _handle_post(draft, view)
-    end
-  rescue => err
-    _tmp_error(err)
-  end
-
-  def rebuild_post(file)
-    log!(enter: __method__, args: [file])
-    raise "Doesn't currently work"
-    debug "Called rebuild_post(#{file.inspect})"
-    raise ArgumentError unless file.is_a?(String)
-    meta = process_post(file)
-    @views_dirty ||= []
-    @views_dirty << meta.views
-    @views_dirty.flatten!
-    @views_dirty.uniq!
+    views.each {|view| _handle_post(draft, view) }
   rescue => err
     _tmp_error(err)
   end

data/lib/runeblog_version.rb

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.99"
+  VERSION = "0.3.05"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/lib/view.rb

@@ -14,7 +14,13 @@ class RuneBlog::View
     @publisher = RuneBlog::Publishing.new(name)
     @can_publish = true  # FIXME
     @blog.view = self
+    get_globals
+  end
+
+  def get_globals
     gfile = @blog.root/"views/#{name}/themes/standard/global.lt3"
+    return unless File.exist?(gfile)  # Hackish!! how is View.new called from create_view??
+
     live = Livetext.customize(call: ".nopara")
     live.xform_file(gfile)
     @globals = live.vars

data/runeblog.gemspec

@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.99'
+  s.add_runtime_dependency 'livetext', '~> 0.9', '>= 0.9.01'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.20'
 
   s.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.0'

data/test/austin.rb

@@ -31,7 +31,7 @@ end
 @fake_date = Date.today - 20
 
 def make_post(x, title, teaser, body, views=[])
-  debug "      make_post #{bold(title)}"
+  debug "  make_post #{bold(title)}"
   pubdate = @fake_date.strftime("%Y-%m-%d")
   @fake_date += (rand(2) + 1)
   x.create_new_post(title, true, teaser: teaser, body: body, views: views,
@@ -53,28 +53,26 @@ puts
 debug bold("Generating test blog...")
 
 system("rm -rf .blogs")
-RuneBlog.create_new_blog_repo(".blogs")
-x = RuneBlog.new(".blogs")
+RuneBlog.create_new_blog_repo # (".blogs")
+x = RuneBlog.new  # (".blogs")
 
 debug("create_view: #{bold('around_austin')}")
 x.create_view("around_austin")   # FIXME remember view title!
 
-#### FIXME later!!
-vars = <<-VARS
-
-.variables
-blog        Around Austin
-blog.desc   The view from downtown...
+#### FIXME
 
-font.family verdana
-.end
+vars = <<-VARS
+author     Hal Fulton
+title      Around Austin
+subtitle   The view from downtown...
+domain     foo.com
 VARS
-File.open(".blogs/views/around_austin/themes/standard/global.lt3", "a") do |f|
-  f.puts vars
-end
+vfile = ".blogs/views/around_austin/settings/view.txt"
+File.open(vfile, "w") {|f| f.puts vars }
+
 ####
 
-debug("-- change_view: #{bold('around_austin')}")
+debug("change_view: #{bold('around_austin')}")
 x.change_view("around_austin")    # 1 2 7 8 9 
 
 make_post(x, "What's at Stubbs...", <<-EXCERPT, <<-BODY)
@@ -144,11 +142,10 @@ But I first heard of them
 in 2005.
 BODY
 
-debug
-debug "** generate_index #{bold("around_austin")}"
+debug "generate_index #{bold("around_austin")}"
 x.generate_index("around_austin") 
 
-debug("** generate_view: #{bold('around_austin')}")
+debug("generate_view: #{bold('around_austin')}")
 x.generate_view("around_austin")
 
 debug bold("...finished.\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.99
+  version: 0.3.05
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-26 00:00:00.000000000 Z
+date: 2020-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.99
+        version: 0.9.01
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.99
+        version: 0.9.01
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +85,7 @@ files:
 - data/EDITOR
 - data/ROOT
 - data/VIEW
+- data/features.txt
 - data/global.lt3
 - data/universal.lt3
 - empty_view/assets/austin-pano.jpg
@@ -109,6 +110,7 @@ files:
 - empty_view/config/twitter/twitter.rb
 - empty_view/posts/GIT_IS_DUMB
 - empty_view/remote/assets/GIT_IS_DUMB
+- empty_view/remote/banner/navbar/GIT_IS_DUMB
 - empty_view/remote/etc/GIT_IS_DUMB
 - empty_view/remote/permalink/GIT_IS_DUMB
 - empty_view/remote/widgets/ad/GIT_IS_DUMB
@@ -116,6 +118,10 @@ files:
 - empty_view/remote/widgets/news/GIT_IS_DUMB
 - empty_view/remote/widgets/pages/GIT_IS_DUMB
 - empty_view/remote/widgets/pinned/GIT_IS_DUMB
+- empty_view/settings/features.txt
+- empty_view/settings/publish.txt
+- empty_view/settings/recent.txt
+- empty_view/settings/view.txt
 - empty_view/themes/standard/README
 - empty_view/themes/standard/banner/banner.lt3
 - empty_view/themes/standard/banner/navbar/about.lt3
@@ -131,12 +137,10 @@ files:
 - empty_view/themes/standard/etc/externals.lt3
 - empty_view/themes/standard/etc/favicon.ico
 - empty_view/themes/standard/etc/misc.js
-- empty_view/themes/standard/global.lt3
 - empty_view/themes/standard/post/generate.lt3
 - empty_view/themes/standard/post/head.lt3
 - empty_view/themes/standard/post/index.lt3
 - empty_view/themes/standard/post/permalink.lt3
-- empty_view/themes/standard/recent.txt
 - empty_view/themes/standard/widgets/README
 - empty_view/themes/standard/widgets/ad/ad.lt3
 - empty_view/themes/standard/widgets/ad/ad1.png

data/empty_view/themes/standard/global.lt3

@@ -1,32 +0,0 @@
-. --------------------------------------------------
-. Global settings are stored here in the form       
-.   <variable>  <value>                             
-. --------------------------------------------------
-
-.variables
-author      Your name here
-blog        Blog title goes here
-blog.desc   Subtitle (if any) goes here
-site        rubyhacker.com
-
-host        localhost:4000//
-charset     utf-8
-url         localhost:4000//
-locale      en_US
-
-font.family       verdana
-
-recent.title.color  #010101
-recent.title.size   28px
-recent.text.color   #0101a1
-recent.text.size    22px
-recent.date.color   #9a9a9a
-recent.date.size    15px
-
-publish.user      root
-publish.server    rubyhacker.com
-publish.docroot   /var/www/
-publish.path      stuff
-publish.proto     http
-.end
-