Skip to content

Commit

Permalink
Merge branch 'andrew:show-version-created_at' to master
Browse files Browse the repository at this point in the history
closes: #1504
  • Loading branch information
sonalkr132 committed Dec 19, 2018
2 parents b68348c + bfcedd7 commit 7162152
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 28 deletions.
2 changes: 1 addition & 1 deletion app/helpers/pages_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def version

def subtitle
subtitle = "v#{version_number}"
subtitle += " - #{nice_date_for(version.built_at)}" if version.try(:built_at)
subtitle += " - #{nice_date_for(version.created_at)}"
subtitle
end
end
4 changes: 2 additions & 2 deletions app/models/rubygem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ def find_or_initialize_version_from_spec(spec)
version
end

def first_built_date
versions.by_earliest_built_at.limit(1).last.built_at
def first_created_date
versions.by_earliest_created_at.first.created_at
end

# returns days left before the reserved namespace will be released
Expand Down
12 changes: 4 additions & 8 deletions app/models/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,14 @@ def self.by_position
order(:position)
end

def self.by_built_at
order(built_at: :desc)
end

def self.by_earliest_built_at
order(built_at: :asc)
end

def self.by_created_at
order(created_at: :desc)
end

def self.by_earliest_created_at
order(created_at: :asc)
end

def self.rows_for_index
joins(:rubygem)
.indexed
Expand Down
2 changes: 1 addition & 1 deletion app/views/versions/_version.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<li class="gem__version-wrap">
<%= link_to version.number, rubygem_version_path(version.rubygem, version.slug), :class => 't-list__item' %>
<small class="gem__version__date">- <%= nice_date_for(version.built_at) %></small>
<small class="gem__version__date">- <%= nice_date_for(version.created_at) %></small>
<% if version.platformed? %>
<span class="gem__version__date platform"><%= version.platform %></span>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/versions/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<p><%= t('.not_hosted_notice') %></p>
</div>
<% else %>
<h3 class="t-list__heading"><%= t('.versions_since', :count => @versions.size, :since => nice_date_for(@rubygem.first_built_date)) %>:</h3>
<h3 class="t-list__heading"><%= t('.versions_since', :count => @versions.size, :since => nice_date_for(@rubygem.first_created_date)) %>:</h3>
<div class="versions">
<ul class="t-list__items">
<%= render @versions %>
Expand Down
2 changes: 1 addition & 1 deletion test/functional/rubygems_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class RubygemsControllerTest < ActionController::TestCase
should "render info about the gem" do
assert page.has_content?(@rubygem.name)
assert page.has_content?(@latest_version.number)
css = "small:contains('#{@latest_version.built_at.to_date.to_formatted_s(:long)}')"
css = "small:contains('#{@latest_version.created_at.to_date.to_formatted_s(:long)}')"
assert page.has_css?(css)
assert page.has_content?("Links")
end
Expand Down
2 changes: 1 addition & 1 deletion test/functional/versions_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class VersionsControllerTest < ActionController::TestCase
should "render other versions" do
assert page.has_content?("Versions")
assert page.has_content?(@version.number)
css = "small:contains('#{@version.built_at.to_date.to_formatted_s(:long)}')"
css = "small:contains('#{@version.created_at.to_date.to_formatted_s(:long)}')"
assert page.has_css?(css)
end
should "renders owner gems overview link" do
Expand Down
8 changes: 1 addition & 7 deletions test/unit/helpers/pages_helper_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,7 @@ class PagesHelperTest < ActionView::TestCase
end

should "return subtitle with release date and version number if both exist" do
assert_equal "v#{@version_last.number} - #{nice_date_for(@version_last.built_at)}", subtitle
end

should "return subtitle with release date and version number if built_at doesn't exist" do
@version_last.built_at = nil
@version_last.save
assert_equal "v#{@version_last.number}", subtitle
assert_equal "v#{@version_last.number} - #{nice_date_for(@version_last.created_at)}", subtitle
end
end
end
12 changes: 6 additions & 6 deletions test/unit/rubygem_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,14 @@ class RubygemTest < ActiveSupport::TestCase
assert_equal version3_ruby, @rubygem.versions.most_recent
end

should "can find when the first built date was" do
should "can find when the first created date was" do
travel_to Time.zone.now do
create(:version, rubygem: @rubygem, number: "3.0.0", built_at: 1.day.ago)
create(:version, rubygem: @rubygem, number: "2.0.0", built_at: 2.days.ago)
create(:version, rubygem: @rubygem, number: "1.0.0", built_at: 3.days.ago)
create(:version, rubygem: @rubygem, number: "1.0.0.beta", built_at: 4.days.ago)
create(:version, rubygem: @rubygem, number: "3.0.0", created_at: 1.day.ago)
create(:version, rubygem: @rubygem, number: "2.0.0", created_at: 2.days.ago)
create(:version, rubygem: @rubygem, number: "1.0.0", created_at: 3.days.ago)
create(:version, rubygem: @rubygem, number: "1.0.0.beta", created_at: 4.days.ago)

assert_equal 4.days.ago.to_date, @rubygem.first_built_date.to_date
assert_equal 4.days.ago.to_date, @rubygem.first_created_date.to_date
end
end

Expand Down

0 comments on commit 7162152

Please sign in to comment.