@@ -1,6 +1,7 @@ $LOAD_PATH << File.dirname(__FILE__) + '/terror' require 'rubygems' -require 'activerecord' +require 'dm-core' +require 'dm-more' require 'sinatra' require 'yaml' require 'post' @@ -23,27 +24,11 @@ module Terror def self.init_database init_database_connection - init_database_tables end def self.init_database_connection - ActiveRecord::Base.establish_connection(self.config['database'][Sinatra::Application.environment.to_s]) + DataMapper.setup(:default, self.config['database'][Sinatra::Application.environment.to_s]) + DataMapper.auto_upgrade! end - - def self.init_database_tables - ActiveRecord::Schema.define do - create_table :posts do |t| - t.string :title - t.string :source - t.string :url - t.datetime :date - t.datetime :created_at - end - add_index :posts, :url - add_index :posts, :date - end - rescue ActiveRecord::StatementInvalid - # tables already exist - end - + end \ No newline at end of file lib/terror.rb @@ -21,7 +21,7 @@ module Terror :url => entry.url, :source => feed.title, :date => entry.date_published - ) unless Post.exists?(:url => entry.url) + ) unless self.get(:first, :url => entry.url) end end lib/terror/feed_fetcher.rb @@ -1,23 +1,31 @@ require 'feed_fetcher' module Terror - class Post < ActiveRecord::Base + class Post + include DataMapper::Resource include FeedFetcher - validates_presence_of :title, :url - validates_format_of :url, :with => /^http|https:\/\// + property :id, Integer, :serial => true + property :title, String, :nullable => false + property :url, String, :nullable => false, :format => /^http|https:\/\// + property :source, String + property :date, Date def self.paginate(options = {}) per_page = options[:per_page] page = options[:page].to_i > 0 ? options[:page].to_i : 1 - posts = self.find(:all, :order => 'date DESC', :limit => per_page, :offset => per_page * (page - 1)) + posts = self.all(:order => [:date.desc], :limit => per_page, :offset => per_page * (page - 1)) add_pagination_info(posts, per_page, page) end protected def self.add_pagination_info(posts, per_page, page) - posts.class_eval { attr_accessor :current_page, :total_pages } + posts.instance_eval do + class << self + attr_accessor :current_page, :total_pages + end + end posts.total_pages = (self.count.to_f / per_page).ceil posts.current_page = page posts lib/terror/post.rb @@ -3,4 +3,10 @@ require 'sinatra' require 'sinatra/test' require 'spec' require 'spec/interop/test' + +disable :run +disable :reload +set :environment, :test +set :root, File.dirname(__FILE__) + '/../' + require File.dirname(__FILE__) + '/../terror_aggregator' \ No newline at end of file test/spec_helper.rb @@ -5,7 +5,7 @@ describe 'Test' do it 'should show posts' do get '/' - response.should be_ok + response.should be_ok end it 'should show feed' do test/terror_test.rb @@ -8,14 +8,14 @@ builder do |xml| :rel => 'alternate' xml.link :type => 'application/atom+xml', :href => 'http://localhost:4567' - xml.updated(rfc_3339(@posts.first ? @posts.first.created_at : Time.now)) + xml.updated(rfc_3339(@posts.first ? @posts.first.date : Time.now)) @posts.each do |post| xml.entry do |entry| entry.id post.url entry.link :type => 'text/html', :href => post.url, :rel => 'alternate' - entry.updated rfc_3339(post.created_at) + entry.updated rfc_3339(post.date) entry.title post.title entry.author do |author| author.name post.source views/feed.builder 37a35c8185a794f8904c21e58b9422a205439a04 Andrea Franz andrea@gravityblast.com http://github.com/pilu/terror/commit/03391f0ccd8122db9b6f3d2111c3294b42427bac 03391f0ccd8122db9b6f3d2111c3294b42427bac 2009-03-16T16:54:19-07:00 2009-03-16T16:54:19-07:00 switched to datamapper 373214d2f3f852effb1f09ccae2bef21f73a65bb Andrea Franz andrea@gravityblast.com