tricle 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b642f05f1b01ca4cd31ea2686d60ef99e63d203a
-  data.tar.gz: c230338123cff716fa9951ec7a2973c059448df3
+  metadata.gz: c0460bda7f826c939acd97c2e0334932b9f0ea64
+  data.tar.gz: 2d54ea7afaa2b7de1d75f281a4a875ebf3096501
 SHA512:
-  metadata.gz: 2ca75aae8ba3b852f2983e4444ba970959586be2209c4dc08209c7a5a0b3910d97e6d0982a0251a7aa7bb7b259c8c886b0d9af8ff8d765a6b53b6ad069543a7b
-  data.tar.gz: 59a2a220783e513ee84e8d650d213779dbc16735bdbbd7920b386d926b0caa6ff232438989fdf5720410680f8680504ad1101aabe9f4e1ec8f98dc2f7b69c365
+  metadata.gz: 0578353886fe5153797d77ef3082e2e90a741812a0381fa1e14844d865a23ec967f3ccfc169032317cff2e8b9d073b86fdccf5950aefea051be67c6bb14b6e88
+  data.tar.gz: be52787ddabd878a279254dcee7e529b7f300cdcac285cbfb89a652ee85d87f21bcd0dfee2e6760cf454ebcefa1f8cfe1a7d2a5d04d830872a7e7a38663c0e7e

data/lib/tricle/aggregation.rb

@@ -25,7 +25,7 @@ module Tricle
     end
 
     def weekly_values(past_num_weeks)
-      weeks_range = 1..past_num_weeks
+      weeks_range = past_num_weeks.downto(1)
       weeks_range.map{|n| self.weeks_ago(n) }
     end
 

data/lib/tricle/templates/email.html.erb

@@ -15,29 +15,29 @@
           <tr>
             <th><!--Title--></th>
             <th>
-              <div>Last week</div>
-              <%= last_week_dates_cell %>
+              <div>Quarterly average</div>
+              <%= quarter_dates_cell %>
             </th>
             <th>
               <div>Previous week</div>
               <%= previous_week_dates_cell %>
             </th>
             <th>
-              <div>Quarterly average</div>
-              <%= quarter_dates_cell %>
+              <div>Last week</div>
+              <%= last_week_dates_cell %>
             </th>
           </tr>
           <% section.metrics.each do |metric| %>
             <tr>
               <th class="metric-title" rowspan="2"><%= metric.title %></th>
+              <%= percent_change_cell(metric.last_week, metric.week_average_this_quarter, metric.better) %>
+              <%= percent_change_cell(metric.last_week, metric.weeks_ago(2), metric.better) %>
               <td>
                 <div><%= format_number(metric.last_week) %></div>
                 <% if metric.total? %>
                   <div><%= format_number(metric.total) %> (total)</div>
                 <% end %>
               </td>
-              <%= percent_change_cell(metric.last_week, metric.weeks_ago(2), metric.better) %>
-              <%= percent_change_cell(metric.last_week, metric.week_average_this_quarter, metric.better) %>
             </tr>
             <tr>
               <td colspan="3">

data/lib/tricle/version.rb

@@ -1,3 +1,3 @@
 module Tricle
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/unit/aggregation_spec.rb

@@ -32,6 +32,13 @@ describe Tricle::Aggregation do
     end
   end
 
+  describe '#weekly_values' do
+    it "should return the values by week ascending" do
+      expect(metric).to receive(:weeks_ago) {|n| n }.exactly(5).times
+      expect(metric.weekly_values(5)).to eq([5,4,3,2,1])
+    end
+  end
+
   describe '#week_average_this_quarter' do
     it "should average the values provided by #size_for_range" do
       expect(metric).to receive(:size_for_range).exactly(13).times.and_return(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tricle
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Aidan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer