From 932883f3cabe5db60b133eb08140de3c820ce9e0 Mon Sep 17 00:00:00 2001
From: Diego Araújo <diegoamc90@gmail.com>
Date: Wed, 1 Apr 2015 16:45:18 -0300
Subject: [PATCH] ModuleResult ordering done through Granularity built-in comparisons

---
 Gemfile.lock                          | 2 +-
 app/helpers/kalibro_modules_helper.rb | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b2a14d9..979db6b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -149,7 +149,7 @@ GEM
     jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
     json (1.8.2)
-    kalibro_client (0.0.3)
+    kalibro_client (0.1.0)
       activesupport (>= 2.2.1)
       faraday_middleware (~> 0.9.0)
     konacha (3.3.0)
diff --git a/app/helpers/kalibro_modules_helper.rb b/app/helpers/kalibro_modules_helper.rb
index 45fe71c..559ba96 100644
--- a/app/helpers/kalibro_modules_helper.rb
+++ b/app/helpers/kalibro_modules_helper.rb
@@ -1,7 +1,11 @@
 module KalibroModulesHelper
   def sort_by_granularity_and_name(module_results)
-    module_results.sort do |a,b|
-      (a.kalibro_module.granularity == b.kalibro_module.granularity) ? a.kalibro_module.name <=> b.kalibro_module.name : -a.kalibro_module.granularity.length <=> -b.kalibro_module.granularity.length
+    module_results.sort! do |a,b|
+      if (a.kalibro_module.granularity == b.kalibro_module.granularity)
+        a.kalibro_module.name <=> b.kalibro_module.name
+      else
+        (KalibroClient::Entities::Miscellaneous::Granularity.new(b.kalibro_module.granularity.to_sym) <=> KalibroClient::Entities::Miscellaneous::Granularity.new(a.kalibro_module.granularity.to_sym))
+      end
     end
   end
 end
\ No newline at end of file
--
libgit2 0.21.2