mymedia 0.3.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fc78e7e213ed935fdffc733862d520abb3b0c7d1dc3afde43905372e8bfd427
-  data.tar.gz: fdae3bd4aeeb04d230dbe95b67700b68fe2ec92a09292124e912bc66285a1937
+  metadata.gz: 788b610f7561b603c218b18e55045766e787fef8f6065471fc5faccfa2e3f6d0
+  data.tar.gz: 3f16cb556b14e811bee09bb267dc2d7b4007bad0d358d1aa4b6755c198d14e22
 SHA512:
-  metadata.gz: ee00e96ba62317e509b44024544885deae61cebbc973fd62417106bd56f6c025eba8aac5c6baa658ad965bff9be1d37501a8a8be2716e5d36f37b21d4cf88692
-  data.tar.gz: 0a4ed8e0eb86dccf1e6603d9f6a0b7bc78acbb3e864706c2e61724d46d1a925e520e84d94dfb111f4193b46615af9cc5132868f93f2c9d79c0c47272e0edd44b
+  metadata.gz: 54085653a1f9707f565070f00faa8eb31a81aa3452b124f3c6dd8f7c95879880348206ac5c372b65713c473846139d588f7f3751091e5e316bba5704c2283d31
+  data.tar.gz: 68922f33adc6cb6d1008d22bc76243a8a48a90f91644cf4a32121d8fb9ac6f3d80a0fca7ae5503ccdc7d445cd5aaa530a0d28ab76b5906f9dae29d2703718b04

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-mبB��d!�׻�%�l����+����1�/�D�i��ހq��A��/�V��m�ZR�;�!
-�uu��S��W����Q�_�6?�}�D@ҵ{����궠�:D������6)K�[ʀ����1
+;�R�O(x�5�}RcC�j	����6Q����<p�|IP:�S'�

data/lib/mymedia.rb

@@ -3,7 +3,6 @@
 # file: mymedia.rb
 
 require 'time'
-require 'fileutils'
 require 'logger'
 require 'dynarex'
 require 'sps-pub'
@@ -11,6 +10,7 @@ require 'dir-to-xml'
 require 'dataisland'
 require 'increment'
 require 'simple-config'
+require 'rxfileio'
 
 
 module MyMedia
@@ -20,6 +20,7 @@ module MyMedia
 
 
   class Publisher
+    include RXFReadWriteModule
 
     def initialize(opts={})
       @index_page = true
@@ -33,7 +34,7 @@ module MyMedia
 
       opt = {id: nil, rss: false}.merge(options)
 
-      dynarex = if File.exists? dynarex_filepath then
+      dynarex = if FileX.exists? dynarex_filepath then
         Dynarex.new(dynarex_filepath)
       else
         Dynarex.new(@schema)
@@ -48,7 +49,7 @@ module MyMedia
 
         dynarex.xslt_schema = dynarex.summary[:xslt_schema]
         rss_filepath = dynarex_filepath.sub(/\.xml$/,'_rss.xml')
-        File.open(rss_filepath, 'w'){|f| f.write dynarex.to_rss }
+        FileX.write rss_filepath, dynarex.to_rss
       end
 
     end
@@ -61,7 +62,7 @@ module MyMedia
       return unless @index_page == true
       raise MyMediaPublisherException, \
           "template path: #{template_path} not found" unless \
-                                                    File.exists?(template_path)
+                                                    FileX.exists?(template_path)
 =begin jr 040916
       dataisland = DataIsland.new(template_path, @opts)
 
@@ -71,7 +72,7 @@ module MyMedia
 
     def publish_dxlite(dynarex_filepath='', record={title: '',url: ''})
 
-      dynarex = if File.exists? dynarex_filepath then
+      dynarex = if FileX.exists? dynarex_filepath then
         DxLite.new(dynarex_filepath)
       else
         DxLite.new(@schema)
@@ -92,12 +93,13 @@ module MyMedia
   end
 
   module IndexReader
+    include RXFRead
 
     def browse()
 
       json_filepath = "%s/%s/dynarex.json" % [@home, @public_type]
 
-      if File.exists? json_filepath then
+      if FileX.exists? json_filepath then
 
         dx = DxLite.new(json_filepath)
         return dx.all
@@ -110,7 +112,7 @@ module MyMedia
 
       json_filepath = "%s/%s/dynarex.json" % [@home, @public_type]
 
-      if File.exists? json_filepath then
+      if FileX.exists? json_filepath then
 
         dx = DxLite.new(json_filepath)
         return dx.all.select {|x| x.title =~ /#{keyword}/i}
@@ -124,10 +126,11 @@ module MyMedia
   end
 
   class Base < Publisher
+    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()
@@ -139,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]
 
@@ -160,7 +164,7 @@ module MyMedia
       @rss = false
       @debug = debug
 
-      Dir.chdir @home
+      DirX.chdir @home
 
     end
 
@@ -180,26 +184,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
 
 
@@ -217,18 +226,23 @@ 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]
 
-      if File.exists? raw_destination then
+      if FileX.exists? raw_destination then
         raw_destination = "%s/%s/%s" % [@home, 'r', public_path2]
         public_path = public_path2
       end
 
       destination = File.join(@home, public_path)
-      FileUtils.mkdir_p File.dirname(raw_destination)
-      FileUtils.mkdir_p File.dirname(destination)
+      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
 
@@ -239,8 +253,21 @@ module MyMedia
         raw_msg, target_url = yield(destination, raw_destination)
         static_url = target_url
       else
-        FileUtils.cp src_path, destination
-        FileUtils.cp src_path, raw_destination
+
+        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
@@ -261,7 +288,13 @@ module MyMedia
       static_destination = "%s/%s" % [@home, static_path]
 
       #FileUtils.mkdir_p File.dirname(static_destination)
-      FileUtils.cp destination, 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
 
@@ -270,8 +303,14 @@ module MyMedia
 
         xmlfilepath = destination.sub('.html','.xml')
 
-        if File.exists?(xmlfilepath) then
-          FileUtils.cp xmlfilepath, static_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.3.0
+  version: 0.5.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,88 +35,48 @@ cert_chain:
   bL55NDdi8BFHkNVohRBak7aqxsw41LJKy3UTP+4TzU5vyluDJMiscK6JJFaM4JiS
   xtlAM0O5ZFe9QflatP+P8JnB
   -----END CERTIFICATE-----
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-03-06 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