Merge pull request #251 from sensu/issue_249

Issue 249 continued

Author: pzupan

app/models/extension.rb

@@ -177,13 +177,26 @@ def self.total_download_count
   def sorted_extension_versions
     # ignore preceding 'V' and ignore 'master' so it sorts to end
     # convert version to array of integers so 10.0.0 comes after 9.0.0
-    # TODO: temporary rescue for regex issue on postgres - plux sign not escaping properly
-    @sorted_extension_versions ||= 
-    begin
-      extension_versions.order(Arel.sql("STRING_TO_ARRAY( REGEXP_REPLACE(extension_versions.version, E'V|v|master|[\+]|-(.*)', ''), '.')::int[] DESC"))
-    rescue 
-      extension_versions.order(Arel.sql("STRING_TO_ARRAY(extension_versions.version, '.') DESC"))
-    end
+
+    # Hack for regex issue on postgres - plus sign not escaping properly
+    @sorted_extension_versions = extension_versions.order(Arel.sql(
+      "STRING_TO_ARRAY(
+        REGEXP_REPLACE(
+          REGEXP_REPLACE(
+            REGEXP_REPLACE(
+              extension_versions.version, 
+              E'[-](.*)', ''
+            ), 
+           E'[\+](.*)', ''
+          ),
+          E'V|v|master', ''
+         )
+      , '.')::bigint[] DESC "))
+
+    @sorted_extension_versions.limit(1).map(&:id) # executes query to test postgres regex
+    @sorted_extension_versions
+    rescue ActiveRecord::StatementInvalid => error
+      @sorted_extension_versions = extension_versions.order(Arel.sql("STRING_TO_ARRAY(extension_versions.version, '.') DESC"))
   end
 
   #

spec/models/extension_spec.rb

@@ -43,18 +43,23 @@
   end
 
   describe "sorted_extension_versions" do
-    let(:extension) { create(:extension, extension_versions_count: 4) }
-    let(:versions) { extension.extension_versions }
+    let(:extension) { create(:extension, extension_versions_count: 6) }
+    let(:versions ) { extension.extension_versions }
+    let(:sorted_versions) { extension.sorted_extension_versions }
+    
     it 'returns sorted versions' do
-      expect(versions.first.version).to be < versions.second.version
+      expect(sorted_versions.first.version).to be > sorted_versions.second.version
     end
     it 'sorts semvar versions with prerelease last' do
-      version_1 = versions.first.update(version: '0.0.1-1+jef.1')
-      version_2 = versions.second.update(version: '1.0.0-alpha+001')
-      version_3 = versions.third.update(version: '1.0.0-beta+exp.sha.5114f85')
-      version_4 = versions.fourth
-      versions.reload
-      expect(versions.first.version).to eq(version_4.version)
+      versions[0].update(version: '0.0.1-1+jef.1')
+      versions[1].update(version: '1.0.0-alpha+001')
+      versions[2].update(version: '1.0.0-beta+exp.sha.5114f85')
+      versions[3].update(version: '1.0.0+20130313144700')
+      versions[4].update(version: 'master')
+      version_5 = versions[5].version
+      sorted_versions.reload
+      puts sorted_versions.map(&:version) #{|v| v.version.gsub(/V|v|master|\+(.*)|-(.*)/, '')}
+      expect(sorted_versions.first.version).to eq(version_5)
     end
   end