rss_creator 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 647757a294410e98e341314c9f85c097059161320456321ff8472deb90c363d6
-  data.tar.gz: 396951cc15ffcd5ae92790392a4ad139310acd35cdd2d7b1f59d0e15696a6bd2
+  metadata.gz: 1e9a19b111850395e005bf30f5988a3d9fa3e77b18e7ea64ecd946223f6b0132
+  data.tar.gz: b874598f45e34d85d949b1a6a86f13b43ea52a0db1ee5404fc6a94dbb2d27cdd
 SHA512:
-  metadata.gz: 465c8405ef8d2f6ff853f418d35eaf4eb6d07f301f02664d31a59b41357a27486a49d5b159e8b941c69697b1464ec623dab641dcbcfd77612e704e9861565abd
-  data.tar.gz: 2308016cbad0de11a04ccfdbb2bfa2e345ac440700fedb7cea0c1f9aeac1164fc152fd0569fa8f55a69db3e82c32ac3695be5e0f003cc867a56bb54422263ef2
+  metadata.gz: 620d7a274a083fdc661b1dc5aa11515ecb2c1d41373028e8e29cd12a7f8ba60da94f5e3a008e0f359e914647ed9918d534a76f53fed9fe6ec3256322d694002a
+  data.tar.gz: e6122e91ce400ed1ed538e1d18add56be3dad0d1674901d0b1773c157e37266a5663563ee13df9234e63de2d5b32f87f2147d911a9aa5facc20f58cfe54a6903

data/lib/rss_creator.rb

@@ -7,49 +7,53 @@ require 'rss_to_dynarex'
 
 
 class RSScreator
+  include RXFHelperModule
 
-  attr_accessor :title, :description, :link, :limit, :xslt, :image_url, 
+  attr_accessor :title, :description, :link, :limit, :xslt, :image_url,
       :image_target_url
 
-  def initialize(filepath='rss.xml', dx_xslt: nil, dx_filename: 'feed.xml', 
-                 custom_fields: [], limit: 10, debug: false)
+  def initialize(filepath='rss.xml', dx_xslt: nil, dx_filename: 'feed.xml',
+                 custom_fields: [], limit: 10, log: nil, debug: false)
 
 
-    @filepath, @debug = filepath, debug
+    @filepath, @log, @debug = filepath, log, debug
 
     dxfilepath = File.join(File.dirname(filepath), dx_filename)
-    
-    if filepath and File.exists? dxfilepath then
+
+    if filepath and FileX.exists? dxfilepath then
 
       @dx = Dynarex.new dxfilepath
       @title, @description, @link = @dx.title, @dx.description, @dx.link
+      @image_url = @dx.image
 
     else
-      if filepath and File.exists? filepath
-      
+      if filepath and FileX.exists? filepath
+
         rtd = RSStoDynarex.new filepath
         @dx = rtd.to_dynarex
 
         @title, @description, @link = @dx.title, @dx.description, @dx.link
-      
+        @image_url = @dx.image if @dx.image and @dx.image.length > 1
+        @image_target_url = @link if @link and @link.length > 1
+
       else
 
-      
-        schema = 'channel[title, description, link]/' + \
+
+        schema = 'channel[title, description, link, image]/' + \
                                   'item(title, link, description, date'
         schema +=  ', ' + custom_fields.join(', ') if custom_fields.any?
         schema += ')'
-        
+
         @dx = Dynarex.new schema
       end
 
-      @dx.order = 'descending'    
+      @dx.order = 'descending'
       @dx.default_key = 'uid'
-      @dx.xslt = dx_xslt if dx_xslt    
+      @dx.xslt = dx_xslt if dx_xslt
+
 
-      
     end
-    
+
     @dx.xslt_schema = 'channel[title:title,description:description,' + \
                     'link:link]/item(title:title,description:description,' + \
                                                       'link:link,pubDate:date)'
@@ -62,31 +66,33 @@ class RSScreator
 
   end
 
-  def add(item: {title: '', link: '', description: ''}, id: nil)
+  def add(itemx={title: '', link: '', description: ''}, item: itemx, id: nil)
+
+    @log.debug 'RssCreator#add item: ' + item.inspect if @log
 
     unless item[:title] and item[:link] then
-      raise 'RSScreator: title or link can\'t be blank' 
+      raise 'RSScreator: title or link can\'t be blank'
     end
-    
+
     record = {date: Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")}.merge(item)
     @dx.create(record, id: id)
-    
+
     @dirty = true
-    
+
   end
 
   def save(new_filepath=nil)
 
     filepath = new_filepath ? new_filepath : @filepath
-    File.write filepath, print_rss
+    FileX.write filepath, print_rss
     @dx.save File.join(File.dirname(filepath), @dxfilename) if @dxfilename
   end
-  
+
   def description=(val)
     @description = val
     @dirty = true
   end
-  
+
   def delete(id)
     @dx.delete id.to_s
   end
@@ -97,24 +103,24 @@ class RSScreator
   def dynarex()
     @dx
   end
-  
+
   def image_url=(val)
     @image_url = val
     @dirty = true
   end
-  
+
   alias image= image_url=
-  
+
   def image_target_url=(val)
     @image_target_url = val
     @dirty = true
-  end  
+  end
 
   def link=(val)
     @link = val
     @dirty = true
-  end  
-  
+  end
+
   def title=(val)
     @title = val
     @dirty = true
@@ -127,42 +133,43 @@ class RSScreator
   private
 
   def print_rss()
-    
+
     return @rss unless @dirty
 
     if @title.nil? or @description.nil?  then
-      raise 'RSScreator: title or description can\'t be blank' 
+      raise 'RSScreator: title or description can\'t be blank'
     end
 
     @dx.title, @dx.description, @dx.link = @title, @description, @link || ''
-    
+    @dx.image = @image_url if @dx.respond_to? :image
+
     @rss = if @xslt then
-    
+
       @dx.to_rss({limit: @limit}) do |doc|
-        
+
         doc.instructions << ['xml-stylesheet',\
           "title='XSL_formatting' type='text/xsl' href='#{@xslt}'"]
-        
-      end      
-      
+
+      end
+
     else
-      
+
       @dx.to_rss({limit: @limit}) do |doc|
-        
+
         if @image_url then
-          
+
           img = Rexle::Element.new('image')
           img.add Rexle::Element.new('url').add_text @image_url
           img.add Rexle::Element.new('link').add_text @image_target_url
-        
+
           doc.root.element('channel/item').insert_before img
-        
-        end        
-        
+
+        end
+
       end
-      
+
     end
-    
+
     @dirty = false
     @rss
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rss_creator
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   CmoNNvIZ3zS4vUkMoFR7S0bXN/xdxzLVn5uGLJ8FwP76BqKlR2+xV5Bj+40hyMDP
   s+qwrtoA3kBtGhpVjCn/TE5q
   -----END CERTIFICATE-----
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rss_to_dynarex