livetext 0.8.42 → 0.8.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1902fcbf9b44c268b05bcd185223203bab7e985d10f36242d41d3e7b7683e56
-  data.tar.gz: 9dcf1fe627a781be69837ac89f0d69929ed1a9cac2f1a86b576112af9361fb13
+  metadata.gz: 6f616a0419bfa694f6b124dd9a9951571f5e9ca86f62c29d6c9f594a680b5abc
+  data.tar.gz: cf4ea38b26db10bd5756f3a6a37010b9d5a16af570114222b5ae35d6160a46ee
 SHA512:
-  metadata.gz: 89c23d7cbf0acd8fbc6841f79285d39a866c4ac6ebb25a2cf20516adf2b7ce306f8ccaf265db3223b149d864895b64e205e1d982d9aaa2554e4bf08d7e8a1f3b
-  data.tar.gz: c4eb4e89272f1d97113a3f7c825f94ef962afdb1e515b95a0490ffee4cf4418dac92a73e723848adde8b5d077d440a778bde1e16115a69f83f856ee473163fb2
+  metadata.gz: b195ba333856b2d1ac0e4a98b1a9cf1bec33f804eef68f11d8600a7e3e5e2ff4c529d2d06d6b82a4ab9871a6f86adbc44d8810b1b6711dfa163e949d10a17a1a
+  data.tar.gz: 7868ec91b536e5beca57b7bd955907935941b12e677ece9a6af886d377d32a17af810b94ccaddfe64e700be8d5589399b71af331777ede6ce841cdff59dc3be2

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.42"
+  VERSION = "0.8.43"
 end
 
 $Livetext = Livetext
@@ -119,6 +119,20 @@ class Livetext
     end
   end
 
+  def process_text(text, *args)
+    text = text.split("\n") if text.is_a? String
+    enum = text.each
+    @backtrace = false
+    @main.source(enum, fname, 0)
+    loop do 
+      line = @main.nextline
+      break if line.nil?
+      process_line(line, context)
+    end
+    val = @main.finalize if @main.respond_to? :finalize
+    val
+  end
+
   def process_file(fname, context=nil)
     context ||= binding
     @context = context

data/livetext.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
 
   s.files       =  main + misc + test
   s.homepage    = 'https://github.com/Hal9000/livetext'
-  s.license     = "Ruby's license"
+  s.license     = "Ruby"
 end

data/plugin/liveblog.rb

@@ -23,7 +23,7 @@ class ::Livetext::Functions   # do this differently??
     text, name = param.split("|")
  
     # FIXME how should this work?
-    view = ThisBlog.view
+    view = @blog.view
     url = find_asset(name)
     "<a href='#{url}'>#{text}</a>"
   end
@@ -69,6 +69,7 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   @blog = ThisBlog
   @config = ThisBlog
   @root = @config.root
+  @title = ""
   @teaser = ""
   @body = ""
   @body = ""
@@ -108,15 +109,11 @@ def pubdate
   @meta.pubdate = "%04d-%02d-%02d" % [y, m, d]
 end
 
-# def categories   # now: tags
-#   _debug "args = #{_args}"
-#   @meta.categories = _args  # phase out
-#   @meta.tags = _args
-# end
-
 def image   # primitive so far
   _debug "img: huh? <img src=#{_args.first}></img>"
-  @body << "<img src=#{_args.first}></img>"
+  fname = _args.first
+  path = "assets/#{fname}"
+  @body << "<img src=#{path}></img>"
 end
 
 def tags
@@ -174,6 +171,10 @@ end
 
 def finalize
   @meta.body = @body
+File.open("/tmp/lblog.txt", "w") do |f|
+  f.puts 
+  f.puts @meta.inspect
+end
   @meta
 end
 

data/plugin/old_liveblog.rb

@@ -0,0 +1,185 @@
+require 'ostruct'
+require 'pp'
+require 'date'
+
+require 'runeblog'  # Now depends explicitly
+
+def quote
+  _puts "<blockquote>"
+  _puts _body
+  _puts "</blockquote>"
+end
+
+class ::Livetext::Functions   # do this differently??
+
+  def asset   # FIXME this is baloney...
+    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
+
+
+begin
+  ThisBlog
+rescue
+  ThisBlog    = RuneBlog.new
+# ThisConfig  = ThisBlog.open_blog
+end
+
+### find_asset
+
+def find_asset(asset)
+  views = @config.views
+  views.each do |view| 
+    vdir = @config.viewdir(view)
+    post_dir = "#{vdir}#{@meta.slug}/assets/"
+    path = post_dir + asset
+    STDERR.puts "          Seeking #{path}"
+    return path if File.exist?(path)
+  end
+  views.each do |view| 
+    dir = @config.viewdir(view) + "/assets/"
+    path = dir + asset
+    STDERR.puts "          Seeking #{path}"
+    return path if File.exist?(path)
+  end
+  top = @root + "/assets/"
+  path = top + asset
+  STDERR.puts "          Seeking #{path}"
+  return path if File.exist?(path)
+
+  return nil
+end
+
+#############
+
+def init_liveblog    # FIXME - a lot of this logic sucks
+  @blog = ThisBlog
+  @config = ThisBlog
+  @root = @config.root
+  @title = ""
+  @teaser = ""
+  @body = ""
+  @body = ""
+  @meta = ::OpenStruct.new
+
+  @publish ||= {}
+  @config.views.each do |view|
+    publish = @config.viewdir(view) + "publish"
+    raise "File '#{publish}' not found" unless File.exist?(publish)
+    lines = File.readlines(publish).map {|x| x.chomp }
+    @publish[view] = lines
+  end
+end
+
+def _errout(*args)
+  ::STDERR.puts *args
+end
+
+def _passthru(line, context = nil)
+  return if line.nil?
+  @body << "<p>" if line == "\n" and ! @_nopara
+  line = _formatting(line, context)
+  @body << line + "\n"
+end
+
+def title 
+  @meta.title = @_data
+  @body << "<h1>#{@meta.title}</h1>"
+end
+
+def pubdate 
+  _debug "data = #@_data"
+  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]
+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>"
+end
+
+def tags
+  _debug "args = #{_args}"
+  @meta.tags = _args
+end
+
+def views
+  _debug "data = #{_args}"
+  @meta.views = _args.dup # + ["main"]
+end
+
+def pin  
+  _debug "data = #{_args}"
+  # verify only already-specified views?
+  @meta.pinned = _args.dup
+end
+
+# def liveblog_version
+# end
+
+def list
+  @body << "<ul>"
+  _body {|line| @body << "<li>#{line}</li>" }
+  @body << "</ul>"
+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>"
+end
+
+def asset
+  @meta.assets ||= {}
+  list = _args
+  list.each {|asset| @meta.assets[asset] = find_asset(asset) }
+# STDERR.puts red("\n  [DEBUG] ") + "Asset(s): #{@meta.assets}"
+end
+
+def assets
+  @meta.assets ||= []
+  @meta.assets += _body
+# STDERR.puts red("\n  [DEBUG] ") + "Assets: #{_body.inspect}"
+end
+
+def finalize
+  @meta.body = @body
+File.open("/tmp/lblog.txt", "w") do |f|
+  f.puts 
+  f.puts @meta.inspect
+end
+  @meta
+end
+
+def teaser
+  @meta.teaser = _body_text
+  @body << @meta.teaser + "\n"
+  # FIXME
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.42
+  version: 0.8.43
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-22 00:00:00.000000000 Z
+date: 2018-12-24 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -26,12 +26,12 @@ files:
 - lib/standard.rb
 - lib/userapi.rb
 - livetext.gemspec
-- plugin/.calibre.rb.swp
 - plugin/bookish.rb
 - plugin/calibre.rb
 - plugin/liveblog.rb
 - plugin/livemagick.rb
 - plugin/markdown.rb
+- plugin/old_liveblog.rb
 - plugin/pyggish.rb
 - plugin/tutorial.rb
 - test/affirm/kbks.jpg
@@ -127,18 +127,12 @@ files:
 - test/data/table_with_heredocs/expected-error.txt
 - test/data/table_with_heredocs/expected-output.txt
 - test/data/table_with_heredocs/source.lt3
-- test/lines.lt3
-- test/myfile.jpg
 - test/newtest
 - test/sdtest
-- test/somefile.jpg
 - test/test.rb
-- test/try.lt3
-- test/try2.lt3
-- test/try2.rb
 homepage: https://github.com/Hal9000/livetext
 licenses:
-- Ruby's license
+- Ruby
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/test/lines.lt3

@@ -1,213 +0,0 @@
-tick: Single token, beginning of line
-`def is like a reserved word
-
-tick: Single token, middle of line
-They say `def is like a reserved word
-
-tick: Single token, end of line
-like a reserved word, is `def
-
-tick: Bracketed, normal
-This is `[code font] here
-
-tick: Bracketed, hits EOL
-This is `[code font here
-
-tick: followed by space
-This is not ` code
-
-tick: followed by EOL
-This also isn't code: `
-
-tick: Doubled, ignores comma
-This is ``code, of course
-
-tick: Doubled, ignores period
-This is ``code. Hooray, I guess.
-
-tick: Doubled, ignores right paren
-(By the way, this is ``code)
-
-tick: Doubled, ignores EOL
-Up to EOL, this is ``code
-
-uscore: Single token, beginning of line
-_This is italics
-
-uscore: Single token, middle of line
-And _this is italics
-
-uscore: Single token, end of line
-And so is _this
-
-uscore: Bracketed, normal
-The _[USS Enterprise] was here
-
-uscore: Bracketed, hits EOL
-Hey, it's the _[USS Enterprise
-
-uscore: followed by space
-This: _ is just an underscore
-
-uscore: followed by EOL
-This is just an underscore: _
-
-uscore: Doubled, ignores comma
-Just a __second, ok?
-
-uscore: Doubled, ignores period
-Just a __second. OK?
-
-uscore: Doubled, ignores right paren
-I'll (just a __second) be right there.
-
-uscore: Doubled, ignores EOL
-Be there in a __second
-
-Tick has precedence over underscore
-This is a `piece_of_code here
-
-under: Starts after double quote?
-He said, "_Please go away."
-
-Dollar sign followed by blank
-This: $ is a dollar sign
-
-Dollar sign followed by non-alpha
-I'd pay $3 for that
-
-Dollar sign followed by EOL
-This is a dollar sign: $
-
-Double dollar sign followed by blank
-This: $$ is not a function call
-
-Double dollar sign followed by non-alpha
-If I say $$-, that's not a function call
-
-Double dollar sign followed by EOL
-This is two dollar signs: $$
-
-Escaped *
-Asterisk followed by abc: \*abc
-
-Escaped _
-Underscore followed by abc: \_abc
-
-Escaped `
-Tick followed by abc: \`abc
-
-Escaped $
-This:  \$var is not a variable
-
-Escaped $$
-This: \$\$func is not a function
-
-strike: Single token, beginning of line
-~this - no, I mean that
-
-strike: Single token, middle of line
-They say ~redacted is fun
-
-strike: Single token, end of line
-Ignore this: ~foobar
-
-strike: Bracketed, normal
-This is ~[crossed out] text
-
-strike: Bracketed, hits EOL
-This is ~[more stuff crossed out
-
-strike: followed by space
-This is not ~ overstrike
-
-strike: followed by EOL
-This also isn't overstrike: `
-
-strike: Doubled, ignores comma
-This is ~~overstrike, of course
-
-strike: Doubled, ignores period
-This is ~~overstrike. Hooray, I guess.
-
-strike: Doubled, ignores right paren
-(By the way, this is ~~overstrike)
-
-strike: Doubled, ignores EOL
-Up to EOL, this is ~~redacted
-
-Trying $$b function, no param
-This is $$b being called
-
-Trying $$b function, brackets
-This is $$b[bold text] being called
-
-Trying $$b function, unterminated brackets
-This is $$b[bold text being called
-
-Trying $$b function, colon param
-This is $$b:token being called
-
-Try $$i
-There is $$i[some text] here
-
-Try $$t
-There is $$t[some text] here
-
-Try $$s
-There is $$s[some text] here
-
-Try $$bi
-There is $$bi[some text] here
-
-Try $$bt
-There is $$bt[some text] here
-
-Try $$bs
-There is $$bs[some text] here
-
-Try $$it
-There is $$it[some text] here
-
-Try $$is
-There is $$is[some text] here
-
-Try $$ts
-There is $$ts[some text] here
-
-Try $$bit
-There is $$bit[some text] here
-
-Try $$bis
-There is $$bis[some text] here
-
-Try $$bts
-There is $$bts[some text] here
-
-Try $$its
-There is $$its[some text] here
-
-Try $$bits 
-There is $$bits[some text] here
-
-Escaped brackets inside bracketed function parameter
-Here is an $$t[\[:array, :expression\]] with escapes.
-
-Escape brackets inside *
-There are brackets *[\[\]] here
-
-Escape brackets inside _
-There are brackets _[\[\]] here
-
-Escape brackets inside `
-There are brackets `[\[\]] here
-
-Escape brackets inside ~
-There are brackets ~[\[\]] here
-
-Check output of $$date
-Today is $$date, I guess
-
-Check output of $$time
-Tick tock, it's $$time right now
-

data/test/try.lt3

@@ -1,22 +0,0 @@
-.mixin livemagick
-
-.nopass
-
-.image 800 600 skyblue
-.canvas green 1 0
-.pen red red
-.font 80 AvantGarde
-
-.rectangle 250,100 300x300 green 9
-
-.text! 150,200 500x200 
-This is
-only
-a test.
-.end
-
-.draw
-
-.save! somefile.jpg
-
-

data/test/try2.lt3

@@ -1,27 +0,0 @@
-.mixin livemagick
-
-. nopass
-.nopara
-
-Here goes...
-
-.image 400 400 skyblue
-.canvas green 1 0
-.pen red red
-.font 80 Arial
-
-.rectangle 50,50 300x300 black 9
-
-.text! 0,150 400x200 
-This is
-only
-a test.
-.end
-
-.draw
-
-Writing the file...
-
-.save! myfile.jpg
-
-

data/test/try2.rb

@@ -1,26 +0,0 @@
-require 'rmagick'
-
-canvas = Magick::Draw.new
-
-canvas.fill_opacity(0)
-canvas.stroke('green')
-canvas.stroke_width(1)
-canvas.stroke("red")
-
-canvas.rectangle(x, y, x+width, y+height)
-
-text = "This is\n only\n a test."
-
-canvas.annotate(@image, width, height, x, y, str) do 
-  self.font_family = font
-  self.fill = fill
-  self.stroke = stroke
-  self.pointsize = size
-  self.font_weight = weight
-  self.gravity = gravity
-end
-
-canvas.draw # ...
-canvas.save("whatever.jpg") # ...
-
-