runeblog 0.2.95 → 0.2.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8c06b3d51a33a85b3420099bf6f6c40e3ac38bdc80b2c2ea5a77de81936f280
-  data.tar.gz: a28b089f368d4941418ace35fba818f13d7458362863002ab25d9ebefdfae706
+  metadata.gz: 43bbc2d314d9a90cd34f558050a736ed58423f95576b0e32c3e36fc1405d756d
+  data.tar.gz: fcb2d941bff2c4c0bb3e609b347f1afcf9a13bb8073b2868a1af6d07c0883332
 SHA512:
-  metadata.gz: ffd6c82a51c01169b5a045d3f8c2a4f3f2db2230458c8cc4e7eff2740a0d3a0cf424a198a3187a888dd92b3c4976dd41597bae012514b3829c4921ad8750ef04
-  data.tar.gz: b47ac4fd2c6733a5433cf83d6c11c71f8b41bd71681826fadc9f4f98f57338fccc45491babbac7389f51cdd2927b04dee07f85aecfe68c8c75af0807ad03bd67
+  metadata.gz: 0a6446ceda937da5da353cc0b1259c1ad54743b936e36c4f45fadf2cc4e8def5ee2d8f227ef4f2c5e63e192eabd27134ddfd36de533364fe35d4177d45d335b9
+  data.tar.gz: 59c9fbab3e634c7fc99e147211b35e893b48cf6930deb331cba3cb1dbf36807bd746d8579c006fd27cd87ce5bd26eb34318b31e6c3c2b9580ae8c9b9856522e4

data/empty_view/config/facebook/credentials.txt

@@ -0,0 +1,7 @@
+admins   767352779
+appid    1176481582378716
+version  v2.4
+xfbml    true
+share    true
+width    450
+faces    true

data/empty_view/config/facebook/facebook.rb

@@ -2,20 +2,25 @@ class Livetext::Functions
 
   def facebook_init
     fb_appid = _var("facebook.appid")
+    xfbml    = _var("facebook.xfbml")
+    ver      = _var("facebook.version")
+    width    = _var("facebook.width")
+    share    = _var("facebook.share")
+    faces    = _var("facebook.faces")
     <<~HTML
         window.fbAsyncInit = function() {
           FB.init({
             appId      : '#{fb_appid}',
-            xfbml      : true,
-            version    : 'v2.4'
+            xfbml      : #{xfbml},
+            version    : '#{ver}'
           });
         };
     HTML
   end
 
 =begin
-<!-- Needed:  btw what is 'content'?
-  <meta property='fb:admins' content='767352779'/> 
+<!-- Needed: 
+  <meta property='fb:admins' content='$facebook.admins'/> 
   <meta property='og:url' content='http://rubyhacker.com/blog2/#{slug}.html'/>
   <meta property='og:type' content='article'/>
   <meta property='og:title' content='#{title}'/>
@@ -27,9 +32,9 @@ class Livetext::Functions
   def facebook_likes
     <<~HTML
       <div class='fb-like'
-           data-share='true'
-           data-width='450'
-           data-show-faces='true'>
+           data-share='#{share}'
+           data-width='#{width}'
+           data-show-faces='#{faces}'>
       </div>
     HTML
   end

data/empty_view/config/facebook/{fb.js → fb.js.lt3}

@@ -1,9 +1,11 @@
+.variables facebook credentials.txt
+
 <script>
   window.fbAsyncInit = function() {
     FB.init({
-      appId      : '1176481582378716',
-      xfbml      : true,
-      version    : 'v2.4'
+      appId      : '$facebook.appid',
+      xfbml      : $facebook.xfbml,
+      version    : '$facebook.ver'
     });
   };
 

data/empty_view/config/reddit/reddit_post_url.py

@@ -2,7 +2,7 @@
 import re
 import praw
 
-f = open("reddit/config.txt", "r")
+f = open("reddit/credentials.txt", "r")
 lines = f.readlines()
 f.close()
 

data/empty_view/config/twitter/credentials.txt

@@ -0,0 +1,3 @@
+user    hal_fulton    # via
+related hal_fulton
+count   false

data/empty_view/config/twitter/twitter.rb

