livetext 0.8.24 → 0.8.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d67dcd5f1a55000e0be2a812706d86183f8a0c0
-  data.tar.gz: 7e1c331915b404cc668bbd49b8a63f729c4f0bd7
+  metadata.gz: b361038930421fd67a403b32b0f2f5e511f6f35c
+  data.tar.gz: c6769d374d3b981ef89193c31dd75f7869810ecb
 SHA512:
-  metadata.gz: 98b1eeb02376acb99b3d35f401a44a8c4c1f85427cca98007afb3fbc8ac498f9f5114c3a49846659a6b7e23290a243cf1b2da110ded69c40600a2b183c12b09c
-  data.tar.gz: dc6470a660cc1798c4a64136b3957382090166e3c3d5058038e321c159a87ab38e5dad30829acbc1540611d8ebba4a2fa27ef92dc27660a0da0e45550a314b14
+  metadata.gz: 7a260fec5f64e897f2d7a09b162e8bf55ee76b6bb59982fa17f4724162746b2930224577c3a415ab6ee91e57586d360bf4c90bac3445c66c255a3f286c8adb62
+  data.tar.gz: 7503dd3e8c18a9e22b758c0d691e9d91a6861f6414bc6e67dba2d03f8de0e8188c132208ec6405cb282b19a3900258e3b74aa5fa837f069df2a54d28b8f52387

data/dsl/liveblog.rb

@@ -1,7 +1,54 @@
 require 'ostruct'
 require 'yaml'
 
+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("|")
+ 
+     # FIXME how should this work?
+#    url = find_asset(name)
+     url = name
+     "<a href='#{url}'>#{text}</a>"
+  end
+
+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
+  @blog = RuneBlog.new
+  @config = @blog.read_config
+  @root = @config.root
   @teaser = ""
   @body = ""
   @body = ""
@@ -68,8 +115,9 @@ def list!
 end
 
 def asset
-  @meta.assets ||= []
-  @meta.assets += _args
+  @meta.assets ||= {}
+  list = _args
+  list.each {|asset| @meta.assets[asset] = find_asset(asset) }
   STDERR.puts red("\n  [DEBUG] ") + "Asset(s): #{@meta.assets}"
 end
 

data/lib/formatline.rb

@@ -45,10 +45,13 @@ class FormatLine
   end
 
   def funcall(name, param)
-    fobj = ::Livetext::Functions.new
-    ::Livetext::Functions.param = param
-# STDERR.puts "Calling '#{name}' with '#{param}'"
-    fobj.send(name)
+    if self.respond_to?("func_" + name.to_s)
+      self.send("func_" + name.to_s, param)
+    else
+      fobj = ::Livetext::Functions.new
+      ::Livetext::Functions.param = param
+      fobj.send(name)
+    end
   end
 
   def vsub
@@ -57,7 +60,6 @@ class FormatLine
   end
 
   def fcall
-#   puts "Calling funcall: #@name(#@param)"
     @buffer << funcall(@fname, @param)
     @fname, @param = "", ""
   end

data/lib/functions.rb

@@ -27,6 +27,11 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
     "<a href='#{url}'>#{text}</a>"
   end
 
+#   def asset
+#     param = self.class.param
+#     # FIXME how should this work?
+#   end
+
   def yt
     param = self.class.param
     "https://www.youtube.com/watch?v=#{param}"

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.24"
+  VERSION = "0.8.25"
 end
 
 require 'fileutils'

metadata

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