rfeedparser 0.9.92 → 0.9.93

data/lib/rfeedparser/scrub.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-gem 'hpricot', ">=0.5"
+gem 'hpricot', "=0.5"
 require 'hpricot'
 # This used to be based on Michael Moen's Hpricot#scrub, but that seems to 
 # have only been part of its evolution. Hpricot#scrub is cool code, though.

data/lib/rfeedparser/time_helpers.rb

@@ -20,35 +20,33 @@ module FeedParserMixin
     # FIXME The century regexp maybe not work ('\d\d$' says "two numbers at 
     # end of line" but we then attach more of a regexp.  
     iso8601_regexps = [ '^(\d{4})-?([01]\d)-([0123]\d)',
-		      '^(\d{4})-([01]\d)',
-		      '^(\d{4})-?([0123]\d\d)',
-		      '^(\d\d)-?([01]\d)-?([0123]\d)',
-		      '^(\d\d)-?([0123]\d\d)',
-		      '^(\d{4})',
-		      '-(\d\d)-?([01]\d)',
-		      '-([0123]\d\d)',
-		      '-(\d\d)',
-		      '--([01]\d)-?([0123]\d)',
-		      '--([01]\d)',
-		      '---([0123]\d)',
-		      '(\d\d$)',
-		      ''
-    ]
+    '^(\d{4})-([01]\d)',
+    '^(\d{4})-?([0123]\d\d)',
+    '^(\d\d)-?([01]\d)-?([0123]\d)',
+    '^(\d\d)-?([0123]\d\d)',
+    '^(\d{4})',
+    '-(\d\d)-?([01]\d)',
+    '-([0123]\d\d)',
+    '-(\d\d)',
+    '--([01]\d)-?([0123]\d)',
+    '--([01]\d)',
+    '---([0123]\d)',
+    '(\d\d$)',
+    '' ]
     iso8601_values = { '^(\d{4})-?([01]\d)-([0123]\d)' => ['year', 'month', 'day'],
-		  '^(\d{4})-([01]\d)' => ['year','month'], 
-		  '^(\d{4})-?([0123]\d\d)' => ['year', 'ordinal'],
-		  '^(\d\d)-?([01]\d)-?([0123]\d)' => ['year','month','day'], 
-		  '^(\d\d)-?([0123]\d\d)' => ['year','ordinal'],
-		  '^(\d{4})' => ['year'],
-		  '-(\d\d)-?([01]\d)' => ['year','month'], 
-		  '-([0123]\d\d)' => ['ordinal'], 
-		  '-(\d\d)' => ['year'],
-		  '--([01]\d)-?([0123]\d)' => ['month','day'],
-		  '--([01]\d)' => ['month'],
-		  '---([0123]\d)' => ['day'],
-		  '(\d\d$)' => ['century'], 
-		  '' => []
-    }
+    '^(\d{4})-([01]\d)' => ['year','month'], 
+    '^(\d{4})-?([0123]\d\d)' => ['year', 'ordinal'],
+    '^(\d\d)-?([01]\d)-?([0123]\d)' => ['year','month','day'], 
+    '^(\d\d)-?([0123]\d\d)' => ['year','ordinal'],
+    '^(\d{4})' => ['year'],
+    '-(\d\d)-?([01]\d)' => ['year','month'], 
+    '-([0123]\d\d)' => ['ordinal'], 
+    '-(\d\d)' => ['year'],
+    '--([01]\d)-?([0123]\d)' => ['month','day'],
+    '--([01]\d)' => ['month'],
+    '---([0123]\d)' => ['day'],
+    '(\d\d$)' => ['century'], 
+    '' => [] }
     add_to_all = '(T?(\d\d):(\d\d)(?::(\d\d))?([+-](\d\d)(?::(\d\d))?|Z)?)?'
     add_to_all_fields = ['hour', 'minute', 'second', 'tz', 'tzhour', 'tzmin'] 
     # NOTE We use '(?:' to prevent grouping of optional matches (ones trailed
@@ -86,9 +84,9 @@ module FeedParserMixin
       # ordinals are NOT normalized by mktime, we simulate them
       # by setting month=1, day=ordinal
       if ordinal
-	month = DateTime.ordinal(year,ordinal).month
+        month = DateTime.ordinal(year,ordinal).month
       else
-	month = Time.now.utc.month
+        month = Time.now.utc.month
       end
     end
     month = month.to_i unless month.nil?
@@ -96,11 +94,11 @@ module FeedParserMixin
     if day.nil? or day.empty?
       # see above
       if ordinal
-	day = DateTime.ordinal(year,ordinal).day
+        day = DateTime.ordinal(year,ordinal).day
       elsif params['century'] or params['year'] or params['month']
