audrey2 0.3.0 → 0.3.1

data/README.rdoc

@@ -15,8 +15,8 @@ existing installations. They are all very easy to deal with:
 1) The default location of the configuration file has moved from /etc/audrey2/audrey2.conf
 to /etc/audrey2.conf
 
-2) In a theme's entry.haml when you reference data in the entry hash you now need to index 
-the hash using symbols rather than strings: entry[:title] replaces entry['title'].
+2) In a theme's entry.haml when you reference data in the source hash you now need to index 
+the hash using symbols rather than strings: source[:name] replaces source['name'].
 
 3) If email notification of errors is configured via SMTP you now need to identify the 
 SMTP server with the key 'address' instead of 'server' in Audrey 2.0's configuration file.

data/Rakefile

@@ -11,9 +11,9 @@ begin
     gem.homepage    = "http://github.com/svenaas/audrey2"
     gem.authors     = ["Sven Aas"]
     gem.add_dependency "feed-normalizer", "~>1.5.2"
-    gem.add_dependency "haml", "~>3.0.13"    
+    gem.add_dependency "haml", "~>3.0.13"
     gem.add_development_dependency "shoulda", ">= 2.11.1"
-    gem.add_development_dependency "mocha", ">= 0.9.8"    
+    gem.add_development_dependency "mocha", ">= 0.9.8"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -45,7 +45,7 @@ task :test => :check_dependencies
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
@@ -53,4 +53,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.title = "audrey2 #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/audrey2.gemspec

@@ -1,63 +1,50 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{audrey2}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sven Aas"]
-  s.date = %q{2010-08-17}
+  s.date = %q{2013-02-12}
   s.default_executable = %q{feedme}
   s.description = %q{Audrey 2.0 is a command-line utility for customizable feed processing, aggregation, and output.}
   s.email = %q{sven.aas@gmail.com}
   s.executables = ["feedme"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "audrey2.conf.sample",
-     "audrey2.gemspec",
-     "bin/feedme",
-     "lib/audrey2.rb",
-     "test/helper.rb",
-     "test/test_config.rb",
-     "test/test_email.rb",
-     "test/test_misc.rb",
-     "test/test_options.rb",
-     "test/test_parse.rb",
-     "test/test_recipes.rb",
-     "test/test_sort.rb",
-     "test/test_themes.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "audrey2.conf.sample",
+    "audrey2.gemspec",
+    "bin/feedme",
+    "lib/audrey2.rb",
+    "test/helper.rb",
+    "test/test_config.rb",
+    "test/test_email.rb",
+    "test/test_helper.rb",
+    "test/test_misc.rb",
+    "test/test_options.rb",
+    "test/test_parse.rb",
+    "test/test_recipes.rb",
+    "test/test_sort.rb",
+    "test/test_themes.rb"
   ]
   s.homepage = %q{http://github.com/svenaas/audrey2}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Feed processing and aggregation}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_config.rb",
-     "test/test_email.rb",
-     "test/test_misc.rb",
-     "test/test_options.rb",
-     "test/test_parse.rb",
-     "test/test_recipes.rb",
-     "test/test_sort.rb",
-     "test/test_themes.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/audrey2.rb

@@ -24,6 +24,28 @@ module HashExtensions # Adapted from http://gist.github.com/151324 by Avdi Grimm
 end
 Hash.send(:include, HashExtensions)
 
+# Monkeypatch to get alternate link rather than comments Atom feed for blogspot Atom feed entries
+# Adapted from https://github.com/jbrownlee/AIFeeds/blob/master/part1/parserss.rb
+module FeedNormalizer
+  class SimpleRssParser < Parser
+    def self.parse(xml, loose)
+      begin
+        atomrss = parser.parse(xml)
+      rescue Exception => e
+        return nil
+      end
+
+      atomrss.items.each do |item|
+        if item[:'link+alternate']
+          item[:link] = item[:'link+alternate']
+        end
+      end
+
+      package(atomrss)
+    end
+  end
+end
+
 module Audrey2
   class Options
     def self.parse(args)
@@ -125,7 +147,7 @@ EOF
       mail[:to] =      @email[:to]
       mail[:subject] = "[AUDREY 2.0] Exception Notification"
       mail[:body]    = e
-      
+
       @email[:via] ||= 'sendmail' # Do this somewhere else?
       case @email[:via].to_sym    # Do this somewhere else too?
       when :sendmail
@@ -191,13 +213,13 @@ EOF
       end
     end
 
-    # Implements sort orders which may be specified in configuration    
+    # Implements sort orders which may be specified in configuration
     def entry_sort_comparator(sort = @sort) # Defaults to the sort order specified in configuration
       case sort
       when :reverse_chronological
-        Proc.new {|a, b| b.date_published <=> a.date_published } 
+        Proc.new {|a, b| b.date_published <=> a.date_published }
       when :chronological
-        Proc.new {|a, b| a.date_published <=> b.date_published } 
+        Proc.new {|a, b| a.date_published <=> b.date_published }
       end
     end
 
@@ -223,7 +245,7 @@ EOF
         parsed_feed.entries.sort!(&entry_sort_comparator)
         parsed_feed.entries.slice!(feed[:max_entries], parsed_feed.entries.size - feed[:max_entries])
       end
-      
+
       # Store the entry sources. TODO: Store this information in the entries themselves
       parsed_feed.entries.each { |entry| entry_sources[entry] = feed }
 
@@ -302,4 +324,4 @@ EOF
     end
   end
 
-end
+end

data/test/test_helper.rb

@@ -0,0 +1,70 @@
+require 'helper'
+
+class TestParse < Test::Unit::TestCase
+  context "With an initialized, configured Aggregator, helper methods" do
+    setup do
+      @config
+      File.stubs(:exist?).with('configfile').returns(true)
+      File.stubs(:readable?).with('configfile').returns(true)
+      YAML.stubs(:load_file).with('configfile').returns({
+        'recipes_folder' => 'recipes_folder',
+        'themes_folder'  => 'themes_folder',
+        'user_agent'     => 'user_agent',
+        'sort'           => 'sort'
+      })
+      File.stubs(:exist?).with('recipes_folder').returns(true)
+      File.stubs(:readable?).with('recipes_folder').returns(true)
+      File.stubs(:exist?).with('themes_folder').returns(true)
+      File.stubs(:readable?).with('themes_folder').returns(true)
+      @aggregator = Audrey2::Aggregator.new('configfile')
+      recipefile = File.join('recipes_folder', 'recipe')
+      outputfile = File.join('output_folder', 'output_file')
+      File.stubs(:exist?).with(recipefile).returns(true)
+      File.stubs(:readable?).with(recipefile).returns(true)
+      @feed = { 'name' => 'feed', 'url'  => 'http://test.com/feed.xml' }
+      YAML.stubs(:load_file).with(recipefile).returns({
+        'feeds'       => [@feed],
+        'theme'       => 'theme',
+        'output_file' =>  outputfile
+      })
+      File.stubs(:exist?).with('output_folder').returns(true)
+      File.stubs(:writable?).with('output_folder').returns(true)
+      File.stubs(:exist?).with(outputfile).returns(false)
+      theme_path = File.join('themes_folder', 'theme')
+      File.stubs(:exist?).with(theme_path).returns(true)
+      File.stubs(:readable?).with(theme_path).returns(true)
+      entry_template_path = File.join(theme_path, 'entry.haml')
+      File.stubs(:exist?).with(entry_template_path).returns(true)
+      File.stubs(:readable?).with(entry_template_path).returns(true)
+      File.stubs(:read).with(entry_template_path).returns('%p= foo')
+      @helpers_file_path = File.join(theme_path, 'helpers.rb')
+      feed_content =<<-EOF
+<?xml version="1.0"?>
+<rss version="2.0">
+  <channel>
+    <title>Test</title>
+    <link>http://test.com/</link>
+    <description>Test channel</description>
+    <item>
+       <title>Title</title>
+       <link>http://test.com/title</link>
+       <description>Test description</description>
+       <pubDate>Sun, 15 Aug 2010 16:46:00 EDT</pubDate>
+    </item>
+  </channel>
+</rss>
+EOF
+      @aggregator.stubs(:open).with('http://test.com/feed.xml', {'User-Agent' => 'user_agent'}).returns(feed_content)
+    end
+
+    should 'be available in the template' do
+      File.expects(:exist?).with(@helpers_file_path).returns(true)
+      File.expects(:readable?).with(@helpers_file_path).returns(true)      
+      File.expects(:open).with(@helpers_file_path).returns("def foo; 'bar'; end")
+      s = StringIO.new
+      s.expects(:<<).with("<p>bar</p>\n")
+      File.stubs(:open).with(File.join('output_folder', 'output_file'), 'w').yields s
+      @aggregator.feed_me('recipe')
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: audrey2
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sven Aas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 -04:00
+date: 2013-02-12 00:00:00 -05:00
 default_executable: feedme
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -105,6 +104,7 @@ files:
 - test/helper.rb
 - test/test_config.rb
 - test/test_email.rb
+- test/test_helper.rb
 - test/test_misc.rb
 - test/test_options.rb
 - test/test_parse.rb
@@ -116,8 +116,8 @@ homepage: http://github.com/svenaas/audrey2
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -141,17 +141,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Feed processing and aggregation
-test_files: 
-- test/helper.rb
-- test/test_config.rb
-- test/test_email.rb
-- test/test_misc.rb
-- test/test_options.rb
-- test/test_parse.rb
-- test/test_recipes.rb
-- test/test_sort.rb
-- test/test_themes.rb
+test_files: []
+

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC