runeblog 0.3.02 → 0.3.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af242702c47c1cad260040a42b4fe58f5fb84e83934bfa80e0f12fd3e7083c9c
-  data.tar.gz: 90b1d17454ce166e5c89b1c8ed6cc43f129a708a14200b94a1bb5c2a5a721a7b
+  metadata.gz: 981c7fd06d3616dd52825124cc99baf2822e45733c02d7d979750d95bb296a1a
+  data.tar.gz: 7662e51fbe7a7ac7986ef6c4f745a4d745774a1a36085a2ac666d1d96cc06a5d
 SHA512:
-  metadata.gz: a70f36f01ebdfc94db5b6794b8975b876b0255b154d8393d87e7728f19010c478daaa93462cbb21aa0bee539c4d4a922640d8c92f7f3707538974d5cbe60f65d
-  data.tar.gz: 50d5b646a4fa6e050f0aedb2789371c61fd5115ce35d03051b3ce690f113b47182782951ac8a6e7742bbf1316e7791fcccfd653d2d67911bf75b4bf3e62ae4a6
+  metadata.gz: a72de8c66f10ede4bec71970d46d3f1d48cb41546d8f600338cb8738d22419acc992ab9d88d3e5c8a6531d7f6b3a0b1e82bc80a12078032addaa6d2b5edb49cc
+  data.tar.gz: 556c8604bea8f8fbd42d78b8cfffcb8a8af183958698543d25969cd4d9511f986814b55488d98fe87ac81a5bea05dc51a058f7a0ce24f7a39271aa6e38697a30

data/data/features.txt

@@ -2,7 +2,7 @@
 # 1 = enabled (implies installed)
 # x = excluded (not installed; does it even exist?)
 
-reddit     1   # autopost, embed thread after blog post
+reddit     0   # autopost, embed thread after blog post
 facebook   0   # reader-like, reader post, autopost?
 twitter    0   # reader-tweet, reader-follow, autotweet?
 

data/empty_view/settings/features.txt

@@ -2,7 +2,7 @@
 # 1 = enabled (implies installed)
 # x = excluded (not installed; does it even exist?)
 
-reddit     1   # autopost, embed thread after blog post
+reddit     0   # autopost, embed thread after blog post
 facebook   0   # reader-like, reader post, autopost?
 twitter    0   # reader-tweet, reader-follow, autotweet?
 

data/lib/helpers-blog.rb

@@ -14,14 +14,22 @@ module RuneBlog::Helpers
     exit
   end
 
-  def read_features
+  def read_features(view = nil)
     hash = {}
-    file = @root/self.view/"settings/features.txt"
+    if view.nil?  # toplevel default
+      dir = @root/"data"
+    else
+      dir = @root/:views/self.view/:settings
+    end
+    file = dir/"features.txt"
     lines = File.readlines(file)
     lines.each do |line|
-      char, line = line[0], line[1..-1].chomp
-      name = line.strip
-      hash[name] = (char != "-")
+      line = line.strip
+      line.sub!(/ #.*/, "")   # trailing
+      next if line =~ /^ *#/  # leading
+      next if line.empty?
+      name, status = line.split
+      hash[name] = (status == "1")  # enabled
     end
     @features = hash
   end
@@ -39,15 +47,9 @@ module RuneBlog::Helpers
 
   def copy_data(tag, dest)
     data  = RuneBlog::Path + "/../data"    # files kept inside gem
-    extra = RuneBlog::Path + "/../config"  # files kept inside gem
-    # FIXME names are confusing
-    case tag
-      when :config 
-        files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3]
-        files.each {|file| copy(data + "/" + file, dest) }
-      when :extra  # FIXME remove later
-#        copy!(extra, dest)
-    end
+    # FIXME tag no longer used
+    files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3 features.txt]
+    files.each {|file| copy(data + "/" + file, dest) unless File.exist?(dest/file) }
   end
 
   def read_vars(file)

data/lib/liveblog.rb

@@ -72,7 +72,7 @@ def post_trailer
   tags = _var("post.tags")
   taglist = tags.empty? ? "" : "Tags: #{tags}"
 
-  reddit_enabled = @blog.features["reddit"] rescue nil
+  reddit_enabled = @blog.features["reddit"]
   reddit_txt = ""
   if reddit_enabled
     vdir  = @blog.root/:views/@blog.view
@@ -110,7 +110,7 @@ def faq
   _out %[&nbsp;<a data-toggle="collapse" href="##{id}" role="button" aria-expanded="false" aria-controls="collapseExample"><font size=+3>&#8964;</font></a>]
   _out %[&nbsp;<b>#{ques}</b>]
   _out %[<div class="collapse" id="#{id}"><br><font size=+1>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#{ans}</font></div>\n]
-  _out "<br>" unless @faq_count == 1
+  _out "<br>" # unless @faq_count == 1
   _optional_blank_line
 end
 

data/lib/runeblog.rb

@@ -122,6 +122,7 @@ class RuneBlog
     @root = Dir.pwd/root_rel
     write_repo_config(root: @root)   # ?? FIXME
     get_repo_config
+    read_features   # top level
     @views = retrieve_views
     self.view = File.read(@root/"data/VIEW").chomp
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
@@ -294,11 +295,13 @@ class RuneBlog
         @view = nil
       when RuneBlog::View
         @view = arg
+        read_features(@view)
         _set_publisher
       when String
         new_view = str2view(arg)
         raise NoSuchView(arg) if new_view.nil?
         @view = new_view
+        read_features(@view)
         _set_publisher
       else 
         raise CantAssignView(arg.class.to_s)

data/lib/runeblog_version.rb

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.3.02"
+  VERSION = "0.3.03"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/test/austin.rb

@@ -31,7 +31,7 @@ end
 @fake_date = Date.today - 20
 
 def make_post(x, title, teaser, body, views=[])
-  debug "      make_post #{bold(title)}"
+  debug "  make_post #{bold(title)}"
   pubdate = @fake_date.strftime("%Y-%m-%d")
   @fake_date += (rand(2) + 1)
   x.create_new_post(title, true, teaser: teaser, body: body, views: views,
@@ -53,8 +53,8 @@ puts
 debug bold("Generating test blog...")
 
 system("rm -rf .blogs")
-RuneBlog.create_new_blog_repo(".blogs")
-x = RuneBlog.new(".blogs")
+RuneBlog.create_new_blog_repo # (".blogs")
+x = RuneBlog.new  # (".blogs")
 
 debug("create_view: #{bold('around_austin')}")
 x.create_view("around_austin")   # FIXME remember view title!
@@ -72,7 +72,7 @@ File.open(vfile, "w") {|f| f.puts vars }
 
 ####
 
-debug("-- change_view: #{bold('around_austin')}")
+debug("change_view: #{bold('around_austin')}")
 x.change_view("around_austin")    # 1 2 7 8 9 
 
 make_post(x, "What's at Stubbs...", <<-EXCERPT, <<-BODY)
@@ -142,11 +142,10 @@ But I first heard of them
 in 2005.
 BODY
 
-debug
-debug "** generate_index #{bold("around_austin")}"
+debug "generate_index #{bold("around_austin")}"
 x.generate_index("around_austin") 
 
-debug("** generate_view: #{bold('around_austin')}")
+debug("generate_view: #{bold('around_austin')}")
 x.generate_view("around_austin")
 
 debug bold("...finished.\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.02
+  version: 0.3.03
 platform: ruby
 authors:
 - Hal Fulton