-	day = 1
+        day = 1
       else
-	day = Time.now.utc.day
+        day = Time.now.utc.day
       end
     else
       day = day.to_i
@@ -124,13 +122,13 @@ module FeedParserMixin
     if tz and not tz.empty? and tz != 'Z'
       # FIXME does this cross over days?
       if tz[0] == '-'
-	tm[3] += params['tzhour'].to_i
-      tm[4] += params['tzmin'].to_i
+        tm[3] += params['tzhour'].to_i
+        tm[4] += params['tzmin'].to_i
       elsif tz[0] == '+'
-	tm[3] -= params['tzhour'].to_i
-	tm[4] -= params['tzmin'].to_i
+        tm[3] -= params['tzhour'].to_i
+        tm[4] -= params['tzmin'].to_i
       else
-	return nil
+        return nil
       end
     end
     return Time.utc(*tm) # Magic!
@@ -148,7 +146,7 @@ module FeedParserMixin
     korean_onblog_date_re = /(\d{4})#{korean_year}\s+(\d{2})#{korean_month}\s+(\d{2})#{korean_day}\s+(\d{2}):(\d{2}):(\d{2})/
 
 
-      m = korean_onblog_date_re.match(dateString)
+    m = korean_onblog_date_re.match(dateString)
     return unless m
     w3dtfdate = "#{m[1]}-#{m[2]}-#{m[3]}T#{m[4]}:#{m[5]}:#{m[6]}+09:00"
 
@@ -163,7 +161,7 @@ module FeedParserMixin
     korean_pm    = u("오후") # bfc0 c8c4 in euc-kr
 
     korean_nate_date_re = /(\d{4})-(\d{2})-(\d{2})\s+(#{korean_am}|#{korean_pm})\s+(\d{0,2}):(\d{0,2}):(\d{0,2})/
-      m = korean_nate_date_re.match(dateString)
+    m = korean_nate_date_re.match(dateString)
     return unless m
     hour = m[5].to_i
     ampm = m[4]
@@ -179,7 +177,7 @@ module FeedParserMixin
   def _parse_date_mssql(dateString)
     mssql_date_re = /(\d{4})-(\d{2})-(\d{2})\s+(\d{2}):(\d{2}):(\d{2})(\.\d+)?/
 
-      m = mssql_date_re.match(dateString)
+    m = mssql_date_re.match(dateString)
     return unless m
     w3dtfdate =  "#{m[1]}-#{m[2]}-#{m[3]}T#{m[4]}:#{m[5]}:#{m[6]}+09:00"
     $stderr << "MS SQL date parsed as: %s\n" % w3dtfdate if $debug
@@ -223,7 +221,7 @@ module FeedParserMixin
 
     greek_date_format = /([^,]+),\s+(\d{2})\s+([^\s]+)\s+(\d{4})\s+(\d{2}):(\d{2}):(\d{2})\s+([^\s]+)/
 
-      m = greek_date_format.match(dateString)
+    m = greek_date_format.match(dateString)
     return unless m
     begin
       wday = greek_wdays[m[1]]
@@ -239,7 +237,7 @@ module FeedParserMixin
   def _parse_date_hungarian(dateString)
     # Parse a string according to a Hungarian 8-bit date format.
     hungarian_date_format_re = /(\d{4})-([^-]+)-(\d{0,2})T(\d{0,2}):(\d{2})((\+|-)(\d{0,2}:\d{2}))/
-      m = hungarian_date_format_re.match(dateString)
+    m = hungarian_date_format_re.match(dateString)
     return unless m
 
     # Unicode strings for Hungarian date strings
@@ -314,8 +312,8 @@ module FeedParserMixin
       w3[2] -= num_days
       w3[1] += 1
       if w3[1] > 12
-	w3[0] += 1
-	w3[1] = set_self(w3[1], 12)
+        w3[0] += 1
+        w3[1] = set_self(w3[1], 12)
       end
       num_days = Time.days_in_month(w3[1], w3[0])
     end
@@ -323,9 +321,9 @@ module FeedParserMixin
 
     unless w3[6].class != String
       if /^-/ =~ w3[6] # Zone offset goes backwards
-	w3[6][0] = '+'
+        w3[6][0] = '+'
       elsif /^\+/ =~ w3[6]
-	w3[6][0] = '-'
+        w3[6][0] = '-'
       end
     end
     return Time.utc(w3[0], w3[1], w3[2] , w3[3], w3[4], w3[5])+Time.zone_offset(w3[6] || "UTC")
@@ -335,8 +333,8 @@ module FeedParserMixin
     # Parse an RFC822, RFC1123, RFC2822 or asctime-style date 
     # These first few lines are to fix up the stupid proprietary format from Disney
     unknown_timezones = { 'AT' => 'EDT', 'ET' => 'EST', 
-			'CT' => 'CST', 'MT' => 'MST', 
-			'PT' => 'PST' 
+      'CT' => 'CST', 'MT' => 'MST', 
+      'PT' => 'PST' 
     }
 
     mon = dateString.split[2]
@@ -390,11 +388,11 @@ module FeedParserMixin
   def parse_date(dateString)
     @date_handlers.each do |handler|
       begin 
-	$stderr << "Trying date_handler #{handler}\n" if $debug
-	datething = extract_tuple(send(handler,dateString))
-	return datething
+        $stderr << "Trying date_handler #{handler}\n" if $debug
+        datething = extract_tuple(send(handler,dateString))
+        return datething
       rescue Exception => e
-	$stderr << "#{handler} raised #{e}\n" if $debug
+        $stderr << "#{handler} raised #{e}\n" if $debug
       end
     end
     return nil
@@ -403,6 +401,6 @@ end
 
 module FeedParserUtilities
   def py2rtime(pytuple)
-    Time.utc(pytuple[0..5])
+    return Time.utc(*pytuple[0..5]) unless pytuple.blank? 
   end
 end

data/tests/rfponly/wellformed/mrss/mrss_media_content.xml

@@ -0,0 +1,20 @@
+<!--
+  Description: interprets media:content
+  Expect:      not bozo and entries[0]['enclosures'][0]['href'] == u'http://www.webmonkey.com/monkeyrock.mpg'
+-->
+<rss version="2.0" xmlns:media="http://search.yahoo.com/mrss/">
+  <channel>
+    <title>Some Bands I Like</title>
+    <link>http://www.andyvolk.com/webmonkey/bands/</link>
+    <description>A list of some bands I like (or have been a member of).</description>
+
+    <item>
+      <title>Rocking Webmonkey Garage Band</title>
+      <link>http://www.webmonkey.com/ourband.html</link>
+      <description>The best ever garage band on the Internet.</description>
+      <guid isPermaLink="false"> http://www.webmonkey.com/ourband.html</guid>
+      <media:content url="http://www.webmonkey.com/monkeyrock.mpg" fileSize="2471632" type="video/mpeg" height="240" width="320" duration="147" medium="video" isDefault="true">
+      </media:content>
+    </item>
+  </channel>
+</rss>

data/tests/rfponly/wellformed/mrss/mrss_thumbnail.xml

@@ -0,0 +1,21 @@
+<!--
+  Description: interprets media:content
+  Expect:      not bozo and entries[0]['enclosures'][1]['href'] == u'http://www.webmonkey.com/images/monkeyrock-thumb.jpg'
+-->
+<rss version="2.0" xmlns:media="http://search.yahoo.com/mrss/">
+  <channel>
+    <title>Some Bands I Like</title>
+    <link>http://www.andyvolk.com/webmonkey/bands/</link>
+    <description>A list of some bands I like (or have been a member of).</description>
+
+    <item>
+      <title>Rocking Webmonkey Garage Band</title>
+      <link>http://www.webmonkey.com/ourband.html</link>
+      <description>The best ever garage band on the Internet.</description>
+      <guid isPermaLink="false"> http://www.webmonkey.com/ourband.html</guid>
+      <media:content url="http://www.webmonkey.com/monkeyrock.mpg" fileSize="2471632" type="video/mpeg" height="240" width="320" duration="147" medium="video" isDefault="true">
+        <media:thumbnail url="http://www.webmonkey.com/images/monkeyrock-thumb.jpg" height="98" width="145"/>
+      </media:content>
+    </item>
+  </channel>
+</rss>

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: rfeedparser
 version: !ruby/object:Gem::Version 
-  version: 0.9.92
-date: 2007-06-07 00:00:00 -07:00
+  version: 0.9.93
+date: 2007-07-21 00:00:00 -07:00
 summary: Parse RSS and Atom feeds in Ruby
 require_paths: 
 - lib
@@ -1822,6 +1822,11 @@ files:
 - tests/illformed/sanitize/item_xhtml_body_style.xml
 - tests/rfeedparserserver.rb
 - tests/rfeedparsertest.rb
+- tests/rfponly
+- tests/rfponly/wellformed
+- tests/rfponly/wellformed/mrss
+- tests/rfponly/wellformed/mrss/mrss_media_content.xml
+- tests/rfponly/wellformed/mrss/mrss_thumbnail.xml
 - tests/wellformed
 - tests/wellformed/amp
 - tests/wellformed/amp/amp01.xml
@@ -3426,7 +3431,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.0"
+        version: "1.1"
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -3442,7 +3447,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: "0.5"
     version: