pulse-meter 0.3.0 → 0.3.1

data/lib/pulse-meter/sensor/timeline.rb

@@ -8,6 +8,7 @@ module PulseMeter
       include PulseMeter::Mixins::Utils
 
       MAX_TIMESPAN_POINTS = 1000
+      MAX_INTERVALS = 100
 
       # @!attribute [r] interval
       #   @return [Fixnum] Rotation interval
@@ -82,12 +83,21 @@ module PulseMeter
 
       # Reduces data in all raw interval
       def reduce_all_raw
-        min_time = Time.now - reduce_delay - interval
-        redis.keys(raw_data_key('*')).each do |key|
-          interval_id = key.split(':').last
-          next if Time.at(interval_id.to_i) > min_time
-          reduce(interval_id)
+        time = Time.now
+        min_time = time - reduce_delay  - interval
+        max_depth = time - reduce_delay - interval * MAX_INTERVALS
+        ids = []
+        while (time > max_depth)
+          time -= interval
+          interval_id = get_interval_id(time)
+          next if Time.at(interval_id) > min_time
+
+          reduced_key = data_key(interval_id)
+          raw_key = raw_data_key(interval_id)
+          break if redis.exists(reduced_key)
+          ids << interval_id
         end
+        ids.reverse.each {|id| reduce(id)}
       end
 
       def self.reduce_all_raw

data/lib/pulse-meter/version.rb

@@ -1,3 +1,3 @@
 module PulseMeter
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/shared_examples/timeline_sensor.rb

@@ -6,8 +6,8 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
   end
 
   let(:name){ :some_value_with_history }
-  let(:ttl){ 100 }
-  let(:raw_data_ttl){ 30 }
+  let(:ttl){ 10000 }
+  let(:raw_data_ttl){ 3000 }
   let(:interval){ 5 }
   let(:reduce_delay){ 3 }
   let(:good_init_values){ {:ttl => ttl, :raw_data_ttl => raw_data_ttl, :interval => interval, :reduce_delay => reduce_delay}.merge(extra_init_values || {}) }
@@ -179,13 +179,29 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
       Timecop.freeze(@start_of_interval + interval){ sensor.event(sample_event) }
       val1 = sensor.summarize(@next_raw_data_key)
       expect{
-        Timecop.freeze(@start_of_interval + interval + interval + reduce_delay + 1) { sensor.reduce_all_raw }
+        Timecop.freeze(@start_of_interval + interval + interval + reduce_delay + 1) do
+          sensor.reduce_all_raw
+        end
       }.to change{ redis.keys(sensor.raw_data_key('*')).count }.from(2).to(0)
 
       redis.get(sensor.data_key(@interval_id)).should == val0.to_s
       redis.get(sensor.data_key(@interval_id + interval)).should == val1.to_s
     end
 
+    it "creates up to MAX_INTERVALS compresed data pieces from previously uncompressed data" do
+      max_count = described_class::MAX_INTERVALS
+      start = @start_of_interval - reduce_delay - max_count * interval
+      (max_count + 100).times do |i|
+        Timecop.freeze(start + i * interval) {sensor.event(sample_event)}
+      end
+
+      Timecop.freeze(@start_of_interval) do
+        expect {
+          sensor.reduce_all_raw
+        }.to change {redis.keys(sensor.data_key('*')).count}.from(0).to(max_count)
+      end
+    end
+
     it "should not reduce fresh data" do
       Timecop.freeze(@start_of_interval){ sensor.event(sample_event) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gon-sinatra
@@ -585,9 +585,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2422587240922148030
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23