livetext 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58616785a3710e488a7544ebbddf8252b0c1c3c1
-  data.tar.gz: f72aabb6d7ac5a8e82853432feba4cb3a7f764d8
+  metadata.gz: 6954888defa54a2e9666f5ac2f0a7bd444b0d982
+  data.tar.gz: 833e60f5aba4fad4e9af99ea3e3fc3454672e994
 SHA512:
-  metadata.gz: 5eb339456e6106843986d544b011644e1ebe1d1c0de18f3c5d44496bd8895d4b48e5423dd826a60a5da7e925e805c1e10f65533504f9670b5d2e7affcbfb57df
-  data.tar.gz: f6278c805e1aee2e0a2ca9a217a87c69591f3efdec5eda9fbd606f53b5544a6c6c31f42fee9249ed51081dc859e44e5797012004ac1686ef251b207bc0a393b6
+  metadata.gz: 1309cac8ff690ba7b7d1232c0238328168c4502d5c2fefaa7b9726896096aa6d439b2daec7c13ea07e05f2ccd0ee3c742bf435703260ac31fa8d9c984440e3a0
+  data.tar.gz: 3d5ea124005121b9dd6ccefe1dbac39afc6869d4d18c2f1882ab015d3c29d722539f9006be8cb9aea90138d5f28ef38512cadd45955f5f7e47496bd4f35fa591

data/lib/liveblog.rb

@@ -6,10 +6,10 @@ def init_liveblog
   @body = ""
   @dest = @teaser
   @meta = ::OpenStruct.new
-# @views = ::Dir.entries("#{@config.root}/views") - %w[. ..]
-  @deployment = {}
+# @views = ::Dir.entries("views") - %w[. ..]
+# @deployment = {}
 # @views.each do |per|
-#   file = ""#{@config.root}views/#{per}/deploy"
+#   file = "views/#{per}/deploy"
 #   server, destdir = ::File.readlines(file).map {|x| x.chomp }
 #   @deployment[per] = [server, destdir]
 # end
@@ -20,6 +20,7 @@ def _errout(*args)
 end
 
 def _passthru(line)
+  @dest << "<p>" if line == "\n" and ! @_nopara
   OLD_formatting(line)
   _var_substitution(line)
   @dest << line
@@ -27,6 +28,7 @@ end
 
 def title 
   @meta.title = _data
+  @dest << "<h1>#{@meta.title}</h1>"
 end
 
 def pubdate 
@@ -56,20 +58,30 @@ end
 def liveblog_version
 end
 
-def _slug(str)
-  date = @meta.pubdate
-  s2 = date + "-" + str.chomp.strip.gsub(/[?:,\.()'"\/]/,"").gsub(/ /, "-").downcase
-  # _errout "SLUG: #{str} => #{s2}"
-  s2
+def list
+  @dest << "<ul>"
+  _body {|line| @dest << "<li>#{line}</li>" }
+  @dest << "</ul>"
+end
+
+def list!
+  @dest << "<ul>"
+  lines = _body.each   # {|line| @dest << "<li>#{line}</li>" }
+  loop do 
+    line = lines.next
+    line = _formatting(line)
+    if line[0] == " "
+      @dest << line
+    else
+      @dest << "<li>#{line}</li>"
+    end
+  end
+  @dest << "</ul>"
 end
 
 def finalize
-  @meta.slug = _slug(@meta.title)
+  @meta.slug = make_slug(@meta.title, @config.sequence)
   @meta.body = @dest
-# @list = {}    # FIXME Make hash by view
-# @meta.views.each {|per| generate(per) }
-# deploy
-  p @meta
   @meta
 end
 
@@ -125,7 +137,7 @@ def generate_index(view) # FIXME
     <font size=+2 color=blue><a href=../#{html} style="text-decoration: none">#{meta["title"]}</font></a>
     <br>
     #{meta["teaser"]}  
-    <a href=../#{html} style="text-decoration: none">Read more...</a>
+    <a href=../#{html} style="text-decoration: none"><br>Read more...</a>
     <br><br>
     <hr>
     HTML

data/lib/livetext.rb

@@ -15,7 +15,7 @@ class Enumerator
 end
 
 class Livetext
-  VERSION = "0.5.4"
+  VERSION = "0.5.6"
 
   MainSigil = "."
   Sigils = [MainSigil]
@@ -57,12 +57,16 @@ class Livetext
     end
   end
 
-
   def self.handle_file(file)
-    file = File.new(file) if file.is_a? String
+    fname = "<<none>>"
+    if file.is_a? String
+      fname = file
+      file = File.new(fname) 
+    end
     source = file.each_line
     @main = Livetext::Objects[Livetext::MainSigil] = Livetext::System.new(source)
-    @main.file = ARGV[0]
+    @main._pushfile(fname)
+    @main.file = fname
     @main.lnum = 0
 
     loop do
@@ -76,6 +80,7 @@ class Livetext
     STDERR.puts "handle_file: #{err}"
   end
 
+
   def self.rx(str, space=nil)
     Regexp.compile("^" + Regexp.escape(str) + "#{space}")
   end
@@ -126,6 +131,11 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
   def time
     Time.now.strftime("%F")
   end
+
+  def basename
+    file = ::Livetext.main.file
+    ::File.basename(file, ".*")
+  end
 end
 
 module Livetext::Helpers
@@ -464,6 +474,7 @@ module Livetext::Standard
     @source_files ||= []
     @source_files.push(@file)
     @file = fname
+    @file
   end
 
   def _popfile

data/livetext.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'livetext'
-  s.version     = '0.5.4'
-  s.date        = '2017-02-09'
+  s.version     = '0.5.6'
+  s.date        = '2017-02-21'
   s.summary     = "A smart processor for text"
   s.description = "A smart text processor extensible in Ruby"
   s.authors     = ["Hal Fulton"]
@@ -103,5 +103,5 @@ Gem::Specification.new do |s|
                      ./test/testfiles/single_raw_line/source.ltx
                     ]
   s.homepage    = 'https://github.com/Hal9000/livetext'
-  s.license       = "Ruby's"
+  s.license       = "Ruby's license"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -91,7 +91,7 @@ files:
 - "./test/testfiles/single_raw_line/source.ltx"
 homepage: https://github.com/Hal9000/livetext
 licenses:
-- Ruby's
+- Ruby's license
 metadata: {}
 post_install_message: 
 rdoc_options: []