mymedia-wiki 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bc0c4c39b3155ff566883d1591a7d3b086e25628902e50a9049eecc78e19c83
-  data.tar.gz: 42221f01061d15c6fac9d2d82312f3d0038a3cbb7cb8ed9294e5d83e0729d36b
+  metadata.gz: 81fac9c285e97ffd22bc008d834ab169c5a124bec8197070f7afde531159cac1
+  data.tar.gz: 1c28af4dfe8098e6d0cf321f2ef9f22397b7f93ef8ab467930ae843ae84d5d5f
 SHA512:
-  metadata.gz: fc9584925927356cb9b39c7954c372ecbacf2e23edba6af69710ed9716289bbae06bc3497d5ba53867b4761daf1ec8ab93e709da3da6631cbd37200793dfb48f
-  data.tar.gz: d65e82bb025de66e83a72299b751fd7d73e8c5f5349446031892c30f7d626e6e5810da13cd1ba020268d7d588f7480ccc46a46fa2451bd5e4464ba18a39b8609
+  metadata.gz: fb6fbb12dec7a46d580ee9a1cdc295cc6bd0c2fc11bc7e564ca35ae2eea0b3f90680fe0c3ec2d2694340a7a289f0935cc0296631ca1952790fd8737f48e6d7b6
+  data.tar.gz: 6562512cc0dcfd51427bb1b1d293092027dd560c6685cba772bcc388d0ced71335741bea280aea833944dc5e3d89a03e4eab04a1bda47bc93967e0d902cc5fca

data/lib/mymedia-wiki.rb

@@ -8,7 +8,7 @@ require 'mymedia-pages'
 class MyMediaWikiError < Exception
 end
 
-class MyMediaWiki < MyMediaPages
+class MyMediaWikiBase < MyMediaPages
   include RXFileIOModule
 
   def initialize(media_type: media_type='wiki',
@@ -26,6 +26,7 @@ class MyMediaWiki < MyMediaPages
     @filename = filename
     src_path = File.join(@media_src, filename)
 
+
     html_filename = basename(@media_src, src_path).sub(/(?:md|txt)$/,'html')
 
     FileX.mkdir_p File.dirname(@home + "/#{@public_type}/" + html_filename)
@@ -74,6 +75,7 @@ class MyMediaWiki < MyMediaPages
                                      raw_dest_xml)
 
     target_url = [@website, @public_type, html_filename].join('/')
+    target_url.sub!(/\.html$/,'') if @omit_html_ext
 
     json_filepath = "%s/%s/dynarex.json" % [@home, @public_type]
     publish_dxlite(json_filepath, {title: raw_msg, url: target_url})
@@ -88,6 +90,31 @@ class MyMediaWiki < MyMediaPages
 
   end
 
+  def delete(id)
+
+    dx = DxLite.new(File.join(@home, @public_type, 'dynarex.json'),
+                    autosave: true)
+
+    # Use the id to identify the entry in the dynarex.json file
+    rx = dx.find_by_id id
+    return unless rx
+
+    # Use the File.basename(url) to identify the file name.
+    # Note: Strip out the extension before adding the target ext.
+    filename = File.basename(rx.url).sub(/\.html$/,'')
+
+    # Within r/wiki delete the 2 files: .txt and .xml
+    FileX.rm File.join(@home, 'r', @public_type, filename + '.txt')
+    FileX.rm File.join(@home, 'r', @public_type, filename + '.xml')
+
+    # Within wiki, delete the .html file
+    FileX.rm File.join(@home, @public_type, filename + '.html')
+
+    # Delete the entry from the dynarex.json file.
+    dx.delete id
+
+  end
+
   def writecopy_publish(raws)
 
     s = raws.strip.gsub(/\r/,'')
@@ -99,11 +126,52 @@ class MyMediaWiki < MyMediaPages
     copy_publish filename
   end
 
-  private
 
-  def escape(s)
-    s.gsub(/ +/,'_')#.gsub(/'/,'%27')
+end
+
+class MyMediaWiki < MyMediaWikiBase
+
+  def initialize(config: nil, newpg_url: '', log: nil, debug: false)
+
+    @url4new = newpg_url
+    super(config: config, log: log, debug: debug)
   end
 
+  def writecopy_publish(raws)
+
+    # The content to be published might contain 1 or more wiki link
+    #    e.g. [[topic2022]] or [[topic2022url|topic2022
+    # Here, the link will be transformed to an actual hyperlink which points
+    # to a valid wiki page
+
+    s = raws.gsub(/\[\[([^\]]+)\]\]/) do |x|
+
+      puts 'x: ' + x.inspect if @debug
+      title = $1
+      puts 'searching for title ' + title.inspect  if @debug
+
+      # does the title exist?
+      r = find_title(title)
+
+      puts 'r: ' + r.inspect  if @debug
+
+      if r then
+        '<a href="' + '/wiki/' + r.title[/^#{title}/i] + '">' + title +'</a>'
+      else
+        '<a href="' + url4new + escape(title) + '" class="new" title="' \
+            + title + ' (page does not exist)">' + title + '</a>'
+      end
+
+    end
+
+    super(s)
+
+  end
+
+  private
+
+  def find_title(s)
+    find /^#{s} (?=#)/i
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-wiki
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   y9Yuu5WqjuJZ3NtesI/X2BMzO5Pq/vyXzvVcAv1v2VnVoWoodKFBNGzwA+Lgs+aV
   5FkMbZJFlcCYg1dUZxGwV5OV
   -----END CERTIFICATE-----
-date: 2022-03-06 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia-pages
@@ -46,7 +46,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.4
 description: 
 email: digital.robertson@gmail.com
 executables: []