@@ -4,16 +4,7 @@ class GroupsController < ApplicationController #uses_tiny_mce :options => tiny_mce_options, :only => [ :new,:create, :update, :edit ] def index - @groups = Group.all - respond_to do |format| - format.html { - @posts = Post.sorted_by_commented_at.paginate(:page => params[:page], :per_page => 15) - } - format.rss { - @posts = Post.sorted_by_commented_at.limit_to(15) - render :layout => false - } - end + @groups = Group.order_by_contributed_at end def show app/controllers/groups_controller.rb @@ -11,7 +11,7 @@ class Group < ActiveRecord::Base alias_attribute :category, :group_category alias_attribute :images, :post_images - named_scope :order_by_contributed_at, lambda { { :order => "contributed_at DESC" } } + named_scope :order_by_contributed_at, lambda { { :conditions=>"contributed_at is not NULL", :order => "contributed_at DESC" } } def to_param name app/models/group.rb @@ -7,6 +7,8 @@ class Post < ActiveRecord::Base validates_presence_of :video, :if => :specifying_video validate :must_have_attachment #validates_tiny_mce_presence_of :detail, :unless => :specifying_video + validates_presence_of :group + validates_associated :group belongs_to :group @@ -33,6 +35,11 @@ class Post < ActiveRecord::Base post.commented_at = post.created_at end + before_create do |post| + post.group.contributed_at = Time.now + post.group.save! + end + def brief truncate_html_text(detail) end app/models/post.rb @@ -4,8 +4,10 @@ studio1: desc: Studio one is such a cool place home_page: MyString contributed_at: <%= 1.day.ago %> + group_category: other studio3: name: Studio Free desc: We love ourselves home_page: MyString + group_category: other test/fixtures/groups.yml @@ -60,7 +60,6 @@ class GroupsTest < ActionController::IntegrationTest assert_has_links ["/groups/Studio%201/edit"] assert_select 'a[href=MyString]' get_ok "/groups/Studio%201/edit" - view submit_form do |form| form.group.home_page = 'http://somewhereelse' end test/integration/groups_test.rb @@ -1,28 +1,29 @@ require 'test_helper' class GroupTest < ActiveSupport::TestCase - should "should updated_at when new post" do + context "a group" do + should "should update contributed_at when new post" do group = Group.find(groups(:studio1).id) - assert group.updated_at < (Time.now+ 10) + assert group.contributed_at < (Time.now- 10) group.posts.new(:title=>'some', :detail=>'some').save! group = Group.find(groups(:studio1).id) - assert group.updated_at > (Time.now + 10) + assert group.contributed_at > (Time.now - 10) end - + end context "Group class" do should "be able to find by contributed_at" do groups = Group.order_by_contributed_at groups = groups.all # make sure we get the array! assert_equal 1, groups.size - assert_equal group(:studio1).id,groups[0] + assert_equal groups(:studio1).id,groups[0].id Group.find(groups(:studio3).id).posts.new(:title=>'some', :detail=>'some').save! - groups = Group.order_by_contributed_at + groups = Group.order_by_contributed_at groups = groups.all # make sure we get the array! assert_equal 2, groups.size - assert_equal group(:studio3).id,groups[0] + assert_equal groups(:studio3).id,groups[0].id end end test/unit/group_test.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper' class PostTest < ActiveSupport::TestCase should "ensure that the subscriber list for a post is unique" do - post = Post.new + post = new_post assert_equal([], post.subscribers) duff = users(:duff) @@ -22,10 +22,10 @@ class PostTest < ActiveSupport::TestCase context "video_embed_tags" do should "should calculate ok for youtube" do - post = Post.new + post = new_post assert_nil(post.video_embed_tags) - post = Post.new(:video => " ") + post = new_post(:video => " ") assert_nil(post.video_embed_tags) post.video = %Q{<object width="425" height="344"><param name="movie" value="http://www.youtube.com/v/yCM_wQy4YVg&hl=en&fs=1&color1=0xe1600f&color2=0xfebd01"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/yCM_wQy4YVg&hl=en&fs=1&color1=0xe1600f&color2=0xfebd01" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="425" height="344"></embed></object>} @@ -66,19 +66,19 @@ class PostTest < ActiveSupport::TestCase end should "allow embed tag blip.tv to pass through" do - post = Post.new + post = new_post post.video = %Q{<embed src="http://blip.tv/play/lG3hz1eBolM" type="application/x-shockwave-flash" width="1024" height="798" allowscriptaccess="always" allowfullscreen="true"></embed>} assert_equal(post.video, post.video_embed_tags) end should "currently I think allow for aritrary object tag to pass through" do - post = Post.new + post = new_post post.video = %Q{<object >some stuff</object>} assert_equal(post.video, post.video_embed_tags) end should "convert http urls to links" do - post = Post.new + post = new_post link = %Q{http://someurlorother.com/wherever} post.video = link assert(post.video_embed_tags.include?(%Q{<a href="#{link}" rel="nofollow">#{link}</a>})) @@ -86,7 +86,7 @@ class PostTest < ActiveSupport::TestCase end should "require video appropriately" do - post = Post.new(:title => "Whatever", :detail => "Whatever") + post = new_post(:title => "Whatever", :detail => "Whatever") assert post.valid? post.specifying_video = true @@ -103,13 +103,13 @@ class PostTest < ActiveSupport::TestCase should "calculate preview_image for video" do - post = Post.new + post = new_post expectedPreviewImage = nil assert_equal(expectedPreviewImage, post.preview_image) end should "calculate preview_image_src for video" do - post = Post.new + post = new_post expectedPreviewImage = %Q{http://img.youtube.com/vi/FG2PUZoukfA/2.jpg} post.video = %Q{http://youtube.com/watch?v=FG2PUZoukfA} @@ -123,7 +123,7 @@ class PostTest < ActiveSupport::TestCase end should "initialize date fields correctly" do - post = Post.new(:title => "Whatever", :detail => "Whatever") + post = new_post(:title => "Whatever", :detail => "Whatever") assert post.valid? post.save! assert !post.created_at.nil?, "expected created at not to be nil" @@ -140,4 +140,8 @@ class PostTest < ActiveSupport::TestCase # assert post.has_contributed?(users(:duff)) # end # end + + def new_post *args + groups(:studio1).posts.new *args + end end test/unit/post_test.rb @@ -10,7 +10,7 @@ class TagTest < ActiveSupport::TestCase should "handle basic relationship with post" do tag = Tag.create!(:name => "Cool") - post = Post.create!(:title => "My Post", :detail => "Here it be") + post = create_post!(:title => "My Post", :detail => "Here it be") assert_equal([], tag.posts) assert_equal([], post.tags) @@ -21,7 +21,7 @@ class TagTest < ActiveSupport::TestCase assert_equal([tag], post.tags) assert_equal([post], tag.posts) - another_post = Post.create!(:title => "My Second Post", :detail => "Here it be again") + another_post = create_post!(:title => "My Second Post", :detail => "Here it be again") another_tag = Tag.create!(:name => "Really Cool") tag.posts << another_post @@ -104,4 +104,8 @@ class TagTest < ActiveSupport::TestCase assert_equal ['two','one','one','one'], gotCss end + + def create_post! *args + groups(:studio1).posts.create! *args + end end test/unit/tag_test.rb c970495eb8b44babb6e55080d66a396291f04c05 Tim Diggins tim@red56.co.uk http://github.com/red56/the-connected-website/commit/31df81af1c28ce26d5039d64f5dd61e318ce8fec 31df81af1c28ce26d5039d64f5dd61e318ce8fec 2009-06-09T04:30:03-07:00 2009-06-09T04:30:03-07:00 http://nokahuna.com/projects/5943/tasks/85 list groups by contributed_at 6323fea0ecc691ef5a9736ee8ee687c489f520c1 Tim Diggins tim@red56.co.uk