.gitignore @@ -1,4 +1,7 @@ # Redefines the mappings in order for Autotest to pick up on a merb app +puts "loaded .autotest" +require 'autotest/redgreen' + Autotest.add_hook :initialize do |at| at.clear_mappings at.add_exception(/\.git/) .autotest @@ -1,4 +1,4 @@ -Copyright (c) 2008 YOUR NAME +Copyright (c) 2008 Jonas Nicklas Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the LICENSE @@ -23,6 +23,6 @@ end module FeedMe end -['consts', 'abstract_parser', 'feed_parser', 'item_parser'].each do |f| +['consts', 'abstract_parser', 'feed_parser', 'item_parser', 'author_parser'].each do |f| require File.join(File.dirname(__FILE__), 'feed_me', f) end \ No newline at end of file lib/feed_me.rb @@ -42,10 +42,6 @@ class FeedMe::AbstractParser return nil elsif p.class == Array return fetch("/#{p[0]}", root_node, p[1].to_sym) - elsif p.class == Hash - sub = self.dup - sub.properties = p - return sub elsif p return fetch("/#{p}", root_node) else lib/feed_me/abstract_parser.rb @@ -20,10 +20,7 @@ module FeedMe :feed_id => :undefined, :url => :link, :href => :undefined, - :generator => :generator, - :author => { - :email => :author - } + :generator => :generator } } @@ -42,6 +39,14 @@ module FeedMe :url => :link, :content => :description } - } + } + + AUTHOR_PROPERTIES = { + :atom => { + :name => :name, + :uri => :uri, + :email => :email + } + } end \ No newline at end of file lib/feed_me/consts.rb @@ -3,6 +3,13 @@ module FeedMe class ItemParser < AbstractParser self.properties = ITEM_PROPERTIES + + attr_accessor :feed + + def initialize(feed, xml, format = nil) + super(xml, format) + self.feed = feed + end end end \ No newline at end of file lib/feed_me/item_parser.rb @@ -13,7 +13,8 @@ <updated>2008-03-07T20:41:10Z</updated> <author> <name>Jonas Nicklas</name> - <uri href="http://imaginary.host/students/jnicklas"/> + <uri>http://imaginary.host/students/jnicklas</uri> + <email>jonas.nicklas@imaginary.host</email> </author> <content type="html">Here be content</content> </entry> @@ -24,7 +25,8 @@ <updated>2008-03-07T20:40:58Z</updated> <author> <name>Jonas Nicklas</name> - <uri href="http://imaginary.host/students/jnicklas"/> + <uri>http://imaginary.host/students/jnicklas</uri> + <email>jonas.nicklas@imaginary.host</email> </author> <content type="html">Moar content!</content> </entry> @@ -35,7 +37,8 @@ <updated>2008-03-07T20:40:44Z</updated> <author> <name>Jonas Nicklas</name> - <uri href="http://imaginary.host/students/jnicklas"/> + <uri>http://imaginary.host/students/jnicklas</uri> + <email>jonas.nicklas@imaginary.host</email> </author> <content type="html">Also Content!</content> </entry> spec/fixtures/welformed.atom @@ -6,9 +6,9 @@ describe FeedMe::ItemParser do before :each do @atom_feed = FeedMe::FeedParser.open(fixture('welformed.atom')) - @atom = FeedMe::ItemParser.new(@atom_feed.root_node.search('/entry').first, :atom) + @atom = FeedMe::ItemParser.new(@atom_feed, @atom_feed.root_node.search('/entry').first, :atom) @rss2_feed = FeedMe::FeedParser.open(fixture('welformed.rss2')) - @rss2 = FeedMe::ItemParser.new(@rss2_feed.root_node.search('/item').first, :rss2) + @rss2 = FeedMe::ItemParser.new(@atom_feed, @rss2_feed.root_node.search('/item').first, :rss2) end describe '#title' do @@ -61,6 +61,4 @@ describe FeedMe::ItemParser do end end - - end \ No newline at end of file spec/item_parser_spec.rb c8ad6561c8010d6c7c4f2d7423de3f74f2092e76 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/jnicklas/feed_me/commit/36e3dd1fe8617d4204b5e850d6c1b08649e66963 36e3dd1fe8617d4204b5e850d6c1b08649e66963 2008-03-10T02:53:23-07:00 2008-03-10T02:53:23-07:00 muchos stuff 4a6253718067fa1e7aea47c36d56328d935baf04 Jonas Nicklas jonas.nicklas@gmail.com