livetext 0.8.25 → 0.8.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b361038930421fd67a403b32b0f2f5e511f6f35c
-  data.tar.gz: c6769d374d3b981ef89193c31dd75f7869810ecb
+  metadata.gz: 32e86e25ebebcbf8fe7b16ae41d200f09acd4575
+  data.tar.gz: 9232fb4dc849f320b79d92a9b367842f3bd2564f
 SHA512:
-  metadata.gz: 7a260fec5f64e897f2d7a09b162e8bf55ee76b6bb59982fa17f4724162746b2930224577c3a415ab6ee91e57586d360bf4c90bac3445c66c255a3f286c8adb62
-  data.tar.gz: 7503dd3e8c18a9e22b758c0d691e9d91a6861f6414bc6e67dba2d03f8de0e8188c132208ec6405cb282b19a3900258e3b74aa5fa837f069df2a54d28b8f52387
+  metadata.gz: 67f94af5e205a02512ecb802f33a33be2fb8e6e2186febbbf2c23937357b4900c5a40098a52e7995326f5a3732792f9b64a5bc3aaf914c0c970673426b037915
+  data.tar.gz: 2635e5b110ea1b24e38dc0e8e83ea7fc20ae18baa258258ab67a3477aa9e9545a96056281ff97ebc9d5beaa3f7713e596db173e189655d1aa6c985bf445df0c3

data/dsl/liveblog.rb

@@ -1,23 +1,37 @@
 require 'ostruct'
 require 'yaml'
+require 'pp'
 
 require 'runeblog'  # Now depends explicitly
 
 class ::Livetext::Functions   # do this differently??
 
   def asset   # FIXME this is baloney...
-  param = Livetext::Functions.param
-  puts "REACHED func_asset"
-     text, name = param.split("|")
+    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?
-#    url = find_asset(name)
-     url = name
-     "<a href='#{url}'>#{text}</a>"
+    # FIXME how should this work?
+    view = ThisConfig.view
+    url = find_asset(name)
+    "<a href='#{url}'>#{text}</a>"
   end
 
 end
 
+
+begin
+  ThisBlog
+rescue
+  ThisBlog    = RuneBlog.new
+  ThisConfig  = ThisBlog.read_config
+end
+
 ### find_asset
 
 def find_asset(asset)
@@ -46,23 +60,31 @@ end
 #############
 
 def init_liveblog
-  @blog = RuneBlog.new
-  @config = @blog.read_config
+  @blog = ThisBlog
+  @config = ThisConfig
   @root = @config.root
   @teaser = ""
   @body = ""
   @body = ""
   @meta = ::OpenStruct.new
+
+  @deploy ||= {}
+  @config.views.each do |view|
+    deployment = @config.viewdir(view) + "deploy"
+    raise "File '#{deployment}' not found" unless File.exist?(deployment)
+    lines = File.readlines(deployment).map {|x| x.chomp }
+    @deploy[view] = lines
+  end
 end
 
 def _errout(*args)
   ::STDERR.puts *args
 end
 
-def _passthru(line)
+def _passthru(line, context = nil)
   return if line.nil?
   @body << "<p>" if line == "\n" and ! @_nopara
-  line = _formatting(line)
+  line = _formatting(line, context)
   @body << line + "\n"
 end
 
@@ -87,7 +109,7 @@ end
 
 def views
   _debug "data = #{_args}"
-  @meta.views = _args # + ["main"]
+  @meta.views = _args.dup # + ["main"]
 end
 
 def liveblog_version
@@ -118,13 +140,13 @@ def asset
   @meta.assets ||= {}
   list = _args
   list.each {|asset| @meta.assets[asset] = find_asset(asset) }
-  STDERR.puts red("\n  [DEBUG] ") + "Asset(s): #{@meta.assets}"
+# 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}"
+# STDERR.puts red("\n  [DEBUG] ") + "Assets: #{_body.inspect}"
 end
 
 def finalize

data/lib/formatline.rb

