runeblog 0.1.54 → 0.1.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea5002de3576419be68f651ed79ccd06abb53fcca47deb90601a1d21dadbb093
-  data.tar.gz: 544e57415acfbae4302bf0b21be89edd7d2fa14390402aa2c342ecc4d7f2986e
+  metadata.gz: 5dfb6b74967e6212fc9e8474f483db8da090603d3b69ff77c3bdf0693ba01c77
+  data.tar.gz: e33b778ece67830c43c6ef717692e0987071e77c750cae360df7c354ae016b75
 SHA512:
-  metadata.gz: 9da4ec096ef6e44aacd9e932407dca5e6aed3a482b0f3b8c47bbf220be98343455676bb31995feab8cc147c9cac9f3c42555d6ba40d345c2b308783b45c75f57
-  data.tar.gz: c75b09de425a4994bf11a5c29838e58d0ab8306020ff69a0716f0d31bd32da197fd40dcf1b916c2eeb40aa58ac30c9ee4ee6129b6cdf1186eadc47300684e1fb
+  metadata.gz: 438cd7ca72a2c3491d37aaab15540f176858b3d63742d2a0803baaaf7b8a038ebdefdff54d228e96a5d6e3c48595ab5a388cc6668733048d1ea8b73e5823a7a3
+  data.tar.gz: 95cd3836e734ee3121d00720fd71fbcade3f1920a41c8fb596e2a08aad74b32b495d7807ad8d6d99df0cf7f32e575dec67426ae565fe1a08c103ea6d092c9133

data/lib/liveblog.rb

