prosperity 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c4975bfb8d25cc3a99a70c519d741a20409030
-  data.tar.gz: 409c4ec232d033c74e29a07d067154a0fbc40054
+  metadata.gz: 008b05b3d6cff9ffbe1fa9e2f26bdea7ae259762
+  data.tar.gz: 54729633e2aa2675fca30a0dc3e793df28c62691
 SHA512:
-  metadata.gz: 05440b2f94e46093d8737b05649c18a0b62679cdf0464306d0693eabb48b1da7bdacaaf2a1419350c0c278032a6a2d3c95d3a45c4eb4007152a693270c20c55b
-  data.tar.gz: c2a87e6014004fbcb9b7982be91a60c7fa5f9e4709496de1e8b2c883e5a3911727da0dd2d6934f01e9ffadc9d970349b7e9607c6cb6403a4f4e55c1d3641526d
+  metadata.gz: 668d601aa27d60b1d8f61c3d12de2c0bc1e8ce7b70290504ba73832e130f6b7ccdd7caa25776aa38088504d7ab6ff3cd12c2934d8d0c16cfddb142d2265a246f
+  data.tar.gz: 9397bf4bce9520b944c6575565d98efb066932560784c4aa7f72c596b455ef3d5c7d042424bd04f116a3ee4a55e9d46dc6ff5a7b989e3524a91ab06820202fd0

data/app/controllers/prosperity/metrics_controller.rb

@@ -45,7 +45,8 @@ module Prosperity
         data: ext.to_a,
         key: ext.key,
         label: ext.label,
-        start_time: start_time.iso8601,
+        start_time: p.actual_start_time(start_time).iso8601,
+        end_time: p.actual_end_time(end_time).iso8601,
         period_milliseconds: p.duration * 1000
       }
       render json: json

data/lib/prosperity/period.rb

@@ -1,12 +1,20 @@
 module Prosperity
   class Period < Struct.new(:db_strf_str, :ruby_strf_str, :duration, :floor_date, :ceil_date)
     def each_period(start_time, end_time)
-      start_time = floor_date.call(start_time)
-      end_time = ceil_date.call(end_time) + 1
+      start_time = actual_start_time(start_time)
+      end_time = actual_end_time(end_time) + 1
       while start_time <= end_time
         yield start_time
         start_time += duration
       end
     end
+
+    def actual_start_time(start_time)
+      floor_date.call(start_time)
+    end
+
+    def actual_end_time(end_time)
+      ceil_date.call(end_time) + 1
+    end
   end
 end

data/lib/prosperity/version.rb

@@ -1,3 +1,3 @@
 module Prosperity
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/controllers/prosperity/metrics_controller_spec.rb

@@ -46,6 +46,14 @@ module Prosperity
         json['data'].should == [1,2,3]
       end
 
+      it "returns the actual start and end time" do
+        Extractors::Interval.any_instance.stub(to_a: [1,2,3])
+        get :data, id: metric.id, format: 'json'
+        response.should be_success
+        json['start_time'].should be_present
+        json['end_time'].should be_present
+      end
+
       it "lets you specify any extractor key" do
         Extractors::Total.any_instance.stub(to_a: [1,2,3])
 

data/spec/dummy/app/prosperity/ruby_users_metric.rb

@@ -0,0 +1,5 @@
+class RubyUsersMetric < Prosperity::Metric
+  value_at do |time, period, *|
+    User.where("users.created_at < ?", time).count
+  end
+end