feedparser 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98fe29b4b37ab3f10f52e1eb8b928807cf911f6e
-  data.tar.gz: ca67cc643a6c0219efe13dbf4bd99ccd76c359a0
+  metadata.gz: fdd14a8952605dcb40547f1675bc234fb16af21f
+  data.tar.gz: de37586ae452d80ebc2042ebfda9c29dabfa2aa0
 SHA512:
-  metadata.gz: e5fef03a0a3680af0d825c4169af41dbd16ebee7b68d8b34ef2548d12b7105d6748dc62b8e9fe3bf5be0513dbfe5530359c65b73ab0f8f83848364c8657587ed
-  data.tar.gz: 94a342686dc2b21e6fe9e0d963b08ab3d7c0701f4981e354d698818106e77eb1b7dfc46bf03164140aa03a0221af8ee6a6c31c846419c36e95a4dd96bce9c35b
+  metadata.gz: b79665575a1596f1c644d48307e5660a52cf6ac1b0124bf6bc5df4ce66123cabada4dacebcf9240665dc2e0d5e2e52d14d764e9183bcf5bf25d9766385996b73
+  data.tar.gz: 8cb7a605620667f035a635826c29690835a4b38fa50e932d6b2fa6ac054d34f9c37a10585b5d9fcf0438836e3462081f85bb24a67ca2c1baa04fa4659cbd59eb

data/Manifest.txt

@@ -1,4 +1,4 @@
-HISTORY.md
+CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile

data/Rakefile

@@ -15,7 +15,7 @@ Hoe.spec 'feedparser' do
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
-  self.history_file = 'HISTORY.md'
+  self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
     ['logutils', '>=0.6.1'],
@@ -27,7 +27,7 @@ Hoe.spec 'feedparser' do
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   required_ruby_version: '>= 2.3'
+   required_ruby_version: '>= 2.2.2'
   }
 
 end

data/lib/feedparser/parser.rb

@@ -16,38 +16,53 @@ class Parser
   ### Note: lets keep/use same API as RSS::Parser for now
   def initialize( text )
     @text = text
+    @head = @text[0..100].strip     # note: remove leading spaces if present
   end
 
 
 
-  def parse
-    head = @text[0..100].strip     # note: remove leading spaces if present
-
-    jsonfeed_version_regex = %r{"version":\s*"https://jsonfeed.org/version/1"}
+  #### note:
+  # make format checks callable from outside (that is, use builtin helper methods)
 
+  def is_xml?
     ## check if starts with knownn xml prologs
-    if head.start_with?( '<?xml' )  ||
-       head.start_with?( '<feed/' ) ||
-       head.start_with?( '<rss/' )
+    @head.start_with?( '<?xml' )  ||
+    @head.start_with?( '<feed' ) ||
+    @head.start_with?( '<rss' )
+  end
+  alias_method :xml?, :is_xml?
+
+  JSONFEED_VERSION_RE = %r{"version":\s*"https://jsonfeed.org/version/1"}
+  def is_json?
     ## check if starts with { for json object/hash
     ##    or if includes jsonfeed prolog
+    @head.start_with?( '{' ) ||
+    @head =~ JSONFEED_VERSION_RE
+  end
+  alias_method :json?, :is_json?
+
+  def is_microformats?
+    #  for now check for microformats v2 (e.g. h-entry, h-feed)
+    #    check for v1 too - why? why not? (e.g. hentry, hatom ??)
+    @text.include?( 'h-entry' ) ||
+    @text.include?( 'h-feed' )
+  end
+  alias_method :microformats?, :is_microformats?
+
+
+
+  def parse
+    if is_xml?
        parse_xml
-    elsif head.start_with?( '{' ) ||
-          head =~ jsonfeed_version_regex
+    elsif is_json?
        parse_json
     ##  note: reading/parsing microformat is for now optional
     ##    microformats gem requires nokogiri
     ##       nokogiri (uses libxml c-extensions) makes it hard to install (sometime)
     ##       thus, if you want to use it, please opt-in to keep the install "light"
-    #
-    #  for now check for microformats v2 (e.g. h-entry, h-feed)
-    #    check for v1 too - why? why not? (e.g. hentry, hatom ??)
-  elsif defined?( Microformats ) &&
-          (@text.include?( 'h-entry' ) ||
-           @text.include?( 'h-feed' )
-           )
-      parse_microformats
-    else  ## assume xml for now
+    elsif defined?( Microformats ) && is_microformats?
+       parse_microformats
+    else  ## fallback - assume xml for now
        parse_xml
     end
   end # method parse

data/lib/feedparser/version.rb

@@ -4,7 +4,7 @@ module FeedParser
 
   MAJOR = 2
   MINOR = 1
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_atom_live.rb

@@ -4,6 +4,8 @@
 #  or better
 #     rake test
 
+
+
 require 'helper'
 
 class TestAtomLive < MiniTest::Test
@@ -11,16 +13,18 @@ class TestAtomLive < MiniTest::Test
   def test_rubyonrails
     feed = fetch_and_parse_feed( 'http://weblog.rubyonrails.org/feed/atom.xml' )
 
-    assert_equal 'atom',                           feed.format
-    assert_equal 'http://weblog.rubyonrails.org/', feed.url
+    assert_equal 'atom',                            feed.format
+    assert_equal 'https://weblog.rubyonrails.org/', feed.url
+    ## note was (2020/1): 'http://weblog.rubyonrails.org/', feed.url
   end
 
 
   def test_railstutorial
     feed = fetch_and_parse_feed( 'http://feeds.feedburner.com/railstutorial?format=xml' )
 
-    assert_equal 'atom',                           feed.format
-    assert_equal 'http://news.learnenough.com/',   feed.url
+    assert_equal 'atom',                            feed.format
+    assert_equal 'https://news.learnenough.com/',   feed.url
+    ## note was (2020/1):  assert_equal 'http://news.learnenough.com/',   feed.url
     ## note was (2017/5):  assert_equal 'http://news.railstutorial.org/', feed.url
   end
 
@@ -38,13 +42,19 @@ class TestAtomLive < MiniTest::Test
 
 
   def test_headius
-    feed = fetch_and_parse_feed( 'http://blog.headius.com/feeds/posts/default' )
+    feed = fetch_and_parse_feed( 'http://blog.headius.com/feed.xml' )
+    ## note was (2020/1): 'http://blog.headius.com/feeds/posts/default'
 
     assert_equal 'atom',    feed.format
-    assert_equal 'Blogger', feed.generator.name
-    assert_equal 'Headius', feed.title
-    assert_equal 'Helping the JVM Into the 21st Century', feed.summary  # aka subtitle in atom
-    assert_equal 'http://blog.headius.com/', feed.url
+    assert_equal 'Jekyll',  feed.generator.name
+    ## note was (2020/1): 'Blogger'
+    
+    assert_equal 'Charles Oliver Nutter', feed.title
+    ## note was (2020/1): 'Headius', feed.title
+    assert_equal 'Java, Ruby, and JVM guy trying to make sense of it all', feed.summary  # aka subtitle in atom
+    ## note was (2020/1): 'Helping the JVM Into the 21st Century', feed.title
+    assert_equal 'https://headius.github.io/', feed.url
+    ## note was (2020/1): 'http://blog.headius.com/' 
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedparser
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-05 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
@@ -72,11 +72,11 @@ email: wwwmake@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 - Rakefile
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="