app/models/source_parser/upcoming.rb spec/models/source_parser_upcoming_spec.rb spec/samples/upcoming_ip7.xml @@ -8,30 +8,26 @@ class SourceParser # * :url - URL string to read as parser input. # * :content - String to read as parser input. def self.to_abstract_events(opts) - # Upcoming consistently breaks their hCalendar content and I can't keep fixing the parser. The following horrible hack rewrites Upcoming's hCalendar URLs into iCalendar URLs in hopes that they're paying more attention to iCalendar's validity and so that we've only got one single set of Upcoming parser hacks. Here's what the two types of URLs look like: - # hCalendar: http://upcoming.yahoo.com/event/1366250/ - # iCalendar: webcal://upcoming.yahoo.com/calendar/v2/event/1366250 - if matcher = opts[:url].ergo.match(%r{http://upcoming.yahoo.com/event/(\w+)}) - opts[:url] = "http://upcoming.yahoo.com/calendar/v2/event/#{matcher[1]}" - end - + # Cache the content content = self.content_for(opts) - returning([]) do |events| - parsers.each do |parser| - begin - events.concat(parser.to_abstract_events(opts.merge(:content => content))) - rescue Exception => e - RAILS_DEFAULT_LOGGER.info("SourceParser.to_abstract_events : Can't parse with #{parser.name} because -- #{e}") - :ignore # Leave this line for rcov's code coverage - end + # Return events from the first parser that suceeds. + parsers.each do |parser| + begin + events = parser.to_abstract_events(opts.merge(:content => content)) + return events if not events.blank? + rescue Exception => e + # Ignore end end + + # Return empty set if no matches + return [] end # Returns an Array of parser classes for the various formats def self.parsers - $SourceParserImplementations.map{|parser| parser}.uniq + $SourceParserImplementations end # Return content for the arguments @@ -53,9 +49,7 @@ class SourceParser # Add class-wide ::_label accessor to subclasses. subclass.meta_eval {attr_accessor :_label} - # Use global because it's the only data structure that survives a Rails #reload! - $SourceParserImplementations ||= Set.new - $SourceParserImplementations << subclass + $SourceParserImplementations << subclass unless $SourceParserImplementations.include?(subclass) end # Gets or sets the human-readable label for this parser. @@ -115,8 +109,8 @@ class SourceParser end end -# Load all the format-specific drivers in the "source_parser" directory -source_parser_driver_path = File.join(File.dirname(__FILE__), "source_parser") -for entry in Dir.entries(source_parser_driver_path).select{|t| t.match(/.+\.rb$/)} - require File.join(source_parser_driver_path, entry) -end +# Load format-specific drivers in the following order: +$SourceParserImplementations = [] +SourceParser::Upcoming +SourceParser::Ical +SourceParser::Hcal app/models/source_parser.rb @@ -39,10 +39,21 @@ describe SourceParser, "when subclassing" do end describe SourceParser, "when parsing events" do - it "should skip past parsing errors" do + it "should have expected parsers plus FakeParser" do + SourceParser.parsers.should == [ + SourceParser::Upcoming, + SourceParser::Ical, + SourceParser::Hcal, + SourceParser::FakeParser, + ] + end + + it "should use first successful parser's results" do events = [mock_model(SourceParser::AbstractEvent)] - SourceParser::FakeParser.should_receive(:to_abstract_events).and_raise(NotImplementedError) + SourceParser::Upcoming.should_receive(:to_abstract_events).and_return(false) + SourceParser::Ical.should_receive(:to_abstract_events).and_raise(NotImplementedError) SourceParser::Hcal.should_receive(:to_abstract_events).and_return(events) + SourceParser::FakeParser.should_not_receive(:to_abstract_events) SourceParser::Base.should_receive(:content_for).and_return("fake content") SourceParser.to_abstract_events(:fake => :argument).should == events spec/models/source_parser_spec.rb 31b518c6f1dec33ceffd4b08fa66ac9c8a923db4 Igal Koshevoy igal@pragmaticraft.com http://github.com/calagator/calagator/commit/31518d7b9b5854f78ebe57f0005f4555e1f6104d 31518d7b9b5854f78ebe57f0005f4555e1f6104d 2009-10-19T16:25:01-07:00 2009-10-19T16:25:01-07:00 Implemented SourceParser::Upcoming to import events using the Upcoming API, wrote spec and added sample data. Improved SourceParser to load drivers in specific order and return results from the first to suceeed, updated specs. b6f7eb449f57939e7f9dc080a9d51b0ab7cfee45 Igal Koshevoy igal@pragmaticraft.com