@@ -19,9 +19,12 @@ begin gem.executables = ['terror'] gem.post_install_message = 'Run terror projectname and start aggregating.' - gem.add_dependency 'sinatra', ['>= 0.9.1.1'] + gem.add_dependency 'sinatra', ['>= 0.9.1.1'] gem.add_dependency 'feed-normalizer', ['>= 1.5.1'] - gem.add_dependency 'activerecord', ['>= 2.2.2'] + gem.add_dependency 'dm-core', ['>= 0.9.10'] + gem.add_dependency 'dm-validations', ['>= 0.9.10'] + gem.add_dependency 'dm-aggregates', ['>= 0.9.10'] + gem.add_dependency 'do_sqlite3', ['>= 0.9.11'] end rescue LoadError end Rakefile @@ -1,7 +1,8 @@ $LOAD_PATH << File.dirname(__FILE__) + '/terror' require 'rubygems' require 'dm-core' -require 'dm-more' +require 'dm-validations' +require 'dm-aggregates' require 'sinatra' require 'yaml' require 'post' lib/terror.rb @@ -21,7 +21,7 @@ module Terror :url => entry.url, :source => feed.title, :date => entry.date_published - ) unless self.get(:first, :url => entry.url) + ) unless self.first(:url => entry.url) end end lib/terror/feed_fetcher.rb @@ -12,7 +12,7 @@ module Terror end def rfc_3339(time) - time.strftime("%Y-%m-%dT%H:%M:%SZ") + time.strftime("%Y-%m-%dT%H:%M:%SZ") if time end def newer_page? lib/terror/helper.rb @@ -6,10 +6,10 @@ module Terror include FeedFetcher property :id, Integer, :serial => true - property :title, String, :nullable => false - property :url, String, :nullable => false, :format => /^http|https:\/\// - property :source, String - property :date, Date + property :title, String, :nullable => false, :length => 255 + property :url, String, :nullable => false, :length => 255, :index => true, :format => /^http|https:\/\// + property :source, String, :length => 255 + property :date, Time, :nullable => false def self.paginate(options = {}) per_page = options[:per_page] lib/terror/post.rb @@ -9,6 +9,7 @@ <id>http://example.com/post-1</id> <link type="text/html" rel="alternate" href="http://example.com/post-1"/> <updated>2009-03-15T01:11:33Z</updated> + <published>2009-03-15T01:11:33Z</published> <title>Title 1</title> <author> <name>author</name> @@ -19,6 +20,7 @@ <id>http://example.com/post-2</id> <link type="text/html" rel="alternate" href="http://example.com/post-2"/> <updated>2009-03-15T01:11:33Z</updated> + <published>2009-03-15T01:11:33Z</published> <title>Title 2</title> <author> <name>author</name> test/feeds/example.xml @@ -23,11 +23,16 @@ describe 'Creating posts' do post = Terror::Post.create(:url => 'example.com') post.errors.on(:url).should_not be_nil end + + it 'should validate presence of date' do + @blank_post.errors.on(:date).should_not be_nil + end it 'should create post' do - post = Terror::Post.create(:url => 'http://example.com/', :title => 'Example') + post = Terror::Post.create(:url => 'http://example.com/', :title => 'Example', :date => Time.now) post.should be_valid end + end describe 'Fetching feed' do test/post_test.rb 03391f0ccd8122db9b6f3d2111c3294b42427bac Andrea Franz andrea@gravityblast.com http://github.com/pilu/terror/commit/f2ad7813a16576952eecfc31d1fdec2dc5e22aa4 f2ad7813a16576952eecfc31d1fdec2dc5e22aa4 2009-03-16T17:42:32-07:00 2009-03-16T17:42:32-07:00 fixed post fetching be85e395d4615e506a4e796d808c3be13988bfb7 Andrea Franz andrea@gravityblast.com