app/controllers/feeds_controller.rb app/helpers/feeds_helper.rb app/models/feed.rb app/views/feeds/edit.html.erb app/views/feeds/index.html.erb app/views/feeds/new.html.erb app/views/feeds/show.html.erb app/views/layouts/feeds.html.erb config/initializers/feedable.rb db/migrate/004_create_feeds.rb test/fixtures/feeds.yml test/functional/feeds_controller_test.rb test/mocks/animoto_news.rss test/mocks/daringfireball.xml test/mocks/dhh.rss test/unit/feed_test.rb @@ -2,7 +2,9 @@ class Post < ActiveRecord::Base has_many :comments, :as => :commentable - validates_presence_of :user_id, :permalink + validates_presence_of :permalink + validates_presence_of :user_id, :unless => :feed_id + validates_presence_of :feed_id, :unless => :user_id def self.per_page; 5; end app/models/post.rb @@ -1,4 +1,6 @@ ActionController::Routing::Routes.draw do |map| + map.resources :feeds + map.resources :posts map.resources :users config/routes.rb @@ -7,9 +7,9 @@ class CreatePosts < ActiveRecord::Migration t.string :cite t.string :type t.integer :user_id + t.integer :feed_id t.string :lang t.integer :comment_counter - t.timestamps end end db/migrate/002_create_posts.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 3) do +ActiveRecord::Schema.define(:version => 4) do create_table "comments", :force => true do |t| t.integer "commentable_id" @@ -23,6 +23,18 @@ ActiveRecord::Schema.define(:version => 3) do t.datetime "updated_at" end + create_table "feeds", :force => true do |t| + t.datetime "last_updated_at" + t.string "title" + t.string "url" + t.text "description" + t.string "uri" + t.integer "user_id" + t.string "type" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "posts", :force => true do |t| t.string "permalink" t.string "header" @@ -30,6 +42,7 @@ ActiveRecord::Schema.define(:version => 3) do t.string "cite" t.string "type" t.integer "user_id" + t.integer "feed_id" t.string "lang" t.integer "comment_counter" t.datetime "created_at" db/schema.rb @@ -25,5 +25,27 @@ end class Feed < ActiveRecord::Base # Attributes: - # url:string doctype:string -end \ No newline at end of file + # last_updated_at:datetime title:string url:string description:text uri:string user_id:integer type:string + + def self.inherited(subclass) + subclass.send :include, Aintablog::Feedable + end + + def poll! + + end + +end + +class Twitter < Feed + entries_become :tweets +end + +class Blog < Feed + entries_become :articles +end + +class Flickr < Feed + entries_become :pictures +end + doc/blog_plans.rb @@ -34,6 +34,8 @@ class Test::Unit::TestCase # Note: You'll currently still have to declare fixtures explicitly in integration tests # -- they do not yet inherit this setting fixtures :all + + MOCK_ROOT = File.dirname(__FILE__) + '/mocks' unless defined?(MOCK_ROOT) # Add more helper methods to be used by all tests here... include AuthenticatedTestHelper test/test_helper.rb @@ -8,16 +8,32 @@ class PostTest < ActiveSupport::TestCase end end - def test_should_require_user_id + def test_should_require_user_id_sans_feed_id assert_no_difference 'Post.count' do + post = create_post({ :user_id => nil, :feed_id => nil }) + end + end + + def test_should_create_with_only_user_id + assert_difference 'Post.count' do + post = create_post( :feed_id => nil ) + end + end + + def test_should_create_with_only_feed_id + assert_difference 'Post.count' do post = create_post( :user_id => nil ) - assert ! post.valid?, post.to_yaml end end + def test_should_override_to_param + post = create_post + assert_equal post.permalink, post.to_param + end + protected def create_post(options={}) - Post.create({ :header => 'A name', :content => 'Some content', :type => 'Article', :user_id => users(:quentin).id, :permalink => 'ok' }.merge(options)) + Post.create({ :header => 'A name', :content => 'Some content', :user_id => users(:quentin).id, :feed_id => feeds(:one).id, :permalink => 'ok' }.merge(options)) end end test/unit/post_test.rb 5263f1158e7608d0ddc3b0cb656e0065f5bdc1b4 Pat Nakajima patnakajima@gmail.com http://github.com/nakajima/aintablog/commit/4c6d37fb19b889e451f026b6ed3bd3283bbe7190 4c6d37fb19b889e451f026b6ed3bd3283bbe7190 2008-03-11T15:07:24-07:00 2008-03-11T15:07:24-07:00 added feeds 867ad34da7ebb39799deddd8450950f33886a483 Pat Nakajima patnakajima@gmail.com