@@ -0,0 +1,232 @@
+require 'ostruct'
+require 'pp'
+require 'date'
+
+require 'runeblog'  # Now depends explicitly
+
+def quote
+  _passthru "<blockquote>"
+  _passthru _body
+  _passthru "</blockquote>"
+  _optional_blank_line
+end
+
+class ::Livetext::Functions   # do this differently??
+
+  def asset   # FIXME this is baloney...
+    raise "meh"
+    param = ::Livetext::Functions.param
+    context = ::Livetext::Functions.context
+    main = context.eval("@main") rescue "NO MAIN?"
+    @meta = main.instance_eval("@main.instance_eval { @meta }")
+    @config = main.instance_eval("@main.instance_eval { @config }")
+    @root = @config.root
+
+    text, name = param.split("|")
+ 
+    # FIXME how should this work?
+    view = @blog.view
+    url = find_asset(name)
+    "<a href='#{url}'>#{text}</a>"
+  end
+
+end
+
+def categories   # does nothing right now
+end
+
+### inset
+
+def inset
+  lines = _body
+  box = ""
+  lines.each do |line| 
+    line = line.dup
+    if line[0] == "/"  # Only into inset
+      line[0] = ' '
+      box << line.dup + " "
+      line.replace(" ")
+    end
+    if line[0] == "|"  # Into inset and body
+      line[0] = ' '
+      box << line.dup + " "
+    end
+    _passthru(line)
+  end
+  lr = _args.first
+  wide = _args[1] || "25"
+  _passthru "<div style='float:#{lr}; width: #{wide}%; padding:8px; padding-right:12px; font-family:verdana'>"
+  _passthru '<b><i>'
+  _passthru box
+  _passthru_noline '</i></b></div>'
+  _optional_blank_line
+end
+
+### copy_asset
+
+def copy_asset(asset)
+  vdir = @blog.view.dir
+  return if File.exist?(vdir + "/assets/" + asset)
+  top = vdir + "/../../assets/"
+  if File.exist?(top + asset)
+    system("cp #{top}/#{asset} #{vdir}/assets/#{asset}")
+    return
+  end
+  raise "Can't find #{asset.inspect}"
+end
+
+#############
+
+def init_liveblog    # FIXME - a lot of this logic sucks
+  @blog, num = Livetext.parameters
+  @meta = OpenStruct.new
+  @meta.num = num
+  @root = @blog.root rescue nil
+  @view = @blog.view.name rescue nil
+  @vdir = @blog.view.dir rescue nil
+  @body = ""
+end
+
+def _errout(*args)
+  ::STDERR.puts *args
+end
+
+def _passthru(line, context = nil)
+  return if line.nil?
+  line = _formatting(line, context)
+  @body << line + "\n"
+  @body << "<p>" if line.empty? && ! @_nopara
+end
+
+def _passthru_noline(line, context = nil)
+  return if line.nil?
+  line = _formatting(line, context)
+  @body << line
+  @body << "<p>" if line.empty? && ! @_nopara
+end
+
+def title 
+  title = @_data.chomp
+  @meta.title = title
+  @body << "<h1>#{title}</h1>"
+  _optional_blank_line
+end
+
+def pubdate 
+  _debug "data = #@_data"
+  # Check for discrepancy?
+  match = /(\d{4}).(\d{2}).(\d{2})/.match @_data
+  junk, y, m, d = match.to_a
+  y, m, d = y.to_i, m.to_i, d.to_i
+  @meta.date = ::Date.new(y, m, d)
+  @meta.pubdate = "%04d-%02d-%02d" % [y, m, d]
+  _optional_blank_line
+end
+
+def image   # primitive so far
+  _debug "img: huh? <img src=#{_args.first}></img>"
+  fname = _args.first
+  path = "../assets/#{fname}"
+  @body << "<img src=#{path}></img>"
+  _optional_blank_line
+end
+
+def tags
+  _debug "args = #{_args}"
+  @meta.tags = _args.dup || []
+  _optional_blank_line
+end
+
+def views
+  _debug "data = #{_args}"
+  @meta.views = _args.dup # + ["main"]
+  _optional_blank_line
+end
+
+def pin  
+  _debug "data = #{_args}"
+  # verify only already-specified views?
+  @meta.pinned = _args.dup
+  _optional_blank_line
+end
+
+# def liveblog_version
+# end
+
+def list
+  @body << "<ul>"
+  _body {|line| @body << "<li>#{line}</li>" }
+  @body << "</ul>"
+  _optional_blank_line
+end
+
+def list!
+  @body << "<ul>"
+  lines = _body.each   # {|line| @body << "<li>#{line}</li>" }
+  loop do 
+    line = lines.next
+    line = _formatting(line)
+    if line[0] == " "
+      @body << line
+    else
+      @body << "<li>#{line}</li>"
+    end
+  end
+  @body << "</ul>"
+  _optional_blank_line
+end
+
+def asset
+  @meta.assets ||= {}
+  list = _args
+  # For now: copies, doesn't keep record
+  # Later: Add to file and uniq; use in publishing
+  list.each {|asset| copy_asset(asset) }
+  _optional_blank_line
+end
+
+def assets
+  @meta.assets ||= []
+  @meta.assets += _body
+  _optional_blank_line
+end
+
+def write_post(meta)
+  save = Dir.pwd
+  @postdir.gsub!(/\/\//, "/")  # FIXME unneeded?
+  Dir.mkdir(@postdir) unless Dir.exist?(@postdir) # FIXME remember assets!
+  Dir.chdir(@postdir)
+  meta.views = meta.views.join(" ")
+  meta.tags  = meta.tags.join(" ") rescue ""
+  File.write("body.txt", @body)  # Actually HTML...
+  File.write("teaser.txt", meta.teaser)
+  
+  fields = [:num, :title, :date, :pubdate, :views, :tags]
+  
+  fname2 = "metadata.txt"
+  f2 = File.open(fname2, "w") do |f2| 
+    fields.each {|fld| f2.puts "#{fld}: #{meta.send(fld)}" }
+  end
+  Dir.chdir(save)
+rescue => err
+  puts "err = #{err}"
+  puts err.backtrace.join("\n")
+end
+
+def teaser
+  @meta.teaser = _body_text
+  @body << @meta.teaser + "\n"
+  # FIXME
+end
+
+def finalize
+  if @blog.nil?
+    puts @body
+    return
+  end
+  @slug = @blog.make_slug(@meta)
+  @postdir = @blog.view.dir + "/#@slug"
+  write_post(@meta) # FIXME
+  @meta
+end
+ 

data/lib/post.rb

@@ -98,8 +98,8 @@ class RuneBlog::Post
 
   def create_draft
     viewhome = @blog.view.publisher.url
-print "HOME = "
-p viewhome
+# print "HOME = "
+# p viewhome
     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)

data/lib/repl.rb

@@ -240,6 +240,7 @@ module RuneBlog::REPL
     file = files.first
     result = edit_file("#{@blog.root}/src/#{file}")
     @blog.rebuild_post(file)
+sleep 5
     @out
   end
 

data/lib/runeblog.rb

@@ -300,6 +300,8 @@ class RuneBlog
     debug "Called rebuild_post(#{file.inspect})"
     raise ArgumentError unless file.is_a?(String)
     meta = process_post(file)
+p meta
+sleep 4
     @views_dirty ||= []
     @views_dirty << meta.views
     @views_dirty.flatten!

data/lib/runeblog_version.rb

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

data/runeblog.gemspec

@@ -5,9 +5,9 @@ $LOAD_PATH << "lib"
 
 require "runeblog_version"
 
-Gem.post_build do |spec|
-  puts "Here we are"
-  puts Dir.pwd
+Gem.post_install do |spec|
+  Dir.chdir(RuneBlog::Path)
+p Dir.pwd
   system("livetext -i liveblog.rb")
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.54
+  version: 0.1.55
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -65,6 +65,7 @@ files:
 - lib/global.rb
 - lib/helpers-blog.rb
 - lib/helpers-repl.rb
+- lib/liveblog.rb
 - lib/post.rb
 - lib/publish.rb
 - lib/repl.rb