Merge pull request #6500 from tsigo/natural-tag-sorting

Natural version sorting

Merge pull request #6500 from tsigo/natural-tag-sorting
Natural version sorting
Dmitriy Zaporozhets
2 parents 0142aa5a efd860d1
Showing 4 changed files with 44 additions and 4 deletions Show diff stats
Gemfile
Gemfile.lock
app/helpers/application_helper.rb
spec/helpers/application_helper_spec.rb
@@ -114,6 +114,7 @@ gem &#39;settingslogic&#39;
 # Misc
 gem "foreman"
+gem 'version_sorter'
 # Cache
 gem "redis-rails"
@@ -537,6 +537,7 @@ GEM
       raindrops (~> 0.7)
     unicorn-worker-killer (0.4.2)
       unicorn (~> 4)
+    version_sorter (1.1.0)
     virtus (1.0.1)
       axiom-types (~> 0.0.5)
       coercible (~> 1.0)
@@ -662,4 +663,5 @@ DEPENDENCIES
   underscore-rails (~> 1.4.4)
   unicorn (~> 4.6.3)
   unicorn-worker-killer
+  version_sorter
   webmock
@@ -89,16 +89,15 @@ module ApplicationHelper
     "Never"
   end
-  def grouped_options_refs(destination = :tree)
+  def grouped_options_refs
     repository = @project.repository
     options = [
       ["Branches", repository.branch_names],
-      ["Tags", repository.tag_names]
+      ["Tags", VersionSorter.rsort(repository.tag_names)]
     ]
-    # If reference is commit id -
-    # we should add it to branch/tag selectbox
+    # If reference is commit id - we should add it to branch/tag selectbox
     if(@ref && !options.flatten.include?(@ref) &&
        @ref =~ /^[0-9a-zA-Z]{6,52}$/)
       options << ["Commit", [@ref]]
@@ -116,7 +116,45 @@ describe ApplicationHelper do
       allow(self).to receive(:request).and_return(double(:ssl? => false))
       gravatar_icon(user_email).should == gravatar_icon(user_email.upcase + " ")
     end
+  end
+
+  describe "grouped_options_refs" do
+    # Override Rails' grouped_options_for_select helper since HTML is harder to work with
+    def grouped_options_for_select(options, *args)
+      options
+    end
+
+    let(:options) { grouped_options_refs }
+
+    before do
+      # Must be an instance variable
+      @project = create(:project)
+    end
+
+    it "includes a list of branch names" do
+      options[0][0].should == 'Branches'
+      options[0][1].should include('master', 'stable')
+    end
+
+    it "includes a list of tag names" do
+      options[1][0].should == 'Tags'
+      options[1][1].should include('v0.9.4','v1.2.0')
+    end
+
+    it "includes a specific commit ref if defined" do
+      # Must be an instance variable
+      @ref = '2ed06dc41dbb5936af845b87d79e05bbf24c73b8'
+      options[2][0].should == 'Commit'
+      options[2][1].should == [@ref]
+    end
+
+    it "sorts tags in a natural order" do
+      # Stub repository.tag_names to make sure we get some valid testing data
+      expect(@project.repository).to receive(:tag_names).and_return(["v1.0.9", "v1.0.10", "v2.0", "v3.1.4.2", "v1.0.9a"])
+
+      options[1][1].should == ["v3.1.4.2", "v2.0", "v1.0.10", "v1.0.9a", "v1.0.9"]
+    end
   end
   describe "user_color_scheme_class" do
	@@ -114,6 +114,7 @@ gem 'settingslogic'		@@ -114,6 +114,7 @@ gem 'settingslogic'
114		114
115	# Misc	115	# Misc
116	gem "foreman"	116	gem "foreman"
		117	+gem 'version_sorter'
117		118
118	# Cache	119	# Cache
119	gem "redis-rails"	120	gem "redis-rails"
	@@ -537,6 +537,7 @@ GEM		@@ -537,6 +537,7 @@ GEM
537	raindrops (~> 0.7)	537	raindrops (~> 0.7)
538	unicorn-worker-killer (0.4.2)	538	unicorn-worker-killer (0.4.2)
539	unicorn (~> 4)	539	unicorn (~> 4)
		540	+ version_sorter (1.1.0)
540	virtus (1.0.1)	541	virtus (1.0.1)
541	axiom-types (~> 0.0.5)	542	axiom-types (~> 0.0.5)
542	coercible (~> 1.0)	543	coercible (~> 1.0)
	@@ -662,4 +663,5 @@ DEPENDENCIES		@@ -662,4 +663,5 @@ DEPENDENCIES
662	underscore-rails (~> 1.4.4)	663	underscore-rails (~> 1.4.4)
663	unicorn (~> 4.6.3)	664	unicorn (~> 4.6.3)
664	unicorn-worker-killer	665	unicorn-worker-killer
		666	+ version_sorter
665	webmock	667	webmock
	@@ -116,7 +116,45 @@ describe ApplicationHelper do		@@ -116,7 +116,45 @@ describe ApplicationHelper do
116	allow(self).to receive(:request).and_return(double(:ssl? => false))	116	allow(self).to receive(:request).and_return(double(:ssl? => false))
117	gravatar_icon(user_email).should == gravatar_icon(user_email.upcase + " ")	117	gravatar_icon(user_email).should == gravatar_icon(user_email.upcase + " ")
118	end	118	end
		119	+ end
		120	+
		121	+ describe "grouped_options_refs" do
		122	+ # Override Rails' grouped_options_for_select helper since HTML is harder to work with
		123	+ def grouped_options_for_select(options, *args)
		124	+ options
		125	+ end
		126	+
		127	+ let(:options) { grouped_options_refs }
		128	+
		129	+ before do
		130	+ # Must be an instance variable
		131	+ @project = create(:project)
		132	+ end
		133	+
		134	+ it "includes a list of branch names" do
		135	+ options[0][0].should == 'Branches'
		136	+ options[0][1].should include('master', 'stable')
		137	+ end
		138	+
		139	+ it "includes a list of tag names" do
		140	+ options[1][0].should == 'Tags'
		141	+ options[1][1].should include('v0.9.4','v1.2.0')
		142	+ end
		143	+
		144	+ it "includes a specific commit ref if defined" do
		145	+ # Must be an instance variable
		146	+ @ref = '2ed06dc41dbb5936af845b87d79e05bbf24c73b8'
119		147
		148	+ options[2][0].should == 'Commit'
		149	+ options[2][1].should == [@ref]
		150	+ end
		151	+
		152	+ it "sorts tags in a natural order" do
		153	+ # Stub repository.tag_names to make sure we get some valid testing data
		154	+ expect(@project.repository).to receive(:tag_names).and_return(["v1.0.9", "v1.0.10", "v2.0", "v3.1.4.2", "v1.0.9a"])
		155	+
		156	+ options[1][1].should == ["v3.1.4.2", "v2.0", "v1.0.10", "v1.0.9a", "v1.0.9"]
		157	+ end
120	end	158	end
121		159
122	describe "user_color_scheme_class" do	160	describe "user_color_scheme_class" do