rrsimple-rss 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e4bbd535ab0d41860e37b2c9dbbce4b2812a966
-  data.tar.gz: 166312f654025eb0ced44b7dfeb79fcab0dac47e
+  metadata.gz: b202a9c81df93abba588c6c9157ba77038ae71e0
+  data.tar.gz: e98e2d08b4729243d06ddceafdf19dc0c4fe41d2
 SHA512:
-  metadata.gz: 6e9275e1f51621fd66f658b1da17a04f03ce503bffcf10a3fd2b7b99bfe42fb60a5e833051726fc6c445aa5ff0d11d1578b893a8e7e2c2f327d02afc15a1e8a9
-  data.tar.gz: 5ec05713590bab65a981b401477a8ed75dcb21980eeaa7545fcb8f1444c48860870409b84105869e03999d505a0985647474714539f4aaa636490959e7f0b93f
+  metadata.gz: 79fa2c492e08186e26aa56ab6576e943be4a2b23ace18bb804dc9843d8e1deeefac34e870b6f390908cecade038e4c22d5dedbfbe000c3fb7a605973c69eddee
+  data.tar.gz: bb9fc6666f882d8e440bfdd0c33918f078340a1146866e8edd5a067de29d32a53fdadcb17a8a487be8a341b12c2c8dc96bd78688ff0a0a97395d03c70c9f4f58

data/lib/rrsimple-rss.rb

@@ -3,7 +3,7 @@ require 'cgi'
 require 'time'
 
 class RRSimpleRSS
-  VERSION = "1.3.9"
+  VERSION = "1.3.10"
 
   attr_reader :items, :source
   alias :entries :items
@@ -131,9 +131,19 @@ class RRSimpleRSS
           end
 
           if tag == :category
