@@ -43,6 +43,16 @@ class Deploy def notify DeployMailer.send(project, current_rev, head_rev, scm_log) end + + def month + created_at.strftime('%Y-%m') + end + + def self.in_month(year_month) + year, month = year_month.split('-') + next_month = "#{year}-%02i" % (month.to_i + 1) + all(:created_at.gte => year_month, :created_at.lt => next_month, :order => [:created_at.desc]) + end end class Project @@ -56,6 +66,13 @@ class Project has n, :subscriptions has n, :users, :through => :subscriptions + def all_deploys_grouped_by_date + deploys.all(:order => [:created_at.desc]).inject({}) do |groups, deploy| + (groups[deploy.month] ||= []) << deploy + groups + end + end + def self.find_or_create(name) project = self.first(:name => name) project || self.create(:name => name) @@ -150,7 +167,14 @@ end get '/projects/:id' do @project = Project.get(params[:id]) - @deploys = @project.deploys.all(:order => [:created_at.desc]) + if params[:show] + @last_deploys = @project.deploys.in_month(params[:show]) + else + @last_deploys = @project.deploys.all(:order => [:created_at.desc], :limit => 10) + end + + @grouped_deploys = @project.all_deploys_grouped_by_date + @years = @grouped_deploys.keys.map { |month| month.split('-').first }.uniq @title = "Recent deploys for #{@project.name}" erb :deploys_list @@ -219,4 +243,13 @@ helpers do def format_time(time) time.strftime('%b %d %H:%M') end + + def link_to_month(month_name, month, project, grouped_deploys) + number_of_deploys = grouped_deploys.has_key?(month) ? grouped_deploys[month].size : 0 + if number_of_deploys == 0 + month_name + else + "<a href=\"/projects/#{project.id}?show=#{month}\">#{month_name}</a> <small>(#{number_of_deploys})</small>" + end + end end deployed_at.rb @@ -30,3 +30,13 @@ pre { font-family: Monaco, "Lucida Console", monospace; font-size: 12px; } + +ul.archive { + float: left; + list-style-type: none; + margin: 0 40px 0 0; +} + +ul.archive li a { + font-weight: bold; +} public/deployed_at.css @@ -36,6 +36,34 @@ class DeployTest < Test::Unit::TestCase assert_equal 2, deploy.get_number_of_changes end + test 'group by date should return empty hash' do + project = create_project + assert_equal Hash.new, project.all_deploys_grouped_by_date + end + + test 'should return deploys grouped by month' do + project = create_project + deploy1 = create_deploy(:project => project, :created_at => '2009-01-01') + deploy2 = create_deploy(:project => project, :created_at => '2009-01-02') + deploy3 = create_deploy(:project => project, :created_at => '2009-02-02') + + grouped_deploys = project.all_deploys_grouped_by_date + assert_equal 2, grouped_deploys.keys.size + assert_equal [deploy2, deploy1], grouped_deploys['2009-01'] + assert_equal [deploy3], grouped_deploys['2009-02'] + end + + test 'should find all deploys in a specific month' do + project = create_project + deploy1 = create_deploy(:project => project, :created_at => '2009-01-01') + deploy2 = create_deploy(:project => project, :created_at => '2009-01-31') + deploy3 = create_deploy(:project => project, :created_at => '2009-02-28') + + assert_equal [deploy2, deploy1], Deploy.in_month('2009-01') + assert_equal [deploy3], Deploy.in_month('2009-02') + assert_equal [], Deploy.in_month('2009-03') + end + test 'should create multiple subscriptions' do user = create_user project1 = create_project(:name => 'project_1') test/test_models.rb @@ -1,5 +1,32 @@ +<div class="span-22"> + <% for year in @years %> + <div class="span-6 append-bottom"> + <h2><%= year %></h2> + <ul class="archive"> + <li><%= link_to_month('December', "#{year}-12", @project, @grouped_deploys) %></li> + <li><%= link_to_month('November', "#{year}-11", @project, @grouped_deploys) %></li> + <li><%= link_to_month('October', "#{year}-10", @project, @grouped_deploys) %></li> + <li><%= link_to_month('September', "#{year}-09", @project, @grouped_deploys) %></li> + <li><%= link_to_month('August', "#{year}-08", @project, @grouped_deploys) %></li> + <li><%= link_to_month('July', "#{year}-07", @project, @grouped_deploys) %></li> + </ul> + + <ul class="archive"> + <li><%= link_to_month('June', "#{year}-06", @project, @grouped_deploys) %></li> + <li><%= link_to_month('May', "#{year}-05", @project, @grouped_deploys) %></li> + <li><%= link_to_month('April', "#{year}-04", @project, @grouped_deploys) %></li> + <li><%= link_to_month('March', "#{year}-03", @project, @grouped_deploys) %></li> + <li><%= link_to_month('February', "#{year}-02", @project, @grouped_deploys) %></li> + <li><%= link_to_month('January', "#{year}-01", @project, @grouped_deploys) %></li> + </ul> + </div> + <% end %> +</div> + +<hr /> + <table> - <% @deploys.each_with_index do |deploy, i| %> + <% @last_deploys.each_with_index do |deploy, i| %> <tr class="large <%= i % 2 == 0 ? 'even' : '' %>"> <td><a href="/deploys/<%= deploy.id %>"><%= deploy.title %></a> <span class="small">(<%= deploy.changes %> changes)</span></td> <td>by <%= deploy.user %></td> views/deploys_list.erb c848fdb8733cf19e11882cba372fef8c45afc1a3 Florian Munz surf@theflow.de http://github.com/theflow/deployed_at/commit/8738c149f0f2ac7825fa2d9b05883b2b58198acd 8738c149f0f2ac7825fa2d9b05883b2b58198acd 2009-10-02T09:55:04-07:00 2009-10-02T09:55:04-07:00 added an archive view for projects. Since the list of deploys can get long very fast, show a list of months and filter deploys by month 45fb2ce445504c9cb3f25d6fb21336f05ba0c060 Florian Munz surf@theflow.de