runeblog 0.1.56 → 0.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ded36cfd802fe47978c4168e0cd566ffcdbe8ae52b340603e5add64462924c9
-  data.tar.gz: 83c1fdf79034407a8d39a2737b3f0dededbedb2abde038749c8654de9bd9ac90
+  metadata.gz: 25ab912bbfad61d824612c26a6276f41fcbb0ef2d3ac189e5ec361de80aa6de9
+  data.tar.gz: f459c0a6a2ff40e3e57db5a236cc91044d094e3d8d5a6e18ebb5a12edc503f7a
 SHA512:
-  metadata.gz: c278a5ca40d38ce088bb38c7e35e849fb15da82c5f371cedf71190873f0c2b1d5012f035181263da96773773278f3ef72b2742e9f047c4e74442509aa2fc7c47
-  data.tar.gz: 00f51c927d68edf25a434561b12d5fd51ec2a35edd878ce5753537094015b0d665370289919d7ae93cf85effc4a75ba16d4f76d54722071c1fd1fe5d9c1c5a9c
+  metadata.gz: c14c72020011927c953b5df97207e80a489fd21fdc0ec45a159109dfbbde3ac7da8cfd2b00764493f041d5c39b11f70bb5949b7c0f06b325a5b259817a069dc0
+  data.tar.gz: f50990d4641a0e47fa9685e09fc3ab0cf9da805842c6ba9ffb9f71e1097bcb1617d34c1e0c7a963670f6ad3b38ab39b762a7a3bb8980b57a8f0ef2183cd65a1a

data/README.lt3

@@ -15,10 +15,10 @@ It has the concept of multiple "views" for a blog
 .h2 What is Livetext?
 
 Livetext is a markup format that is a throwback to the old, old days of text 
-formatters such as nroff. It's very flexible, and it is extensible _[in Ruby]. 
+formatters such as ``nroff. It's very flexible, and it is extensible _[in Ruby]. 
 
-It isn't yet full-featured, but it is usable. Runeblog uses Livetext, along 
-with some custom definitions, to try to ease the formatting of a blog entry.
+It is far from mature or full-featured, but it is usable. Runeblog uses Livetext, 
+along with some custom definitions, to try to ease the formatting of a blog entry.
 
 .h2 What are "views"?
 

data/lib/default.rb

@@ -7,8 +7,6 @@ NewBlogHeader = <<-TEXT   # Can't do this yet!!
 
 .title Fake Blog, Fake Title, Fake Author
 
-.asset fakeimage.jpg
-
 <table>
   <tr>
     <td>

data/lib/helpers-repl.rb

@@ -18,7 +18,7 @@ module RuneBlog::REPL
 
      "new view $name"    => :cmd_new_view,
 
-     "customize"         => :cmd_customize,
+#    "customize"         => :cmd_customize,
      "tags"              => :cmd_tags,
      "import"            => :cmd_import,
 

data/lib/liveblog.rb

@@ -2,7 +2,7 @@ require 'ostruct'
 require 'pp'
 require 'date'
 
-require 'runeblog'  # Now depends explicitly
+# require 'runeblog'  # Now depends explicitly
 
 def quote
   _passthru "<blockquote>"
@@ -35,6 +35,19 @@ end
 def categories   # does nothing right now
 end
 
+
+def h1; _puts "<h1>#{@_data}</h1>"; end
+def h2; _puts "<h2>#{@_data}</h2>"; end
+
+def h3
+  _puts "<h3>#{@_data}</h3>"
+end
+
+def h4; _puts "<h4>#{@_data}</h4>"; end
+def h5; _puts "<h5>#{@_data}</h5>"; end
+def h6; _puts "<h6>#{@_data}</h6>"; end
+
+
 ### inset
 
 def inset
@@ -79,6 +92,7 @@ end
 
 def init_liveblog    # FIXME - a lot of this logic sucks
   @blog, num = Livetext.parameters
