kete-feedzirra 0.0.18.1 → 0.0.20.1

data/lib/core_ext/string.rb

@@ -4,6 +4,6 @@ class String
   end
   
   def sanitize
-    Dryopteris.sanitize(self)
+    Loofah.scrub_fragment(self, :prune).to_s
   end
 end

data/lib/feedzirra.rb

@@ -5,7 +5,7 @@ gem 'activesupport'
 require 'zlib'
 require 'curb'
 require 'sax-machine'
-require 'dryopteris'
+require 'loofah'
 require 'uri'
 require 'active_support/basic_object'
 require 'active_support/core_ext/object'
@@ -30,5 +30,5 @@ require 'feedzirra/parser/atom'
 require 'feedzirra/parser/atom_feed_burner'
 
 module Feedzirra
-  VERSION = "0.0.18.1"
+  VERSION = "0.0.20.1"
 end

data/lib/feedzirra/feed_utilities.rb

@@ -1,7 +1,7 @@
 module Feedzirra
   module FeedUtilities
-    UPDATABLE_ATTRIBUTES = %w(title feed_url url last_modified)
-    
+    UPDATABLE_ATTRIBUTES = %w(title feed_url url last_modified etag)
+
     attr_writer   :new_entries, :updated, :last_modified
     attr_accessor :etag
 
@@ -11,50 +11,50 @@ module Feedzirra
         entry ? entry.published : nil
       end
     end
-    
+
     def updated?
       @updated
     end
-    
+
     def new_entries
       @new_entries ||= []
     end
-    
+
     def has_new_entries?
       new_entries.size > 0
     end
-    
+
     def update_from_feed(feed)
       self.new_entries += find_new_entries_for(feed)
       self.entries.unshift(*self.new_entries)
-      
-      updated! if UPDATABLE_ATTRIBUTES.any? { |name| update_attribute(feed, name) }
+
+      @updated = false
+      UPDATABLE_ATTRIBUTES.each do |name|
+        @updated ||= update_attribute(feed, name)
+      end
     end
-    
+
     def update_attribute(feed, name)
       old_value, new_value = send(name), feed.send(name)
-      
+
       if old_value != new_value
         send("#{name}=", new_value)
       end
     end
-    
+
     def sanitize_entries!
       entries.each {|entry| entry.sanitize!}
     end
-    
+
     private
-    
-    def updated!
-      @updated = true
-    end
-    
+
     def find_new_entries_for(feed)
       # this implementation is a hack, which is why it's so ugly.
       # it's to get around the fact that not all feeds have a published date.
       # however, they're always ordered with the newest one first.
       # So we go through the entries just parsed and insert each one as a new entry
       # until we get to one that has the same url as the the newest for the feed
+      return feed.entries if self.entries.length == 0
       latest_entry = self.entries.first
       found_new_entries = []
       feed.entries.each do |entry|
@@ -63,7 +63,7 @@ module Feedzirra
       end
       found_new_entries
     end
-    
+
     def existing_entry?(test_entry)
       entries.any? { |entry| entry.url == test_entry.url }
     end

data/spec/feedzirra/feed_entry_utilities_spec.rb

@@ -22,16 +22,16 @@ describe Feedzirra::FeedUtilities do
     end
     
     it "should provide a sanitized title" do
-      new_title = "<script>" + @entry.title
+      new_title = "<script>this is not safe</script>" + @entry.title
       @entry.title = new_title
-      @entry.title.sanitize.should == Dryopteris.sanitize(new_title)
+      @entry.title.sanitize.should == Loofah.scrub_fragment(new_title, :prune).to_s
     end
     
     it "should sanitize content in place" do
       new_content = "<script>" + @entry.content
       @entry.content = new_content.dup
-      @entry.content.sanitize!.should == Dryopteris.sanitize(new_content)
-      @entry.content.should == Dryopteris.sanitize(new_content)
+      @entry.content.sanitize!.should == Loofah.scrub_fragment(new_content, :prune).to_s
+      @entry.content.should == Loofah.scrub_fragment(new_content, :prune).to_s
     end
     
     it "should sanitize things in place" do
@@ -39,9 +39,9 @@ describe Feedzirra::FeedUtilities do
       @entry.author  += "<script>"
       @entry.content += "<script>"
 
-      cleaned_title   = Dryopteris.sanitize(@entry.title)
-      cleaned_author  = Dryopteris.sanitize(@entry.author)
-      cleaned_content = Dryopteris.sanitize(@entry.content)
+      cleaned_title   = Loofah.scrub_fragment(@entry.title, :prune).to_s
+      cleaned_author  = Loofah.scrub_fragment(@entry.author, :prune).to_s
+      cleaned_content = Loofah.scrub_fragment(@entry.content, :prune).to_s
       
       @entry.sanitize!
       @entry.title.should   == cleaned_title

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kete-feedzirra
 version: !ruby/object:Gem::Version 
-  version: 0.0.18.1
+  version: 0.0.20.1
 platform: ruby
 authors: 
 - Paul Dix
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-03 00:00:00 -07:00
+date: 2009-08-03 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
         version: 0.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: pauldix-sax-machine
+  name: sax-machine
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -33,7 +33,7 @@ dependencies:
         version: 0.0.12
     version: 
 - !ruby/object:Gem::Dependency 
-  name: taf2-curb
+  name: curb
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -63,14 +63,14 @@ dependencies:
         version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mdalessio-dryopteris
+  name: loofah
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 0.3.1
     version: 
 description: 
 email: paul@pauldix.net
@@ -114,7 +114,8 @@ files:
 - spec/feedzirra/feed_entry_utilities_spec.rb
 has_rdoc: true
 homepage: http://github.com/pauldix/feedzirra
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: []