mymedia 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9524fd31dc71743e9163c15572ccb65ee1d3cad4a9e9753a4e7bea39cf2caf1b
-  data.tar.gz: a60ca935a57e95a523182a7ad2fc43f35289dc5cb25210b98084e4455c6e982e
+  metadata.gz: e0e73232af677ec81115b33b8c13c8df4b5eb54c79f0af3c063afd7169db3c9c
+  data.tar.gz: e12bf14b0cedfb4689f58ab44cad8213e7f70f4e7859b72ce3301d2e5a1a8554
 SHA512:
-  metadata.gz: 9c26f58519f36dd058cd791002217404c6710479c1255e4217885d8aaff0d04820b11e5313b1f65d1c8a6284bcba3a49a7f61b39edf8a08d10d731fa73897f6c
-  data.tar.gz: d0c6a852d647c5caf91bc282814f40ff718edf53815f0404f390e120bcbcc38b4f4d0e6d7cbc395e45490378d34cedfd5fdc4c493603289962d90748efba8014
+  metadata.gz: 35a2248a7b2ac7cb7007d7d349d2cfd223324597ae1cc67b7282804a948c78b21b602bb60ab2783f2bec13074f59aa538f1bbb644ba200224d8463b998176123
+  data.tar.gz: 90a8cfb9aece78804c4812b3d6f7c2861e9296d8fd756bfabcba27609da5e0019dd0c928c53cad9f826e160878a8810cb43db8ba873f5b18f36c712fe209218c

data/lib/mymedia.rb

@@ -14,12 +14,24 @@ require 'rxfileio'
 require 'wordsdotdat'
 
 
+module StringFilter
+  
+  def normalize(s)
+
+    r = s.downcase.gsub(/\s#\w+/,'').strip.gsub(/\W/,'-').gsub(/-{2,}/,'-')\
+        .gsub(/^-|-$/,'')
+    return s.scan(/#(\w+)/)[0..1].join('_').downcase if r.empty?
+    return r        
+  end      
+  
+end
+
 module MyMedia
 
   class MyMediaPublisherException < Exception
   end
-
-
+  
+  
   class Publisher
     include RXFReadWriteModule
 
@@ -27,12 +39,12 @@ module MyMedia
       @index_page = true
       @opts = opts
     end
-
+    
     protected
-
+    
     def publish_dynarex(dynarex_filepath='', \
           record={title: '',url: '', raw_url: ''}, options={})
-
+      
       opt = {id: nil, rss: false}.merge(options)
 
       dynarex = if FileX.exists? dynarex_filepath then
@@ -45,7 +57,7 @@ module MyMedia
       dynarex.save dynarex_filepath
       publish_html(dynarex_filepath)  if @index_page == true
 
-
+      
       if opt[:rss] == true then
 
         dynarex.xslt_schema = dynarex.summary[:xslt_schema]
@@ -57,19 +69,19 @@ module MyMedia
 
     def publish_html(filepath)
 
-      path2 = File.dirname(filepath)
+      path2 = File.dirname(filepath)  
       template_path = File.join path2, 'index-template.html'
 
-      return unless @index_page == true
+      return unless @index_page == true 
       raise MyMediaPublisherException, \
           "template path: #{template_path} not found" unless \
                                                     FileX.exists?(template_path)
-=begin jr 040916
+=begin jr 040916      
       dataisland = DataIsland.new(template_path, @opts)
 
       File.open(path2 + '/index.html','w'){|f| f.write dataisland.html_doc.xml pretty: true}
-=end
-    end
+=end      
+    end     
 
     def publish_dxlite(dynarex_filepath='', record={title: '',url: ''})
 
@@ -85,12 +97,12 @@ module MyMedia
 
     def send_message(topic: @sps[:default_subscriber], msg: '')
 
-      fqm = "%s: %s" % [topic, msg]
+      fqm = "%s: %s" % [topic, msg]    
 
       SPSPub.notice fqm, address: @sps[:address]
       sleep 0.3
-    end
-
+    end           
+    
   end
 
   module IndexReader
@@ -98,7 +110,7 @@ module MyMedia
 
     def browse(startswith=nil)
 
-      json_filepath = "%s/%s/dynarex.json" % [@home, @public_type]
+      json_filepath = "%s/%s/%s/dynarex.json" % [@home, @www, @public_type]
 
       if FileX.exists? json_filepath then
 
@@ -183,30 +195,35 @@ module MyMedia
 
     end
   end
+  
+
 
   class BaseException < Exception
   end
-
+  
   class Base < Publisher
     include RXFileIOModule
+    include StringFilter
 
-    attr_reader :to_s
+    attr_reader :to_s, :destination
 
     def initialize(media_type: 'blog', public_type: media_type,
-                   ext: 'txt', config: nil, log: nil, debug: false)
+                   ext: 'txt', config: nil, log: nil, now: Time.now,
+                   debug: false)
 
-      super()
+      super()      
 
-      @schema = 'posts/post(title, url, raw_url)'
+      @now = now
+      @schema = 'posts/post(title, url, raw_url)'      
 
-      raise BaseException, "no config found" if config.nil?
+      raise BaseException, "no config found" unless config
 
       c = SimpleConfig.new(config).to_h
-
+      
       @home = c[:home]
       puts '@home: ' + @home.inspect if @debug
       @media_src = "%s/media/%s" % [@home, media_type]
-      @website = c[:website]
+      @website = c[:website]    
 
       @dynamic_website = c[:dynamic_website]
       @www = c[:www]
@@ -214,33 +231,33 @@ module MyMedia
 
       @sps = c[:sps]
       @omit_html_ext = c[:omit_html_ext]
-
+      
       @log = log
 
 
       @media_type = media_type
       @public_type = public_type ||= @media_type
-
+      
       @xslt_schema = 'channel[title:title,description:desc]/' + \
                                                 'item(title:title,link:url)'
       @ext = ext
       @rss = false
       @debug = debug
-
+      
       DirX.chdir @home
 
     end
-
+        
     def add_feed_item(raw_msg, record, options={})
-
-      dynarex_filepath = File.join([@home, @public_type, 'dynarex.xml'])
-      id = Increment.update(File.join([@home, @public_type, 'counter.txt']))
+      
+      dynarex_filepath = File.join([@home, @public_type, 'dynarex.xml'])        
+      id = Increment.update(File.join([@home, @public_type, 'counter.txt'])) 
       static_url = @static_baseurl + id
       record[:uri] = static_url
-
-      publish_dynarex(dynarex_filepath, record, {id: id}.merge(options))
-      publish_timeline(raw_msg, static_url)
-      publish_html(@home + '/index.html')
+      
+      publish_dynarex(dynarex_filepath, record, {id: id}.merge(options))                    
+      publish_timeline(raw_msg, static_url)         
+      publish_html(@home + '/index.html') 
     end
 
     def auto_copy_publish(raw_msg='', &blk)
@@ -260,7 +277,7 @@ module MyMedia
       end
 
     end
-
+    
     def basename(raw_s1, raw_s2)
 
       s1 = raw_s1.sub(/dfs:\/\/[^\/]+/,'')
@@ -268,38 +285,40 @@ module MyMedia
 
       (s2.split('/') - s1.split('/')).join('/')
 
-    end
-
+    end    
+    
     def copy_publish(filename, raw_msg='', &blk)
       file_publish(filename, raw_msg)
     end
-
+        
 
     private
+    
+    def file_publish(src_path, raw_msg='', sps: true)
 
-    def file_publish(src_path, raw_msg='')
-
-      #raise @logger.debug("source file '%s' not found" % src_path) unless File.exists? src_path
       ext = File.extname(src_path)
       @target_ext ||= ext
-
+          
       public_path = "%s/%s/%shrs%s" % [@public_type, \
-        Time.now.strftime('%Y/%b/%d').downcase, Time.now.strftime('%H%M'),
+        @now.strftime('%Y/%b/%d').downcase, @now.strftime('%H%M'),
                                       @target_ext]
 
       public_path2 = "%s/%s/%shrs%s%s" % [@public_type, \
-        Time.now.strftime('%Y/%b/%d').downcase, Time.now.strftime('%H%M'),
-                                       Time.now.strftime('%S%2N'), @target_ext]
-
-      raw_destination = "%s/%s/%s" % [@home, 'r', public_path]
-
+        @now.strftime('%Y/%b/%d').downcase, @now.strftime('%H%M'),
+                                       @now.strftime('%S%2N'), @target_ext]
+      
+      raw_destination = File.join(@home, @www, 'r', public_path)
+      
       if FileX.exists? raw_destination then
-        raw_destination = "%s/%s/%s" % [@home, 'r', public_path2]
+        raw_destination = File.join(@home, @www, 'r', public_path2)
         public_path = public_path2
       end
 
-      destination = File.join(@home, public_path)
+      destination = File.join(@home, @www, public_path)
+      puts 'before raw_destination: ' + raw_destination.inspect if @debug
       FileX.mkdir_p File.dirname(raw_destination)
+
+      puts 'before destination: ' + destination.inspect if @debug
       FileX.mkdir_p File.dirname(destination)
 
       if @debug then
@@ -311,9 +330,9 @@ module MyMedia
 
       raw_msg = src_path[/([^\/]+)\.\w+$/,1] + ' ' + raw_msg if raw_msg[/^#/]
 
-
+      
       if block_given? then
-        raw_msg, target_url = yield(destination, raw_destination)
+        raw_msg, target_url = yield(destination, raw_destination) 
         static_url = target_url
       else
 
@@ -333,22 +352,21 @@ module MyMedia
 
       end
 
-      raw_msg = raw_msg.join if raw_msg.is_a? Array
+      raw_msg = raw_msg.join if raw_msg.is_a? Array   
 
       static_filename = if raw_msg.to_s.length > 0 then
          normalize(raw_msg) + File.extname(destination)
       else
-
+        
         basename(@media_src, src_path)
-
-      end
-
+        
+      end      
+      
       static_path = "%s/%s/%s" % [@public_type, \
-        Time.now.strftime('%Y/%b/%d').downcase, static_filename]
-
-      raw_static_destination = "%s/%s/%s" % [@home, 'r',static_path]
-
-      static_destination = "%s/%s" % [@home, static_path]
+        @now.strftime('%Y/%b/%d').downcase, static_filename]
+      
+      raw_static_destination = File.join(@home, @www, 'r',static_path)
+      static_destination = File.join(@home, @www, static_path)
 
       #FileUtils.mkdir_p File.dirname(static_destination)
 
@@ -365,7 +383,7 @@ module MyMedia
       if File.extname(static_destination) == '.html' then
 
         xmlfilepath = destination.sub('.html','.xml')
-
+        
         if FileX.exists?(xmlfilepath) then
 
           FileX.cp xmlfilepath, static_destination.sub('.html','.xml')
@@ -377,40 +395,33 @@ module MyMedia
         end
 
       end
-
+      
       target_url ||= "%s/%s" % [@website, public_path]
       static_url ||= "%s/%s" % [@website, static_path]
 
       msg = "%s %s" % [target_url, raw_msg ]
-
-      sps_message = ['publish', @public_type,
+      
+      sps_message = ['publish', @public_type, 
                     target_url, static_url, raw_msg]
 
-      send_message(msg: sps_message.join(' '))
+      send_message(msg: sps_message.join(' ')) if sps
 
       static_url
-
-    end
-
-    def normalize(s)
-
-      r = s.downcase.gsub(/\s#\w+/,'').strip.gsub(/\W/,'-').gsub(/-{2,}/,'-').gsub(/^-|-$/,'')
-      return s.scan(/#(\w+)/)[0..1].join('_').downcase if r.empty?
-      return r
-    end
+      
+    end      
 
   end
-
-
+  
+  
   class FrontpageException < Exception
   end
-
+  
   class Frontpage < Publisher
-
+    
     def initialize(config: nil, public_type: '', rss: nil)
-
+      
       raise FrontpageException, "no config found" if config.nil?
-
+      
       c = SimpleConfig.new(config).to_h
 
       @home = c[:home]
@@ -419,56 +430,56 @@ module MyMedia
       @rss = rss
       @sps = c[:sps]
       @opts = {username: c[:username], password: c[:password]}
-
+            
     end
+    
+    def publish_frontpage(s='index.html')    
 
-    def publish_frontpage(s='index.html')
-
-      publish_html(@home + '/' + s)
+      publish_html(@home + '/' + s) 
       'frontpage published'
-    end
-
+    end  
 
+        
     def publish_to_lists(record={}, public_type=nil)
-
+      
       @log.info 'inside publish_to_lists' if @log
-
+      
       @public_type = public_type if public_type
 
       raw_msg, static_url, target_url = \
           record[:title], record[:url], record[:static_url]
 
-      dynarex_filepath = "%s/%s/dynarex.xml" % [@home, @public_type]
-      raw_dynarex_filepath = "%s/r/%s/dynarex.xml" % [@home, @public_type]
-
+      dynarex_filepath = File.join(@home, @www, @public_type, 'dynarex.xml')
+      raw_dynarex_filepath = File.join(@home, @www, 'r', @public_type, 'dynarex.xml')
 
-      publish_dynarex(dynarex_filepath, record, {rss: @rss || false})
-      publish_dynarex(raw_dynarex_filepath, record, {rss: @rss || false})
+      publish_dynarex(dynarex_filepath, record, {rss: @rss || false})    
+      publish_dynarex(raw_dynarex_filepath, record, {rss: @rss || false})          
 
-      publish_timeline(raw_msg, static_url, target_url)
+      publish_timeline(raw_msg, static_url, target_url)         
       send_message(msg: 'publish_to_lists completed')
-
+ 
     end
 
-
+    
     def publish_timeline(raw_msg, static_url, target_url='')
 
-      timeline_filepath = "%s/timeline/dynarex.xml" % @home
-      record = Dynarex.new(@home + '/dynarex/main-directory.xml').find_by_title(@public_type)
+      timeline_filepath = File.join(@home, @www, 'timeline', 'dynarex.xml')
+      main_dir = File.join(@home, @www, 'dynarex', 'main-directory.xml')
+      record = Dynarex.new(main_dir).find_by_title(@public_type)
 
       thumbnail, subject_url = record.thumbnail, record.url
-
+      
       content = {
-              title: raw_msg,
+              title: raw_msg, 
                 url: static_url,
-          thumbnail: thumbnail,
-        subject_url: subject_url,
-            raw_url: target_url
+          thumbnail: thumbnail, 
+        subject_url: subject_url, 
+            raw_url: target_url 
       }
+      
+      publish_dynarex(timeline_filepath, content, rss: true)     
 
-      publish_dynarex(timeline_filepath, content, rss: true)
-
-    end
+    end       
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,32 +10,33 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjAzMjE0MDM4WhcN
-  MjMwMjAzMjE0MDM4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDLhnus
-  EmCSf8Mh4kdpLThgpsLS0N/kupJ35qxUqlluM0Treka8rn+Xv+su5eGY7bwT1lis
-  4rNk+H/YxNqm+7JoleqcdygCSMJju75WILEAuPtaZJbIlHiwlboe2P1Q/Q0qjYV4
-  5Hod6xYAFzjx4NRTCfRwvFjyXrvUJK/CgUWgDLraQEM4iQTWpxp+oIDsQIV5DLn7
-  wv4u+RKVrcHZkeu1r+vt/KBm9qNh2cK/kGw96tylW4/6sSTaPNNY9dvYx2Ee04jf
-  GTuxXBqtyvDKOfQAI/sWQ5J94+uIppx2dDL3eSEYfl2V8CwWVZxx3dETJ8M1fG6M
-  CMA+15zld92rCvGYsLh4jkZnyCt2l1O6IYMW/gAScwgzvlC01U2vV2P+8bwm17Un
-  pWP2FbNiihwZD7mdyKbi8noCeWrompgX5+hJZumFlsqld5XhoaPwQB6VNgVCxtOG
-  ZHXdP6MiTPhH0t6XVmRSMX+zEedaoL2Z2OxaBAM9abkOJ8kNtI3pqqVkQmkCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUTUv11jAO
-  mX0Ta1tkNdz9cHZLKZowJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
-  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEARdXjjSCHczpSquJFR7p/1Xovom9aQAmp8aCgZJg4
-  9oln3FIyBnk3W/LTUJVGS5a3u8JcVMxLTEJqkUMrBVGa8AcJzsPEU8XAG9R2360z
-  iZxVyGiFdi+DUOo++vjbiBRvgl2o3gKEwp8RPFj+OUemVDeFexBHKukDDdk7MJNp
-  WmLLvRyAmB+grz7eMPFjTxfRcV4/6WHNS5MFdXZ0ZioAKUatCNYIpDS7NqnT/nhD
-  CSEqt9HQknjKDK8LFS8Ostfbn0wZxYdh7Gxy6TKEh9dt0mMkIdzKxOJW70N+6bPP
-  CDRYB4NTKybJ2XnbEbJsUBezXDF8p+dmOEhygIAcNrjY9OyorRiZD3m60O+UuqXx
-  jumKCvffqUahjzaQRcW0r0OkF8v087BT7xUdq+K9Iza2Vuc3Qj2YxrFskE7gUhgB
-  bL55NDdi8BFHkNVohRBak7aqxsw41LJKy3UTP+4TzU5vyluDJMiscK6JJFaM4JiS
-  xtlAM0O5ZFe9QflatP+P8JnB
+  MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBIMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
+  8ixkARkWAmV1MB4XDTIzMDIyMjE4NTk1MFoXDTI0MDIyMjE4NTk1MFowSDESMBAG
+  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC
+  ggGBAKA1cGKoDX7bTA9dtbjHRNKdTDV446tBLwevBBPFeSsIibVRYf8XmKeZcuIu
+  ZYcKaCBBFebaZGeFxx96zJUARg93CTF3AzKcelUkwHZKqDUmv7rHGZ2aGVqAeBUo
+  nXOTYkg0krKse5rhqvfd0L3/SsEPWoVNVIdbGlN9piASAreuTRp58ZrqyquaZPwj
+  qKrb8LLalBE5sPWF6cgUuUscbg9FLNSBPaW01HeD2XiVcLlT6jl0BgpW9nzKgwQw
+  0GI8jU6mCTHnwzzmK3A/TgaNXxJtmoRnHZJ/GqnTe3QEgRACey6PTTI2v80LJ0iO
+  6Y0uNLbxCCH4+NLsdigKImYParvE017VjsQt7/SUNL0gHhvtfC9X3Vy+25Rtpz9M
+  AHmMm1f1c9eanxkc+4uivKhkUKY1TI4eGL/CW/VkUJ+rScspqESUty21NGBWJIjZ
+  UhjbYh7HXoGZW7Q+qs3HZNSh5e9ZR6uS/Z89c5xliMGLSzGwvFlMsOTBKh7e+Li8
+  HW8qbQIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBQO6GN9hFPUtZm9hXSHjrK0vDYuyTAmBgNVHREEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MA0GCSqGSIb3DQEBCwUAA4IBgQBi7zH6cYWgeoNoOD/Az2Q1WMbhgoV5
+  HOxqGqnwBsXX33P53WjRrAt0J9sIdplU6lhb/ZYpvPiAKBHO4Ky+SPNQcF7hBKdj
+  U+9uJLikOA8z14ek4z2CJqNiBO7ouZ14PiLPCDBKcEph6pve6OYQG7x5bnS5UmOP
+  coSFSo+bCwu15iBoQDgTSZSY7RDD5HNRL/klat8SaKrFwp0XXfUiRi8LTHRWxswe
+  QcpshuyUHnpaGJ3XftwGw2FZGCAGSqIoSsVpAtazx3/ycK7JfwvATOS8l/7VWs3O
+  DsvPtPbxt2RLMp8hushLA4zXRYPIG6J1oey40opKxQks1SJX3tDiyk5jebwsT/ZB
+  0EzYO3shlM98rrWiiFxLwv+ebOPV9SrDbivLfXs8VMxYD0rOF3ap53AfBiElvszL
+  XV2ORsrE0BA5hbgbfiQFazW2d62rWKrt3CTi36GNST95GXGBpapX9CyezadYE+5i
+  D3/VNb1+lseG5sGSOWMV8J01/J89XOfp5Gk=
   -----END CERTIFICATE-----
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2023-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dir-to-xml
@@ -106,7 +107,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -116,7 +117,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: wordsdotdat
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +164,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: Makes publishing to the web easier