metrify 0.2.3 → 0.2.4

data/app/helpers/metrify_helper.rb

@@ -19,9 +19,8 @@ module MetrifyHelper
     stat_over_time
   end
   
-  def sorted_stat_names
-    #sort alphabetically, begin with finish_date
-    @stat_names.sort.sort { |a,b| (a == "finish_date" ? 0 : 1) <=> (b == "finish_date" ? 0 : 1)}
+  def sorted_stat_names(metrify)
+    metrify.sort_stat_names(@stat_names)
   end
   
   def print_stat_value(stat, stat_name,  metrify, previous_stat = nil)

data/app/views/metrify/_chart.html.erb

@@ -7,7 +7,7 @@
   <thead> 
     <tr>
       <td>Finish Date</td>
-      <% sorted_stat_names.each do |s| %>
+      <% sorted_stat_names(@metrify).each do |s| %>
         <td>
           <%= link_to pretty_col_name(s, @metrify), :action => "graph_stats", :stat_names => s, :unit=>@unit %>
         </td>
@@ -18,7 +18,7 @@
     <% @historical_site_stats.each do |stat| %>
       <tr>
         <td><%= stat.finish_date %></td>
-        <% sorted_stat_names.each do |s| %>
+        <% sorted_stat_names(@metrify).each do |s| %>
           <% idx = @historical_site_stats.index(stat); last = @historical_site_stats.last == stat %>
         <td><%= print_stat_value(stat, s, @metrify, last ? nil : @historical_site_stats[idx+1]) %></td>
         <% end %>

data/lib/metrify.rb

@@ -74,6 +74,24 @@ module Metrify
       super
     end
     
+    def preferred_stat_order
+      metrify_data['stat_order']
+    end
+    
+    def sort_stat_names(stat_names)
+      puts "ERWKL:JHFDLKJHDFLKDSJ #{stat_names.to_yaml}"
+      if preferred_stat_order
+        final_list = []
+        preferred_stat_order.each do |o_stat|
+          final_list << o_stat if stat_names.include?(o_stat)
+        end
+        final_list
+      else
+        #sort alphabetically
+        stat_names.sort
+      end
+    end
+    
     def stat_names(my_filters = nil)
       #filters = ['type' => ['numbers', 'letters'], 'furriness' => ['furry', 'not_furry']]
       if my_filters

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metrify
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Stephen Abrams