mymedia 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cab99c1f36e7249115b72436a3ec9981056b0ed984e22161fc4ef481531b7542
-  data.tar.gz: 58e4ec2b6e97bb96b0c8f002e8b805e82bff8af71d0e3c7414c9a2f50e1fd992
+  metadata.gz: 6db4be538139117711e0efb648d7e93873b129692f1319cf82523e9caf96d1cf
+  data.tar.gz: 494646f0e3e962bbb9764aa64b683f6ac04b985b8df375f5d80b2f57261d875c
 SHA512:
-  metadata.gz: 9e6eec410b50bf3dedb1b33740b480597cac0ece76816d4f860dd99c9cc72f949376fdd39ca48a0263222a99e4694be0952facdf4d19023be6b523166dda7788
-  data.tar.gz: f9d3467d227659265e8237cfbae084134f05dec9a85b54f51b993a735ca8197a72e947630ba8bdeed493e0f4384904e4dd310c766da5aa621e3707090497e6c0
+  metadata.gz: 044a56092a8239fe598563ece75a9e288526201883fb8083f6aa8cce40ff6a79bca679133a49da2730c14b55066ed6ac5ed1539ddbb472d7bbc8d3b8139bdbed
+  data.tar.gz: c296255f7b2f2e43c719ddfc1cdbae91314fe7dd6fc73c5e396027fad0ed4be5f969534fcc63e0e253b593478d79fd5b76a619cdccfee9ff8b696a66dfee87ce

data/lib/mymedia.rb

@@ -10,6 +10,7 @@ require 'dir-to-xml'
 require 'dataisland'
 require 'increment'
 require 'simple-config'
+require 'rxfileio'
 
 
 module MyMedia
@@ -19,7 +20,7 @@ module MyMedia
 
 
   class Publisher
-    include RXFHelperModule
+    include RXFReadWriteModule
 
     def initialize(opts={})
       @index_page = true
@@ -74,7 +75,7 @@ module MyMedia
       dynarex = if FileX.exists? dynarex_filepath then
         DxLite.new(dynarex_filepath)
       else
-        DxLite.new(@schema)
+        DxLite.new(@schema, order: 'descending')
       end
 
       dynarex.create record
@@ -92,7 +93,7 @@ module MyMedia
   end
 
   module IndexReader
-    include RXFHelperModule
+    include RXFRead
 
     def browse()
 
@@ -125,11 +126,11 @@ module MyMedia
   end
 
   class Base < Publisher
-    include RXFHelperModule
+    include RXFileIOModule
 
     attr_reader :to_s
 
-    def initialize(media_type: 'blog', public_type: 'blog',
+    def initialize(media_type: 'blog', public_type: media_type,
                    ext: 'txt', config: nil, log: nil, debug: false)
 
       super()
@@ -141,6 +142,7 @@ module MyMedia
       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]
 
@@ -149,6 +151,7 @@ module MyMedia
       @domain = @website[/[^\.]+\.[^\.]+$/]
 
       @sps = c[:sps]
+      @omit_html_ext = c[:omit_html_ext]
 
       @log = log
 
@@ -162,7 +165,7 @@ module MyMedia
       @rss = false
       @debug = debug
 
-      Dir.chdir @home
+      DirX.chdir @home
 
     end
 
@@ -182,26 +185,31 @@ module MyMedia
 
       @log.info 'Base inside auto_copy_publish' if @log
       puts '@media_src: ' + @media_src.inspect if @debug
-      #exit
-      dir = DirToXML.new(@media_src, recursive: true, debug: false)
-      puts 'before dir.last_modified' if @debug
-      r = dir.last_modified
-      puts 'r: ' + r.inspect if @debug
 
-      filename = r.is_a?(Hash) ? r[:name] : File.join(r.map {|x| x[:name]})
+      # fetch the most recent file
+      filename = FileX.ru_r @media_src
 
-      copy_publish( filename ,raw_msg, &blk)
+      if filename then
+
+        puts 'filename: ' + filename.inspect if @debug
+
+        copy_publish( filename ,raw_msg, &blk)
+
+      end
 
     end
 
-    def basename(s1, s2)
+    def basename(raw_s1, raw_s2)
+
+      s1 = raw_s1.sub(/dfs:\/\/[^\/]+/,'')
+      s2 = raw_s2.sub(/dfs:\/\/[^\/]+/,'')
 
       (s2.split('/') - s1.split('/')).join('/')
 
     end
 
     def copy_publish(filename, raw_msg='', &blk)
-      file_publish(File.join(@media_src,filename), raw_msg)
+      file_publish(filename, raw_msg)
     end
 
 
@@ -219,7 +227,7 @@ module MyMedia
 
       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]
+                                       Time.now.strftime('%S%2N'), @target_ext]
 
       raw_destination = "%s/%s/%s" % [@home, 'r', public_path]
 
@@ -232,6 +240,11 @@ module MyMedia
       FileX.mkdir_p File.dirname(raw_destination)
       FileX.mkdir_p File.dirname(destination)
 
+      if @debug then
+        puts "file_publish() #50 mkdir_p %s" % [File.dirname(raw_destination)]
+        puts "file_publish() #70 mkdir_p %s" % [File.dirname(destination)]
+      end
+
       raw_msg = raw_msg.join ' ' if raw_msg.is_a? Array
 
       raw_msg = src_path[/([^\/]+)\.\w+$/,1] + ' ' + raw_msg if raw_msg[/^#/]
@@ -241,8 +254,21 @@ module MyMedia
         raw_msg, target_url = yield(destination, raw_destination)
         static_url = target_url
       else
+
+        if @debug then
+          puts "file_publish() #80 cp %s to %s" % [src_path, destination]
+          puts "file_publish() #90 cp %s to %s" % [src_path, destination]
+        end
+
         FileX.cp src_path, destination
         FileX.cp src_path, raw_destination
+
+        if @debug then
+          puts "file_publish() #100 copied %s to %s" % [src_path, destination]
+          puts "file_publish() #200 copied %s to %s" % \
+              [src_path, raw_destination]
+        end
+
       end
 
       raw_msg = raw_msg.join if raw_msg.is_a? Array
@@ -263,6 +289,12 @@ module MyMedia
       static_destination = "%s/%s" % [@home, static_path]
 
       #FileUtils.mkdir_p File.dirname(static_destination)
+
+      if @debug then
+        puts "file_publish() #300 copy %s to %s" % [destination,
+                                                      static_destination]
+      end
+
       FileX.cp destination, static_destination
 
       #jr010817 FileUtils.cp raw_destination, raw_static_destination
@@ -273,7 +305,13 @@ module MyMedia
         xmlfilepath = destination.sub('.html','.xml')
 
         if FileX.exists?(xmlfilepath) then
+
           FileX.cp xmlfilepath, static_destination.sub('.html','.xml')
+
+          if @debug then
+            puts "file_publish() #400 copied %s to %s" % [xmlfilepath, static_destination.sub('.html','.xml')]
+          end
+
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,88 +35,48 @@ cert_chain:
   bL55NDdi8BFHkNVohRBak7aqxsw41LJKy3UTP+4TzU5vyluDJMiscK6JJFaM4JiS
   xtlAM0O5ZFe9QflatP+P8JnB
   -----END CERTIFICATE-----
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dynarex
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.2
-- !ruby/object:Gem::Dependency
-  name: sps-pub
+  name: dir-to-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
-  name: dir-to-xml
+  name: dataisland
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.8
-- !ruby/object:Gem::Dependency
-  name: dataisland
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: increment
   requirement: !ruby/object:Gem::Requirement
@@ -183,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Makes publishing to the web easier