@@ -49,7 +49,8 @@ class FormatLine
       self.send("func_" + name.to_s, param)
     else
       fobj = ::Livetext::Functions.new
-      ::Livetext::Functions.param = param
+      ::Livetext::Functions.param = param       # is this screwed up???
+      ::Livetext::Functions.context = @context   # is this screwed up???
       fobj.send(name)
     end
   end
@@ -88,7 +89,9 @@ class FormatLine
     @substr = ""
   end
 
-  def parse(line)
+  def parse(line, context = nil)
+    context ||= binding
+    @context = context
     @enum = line.chomp.each_char
     @buffer = ""
     @substr = ""

data/lib/functions.rb

@@ -4,13 +4,10 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
   Formats = ::Livetext::Standard::SimpleFormats
 
   @param = nil
+  @context = nil
 
-  def self.param
-    @param
-  end
-
-  def self.param=(str)
-    @param = str
+  class << self
+    attr_accessor :param, :context
   end
 
   def date

data/lib/livetext.rb

@@ -1,7 +1,9 @@
 class Livetext
-  VERSION = "0.8.25"
+  VERSION = "0.8.26"
 end
 
+$Livetext = Livetext
+
 require 'fileutils'
 
 Path  = File.expand_path(File.join(File.dirname(__FILE__)))
@@ -20,7 +22,7 @@ TTY = ::File.open("/dev/tty", "w")
 class Livetext
   Vars = {}
 
-  attr_reader :main
+  attr_reader :main, :context
 
   class Processor
     include Livetext::Standard
@@ -54,6 +56,7 @@ class Livetext
     def _error!(err, abort=true, trace=false)
       where = @sources.last || @save_location
       STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
+      STDERR.puts err.backtrace
       STDERR.puts err.backtrace if @backtrace && err.respond_to?(:backtrace)
       exit if abort
     end
@@ -100,7 +103,10 @@ class Livetext
     @main = Processor.new(self, output)
   end
 
-  def process_line(line, sigil=".")
+  def process_line(line, context=nil)
+    context ||= binding
+    @context = context
+    sigil = "." # Can't change yet
     nomarkup = true
     # FIXME inefficient
     scomment  = rx(sigil, Livetext::Space)  # apply these in order
@@ -110,19 +116,21 @@ class Livetext
     elsif line =~ sname 
       handle_sname(line)
     else
-      @main._passthru(line)
+      @main._passthru(line, context)
     end
   end
 
-  def process_file(fname, backtrace=false)
+  def process_file(fname, context=nil)
+    context ||= binding
+    @context = context
     raise "No such file '#{fname}' to process" unless File.exist?(fname)
     enum = File.readlines(fname).each
-    @backtrace = backtrace
+    @backtrace = false
     @main.source(enum, fname, 0)
     loop do 
       line = @main.nextline
       break if line.nil?
-      process_line(line)
+      process_line(line, context)
     end
     val = @main.finalize if @main.respond_to? :finalize
     val

data/lib/userapi.rb

@@ -4,8 +4,6 @@ require 'formatline'
 
 module Livetext::UserAPI
 
-  Parser = ::FormatLine.new
-
   def _check_existence(file, msg)
     _error! msg unless File.exist?(file)
   end
@@ -99,15 +97,18 @@ module Livetext::UserAPI
     str
   end
 
-  def _formatting(line)
-    l2 = Parser.parse(line)
+  def _formatting(line, context = nil)
+    @parser ||= ::FormatLine.new
+    l2 = @parser.parse(line, context)
     line.replace(l2)
   end
 
-  def _passthru(line)
+  def _passthru(line, context = nil)
     return if @_nopass
+#   p [@_nopara, line]
     _puts "<p>" if line == "\n" and ! @_nopara
-    _formatting(line)
+#   _puts "<p>" if line == "" and ! @_nopara
+    _formatting(line, context)
     _puts line
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.25
+  version: 0.8.26
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -148,8 +148,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A smart processor for text
 test_files: []
+has_rdoc: