mymedia 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 879bb9d7cf2f55bd38bb6d2e005d824fc0b63760931424c0ef16599c8e405581
-  data.tar.gz: 77ccdb6252d36a6bf313e491169a2df56b5325284a809060894bb6e30eadfaec
+  metadata.gz: 1a714cd992ef14c2e9ee41a3e29ce25bf90b2d8378636903108993dcb2dd7d21
+  data.tar.gz: f9f81cd5d692cb58cd0b7d82cb9d535f19cbfff5b8c33077d8bef48f50a570f3
 SHA512:
-  metadata.gz: cf2b2df683d4055893ce649e8c3ebc30eee11fbe432b8c9fd7292ee3ca4be66843304e63a79e68a67e3dc2b2cb6e43653de7da371da695274aae2030bd5701c6
-  data.tar.gz: 56cb9c6a53dbd585d1ade2ae2a1afff3934823b3bc7bcd9fad89cbb0cb205316281dad53220a3652559d1f36e84ef218312bc4bc40a6a95e8f497979f43fa580
+  metadata.gz: b6acc8fcf2c6e792f361921e9769879d8ff871f429f36b76276c3a413d60f258b219e66ffa96754cb6d86d4e41268b58632596f274630fd985379887f0d6d72b
+  data.tar.gz: 7a6d6fb05c2600876bb44bf3bde49104f7bb48b573f19e69ea4d2a30d2e5e7245f9995d65a41af613290f688b1855fbb42cd7307c5dada51f0df96b49ad3f959

data/lib/mymedia.rb

@@ -10,6 +10,8 @@ require 'dir-to-xml'
 require 'dataisland'
 require 'increment'
 require 'simple-config'
+require 'rxfileio'
+require 'wordsdotdat'
 
 
 module MyMedia
@@ -19,7 +21,7 @@ module MyMedia
 
 
   class Publisher
-    include RXFHelperModule
+    include RXFReadWriteModule
 
     def initialize(opts={})
       @index_page = true
@@ -74,7 +76,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,16 +94,38 @@ module MyMedia
   end
 
   module IndexReader
-    include RXFHelperModule
+    include RXFRead
 
-    def browse()
+    def browse(startswith=nil)
 
       json_filepath = "%s/%s/dynarex.json" % [@home, @public_type]
 
       if FileX.exists? json_filepath then
 
         dx = DxLite.new(json_filepath)
-        return dx.all
+
+        if startswith then
+
+          @stopwords = WordsDotDat.stopwords
+          q = startswith
+
+          r = dx.all.select do |x|
+
+            found = x.title.scan(/\b\w+/).select do |raw_word|
+
+              word = raw_word.downcase
+              word[0..(q.length-1)] == q and not @stopwords.include? word
+
+            end
+
+            found.any?
+          end
+
+        else
+
+          return dx.all
+
+        end
 
       end
 
@@ -125,7 +149,7 @@ module MyMedia
   end
 
   class Base < Publisher
-    include RXFHelperModule
+    include RXFileIOModule
 
     attr_reader :to_s
 
@@ -141,6 +165,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 +174,7 @@ module MyMedia
       @domain = @website[/[^\.]+\.[^\.]+$/]
 
       @sps = c[:sps]
+      @omit_html_ext = c[:omit_html_ext]
 
       @log = log
 
@@ -184,27 +210,29 @@ module MyMedia
       puts '@media_src: ' + @media_src.inspect if @debug
 
       # fetch the most recent file
-      r = FileX.ru_r @media_src
+      filename = FileX.ru_r @media_src
 
-      if r then
+      if filename then
 
-        puts 'r: ' + r.inspect if @debug
+        puts 'filename: ' + filename.inspect if @debug
 
-        filename = r.sub(/^#{@media_src}/,'')
         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
 
 
@@ -222,7 +250,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]
 
@@ -235,6 +263,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[/^#/]
@@ -244,8 +277,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
@@ -266,6 +312,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
@@ -276,7 +328,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.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,128 +35,108 @@ cert_chain:
   bL55NDdi8BFHkNVohRBak7aqxsw41LJKy3UTP+4TzU5vyluDJMiscK6JJFaM4JiS
   xtlAM0O5ZFe9QflatP+P8JnB
   -----END CERTIFICATE-----
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dynarex
+  name: dir-to-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
-  name: sps-pub
+  name: dataisland
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: dir-to-xml
+  name: increment
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 0.1.4
   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:
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
-  name: increment
+  name: simple-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
-  name: simple-config
+  name: wordsdotdat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.2.0
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -183,8 +163,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