mymedia-wiki 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81fac9c285e97ffd22bc008d834ab169c5a124bec8197070f7afde531159cac1
-  data.tar.gz: 1c28af4dfe8098e6d0cf321f2ef9f22397b7f93ef8ab467930ae843ae84d5d5f
+  metadata.gz: 33e0a0bee92a17d69e4f8767c451ead3af64e1241c529408e8508716cf532694
+  data.tar.gz: ca7f0ee37dd5330553612085864ced39b60eec62bf9218a94092f4854447143a
 SHA512:
-  metadata.gz: fb6fbb12dec7a46d580ee9a1cdc295cc6bd0c2fc11bc7e564ca35ae2eea0b3f90680fe0c3ec2d2694340a7a289f0935cc0296631ca1952790fd8737f48e6d7b6
-  data.tar.gz: 6562512cc0dcfd51427bb1b1d293092027dd560c6685cba772bcc388d0ced71335741bea280aea833944dc5e3d89a03e4eab04a1bda47bc93967e0d902cc5fca
+  metadata.gz: 6a76d8a5362a14c9a369813e4ce7bb3c10e5d500cda0b031a40b567c7a85d14b55b8e73ffdfa3fcc5425655d8d746b949601d7c266c905273348b6861ef3ab97
+  data.tar.gz: e6856cb4dfc0f40b1a4e562707fe55bd2d63c1825cae27882f508a64f723660e4867873f2edcf5de210a8dd2db975aa512fbd41d93a7b4a6080500ecd5456354

data/lib/mymedia-wiki.rb

@@ -17,15 +17,15 @@ class MyMediaWikiBase < MyMediaPages
 
     super(media_type: media_type, public_type: @public_type=media_type,
             ext: '.(html|md|txt)', config: config, log: log, debug: debug)
-
-  end
-
+    
+  end  
+  
   def copy_publish(filename, raw_msg='')
 
     @log.info 'MyMediaWiki inside copy_publish' if @log
     @filename = filename
-    src_path = File.join(@media_src, filename)
-
+    #jr 2011-10-09 src_path = File.join(@media_src, filename)
+    src_path = filename
 
     html_filename = basename(@media_src, src_path).sub(/(?:md|txt)$/,'html')
 
@@ -35,11 +35,11 @@ class MyMediaWikiBase < MyMediaPages
 
     ext = File.extname(src_path)
 
-    raw_destination = "%s/r/%s" % [@home, public_path]
+    raw_destination = [@home, @www, 'r', public_path].join('/')
     FileX.mkdir_p File.dirname(raw_destination)
     raw_dest_xml = raw_destination.sub(/html$/,'xml')
 
-    destination = File.join(@home, public_path)
+    destination = File.join(@home, @www, public_path)
 
     puts 'raw_destination: ' + raw_destination.inspect if @debug
 
@@ -71,13 +71,14 @@ class MyMediaWikiBase < MyMediaPages
 
     @log.info 'mymedia-wiki/copy_publish: after modify_xml' if @log
 
-    FileX.write destination, xsltproc("#{@home}/r/xsl/#{@public_type}.xsl",
-                                     raw_dest_xml)
+    FileX.write destination,
+        xsltproc(File.join(@home, @www, 'xsl', @public_type + '.xsl'),
+                  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]
+    json_filepath = [@home, @www, @public_type, 'dynarex.json'].join('/')
     publish_dxlite(json_filepath, {title: raw_msg, url: target_url})
 =begin
     msg = "%s %s" % [target_url, raw_msg ]
@@ -92,7 +93,9 @@ class MyMediaWikiBase < MyMediaPages
 
   def delete(id)
 
-    dx = DxLite.new(File.join(@home, @public_type, 'dynarex.json'),
+    puts 'inside delete ' if @debug
+    
+    dx = DxLite.new(File.join(@home, @www, @public_type, 'dynarex.json'),
                     autosave: true)
 
     # Use the id to identify the entry in the dynarex.json file
@@ -104,37 +107,28 @@ class MyMediaWikiBase < MyMediaPages
     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')
+    FileX.rm File.join(@home, @www,'r',  @public_type, filename + '.txt')
+    FileX.rm File.join(@home, @www,'r', @public_type, filename + '.xml')
 
     # Within wiki, delete the .html file
-    FileX.rm File.join(@home, @public_type, filename + '.html')
+    FileX.rm File.join(@home, @www, @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/,'')
-
-    title = escape(s.lines[0].chomp)
-    filename = title + '.txt'
-    FileX.write File.join(@media_src, filename), s
-
-    copy_publish filename
-  end
-
+  
 
 end
 
 class MyMediaWiki < MyMediaWikiBase
 
-  def initialize(config: nil, newpg_url: '', log: nil, debug: false)
-
+  def initialize(media_type: 'wiki', config: nil, newpg_url: '', log: nil,
+                 debug: false)
+    
+    puts 'inside MyMediaWik initialize' if debug
     @url4new = newpg_url
-    super(config: config, log: log, debug: debug)
+    super(media_type: media_type, config: config, log: log, debug: debug)
   end
 
   def writecopy_publish(raws)
@@ -158,7 +152,7 @@ class MyMediaWiki < MyMediaWikiBase
       if r then
         '<a href="' + '/wiki/' + r.title[/^#{title}/i] + '">' + title +'</a>'
       else
-        '<a href="' + url4new + escape(title) + '" class="new" title="' \
+        '<a href="' + @url4new + escape(title) + '" class="new" title="' \
             + title + ' (page does not exist)">' + title + '</a>'
       end
 
@@ -175,3 +169,62 @@ class MyMediaWiki < MyMediaWikiBase
   end
 
 end
+
+
+class WikiTester23 < MyMediaWiki
+  
+  # it is assumed this class will be executed from a test directory 
+  # containing the following auxillary files:
+  #  - wiki.xsl
+  #  - index-template.html
+  
+  def initialize(config: '', cur_dir:  '', debug: false)
+    
+    @cur_dir = cur_dir
+    super(config: config, debug: debug)
+    @parent_dir = '/tmp/media'
+    @dir = 'wiki'
+    
+  end
+
+  def cleanup()
+
+    # remove the previous test files
+    #
+    FileX.rm_r '/tmp/www/*', force: true
+    puts 'Previous /tmp/www files now removed!'
+  end
+  
+  def prep()
+    
+    #return
+    # create the template files and directories
+    #
+    xsl_src = File.join(@cur_dir, 'wiki.xsl')
+    www_dest = '/tmp/www/xsl/wiki.xsl'
+    r_dest = '/tmp/www/r/xsl/wiki.xsl'      
+    index_dest = '/tmp/www/wiki/index-template.html'
+
+    FileX.mkdir_p File.dirname(www_dest)
+    FileX.cp xsl_src, www_dest
+
+    FileX.mkdir_p File.dirname(r_dest)
+    FileX.cp xsl_src, r_dest
+
+    FileX.mkdir_p File.dirname(index_dest)
+    FileX.cp File.join(@cur_dir, 'index-template.html'), '/tmp/www/wiki/index-template.html'
+
+    filepath = File.join(@parent_dir, @dir)
+    FileUtils.mkdir_p filepath
+  end
+
+  # create the input file
+  #  
+  def write(filename: '', content: '')
+
+    File.write File.join(@parent_dir, @dir, filename), content
+    puts 'debug: filename: ' + filename.inspect
+
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-wiki
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,32 +10,33 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMjEzMjMxMDM2WhcN
-  MjIxMjEzMjMxMDM2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDT82Vo
-  L6l861D20XG2c1bfspbhYSS3d3mmBPzUDGYWj+Kdq/Uznot8yDnLn7v/r6Y55AHy
-  QO4ArkCnPZc0q5wQnj8AQo7DBucDnfgubJQylGQngWvIoobrbYROCOlQ3/JrtoMu
-  akE8aG9YPneZvoMapEf/Ff7ExJWuD6vj8t1vJRSEBhaW7NDTavmeuPaCPt00aoh0
-  A59T/st4yPcILmuNziS0FCn6o7ejJ8xlrp0KpT0yF+esQ8gmH6UbsOT6J9amej3J
-  SjkkRWXYXxiUlPV/yQWwiJ9FQfbrzr/VY3ewUmzf29on0NqGUYd/sNYu2Dh/KmXc
-  lElSuyvuLKwlQ8TufLa139PRONMyLoWzbsd26kEO6udAq4Awf1JwWQa1bDdORuqk
-  RdG2+9eDHfyVPYx87YCtfuSvO4H/3QmxypLwnvJs7ge3k35JCn9IQ4yNE80P9Wh3
-  emjWuiERLHQOLLWGoXVsy7HIFcdYCLiLbiUwpF5uolXaC8HjQBtpcxg2HUcCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvewzO7/U
-  g+A2eUPXgQElL9LavN0wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
-  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAluRhfJuvCHzVafdLxbEBMGhYNEfLGogtT9GFgb2f
-  TZm0FUPvFr07VdcimssMJe6OkcVLeNCOGCqtN8p0610Y4KwDKzOntW4FrjLT3lrv
-  xeI4Jo3KylZCKXZciZEKjJJJ/t2T3tI+EbT9RbtcLh1VWMonKWAUMbT1b/YO3mEU
-  CMubXjovS1eEuH5st7vqgXLBCJplwUDikt/XfadzwOwjbnS8nuxEi3U2AELFeoWU
-  1u7ifOx4cFy+ld5cuFmnsJYFwOebkK5Hj8WzZcCvUtB41Ik6Uw77YMnqDKKIBAt5
-  JYNUMGl9Q70knJu+7aA+8Noy4dqGyF/nhQxenDdOKcNZ0DVdDQMumd3JKULTdmDP
-  0mNLtgZMHLTEXPtNQKkt4QnQWaITKWXivJf9PM7cgBsuIFug0ttLDNnWOgnp9q51
-  y9Yuu5WqjuJZ3NtesI/X2BMzO5Pq/vyXzvVcAv1v2VnVoWoodKFBNGzwA+Lgs+aV
-  5FkMbZJFlcCYg1dUZxGwV5OV
+  MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBIMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
+  8ixkARkWAmV1MB4XDTIzMDIyMjE5MDQxNloXDTI0MDIyMjE5MDQxNlowSDESMBAG
+  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC
+  ggGBALnwNOn1D0D30UL6FQBCVuCrZWCWXsZlg/ITSv+gBDWqsgq1dbRusjkm2rjZ
+  CBkRuNLqW/MoVcMGlcuPg3qJS5a9jM4leG/5j9fJWkoOfqIN7jKYPKJIKPfr0IfM
+  LE4kVEbuDTQlWkHQtqI8MF7UVRdxwHUyMbGZqxN0MnwU4A6ftfF1dZPFmVb+YLny
+  7MEXM3EVVeOckcK0GI9vY+qgGKxIIq9ozLMlLZ0aCecPSjDZoyl1NOYiUErpIrHD
+  guTA+4qMhPHfydaazLN5JiYSl/4deta3zjjMhEjJXR0oUMWryXVGu0Dl1w9Ersyb
+  VMjKGQm4aTLdL9lGAmRpZJ7dRg9KsMmQ/XZqEQiymbeEEBgOIvcOpTZuvg/PKOv2
+  nDd8lCHUKAUZxg8OdhnL4VcXL8GhLTROlqgvRo1B+XLRS6UUM69976WsC2trJWDo
+  NEe5hQoDayE95sDyC7IoXtDub3EU/dkYFXpeF9SgA3W2Tx9xosVDPuVa2k0IDlPM
+  ACcezQIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBREQCGeB/w5oJWspHNI95w0qWEBYjAmBgNVHREEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MA0GCSqGSIb3DQEBCwUAA4IBgQBr5Xhv0ZbtcOHSK6GEu/2SOwCLgoaB
+  v360otlFzBq8bRXnPzfzV/ZQvNVsKIRpQhgKySuJ9rJwjELYP5vOTV9CPDzGzq/U
+  MkC8UlMVVeEGNFlKvu8sUwPfbr+fu/2xff4moulpfNLhCu+ucApa2GSfkwdZi3vM
+  i5OS1LGfFY7shC+sa4j/JmEDvmCMUHWci/LfarnjfwCj1RjPkKuGXEc3CHii7IPA
+  iCR0zp+SDoB4dCEHxodl7WvQ/6tnvo3Wm86Wh+DAbUCeoPG4kRDNNM2k4JwX8JWH
+  jPzEaQXqsZ04CYgBniLmnzqqeO3U9eAsRPVb0xNW3ZqSeNxiQS7ZoxnNx1mNdTWS
+  badKerIRQ+aTaTzR9KVZ01QlerkbtVZL6TbNPlE/uuz2xoI3GRd2Ix8issdB8cCn
+  oieYuM8pF85DLjFpVCyuRfmjN9NT+eGZU72IfIAEOwJ2gRfCQBorLdrKWTBk9jpd
+  034gd1EDuJQgprCLmdjGpAhud/laq9IhN4o=
   -----END CERTIFICATE-----
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia-pages
@@ -46,7 +47,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +57,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.6
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -83,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: Transforms a kind of Markdown document using Kramdown and XSLT.