-            item[tag] = match[3].scan(%r{<(rss:|atom:)?#{tag}(.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi).map {|x| category(x[2])}
+            if self.channel.link.include?("bbc.com")
+              item[tag] = match[3].scan(%r{<(rss:|atom:)?#{tag} label=(.*?)>}mi).map {|x| categorybbc(x[1]) }
+            else
+              item[tag] = match[3].scan(%r{<(rss:|atom:)?#{tag}(.*?)>(.*?)</(rss:|atom:)?#{tag}>}mi).map {|x| category(x[2])}
+            end
           elsif tag == :keywords
-            item[tag] = match[3].scan(%r{<(rss:|atom:)?dc:subject rdf:type="keywords"(.*?)>(.*?)<\/(rss:|atom:)?dc:subject>}mi).map {|x| x[2].gsub(";", ",") }
+            if self.channel.link.include?("bbc.com")
+              keys = match[3].scan(%r{<(rss:|atom:)?dc:subject rdf:type="keywords"(.*?)>(.*?)<\/(rss:|atom:)?dc:subject>}mi)
+              item[tag] = keys.empty? ? [] : keys[0][2].split("; ")
+              item[:category].map { |x| item[tag] << x }
+            else
+              item[tag] = match[3].scan(%r{<(rss:|atom:)?dc:subject rdf:type="keywords"(.*?)>(.*?)<\/(rss:|atom:)?dc:subject>}mi).map {|x| x[2].gsub(";", ",") }
+            end
           elsif tag == :linkbbc
             match[3] =~ %r{<(rss:|atom:)?link(.*?)/\s*>}mi
             $2 =~ %r{href=(.*?)rel}
@@ -152,6 +162,10 @@ class RRSimpleRSS
 
   end
 
+  def categorybbc(str)
+    str.split(" ").first
+  end
+
   def category(str)
     str.include?("CDATA") ? str[9..str.length-4] : str
   end

data/rrsimple-rss.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rrsimple-rss"
-  s.version = "1.3.9"
+  s.version = "1.3.10"
   s.date = Time.now.strftime("%Y-%m-%d")
   s.summary = "A simple, flexible, extensible, and liberal RSS and Atom reader for Ruby. It is designed to be backwards compatible with the standard RSS parser, but will never do RSS generation."
   s.email = "rodrigo@rrmartins.com"

data/test/base/base_test.rb

@@ -9,6 +9,7 @@ class BaseTest < Test::Unit::TestCase
     @rss_prnews = RRSimpleRSS.parse open(File.dirname(__FILE__) + '/../data/prnews.xml')
     @rss_bbc    = RRSimpleRSS.parse open(File.dirname(__FILE__) + '/../data/bbc.xml')
     @rss_bbc2   = RRSimpleRSS.parse open(File.dirname(__FILE__) + '/../data/bbc2.xml')
+    @rss_bbc3   = RRSimpleRSS.parse open(File.dirname(__FILE__) + '/../data/bbc3.xml')
     @rss_baboo  = RRSimpleRSS.parse open(File.dirname(__FILE__) + '/../data/baboo.xml')
     @rss09      = RRSimpleRSS.parse open(File.dirname(__FILE__) + '/../data/rss09.rdf')
     @rss20      = RRSimpleRSS.parse open(File.dirname(__FILE__) + '/../data/rss20.xml')
@@ -17,8 +18,9 @@ class BaseTest < Test::Unit::TestCase
   end
 
   def test_channel
+    assert_equal @rss_bbc,   @rss_bbc.channel
     assert_equal @rss_bbc2,   @rss_bbc2.channel
-    assert_equal @rss_bbc,    @rss_bbc.channel
+    assert_equal @rss_bbc3,    @rss_bbc3.channel
     assert_equal @rss09,      @rss09.channel
     assert_equal @rss20,      @rss20.channel
     assert_equal @atom,       @atom.feed
@@ -30,6 +32,7 @@ class BaseTest < Test::Unit::TestCase
     assert_kind_of Array, @rss_baboo.items
     assert_kind_of Array, @rss_bbc.items
     assert_kind_of Array, @rss_bbc2.items
+    assert_kind_of Array, @rss_bbc3.items
     assert_kind_of Array, @rss09.items
     assert_kind_of Array, @rss20.items
     assert_kind_of Array, @atom.entries
@@ -85,11 +88,26 @@ class BaseTest < Test::Unit::TestCase
     assert_equal Time.parse("2015-11-09 16:40:33 -0200"), @rss_bbc2.items.first.updated
     assert_equal Time.parse("2015-11-09 13:29:35 -0200"), @rss_bbc2.channel.updated
     assert_not_nil @rss_bbc2.items.first.content
-    assert_nil @rss_bbc2.items.first.category.first
+    assert_not_nil @rss_bbc2.items.first.category.first
     assert_kind_of Array, @rss_bbc2.items.first.keywords
     assert_equal "internacional", @rss_bbc2.items.first.keywords[0].split(", ").first
   end
 
+  def test_rss_bbc3
+    assert_equal 88, @rss_bbc3.items.size
+    assert_equal "BBCBrasil.com | Notícias", @rss_bbc3.title.force_encoding("UTF-8")
+    assert_equal "http://www.bbc.com/portuguese/full_all.xml", @rss_bbc3.channel.link
+    assert_equal "http://www.bbc.com/portuguese/noticias/2015/11/151130_dilma_cervero_cop_lab_rm", @rss_bbc3.items.first.linkbbc
+    assert_equal "http://www.bbc.com/portuguese/noticias/2015/11/151130_dilma_cervero_cop_lab_rm", @rss_bbc3.items.first[:linkbbc]
+    assert_equal Time.parse("2015-11-30 18:41:31 -0200"), @rss_bbc3.items.first.updated
+    assert_equal Time.parse("2015-11-30 18:41:31 -0200"), @rss_bbc3.channel.updated
+    assert_not_nil @rss_bbc3.items.first.content
+    assert_not_nil @rss_bbc3.items.first.category.first
+    assert_kind_of Array, @rss_bbc3.items.first.category
+    assert_kind_of Array, @rss_bbc3.items.first.keywords
+    assert_equal "brasil", @rss_bbc3.items.first.keywords[0].split(", ").first
+  end
+
   def test_rss09
     assert_equal 10, @rss09.items.size
     assert_equal "Slashdot", @rss09.title

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rrsimple-rss
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - Lucas Carlson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies: []
 description: A simple, flexible, extensible, and liberal RSS and Atom reader for Ruby.
   It is designed to be backwards compatible with the standard RSS parser, but will