@@ -4,6 +4,7 @@ module PortfolioTags class TagError < StandardError; end [:clients, :projects].each do |portfolio_model| + single_model = portfolio_model.to_s.singularize tag "#{portfolio_model.to_s}" do |tag| tag.expand end @@ -12,13 +13,17 @@ module PortfolioTags tag.locals.send("#{portfolio_model}=", collection) result = '' collection.each do |item| - tag.locals.send("#{portfolio_model.to_s.singularize}=", item) + tag.locals.send("#{single_model}=", item) result << tag.expand end result end tag "#{portfolio_model.to_s}:each:name" do |tag| - tag.locals.send("#{portfolio_model.to_s.singularize}").send(:name) + tag.locals.send("#{single_model}").send(:name) + end + tag "#{portfolio_model.to_s}:each:content" do |tag| + text_type = single_model + "_text" + tag.locals.send("#{single_model}").send(text_type+"s").find(:first, :conditions => ['name = ?', 'description']).content end end lib/portfolio_tags.rb @@ -19,7 +19,6 @@ class PortfolioExtension < Radiant::Extension end def activate - # connect UserActionObserver with my models Page.send :include, PortfolioTags UserActionObserver.instance.send :add_observer!, Client UserActionObserver.instance.send :add_observer!, ClientText portfolio_extension.rb @@ -2,26 +2,25 @@ class PortfolioDataset < Dataset::Base uses :users def load - create_client 'Saturn Flyer' - create_client 'Ignite Social Media' do - create_project 'ignite website' + create_client 'Saturn Flyer', 'designers and developers' + create_client 'Ignite Social Media', 'original' do + create_project 'ignite website', 'moving to Radiant' end - create_client 'Kratos Defense' do - create_project 'iris' + create_client 'Kratos Defense', 'strength to success' do + create_project 'iris', 'tracking users and deployments' end - create_client 'Smithsonian' do - create_project 'invertebrates' + create_client 'Smithsonian', 'increase & diffusion of knowledge' do + create_project 'invertebrates', 'updating website' end - create_client 'Bright Yellow Jacket' do - create_project 'byj site' + create_client 'Bright Yellow Jacket', 'stand apart' do + create_project 'byj site', 'developing website' end end def create_client(name, text = nil) - create_record :client, name.symbolize, :name => name do - unless text.blank? - create_record :client_text, 'description', :content => text - end + create_record :client, name.symbolize, :name => name + unless text.blank? + create_record :client_text, :name => 'description', :content => text, :client_id => client_id(name.symbolize) end if block_given? @client_id = client_id(name.symbolize) @@ -30,10 +29,9 @@ class PortfolioDataset < Dataset::Base end def create_project(name, text = nil) - create_record :project, name.symbolize, :name => name do - unless text.blank? - create_record :project_text, 'description', :content => text, :client_id => @client_id - end - end + create_record :project, name.symbolize, :name => name, :client_id => @client_id + # unless text.blank? + create_record :project_text, :name => 'description', :content => text, :project_id => project_id(name.symbolize) + # end end end \ No newline at end of file spec/datasets/portfolio_dataset.rb @@ -30,6 +30,11 @@ describe Page do pages(:home).should render('<r:clients:each><r:name /> </r:clients:each>').as('Saturn Flyer Ignite Social Media Kratos Defense Smithsonian Bright Yellow Jacket ') end end + describe "content" do + it "should display the client description" do + pages(:home).should render('<r:clients:each limit="1"><r:content /></r:clients:each>').as('designers and developers') + end + end end end @@ -60,6 +65,11 @@ describe Page do pages(:home).should render('<r:projects:each><r:name /> </r:projects:each>').as('ignite website iris invertebrates byj site ') end end + describe "content" do + it "should display the project description" do + pages(:home).should render('<r:projects:each limit="1"><r:content /></r:projects:each>').as('moving to Radiant') + end + end end end end spec/models/portfolio_tags_spec.rb @@ -2,10 +2,15 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Project do before(:each) do - @project = Project.new + @project = Project.new(:name => 'Test') end it "should be valid" do @project.should be_valid end + + it "should err without a name" do + @project.name = nil + @project.should_not be_valid + end end spec/models/project_spec.rb 96e6a94cf9689175047771373926e57a35dec176 Jim Gay jim@saturnflyer.com http://github.com/saturnflyer/radiant-portfolio/commit/0dc660261692f08a77553646a9c7ada0615ff1d9 0dc660261692f08a77553646a9c7ada0615ff1d9 2009-04-22T19:37:42-07:00 2009-04-22T19:37:42-07:00 more tags efbd8e4d8341e84f2238cc4f92bee9bfcb123183 Jim Gay jim@saturnflyer.com