@@ -13,8 +13,8 @@ class Livetext::Functions
 -->
 =end
 
-  def twitter_share
-    name, title, url = "", "", ""  # FIXME
+  def twitter_share(title, url)
+    name = _var("twitter.user")
     <<~HTML
       <a href='https://twitter.com/share' 
          class='twitter-share-button' 
@@ -26,7 +26,7 @@ class Livetext::Functions
   end
 
   def twitter_follow
-    name = "hal_fulton"   # FIXME
+    name = _var("twitter.user")
     <<~HTML
       <a href='https://twitter.com/#{name}' class='twitter-follow-button' data-show-count='false'>Follow @#{name}</a>
     HTML

data/lib/helpers-blog.rb

@@ -33,8 +33,8 @@ module RuneBlog::Helpers
       when :config 
         files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3]
         files.each {|file| copy(data + "/" + file, dest) }
-      when :extra
-        copy!(extra, dest)
+      when :extra  # FIXME remove later
+#        copy!(extra, dest)
     end
   end
 

data/lib/repl.rb

@@ -1,6 +1,7 @@
 require 'runeblog'
 require 'ostruct'
 require 'helpers-repl'  # FIXME structure
+require 'pathmagic'
 
 make_exception(:PublishError,  "Error during publishing")
 make_exception(:EditorProblem, "Could not edit $1")
@@ -378,10 +379,15 @@ module RuneBlog::REPL
       v = v.to_s
       v = fx(v, :bold) if v == @blog.view.name
       output v + "\n"
-      puts "  ", v unless testing
+      # FIXME: next 3 lines are crufty as hell
+      lines = File.readlines(@blog.root/"views/#{v}/themes/standard/global.lt3")
+      lines = lines.select {|x| x =~ /^blog / && x !~ /VIEW_/ }
+      title = lines.first.split(" ", 2)[1]
+      print "  ", ('%15s' % v) unless testing
+      puts  "  ", fx(title, :black) unless testing
     end
     puts unless testing
-    @out
+#   @out
   end
 
   def cmd_list_posts(arg, testing = false)
@@ -400,6 +406,12 @@ module RuneBlog::REPL
         base = post.sub(/.lt3$/, "")
         num, rest = base[0..3], base[4..-1]
         puts "  ", fx(num, Red), fx(rest, Blue) unless testing
+        draft = @blog.root/:drafts/post + ".lt3"
+        other = @blog._get_views(draft) - [@blog.view.to_s]
+        unless other.empty?
+          print fx(" "*7 + "also in: ", :bold) 
+          puts other.join(", ") 
+        end
       end
     end
     puts unless testing
@@ -420,6 +432,11 @@ module RuneBlog::REPL
         base = draft.sub(/.lt3$/, "")
         num, rest = base[0..3], base[4..-1]
         puts "  ", fx(num, Red), fx(rest, Blue) unless testing
+        other = @blog._get_views(@blog.root/:drafts/draft) - [@blog.view.to_s]
+        unless other.empty?
+          print fx(" "*7 + "also in: ", :bold) 
+          puts other.join(", ") 
+        end
       end
     end
     puts unless testing

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.2.95"
+  VERSION = "0.2.96"
 
   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.95
+  version: 0.2.96
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2019-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -94,14 +94,16 @@ files:
 - empty_view/config/exper/meta.html
 - empty_view/config/exper/s2.html
 - empty_view/config/exper/varmint.rb
+- empty_view/config/facebook/credentials.txt
 - empty_view/config/facebook/facebook.rb
 - empty_view/config/facebook/fb.html
-- empty_view/config/facebook/fb.js
-- empty_view/config/reddit/config.txt
+- empty_view/config/facebook/fb.js.lt3
+- empty_view/config/reddit/credentials.txt
 - empty_view/config/reddit/notes.txt
 - empty_view/config/reddit/reddit_post_url.py
 - empty_view/config/reddit/redpost.rb
 - empty_view/config/reddit/the-graffiti-wall.html
+- empty_view/config/twitter/credentials.txt
 - empty_view/config/twitter/tw.html
 - empty_view/config/twitter/tw.js
 - empty_view/config/twitter/twitter.rb