app/views/groups/_image.html.erb app/views/groups/_post.html.erb db/migrate/20090608173007_add_featured_at_to_post_images.rb @@ -18,8 +18,10 @@ class GroupsController < ApplicationController def show @group = Group.find_by_name!(params[:id]) - @images = @group.images + @recent_images = @group.images.limit_to 20 @posts = @group.posts.paginate(:page => params[:page], :per_page => 15) + @featured_images = @group.images.featured.limit_to 10 + @featured_texts = @group.posts.featured.limit_to 10 end def new app/controllers/groups_controller.rb @@ -1,8 +1,30 @@ class ImagesController < ApplicationController + before_filter :find_image + before_filter :current_user_can_edit_image + def destroy @image = PostImage.find(params[:id]) @image.destroy flash[:notice] = "Successfully deleted the image." redirect_to post_url(@image.post) end + + def feature + @image.update_attributes(:featured_at=>Time.now) + redirect_to post_url(@image.post) + end + + def unfeature + @image.update_attributes(:featured_at=>nil) + redirect_to post_url(@image.post) + end + + protected + def find_image + @image = PostImage.find(params[:id]) + end + + def current_user_can_edit_image + current_user_can_edit @image.post + end end app/controllers/images_controller.rb @@ -3,7 +3,7 @@ class Group < ActiveRecord::Base has_many :group_permissions, :include => :user, :uniq => true, :dependent=>:destroy has_many :rss_feeds, :dependent => :destroy has_many :posts, :dependent => :destroy - has_many :post_images, :through => :posts, :order => "updated_at DESC" + has_many :post_images, :through => :posts, :order => "updated_at DESC" belongs_to :group_category app/models/group.rb @@ -24,7 +24,7 @@ class Post < ActiveRecord::Base named_scope :sorted_by_created_at, lambda { { :order => "created_at DESC" }} named_scope :sorted_by_updated_at, lambda { { :order => "updated_at DESC" }} named_scope :sorted_by_commented_at, lambda { { :order => "commented_at DESC" }} - named_scope :featured, lambda { { :conditions => [ "featured_at IS NOT NULL" ], :order => "featured_at DESC", :limit => 6 }} + named_scope :featured, lambda { { :conditions => [ "featured_at IS NOT NULL" ], :order => "featured_at DESC" }} named_scope :limit_to, lambda { | limit | { :limit => limit } } alias_attribute :to_s, :title app/models/post.rb @@ -2,7 +2,8 @@ class PostImage < ActiveRecord::Base belongs_to :post named_scope :latest3, :limit=>3, :order => "updated_at DESC" - named_scope :featured, :order => "updated_at DESC" + named_scope :featured, lambda { | limit | { :conditions => [ "post_images.featured_at IS NOT NULL" ], :order => "post_images.featured_at DESC" }} + named_scope :limit_to, lambda { | limit | { :limit => limit } } def width_for_height(h) return nil if self.width.nil? || self.height.nil? @@ -12,4 +13,8 @@ class PostImage < ActiveRecord::Base return nil if self.width.nil? || self.height.nil? w*self.height/self.width end + + def featured? + !featured_at.nil? + end end app/models/post_image.rb @@ -41,23 +41,28 @@ </div> <div id="main"> + <h2>Featured images by <%= @group%></h2> + <div class=""> + <%= render :partial=>'image', :collection=>@featured_images %> + <div class="clearThis"> </div> + </div> + + <h2>Featured text by <%= @group%></h2> + <div class=""> + <%= render :partial=>'post', :collection=>@featured_texts %> + <div class="clearThis"> </div> + </div> + <h2>Recent works by <%= @group %></h2> <div class="imageStrip"> - <% for image in @images%> - <a href="<%= post_path(image.post) %>" class="imageStripImage"> - <%= image_tag_for(image, :strip) %> - <div class="label" style="width:<%= image.width_for_height(128) %>px;"> - <span class="title"><%= image.post.title %>.</span> - </div> - </a> - <% end %> + <%= render :partial=>'image', :collection=>@recent_images %> <div class="clearThis"> </div> <p><a href="#">More works</a> by <%= @group %></p> </div> <h2>More recent works</h2> <div class="imageCloud"> - <% for image in @images%> + <% for image in @recent_images%> <a href="<%= post_path(image.post) %>"> <%= image_tag_for(image, :small_square) %> </a> @@ -65,4 +70,5 @@ <div class="clearThis"> </div> <p><a href="#">Browse all works</a> by <%= @group %>.</p> </div> + </div> \ No newline at end of file app/views/groups/show.html.erb @@ -3,9 +3,6 @@ with_controls = local_assigns[:with_controls] %> <p class="meta"> - <%if post.featured?%> - <strong>Featured</strong>. - <%end%> <% if !post.remote_url.nil? && !post.remote_url.empty? %> <span class="author"><%= link_to_user(post.group) %> work retrieved from <%= link_to "external site",post.remote_url %></span> <% end %> @@ -27,9 +24,17 @@ </span> <% end %> --> + </p> <% if with_controls && logged_in? && current_user.can_edit?(post) %> + <p class="meta"> <%= link_to("Edit post", edit_post_url(post), :class => "option") %> <%= link_to("Delete post", post_url(post), :class => "option", :method => :delete, :confirm => "Are you sure you'd like to delete this post?") %> + <%if post.featured?%> + <strong>Text featured</strong>. + <%= link_to("Unfeature post text", unfeature_post_url(post), :class => "option", :method => :put) %> + <% else %> + <%= link_to("Feature post text", feature_post_url(post), :class => "option", :method => :put) %> + <% end %> + </p> <% end %> -</p> \ No newline at end of file app/views/posts/_meta.html.erb @@ -37,10 +37,15 @@ <div class='image-controls'> <% @post.images.each do |image| %> - <span> + <span id="image-<%=image.id%>"> <%= link_to image_tag_for(image, :medium_square), image.src, :title => "Open orignal image on remote site" %> <% if logged_in? && current_user.can_edit?(@post) %> - <%= link_to 'Delete?', image_path(image), :method=>:delete, :confirm=>'Delete this image?' %> + <%= link_to 'Delete?', image_path(image), :method=>:delete, :class=>'option', :confirm=>'Delete this image?' %> + <% if image.featured? %> + <%= link_to 'Unfeature', unfeature_image_path(image), :method=>:put, :class=>'option' %> + <% else %> + <%= link_to 'Feature', feature_image_path(image), :method=>:put, :class=>'option' %> + <% end %> <% end %> </span> <% end %> app/views/posts/show.html.erb @@ -25,7 +25,7 @@ ActionController::Routing::Routes.draw do |map| post.resources :tags, :requirements => { :id => /.*/ } end - map.resources :images + map.resources :images, :member => {:feature=>:put, :unfeature=>:put} map.resources :tags, :requirements => { :id => /.*/ } map.resource :settings, :collection => { :save_new_avatar => :put, :picture => :get, :username_email => :any, :bio => :any, :password => :any} config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090608161446) do +ActiveRecord::Schema.define(:version => 20090608173007) do create_table "attachments", :force => true do |t| t.integer "post_id" @@ -113,6 +113,7 @@ ActiveRecord::Schema.define(:version => 20090608161446) do t.datetime "updated_at" t.integer "width" t.integer "height" + t.datetime "featured_at" end create_table "posts", :force => true do |t| db/schema.rb @@ -2,12 +2,20 @@ article_from_rss_image1: post: article_from_rss - src: MyString + src: image1.png width: 10 height: 20 - + article_from_rss_image2: post: article_from_rss - src: MyString + src: image2.png width: 104 height: 105 + featured_at: <%=1.day.ago%> + +cool_article_image1: + post: cool_article + src: image3.png + width: 110 + height: 110 + featured_at: <%=1.hour.ago%> \ No newline at end of file test/fixtures/post_images.yml @@ -90,5 +90,53 @@ class PostingTest < ActionController::IntegrationTest assert_response 404 end end - -end \ No newline at end of file + should "only be able to delete or feature an image if a the manager of it" do + new_session_as(:duff) do + post_id = posts(:article_from_rss).id + get_ok "/posts/#{post_id}" + i1 = post_images(:article_from_rss_image1) + i2 = post_images(:article_from_rss_image2) + assert_select "#image-#{i2.id}" do + assert_link_does_not_exist DELETE_IMAGE_LINK + assert_link_does_not_exist FEATURE_IMAGE_LINK + end + end + + new_session_as(:alex) do + #because alex_can_moderate_studio1 + post_id = posts(:article_from_rss).id + get_ok "/posts/#{post_id}" + i1 = post_images(:article_from_rss_image1) + i2 = post_images(:article_from_rss_image2) + assert_select "#image-#{i1.id}" do + assert_link_exists DELETE_IMAGE_LINK + assert_link_exists FEATURE_IMAGE_LINK + assert_link_does_not_exist UNFEATURE_IMAGE_LINK + end + assert_select "#image-#{i2.id}" do + assert_link_exists DELETE_IMAGE_LINK + assert_link_exists UNFEATURE_IMAGE_LINK + assert_link_does_not_exist FEATURE_IMAGE_LINK + end + delete_via_redirect "/images/#{i2.id}" + get "/posts/#{post_id}" + assert_select "#image-#{i2.id}", :count=>0 + + put_via_redirect "/images/#{i1.id}/feature" + get "/posts/#{post_id}" + assert_select "#image-#{i1.id}" do + assert_link_exists UNFEATURE_IMAGE_LINK + assert_link_does_not_exist FEATURE_IMAGE_LINK + end + put_via_redirect "/images/#{i1.id}/unfeature" + get "/posts/#{post_id}" + assert_select "#image-#{i1.id}" do + assert_link_exists FEATURE_IMAGE_LINK + assert_link_does_not_exist UNFEATURE_IMAGE_LINK + end + end + end +end +DELETE_IMAGE_LINK = "Delete?" +FEATURE_IMAGE_LINK = "Feature" +UNFEATURE_IMAGE_LINK = "Unfeature" \ No newline at end of file test/integration/posting_test.rb @@ -1,8 +1,4 @@ require 'test_helper' class GroupTest < ActiveSupport::TestCase - # Replace this with your real tests. - test "the truth" do - assert true - end end test/unit/group_test.rb @@ -1,8 +1,28 @@ require 'test_helper' class PostImageTest < ActiveSupport::TestCase - # Replace this with your real tests. - test "the truth" do - assert true + + should "be able to find featured images for a group" do + st1 = groups(:studio1) + fi = st1.images.featured + assert_equal 1, fi.count + assert_equal post_images(:article_from_rss_image2).src, fi[0].src + + st3 = groups(:studio3) + fi = st3.images.featured + assert_equal 1, fi.count + assert_equal post_images(:cool_article_image1).src, fi[0].src end + + should "be able to find all featured images" do + fi = PostImage.featured + assert_equal 2, fi.count + assert_equal post_images(:cool_article_image1).src, fi[0].src + assert_equal post_images(:article_from_rss_image2).src, fi[1].src + + fi2 = PostImage.featured.limit_to(1) + assert_equal 1, fi2.all.size + assert_equal post_images(:cool_article_image1).src, fi2[0].src + end + end test/unit/post_image_test.rb f1f10f619a1513df391e0dc26542332898e69b73 Tim Diggins tim@red56.co.uk http://github.com/red56/the-connected-website/commit/bb4a394977866620f3fee967dc97ca46fdced1c0 bb4a394977866620f3fee967dc97ca46fdced1c0 2009-06-08T15:45:15-07:00 2009-06-08T15:45:15-07:00 allowing for featuring of images and texts - got finders for featured and recent images and featured texts (not yet recent texts) 7130b6de3bb6a67388ce4a79b517a9d44de51827 Tim Diggins tim@red56.co.uk