imap-feeder 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.1 2008-07-8
+
+* Workaround for feeds containing google-adword links, just filter them. This
+  fixes the problems with the Dilbert strip.
+
 == 0.2.0 2008-07-5
 
 * 1 major enhancement:

data/lib/imap-feeder/feedreader.rb

@@ -16,19 +16,21 @@ end
 class FeedReader
   attr_reader :messages
 
+  DEFAULT_ENCODING = "UTF-8"
+
   def initialize(feed_url)
     @feed_url = feed_url
     @feed = SimpleRSS.parse(open(feed_url))
 
     @encoding = @feed.source[/encoding=["'](.*?)["']/, 1]
     if not @encoding
-      $log.warn "No encoding found for #{feed_url}, defaulting to UTF-8."
-      @encoding = "UTF-8"
+      $log.info "No encoding found for #{feed_url}, defaulting to #{DEFAULT_ENCODING}."
+      @encoding = DEFAULT_ENCODING
     end
   end
 
   def conv(str)
-    Iconv.iconv("UTF-8", @encoding, str).first
+    Iconv.iconv(DEFAULT_ENCODING, @encoding, str).first
   rescue Iconv::IllegalSequence => e
     $log.error "IConv reports an IllegalSequence: #{e.message} from #{str}"
     return str

data/lib/imap-feeder/message.rb

@@ -159,6 +159,10 @@ EOF
       href = URI(link.attributes['href']) rescue nil
       next if not href && href.host
       next if link.innerHTML.strip == href.to_s.strip
+      if href.to_s =~ /googleadservices/
+        link.swap ""
+        next
+      end
       urls << href
       link.swap(link.innerHTML.strip + "[#{urls.length}]")
     end

data/lib/imap-feeder/version.rb

@@ -2,7 +2,7 @@ class ImapFeeder #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_message.rb

@@ -150,6 +150,12 @@ body<br/><br/><a href='http://url'>http://url</a>
     EOF
   end
 
+  def test_removes_googleads
+    m_with_ads = Message.new(:title => "with url", :body => 'Hello!<a href="http://feedads.googleadservices.com/~a/2cqltt2cam2gg6mnrvfr05h7gg/a"><img src="http://feedads.googleadservices.com/~a/2cqltt2cam2gg6mnrvfr05h7gg/i"></img></a>')
+    m_without_ads = Message.new(:title => "with url", :body => 'Hello!')
+    assert_equal(m_with_ads.generate_identifier, m_without_ads.generate_identifier)
+  end
+
 end
 
 class MessageFormatterTest < Test::Unit::TestCase

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: imap-feeder
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Mirko Stocker
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDJDCCAgygAwIBAgIBADANBgkqhkiG9w0BAQUFADA4MQswCQYDVQQDDAJtZTEV
-  MBMGCgmSJomT8ixkARkWBW1pc3RvMRIwEAYKCZImiZPyLGQBGRYCY2gwHhcNMDgw
-  NjA5MjEwNDI2WhcNMDkwNjA5MjEwNDI2WjA4MQswCQYDVQQDDAJtZTEVMBMGCgmS
-  JomT8ixkARkWBW1pc3RvMRIwEAYKCZImiZPyLGQBGRYCY2gwggEiMA0GCSqGSIb3
-  DQEBAQUAA4IBDwAwggEKAoIBAQDY4Rq5KS6Dmcz9TQmOCuJgPRv1npHVJ5mRsKlL
-  qwKbFRpWV4VnzcUoo+z1iKHNFHNI4G4nSk+8eZ5I8kLO/K5UPmHtYWUw5p83Aj8d
-  r2/i1cuVxrEdn9JeeroKPfYIHEgtuoEfUAFC7/07GoLiEvDqGS0lN72vyX4H4nnp
-  p7ijurreOIIXbY0ex8PLlpjCrPQT9+ADQe3iX4oLFDIWCrkmPJZVZ/JCqz1hVlRR
-  c8fzm9WGcgXnPm8TjV5PcQnD5ElHfD/O3ZTpdkZkZKlGfqXW6Nb3FQGwCP2wE5cE
-  gd4wxGBHDVJrYpiXdD38V2Y9UDl682ixXU/9UnkHYG5eosk3AgMBAAGjOTA3MAkG
-  A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQo8c+wtGsqDeTZWqPOrR1Y
-  GMg+3jANBgkqhkiG9w0BAQUFAAOCAQEAOJrch12cZO+72z44rHHNMi8jdjvzn8D3
-  b2I5Qu5FzO/NxMGlWyETJyTaaYJ6fHdIoO5tATDo+DfiUtUMQGkE/Jrt8Rff+/1H
-  oWrKMS0+YR3n67RCCoLnsZpeITaqgenXDUiuaG7h8zQFNL4e9/+WVlEi3DM3oaLA
-  iRxaHvD71BuBpA8fJ6cC2WL5QcNUZpfSJZ4LDZoeE1WrzpEqv44dAVT4rjWF3Q3n
-  U6DE8XAdANgJLLQKU0xcFMj20tnkZSj/Frk5eCmMqvwP7URfbywKfSoIIyE17A3n
-  uqXC6cgFmydQfHaHeH24NZ6LBcoaacZYI/xsdm+9S18u2P+G/LAGOg==
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2008-07-05 00:00:00 +02:00
+date: 2008-07-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.1"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: Imap-feeder pushes entries from RSS and Atom feeds to an IMAP server.
 email: 
 - me@misto.ch

metadata.gz.sig

@@ -1,4 +0,0 @@
-B��QS=�|�Fv����;���n�ܹ�IlQ���G<7Yq�Mgm�2�
-5�t��{�yзd��ԁ�@B"�}E�K��?�f�{��7ѕ΋qR-����q����wd�Ջ��3��ay��4�5��9=�Y$�H=b����64�.6ԲOz�Q��({hd7��qu~�\��[
-,Z���E��XC&7� .�w�9����N�_��;��I+
-?~�CG��(�l���I�wJ��?��ۻ��b�(o�A