concerto_simple_rss 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 920510da98f4e29a6a78743863b87b13b831e157
-  data.tar.gz: c86fdb040da61171251108ba49236eb2bbd9c0cb
+  metadata.gz: b661b2dccddb96c606b34d1c63b15b014790c286
+  data.tar.gz: 8d6ecccd2b613b09e6905370bdc6a2cb36a591d6
 SHA512:
-  metadata.gz: dce49c410e3b9013aa6847127eabecd895536c685290b7aa6c64b2d8ce097a0f4a1a20aa820555995d54f9b939a650b36e1439190c191ab98b5458d40e3be532
-  data.tar.gz: 9a938eed7e5bb4ec47c6dea41c58ae0829f3e659d82c787028fd72d5e7a3a00580327603a9b174cf25cfe2014312b520005d4e0a56ff214fa0a01e378183a5e5
+  metadata.gz: b0645137debcd329c78c43bf57f2f64a00b1cefc34f8a477f4af494501058d75622c60b5b1454fd775d86cfd6b7d09eb6defe243692405647346c971bc18026d
+  data.tar.gz: 6e7785a2185ef61abc7e9601108e54ec9a985ae997914e613c0e02e7a0946bee601c84f9f237b573c6b57e05a5b1b4bdb32541fec2d04422ab9303151f9e5f36

data/app/models/simple_rss.rb

@@ -10,15 +10,15 @@ class SimpleRss < DynamicContent
   # Called during `after_find`.
   def load_config
     j = JSON.load(self.data)
-    
+
     # decrypt fields
     unless j.blank?
       encrypted_userid = Base64.decode64(j['url_userid_enc']) unless j['url_userid_enc'].blank?
       encrypted_password = Base64.decode64(j['url_password_enc']) unless j['url_password_enc'].blank?
 
-      j['url_userid'] = (encrypted_userid.blank? ? "" : encrypted_userid.decrypt)
-      j['url_password'] = (encrypted_password.blank? ? "" : encrypted_password.decrypt)
-    end 
+      j['url_userid'] = (encrypted_userid.blank? ? "" : Encryptor.decrypt(encrypted_userid))
+      j['url_password'] = (encrypted_password.blank? ? "" : Encryptor.decrypt(encrypted_password))
+    end
 
     self.config = j
   end
@@ -30,8 +30,8 @@ class SimpleRss < DynamicContent
     j = self.config.deep_dup
 
     # encrypt fields
-    j['url_userid_enc'] = (j['url_userid'].blank? ? "" : Base64.encode64(j['url_userid'].encrypt))
-    j['url_password_enc'] = (j['url_password'].blank? ? "" : Base64.encode64(j['url_password'].encrypt))
+    j['url_userid_enc'] = (j['url_userid'].blank? ? "" : Base64.encode64(Encryptor.encrypt(j['url_userid'])))
+    j['url_password_enc'] = (j['url_password'].blank? ? "" : Base64.encode64(Encryptor.encrypt(j['url_password'])))
     j.delete 'url_userid'
     j.delete 'url_password'
     self.data = JSON.dump(j)
@@ -45,7 +45,7 @@ class SimpleRss < DynamicContent
       url_userid = self.config['url_userid']
       url_password = self.config['url_password']
       type, feed_title, rss, raw = fetch_feed(url, url_userid, url_password)
-      
+
       if (["RSS", "ATOM"].include? type) && !feed_title.blank?
         # it is a valid feed
         if !self.config['reverse_order'].blank? && self.config['reverse_order'] == '1'
@@ -100,7 +100,7 @@ class SimpleRss < DynamicContent
 
           # add a replace [gsub] function for more powerful transforms.  You can use this in a transform
           # by adding the bogus namespace http://concerto.functions
-          # A nodeset comes in as an array of REXML::Elements 
+          # A nodeset comes in as an array of REXML::Elements
           XML::XSLT.registerExtFunc("http://concerto.functions", "replace") do |nodes, pattern, replacement|
             result = xslt_replace(nodes, pattern, replacement)
             result
@@ -115,7 +115,7 @@ class SimpleRss < DynamicContent
           # xslt.serve does always return a string with ASCII-8BIT encoding regardless of what the actual encoding is
           data = data.force_encoding(xslt.xml.encoding) if data
 
-          # try to load the transformed data as an xml document so we can see if there are 
+          # try to load the transformed data as an xml document so we can see if there are
           # mulitple content-items that we need to parse out, if we cant then treat it as one content item
           begin
             data_xml = REXML::Document.new('<root>' + data + '</root>')
@@ -146,7 +146,7 @@ class SimpleRss < DynamicContent
               data.split("</content-item>").each do |n|
                 htmltext = HtmlText.new()
                 htmltext.name = "#{feed_title}"
-                htmltext.data = sanitize(n.sub("<content-item>", "")) 
+                htmltext.data = sanitize(n.sub("<content-item>", ""))
                 contents << htmltext if !htmltext.data.blank?
               end
 
@@ -170,7 +170,7 @@ class SimpleRss < DynamicContent
         raise "Unexpected feed format for #{url}."
       end
     end
-    
+
     return contents
   end
 
@@ -198,7 +198,7 @@ class SimpleRss < DynamicContent
     end
 
     result
-  end    
+  end
 
   # fetch the feed, return the type, title, and contents (parsed) and raw feed (unparsed)
   def fetch_feed(url, url_userid, url_password)
@@ -254,7 +254,7 @@ class SimpleRss < DynamicContent
     when "ATOM"
       title = item.title.content
 
-      # seems like the hard way, but the only way I could figure out to get the 
+      # seems like the hard way, but the only way I could figure out to get the
       # contents without it being html encoded.  most likely a prime candidate for optimizing
       require 'rexml/document'
       entry_xml = REXML::Document.new(item.to_s)
@@ -271,7 +271,7 @@ class SimpleRss < DynamicContent
   end
 
   def items_to_html(items, type)
-    return items.collect {|item| 
+    return items.collect {|item|
       case type
       when "RSS"
         title = item.title
@@ -293,7 +293,7 @@ class SimpleRss < DynamicContent
     url = self.config['url']
     url_userid = self.config['url_userid']
     url_password = self.config['url_password']
-    unless url.blank? 
+    unless url.blank?
       Rails.logger.debug("looking up feed title for #{url}")
 
       type, title = fetch_feed(url, url_userid, url_password)
@@ -321,7 +321,7 @@ class SimpleRss < DynamicContent
         url = self.config['url']
         url_userid = self.config['url_userid']
         url_password = self.config['url_password']
-        unless url.blank? 
+        unless url.blank?
           require 'rexml/document'
           require 'xml/xslt'
 
@@ -365,7 +365,7 @@ class SimpleRss < DynamicContent
 
   def sanitize(html)
     if self.config.include?('sanitize_tags') and !self.config['sanitize_tags'].empty?
-      whitelist = ActionView::Base.sanitized_allowed_tags 
+      whitelist = ActionView::Base.sanitized_allowed_tags
       blacklist = self.config['sanitize_tags'].split(" ")
 
       html = ActionController::Base.helpers.sanitize(html, :tags => (whitelist - blacklist))

data/lib/concerto_simple_rss/engine.rb

@@ -1,13 +1,14 @@
 module ConcertoSimpleRss
   class Engine < ::Rails::Engine
     require 'encryptor'
-    
+
     isolate_namespace ConcertoSimpleRss
 
     initializer "register content type" do |app|
       app.config.content_types << SimpleRss
 
       Encryptor.default_options.merge!(key: ENV["SECRET_KEY_BASE"])
+      Encryptor.default_options.merge!(iv: ENV["SECRET_KEY_BASE"])
     end
   end
 end

data/lib/concerto_simple_rss/version.rb

@@ -1,3 +1,3 @@
 module ConcertoSimpleRss
-  VERSION = "1.0"
+  VERSION = "1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_simple_rss
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Brian Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: encryptor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ruby-xslt
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: RSS Dynamic Concerto for Concerto 2.