+puts "passed in: #{@blog.view}"
   @meta = OpenStruct.new
   @meta.num = num
   @root = @blog.root rescue nil
@@ -92,6 +106,7 @@ def _errout(*args)
 end
 
 def _passthru(line, context = nil)
+  $which = 2
   return if line.nil?
   line = _formatting(line, context)
   @body << line + "\n"

data/lib/repl.rb

@@ -39,13 +39,14 @@ module RuneBlog::REPL
     check_empty(arg)
     dir = @blog.view.dir
     items = ["publish", 
-             "custom/blog_header.html", 
-             "custom/blog_trailer.html", 
-             "custom/post_template.html"] 
+             "templates/blog_header.html", 
+             "templates/blog_trailer.html", 
+             "templates/post_template.html"] 
     num, fname = STDSCR.menu(title: "Edit file:", items: items)
     edit_file("#{dir}/#{fname}")
   end
 
+  # Currently not used
   def cmd_customize(arg, testing = false)
     # add extra views? add tags?
     puts "\n  This is still buggy.\n "

data/lib/runeblog.rb

@@ -124,6 +124,7 @@ class RuneBlog
   def create_view(arg)
     debug "=== create_view #{arg.inspect}"
     raise ArgumentError unless arg.is_a?(String) && ! arg.empty?
+
     names = self.views.map(&:to_s)
     raise ViewAlreadyExists(arg) if names.include?(arg)
 
@@ -133,19 +134,21 @@ class RuneBlog
     up = Dir.pwd
     Dir.chdir(dir)
     x = RuneBlog::Default
-    create_dir('custom')
+    create_dir('templates')
     create_dir('assets')
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
     dump(pub, "publish")
     dump("", "tagpool")
-#   live = Livetext.new
-#   Livetext.parameters = [RuneBlog.blog, 0]
-#   meta = live.process_text(x::BlogHeader)
-    dump(x::BlogHeader, "custom/blog_header.html")
-    dump(x::BlogTrailer, "custom/blog_trailer.html")
+    view = RuneBlog::View.new(arg)
+    self.view = view
+    Livetext.parameters = [RuneBlog.blog, 0]
+    live = Livetext.new
+    meta = live.transform(x::NewBlogHeader)
+#   dump(x::BlogHeader, "templates/blog_header.html")
+#   dump(x::BlogTrailer, "templates/blog_trailer.html")
     dump("Initial creation", "last_published")
     Dir.chdir(up)
-    @views << RuneBlog::View.new(arg)
+    @views << view
   end
 
   def delete_view(name, force = false)
@@ -222,7 +225,7 @@ class RuneBlog
     raise FileNotFound(path) unless File.exist?(path)
     num = file.to_i       # e.g. 0098-this-is-a-title
     Livetext.parameters = [self, num]
-    live = Livetext.new(STDOUT) # (nil)
+    live = Livetext.new # (STDOUT) # (nil)
     text = File.read(path)
     live.process_text(text)
   rescue => err
@@ -242,8 +245,8 @@ class RuneBlog
     # Add view header/trailer
     head = tail = nil
     Dir.chdir(vdir) do 
-      head = File.read("custom/blog_header.html")
-      tail = File.read("custom/blog_trailer.html")
+      head = File.read("templates/blog_header.html")
+      tail = File.read("templates/blog_trailer.html")
     end
     @bloghead = interpolate(head)
     @blogtail = interpolate(tail)

data/lib/runeblog_version.rb

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

data/test/make_blog.rb

@@ -38,6 +38,7 @@ x.create_view("alpha_view")
 if File.exist?("publish")
   system("cp publish .blog/data_test/views/alpha_view/publish")
 end
+puts "inside make_blog: pwd = #{Dir.pwd}"
 system("cp test/fakeimage.jpg .blog/data_test/assets/")
 system("cp test/fakeimage.jpg .blog/data_test/views/alpha_view/assets/")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.56
+  version: 0.1.57
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext