app/views/stories/_tags.html.erb app/views/tags/_header.html.erb app/views/tags/_list.html.erb app/views/tags/_stories.html.erb app/views/tags/_tag.html.erb doc/TODO lib/story_tags_presenter.rb spec/objects/story_tags_presenter_spec.rb spec/views/stories/_tags.html.erb_spec.rb stories/helpers/states.rb @@ -9,5 +9,5 @@ module IterationsHelper :loading => "Element.update('notice', 'Loading #{iteration.name}...') ; Element.show('notice')", :success => "Element.hide('notice')" end - end + end end app/helpers/iterations_helper.rb @@ -29,6 +29,23 @@ class Project < ActiveRecord::Base find_current || build( :name => "Iteration #{size + 1}", :start_date => Date.today, :end_date => Date.today + 7 ) end end + has_many :story_tags, :class_name => Tag.name, :finder_sql => ' + SELECT tags.* + FROM projects + INNER JOIN stories ON stories.project_id=projects.id + INNER JOIN taggings ON (taggings.taggable_id=stories.id AND taggings.taggable_type=\'Story\') + INNER JOIN tags ON tags.id=taggings.tag_id + WHERE + projects.id = #{id} + GROUP BY tags.id' + has_many :tagless_stories, :class_name => Story.name, :finder_sql => ' + SELECT stories.* + FROM projects + INNER JOIN stories ON stories.project_id=projects.id + LEFT JOIN taggings ON (taggings.taggable_id=stories.id AND taggings.taggable_type=\'Story\') + WHERE + projects.id = #{id} AND + taggings.taggable_id IS NULL' def iterations_ordered_by_start_date app/models/project.rb @@ -2,6 +2,10 @@ <div class="section_header">Stories</div> <div id="stories" class="section_content"> - <%= render :partial => 'stories/iterations', :locals => { :iterations => @stories_presenter.iterations_presenter } %> + <% if @stories_presenter.iterations? %> + <%= render :partial => 'stories/iterations', :locals => { :iterations => @stories_presenter.iterations } %> + <% elsif @stories_presenter.tags? %> + <%= render :partial => 'stories/tags', :locals => { :tags => @stories_presenter.tags } %> + <% end %> </div> </div> app/views/stories/index.html.erb @@ -19,6 +19,7 @@ Rails::Initializer.run do |config| # Only load the plugins named here, in the order given. By default all plugins in vendor/plugins are loaded, in alphabetical order # :all can be used as a placeholder for all plugins not explicitly named. # config.plugins = [ :exception_notification, :ssl_requirement, :all ] + config.plugins = [ :acts_as_textiled, :has_many_polymorphs, :all ] # Add additional load paths for your own custom dirs config.load_paths += %W( #{RAILS_ROOT}/app/observers #{RAILS_ROOT}/app/mailers ) config/environment.rb @@ -12,10 +12,17 @@ class StoriesIndexPresenter < PresentationObject VIEWS.include?(@view) ? @view : VIEWS.first end - declare :iterations_presenter do + declare :iterations do IterationsPresenter.new( :iterations => @project.iterations_ordered_by_start_date, :backlog => @project.backlog_iteration, :project => @project) end + + declare :tags do + StoryTagsPresenter.new( + :tags => @project.story_tags, + :project => @project + ) + end end \ No newline at end of file lib/stories_index_presenter.rb @@ -26,6 +26,46 @@ describe Project, "#new with name attribute" do end end +describe Project, '#story_tags' do + before do + @project = Generate.project :name => "foo" + @stories = [ + Generate.story("story 1", :project => @project), + Generate.story("story 2", :project => @project) ] + @stories.first.tag_list = "foo, baz" + @stories.last.tag_list = "foo, baz, bar" + @stories.each{ |s| s.save! } + end + + it "returns the unique tags that belong to the stories on this project" do + @project.story_tags.should == (@stories.first.tags + @stories.last.tags).uniq + end +end + +describe Project, '#tagless_stories' do + before do + @project = Generate.project :name => "foo" + @stories = [ + Generate.story("story1", :project => @project), + Generate.story("story2", :project => @project), + Generate.story("story3", :project => @project) ] + @stories[0].tag_list = "" + @stories[1].tag_list = "foo, baz, bar" + @stories[2].tag_list = "" + @stories.each{ |s| s.save! } + end + + it "returns stories which are not tagged" do + @project.tagless_stories.should == [@stories[0], @stories[2]] + end + + it "doesn't include stories from other projects" do + @project2 = Generate.project :name => "baz" + @story2 = Generate.story "another project's story", :project => @project2 + @project.tagless_stories.should_not include(@story2) + end +end + describe Project, "#total_points" do before do Story.delete_all spec/models/project_spec.rb @@ -44,7 +44,7 @@ describe StoriesIndexPresenter, '#tags?' do end end -describe StoriesIndexPresenter, '#iterations_presenter' do +describe StoriesIndexPresenter, '#iterations' do before do @project = stub("project", :iterations_ordered_by_start_date => nil, @@ -55,12 +55,12 @@ describe StoriesIndexPresenter, '#iterations_presenter' do it "finds all iterations ordered by start date" do @project.should_receive(:iterations_ordered_by_start_date) - @presenter.iterations_presenter + @presenter.iterations end it "finds the backlog iteration" do @project.should_receive(:backlog_iteration) - @presenter.iterations_presenter + @presenter.iterations end it "creates a new IterationsPresenter" do @@ -71,18 +71,48 @@ describe StoriesIndexPresenter, '#iterations_presenter' do :iterations => iterations, :backlog => backlog_iteration, :project => @project) - @presenter.iterations_presenter + @presenter.iterations end - it "returns the newly created iterations_presenter" do - iterations_presenter = stub("iterations presenter") - IterationsPresenter.stub!(:new).and_return(iterations_presenter) - @presenter.iterations_presenter.should == iterations_presenter + it "returns the newly created iterations" do + iterations = stub("iterations presenter") + IterationsPresenter.stub!(:new).and_return(iterations) + @presenter.iterations.should == iterations end it "caches the return value for subsequent calls" do IterationsPresenter.should_receive(:new).once.and_return(:foo) - @presenter.iterations_presenter.should == :foo - @presenter.iterations_presenter.should == :foo # only the call is executed, this one is cached + @presenter.iterations.should == :foo + @presenter.iterations.should == :foo end end + +describe StoriesIndexPresenter, '#tags' do + before do + @tags = stub("tags") + @stories = stub("tagless stories") + @project = stub("project", :story_tags => @tags) + @presenter = StoriesIndexPresenter.new :project => @project + StoryTagsPresenter.stub!(:new) + end + + it "finds all tags that belong to the project" do + @project.should_receive(:story_tags).and_return(@tags) + @presenter.tags + end + + it "creates a new StoryTagsPresenter" do + @project.stub!(:story_tags).and_return(@tags) + StoryTagsPresenter.should_receive(:new).with( + :tags => @tags, + :project => @project) + @presenter.tags + end + + it "caches the return value for subsequent calls" do + StoryTagsPresenter.stub!(:new).once.and_return(:foo) + @presenter.tags.should == :foo + @presenter.tags.should == :foo + end + +end spec/objects/stories_index_presenter_spec.rb @@ -9,14 +9,35 @@ describe "/stories/index.html.erb" do before do @iterations = mock "iterations presenter" - @stories_presenter = stub("stories presenter", :iterations_presenter => @iterations) + @tags = mock "tags presenter" + @stories_presenter = stub("stories presenter", :iterations => @iterations, :tags => @tags) assigns[:stories_presenter] = @stories_presenter - template.expect_render(:partial => "stories/iterations", :locals => {:iterations=>@iterations}).and_return(%|<p id="iterations-partial" />|) end - it "should render the iterations partial" do - render_it - response.should have_tag("#iterations-partial") + describe "when the the stories presenter is presenting on iterations" do + before do + @stories_presenter.stub!(:iterations?).and_return(true) + template.expect_render(:partial => "stories/iterations", :locals => {:iterations=>@iterations}).and_return(%|<p id="iterations-partial" />|) + end + + it "renders the stories/iterations partial" do + render_it + response.should have_tag("#iterations-partial") + end end + + describe "when the the stories presenter is presenting on tags" do + before do + @stories_presenter.stub!(:iterations?).and_return(false) + @stories_presenter.stub!(:tags?).and_return(true) + template.expect_render(:partial => "stories/tags", :locals => {:tags=>@tags}).and_return(%|<p id="tags-partial" />|) + end + + it "renders the stories/tags partial" do + render_it + response.should have_tag("#tags-partial") + end + end + end spec/views/stories/index.html.erb_spec.rb @@ -1,4 +1,3 @@ require File.dirname(__FILE__) + '/lib/acts_as_taggable' - require File.dirname(__FILE__) + '/lib/tagging' require File.dirname(__FILE__) + '/lib/tag' vendor/plugins/acts_as_taggable_on_steroids/init.rb @@ -1,5 +1,9 @@ class Tag < ActiveRecord::Base has_many :taggings + # extend the existing Tag class + # Tag.class_eval do + has_many_polymorphs :taggables, :from => [:stories], :through => :taggings + # end def self.parse(list) tags = [] vendor/plugins/acts_as_taggable_on_steroids/lib/tag.rb c6ce48df1811e3ef65cc5ae67d1f934eb03d158a zdennis zdennis@b1a0fcd8-281e-0410-b946-bf040eef99c3 http://github.com/zdennis/strac/commit/7b9decbbe06a5f01d58f1ebcb824c33ca6c433d4 7b9decbbe06a5f01d58f1ebcb824c33ca6c433d4 2007-12-13T20:48:59-08:00 2007-12-13T20:48:59-08:00 [BROKEN COMMIT] This starts the implementation of a tag-based view for stories. It is functional, but not complete so some stories regarding the tag based view will die. This further extracts out another layer of presenters which is keeping things really simple. git-svn-id: http://rails.lotswholetime.com/svn/strac/trunk@720 b1a0fcd8-281e-0410-b946-bf040eef99c3 6125d3fdc20c43c97c95feac0dbb7eeccb92bc6c zdennis zdennis@b1a0fcd8-281e-0410-b946-bf040eef99c3