feedme 0.8.1 → 0.8.2

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.8.2
+
+* Remove VERSION variable from feedme.rb
+* Don't double-escape CDATA-escaped content
+
+=== 0.8.1 / 2010-01-02
+
+* Add new transformation :esc
+* Expose parsed tags as attribute :fm_parsed
+
 === 0.8 / 2009-12-14
 
 * Add new virtual method _values: returns all values for a given tag.

data/Manifest.txt

@@ -3,7 +3,9 @@ Manifest.txt
 README.txt
 Rakefile
 lib/feedme.rb
-lib/truncator.rb
-lib/util.rb
+lib/feedme-util.rb
+lib/hpricot-util.rb
+lib/html-cleaner.rb
+lib/nokogiri-util.rb
 examples/rocketboom.rb
 examples/rocketboom.rss

data/Rakefile

@@ -9,12 +9,11 @@ tasks = Jeweler::Tasks.new do |s|
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
   s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", 
     "lib/feedme.rb", "lib/hpricot-util.rb", "lib/nokogiri-util.rb", 
-    "lib/html-cleaner.rb", "lib/util.rb", "examples/rocketboom.rb", 
+    "lib/html-cleaner.rb", "lib/feedme-util.rb", "examples/rocketboom.rb", 
     "examples/rocketboom.rss", "test/test_helper.rb"]
   s.homepage = %q{http://wiki.github.com/jdidion/feedme}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{feedme}
   s.summary = %q{A simple, flexible, and extensible RSS and Atom parser for Ruby}
   s.test_files = ["test/test_helper.rb"]
 end

data/lib/feedme.rb

@@ -1,11 +1,8 @@
 require 'cgi'
 require 'time'
-require 'util.rb'
+require 'feedme-util'
 
 module FeedMe
-  # The current version of FeedMe.
-  VERSION = "0.7.2"
-
   # The value of Parser#fm_type for RSS feeds.
   RSS  = :RSS
   # The value of Parser#fm_type for RDF (RSS 1.0) feeds.
@@ -489,6 +486,8 @@ module FeedMe
     
     def _transform(trans_array, value)
       trans_array.each do |t|
+        return nil if value.nil?
+        
         if t.is_a? String
           value = _transform(fm_builder.transformations[t], value)
         else
@@ -503,8 +502,8 @@ module FeedMe
           end
           
           trans = fm_builder.transformation_fns[t_name] or
-            raise NameError.new("No such transformation #{t_name}", t_name)
-          
+            raise NoMethodError.new("No such transformation #{t_name}", t_name)
+
           if value.is_a? Array
             value = value.collect {|x| trans.call(x, *args) }
           else  
@@ -559,9 +558,9 @@ module FeedMe
     def parse
       # RSS = everything between channel tags + everthing between </channel> and </rdf> if this is an RDF document
       if @fm_source =~ %r{<(?:.*?:)?(rss|rdf)(.*?)>.*?<(?:.*?:)?channel(.*?)>(.+)</(?:.*?:)?channel>(.*)</(?:.*?:)?(?:rss|rdf)>}mi
-        @fm_type = $2.upcase.to_s
+        @fm_type = $1.upcase.to_s
         @fm_tags = fm_builder.all_rss_tags
-        attrs = parse_attributes($1, $3)
+        attrs = parse_attributes($1, $2 + $3)
         attrs[:version] ||= '1.0';
         parse_content(self, attrs, $4, @fm_tags)
 
@@ -709,13 +708,17 @@ module FeedMe
     end
   
     def unescape(content)
-      content = CGI.unescapeHTML(content)
-      
-      query = content.match(/^(http:.*\?)(.*)$/)
-      content = query[1] + CGI.unescape(query[2]) if query
-      
       cdata = content.match(%r{<!\[CDATA\[(.*)\]\]>}mi)
-      content = cdata[1] if cdata
+      if cdata
+        # CDATA-escaped content is not encoded
+        content = cdata[1]
+      else
+        # unescape
+        content = CGI.unescapeHTML(content)
+        # further unescape any URL query strings
+        query = content.match(/^(http:.*\?)(.*)$/)
+        content = query[1] + CGI.unescape(query[2]) if query
+      end
       
       return content
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: feedme
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - John Didion
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 -05:00
+date: 2010-01-14 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -31,11 +31,11 @@ files:
 - Rakefile
 - examples/rocketboom.rb
 - examples/rocketboom.rss
+- lib/feedme-util.rb
 - lib/feedme.rb
 - lib/hpricot-util.rb
 - lib/html-cleaner.rb
 - lib/nokogiri-util.rb
-- lib/util.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://wiki.github.com/jdidion/feedme
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: feedme
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3