concerto_simple_rss 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e05cd87dec9e071dcc3766c356e0c6afa2a1069
-  data.tar.gz: 83bd375862ea1f5b814f107acff3eb3f36f14f86
+  metadata.gz: 0dd4732708ed52d5656b207308dffc8595ee1896
+  data.tar.gz: bf0e049cfef54eff5f20e74278fa71c1a7012a26
 SHA512:
-  metadata.gz: 6eefd5e0198c1892aea1587e8c6925dec03a30fcdaca2d0655d58871ca11d55b5a96b248d22d1ef32882f00ea021dd3f92529a2bb2dcbdfec5a35f991d1b2089
-  data.tar.gz: b4943842f8f9b51ea8057580267d37a48a90ac8189c856936c7cb39437adfe2c622463c195ac734d7a6f11ee2774afb3097db3d5d94efd601367d4bb1425b379
+  metadata.gz: 7b54a6c1c6fbdacb11e91882bdf0af5ce26a1826fb0943092fdd5fe43376cb758e4f8befc59baa17a1bff84debf573c2a676ef11bbb8c53722d4689e091922f4
+  data.tar.gz: 3c40ac2612657dbd987efe901673b9372b34243d38e9b87ee37ed9e8398a106e950ae6ae8085ad16691bd555f954eaed1738cf481b9436a2db9491f9a7a7695a

data/README.md

@@ -1,7 +1,6 @@
 # Concerto 2 Simple RSS Plugin
 This plugin provides support to pull dynamic content from RSS feeds.
 
-1.  Add to your Gemfile: ```gem 'concerto_simple_rss'```
-2.  ```bundle install```
+To install this plugin, go to the Plugin management page in concerto, select RubyGems as the source and "concerto_simple_rss" as the gem name.
 
 Concerto 2 Simple RSS is licensed under the Apache License, Version 2.0.

data/app/models/simple_rss.rb

@@ -76,6 +76,8 @@ class SimpleRss < DynamicContent
         end
 
         data = xslt.serve()
+        # 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 
         # mulitple content-items that we need to parse out, if we cant then treat it as one content item
@@ -139,7 +141,7 @@ class SimpleRss < DynamicContent
     result = []
     begin
       # this will only work with nodesets for now
-      re_pattern = Regexp.new(pattern)
+      re_pattern = Regexp.new(pattern, Regexp::MULTILINE)
       if nodes.is_a?(Array) && nodes.count > 0 && nodes.first.is_a?(REXML::Element)
         nodes.each do |node|
           s = node.to_s
@@ -162,7 +164,7 @@ class SimpleRss < DynamicContent
   # fetch the feed, return the type, title, and contents (parsed) and raw feed (unparsed)
   def fetch_feed(url)
     require 'rss'
-    require 'net/http'
+    require 'open-uri'
 
     type = 'UNKNOWN'
     title = ''
@@ -172,11 +174,7 @@ class SimpleRss < DynamicContent
     begin
       # cache same url for 1 minute to alleviate redundant calls when previewing
       feed = Rails.cache.fetch(url, :expires_in => 1.minute) do
-        uri = URI.parse(url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = uri.scheme == 'https'
-        request = Net::HTTP::Get.new(uri.request_uri)
-        http.request(request).body
+        open(url).read()
       end
 
       rss = RSS::Parser.parse(feed, false, true)

data/lib/concerto_simple_rss/version.rb

@@ -1,3 +1,3 @@
 module ConcertoSimpleRss
-  VERSION = "0.5"
+  VERSION = "0.6"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: concerto_simple_rss
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Brian Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-xslt
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Simple support to render RSS content in Concerto 2.
 email:
 - bmichalski@gmail.com