runeblog 0.2.52 → 0.2.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fab29a6bc9b27d8b8390c07288d63a8d27c4131a47ddcecf5291e92a7877d1fa
-  data.tar.gz: 7a782cc946f7d541491755d6c592defaf58df51772b2815801fbc2a27af303d9
+  metadata.gz: 1c84711a690b4971d21429ef66c4db28266d341b114bf509d4960567bee4cf8e
+  data.tar.gz: c3b4d53efe40ba4dfe0e662b20d4bba52d965b11c42f9f580c2063ca92f50aa3
 SHA512:
-  metadata.gz: 56a454e863d21a642101e99de411f22cb2471b60d7f1575d1e6905d50273f3bbdf4ec1ac3a08bae55c5c41137588e0d4f12d388532cc61a369be232d5a2f226f
-  data.tar.gz: 8a4598adc7ac76950e588890db7fbb62d7f024934df04f0c9aed44098296a7b6de5b1fe6f4de82289516eaba010d64554c46df4a711b272c87c9ed6d7ac55d78
+  metadata.gz: c883e358c02c48d38fb8dc647e6d70639d9f9fcc5362da5d672cb991a176c80cb1539bb41c839ce7894a438132e61e2ad50f2025c084dee3251329c6ad218676
+  data.tar.gz: 98e87ccae2538738ea5b43c0d1d8afbbd9069c8dea0502d24687b9a73b59f6da3ebb86878a1b86b07ba40b4fd921e9b816c2627dad2a140877ba0396ee5824f2

data/lib/post.rb

@@ -21,7 +21,8 @@ class RuneBlog::Post
     raise "Doesn't work right now"
     raise NoBlogAccessor if RuneBlog.blog.nil?
     # "post" is a slug
-    pdir = RuneBlog.blog.view.dir/post
+    pdir = RuneBlog.blog.root/:drafts/post
+puts "-- load: opening #{pdir}"
     meta = nil
     Dir.chdir(pdir) do
       meta = read_config("metadata.txt")
@@ -112,9 +113,76 @@ class RuneBlog::Post
 end
 
 class RuneBlog::ViewPost
-  attr_reader :path, :nslug, :aslug, :title, :date,
-              :teaser_text
+  attr_accessor :nslug, :aslug, :num, :view, :blog
+  attr_accessor :path, :title, :date, :teaser_text
+
+  def self.make(blog:, view:, nslug:)
+    raise "No numeric prefix on #{nslug}" unless nslug =~ /^\d{4}-/
+    raise "Not expecting an extension" if nslug.end_with?(".lt3") || nslug.end_with?(".html")
+    view = view.to_s
+    view.define_singleton_method :path do |subdir = ""|
+      str = blog.root/:views/view
+      str << "/#{subdir}" unless subdir.empty?
+      str
+    end
+    view.define_singleton_method :standard do |subdir = ""|
+      str = blog.root/:views/view/:themes/:standard
+      str << "/#{subdir}" unless subdir.empty?
+      str
+    end
+    view.define_singleton_method :postdir do |file = ""|
+      file = file.to_s
+      str = blog.root/:views/view/:posts/nslug
+      str = str/file unless file.empty?
+      str
+    end 
+    view.define_singleton_method :remote do |dir: "", file: ""|
+      subdir = subdir.to_s
+      file = file.to_s
+      str = blog.root/:views/view/:remote
+      str = str/subdir unless subdir.empty?
+      str = str/file unless file.empty?
+      str
+    end
+    obj = RuneBlog::ViewPost.new(view, nslug)
+    obj.blog = blog
+    obj.view = view
+    obj.nslug = nslug
+    obj.aslug = nslug[5..-1]
+    obj.num = nslug[0..3]
+    obj
+  end
+
+  def repo(subdir = "")
+    subdir = subdir.to_s
+    unless subdir.empty?
+      raise "Expected 'posts' or 'drafts'" unless %w[posts drafts].include?(subdir)
+    end
+    str = blog.root
+    str = str/subdir unless subdir.empty?
+    str
+  end
+
+  alias root repo
+
+  def slug(num = true, ext = "")
+    ext = ext.to_s
+    str = ""
+    str << @num << "-" if num
+    str << @aslug 
+    str << ext
+    str
+  end
               
+=begin
+  aslug          this-is-a-post
+  aslug_live     this-is-a-post.lt3
+  aslug_html     this-is-a-post.lt3
+  nslug          0001-this-is-a-post
+
+  slug(:num, ext = "")
+=end
+
   def initialize(view, postdir)
     log!(enter: __method__, args: [view, postdir], level: 3)
     # Assumes already parsed/processed
@@ -122,7 +190,7 @@ class RuneBlog::ViewPost
     @path = postdir.dup
     @nslug = @path.split("/").last
     @aslug = @nslug[5..-1]
-    fname = "#{postdir}/teaser.txt"
+    fname = "#{postdir}/teaser.txt"            # ???
     @teaser_text = File.read(fname).chomp
     # FIXME dumb hacks...
     mdfile = postdir/"metadata.txt"

data/lib/repl.rb

@@ -38,10 +38,10 @@ module RuneBlog::REPL
   end
 
   def cmd_config(arg, testing = false)
-    list = ["global.lt3", "blog/generate.lt3", "     head.lt3", "     index.lt3",
-           "     post_entry.lt3", "etc/blog.css.lt3", "    externals.lt3",
-           "post/generate.lt3", "     head.lt3", "     index.lt3",
-           "     permalink.lt3"]
+    list = ["global.lt3", "blog/generate.lt3", ".... head.lt3", ".... index.lt3",
+           ".... post_entry.lt3", "etc/blog.css.lt3", "... externals.lt3",
+           "post/generate.lt3", ".... head.lt3", ".... index.lt3",
+           ".... permalink.lt3"]
     name = ["global.lt3", "blog/generate.lt3", "blog/head.lt3", "blog/index.lt3",
            "blog/post_entry.lt3", "etc/blog.css.lt3", "blog/externals.lt3",
            "post/generate.lt3", "post/head.lt3", "post/index.lt3",
@@ -345,7 +345,7 @@ puts "Got to #{__method__}"
     end
 
     file = files.first
-    draft = "#{@blog.root}/drafts/#{file}"
+    draft = "#{file}"  # FIXME ?
     result = edit_file(draft)
     @blog.generate_post(draft)
   rescue => err
@@ -482,7 +482,9 @@ puts(`ls -l #{@blog.root}/drafts`)
 puts "@fname = #@fname"
 puts "Pause..."
 gets
-      @meta = @blog.process_post(@fname)
+      # post = Post.load(@slug)
+      draft = "#{@blog.root}/drafts/#@fname"
+      @meta = @blog.generate_post(draft)
       puts
       sleep 2
     end

data/lib/runeblog.rb

@@ -1,5 +1,6 @@
 require 'date'
 require 'find'
+require 'ostruct'
 
 require 'logging'
 
@@ -165,7 +166,7 @@ puts "-- dir = #{dir}\n   pwd = #{Dir.pwd}\n   @root = #@root"
 gets
     create_dirs(dir)
     # FIXME dependencies?
-    xlate cwd: dir, src: @root/:drafts/sourcefile, debug: true
+    xlate cwd: dir, src: @root/:drafts/sourcefile   # , debug: true
 # puts `ls -l #{dir}`
     _deploy_local(dir)
   rescue => err
@@ -394,7 +395,7 @@ gets
     meta = nil
     views = views + [self.view.to_s]
     views.uniq!
-    Dir.chdir(@root/:posts) do
+    Dir.chdir(@root/"posts") do
       post = Post.create(title: title, teaser: teaser, body: body, pubdate: pubdate, views: views)
       post.edit unless testing
       post.build
@@ -408,17 +409,6 @@ gets
   def import_legacy_post(file, oldfile, testing = false)
   end
 
-  def edit_initial_post(file, testing = false)
-    log!(enter: __method__, args: [file, testing], level: 3)
-    debug "=== edit_initial_post #{file.inspect}  => #{file}"
-    result = system!("#@editor #{file} +8") unless testing
-    raise EditorProblem(file) unless result
-    process_post(file)
-    nil
-  rescue => err
-    error(err)
-  end
-
   def posts
     log!(enter: __method__, level: 3)
     dir = self.view.dir/:posts
@@ -469,6 +459,7 @@ gets
   def _get_views(draft)
     log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
+#   view_line = File.readlines(self.root/:drafts/draft).grep(/^.views /)
     view_line = File.readlines(draft).grep(/^.views /)
     raise "More than one .views call!" if view_line.size > 1
     raise "No .views call!" if view_line.size < 1

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.52"
+  VERSION = "0.2.53"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

metadata

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