pulse_meter_core 0.4.13 → 0.5.0

data/README.md

@@ -38,3 +38,4 @@ Or install it yourself as:
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+

data/lib/pulse_meter/sensor/timeline.rb

@@ -1,4 +1,5 @@
 require 'securerandom'
+require 'pulse_meter/time_converter'
 
 module PulseMeter
   module Sensor
@@ -18,7 +19,9 @@ module PulseMeter
       #   @return [Fixnum] How long unsummarized raw data will be stored before expiration
       # @!attribute [r] reduce_delay
       #   @return [Fixnum] Delay between end of interval and summarization
-      attr_reader :interval, :ttl, :raw_data_ttl, :reduce_delay
+      # @!attribute [r] timezone
+      #   @return [String] TimeZone to which sensor data is related
+      attr_reader :interval, :ttl, :raw_data_ttl, :reduce_delay, :timezone
 
       # Default values for some sensor parameters
       DEFAULTS = {
@@ -32,11 +35,13 @@ module PulseMeter
       # @option options [Fixnum] :ttl How long summarized data will be stored before expiration
       # @option options [Fixnum] :raw_data_ttl How long unsummarized raw data will be stored before expiration
       # @option options [Fixnum] :reduce_delay Delay between end of interval and summarization
+      # @option options [String] :timezone TimeZone to which sensor data is related
       def initialize(name, options)
         @interval = assert_positive_integer!(options, :interval)
         @ttl = assert_positive_integer!(options, :ttl)
         @raw_data_ttl = assert_positive_integer!(options, :raw_data_ttl, DEFAULTS[:raw_data_ttl])
         @reduce_delay = assert_positive_integer!(options, :reduce_delay, DEFAULTS[:reduce_delay])
+        @timezone = options[:timezone]
         super
       end
 
@@ -54,7 +59,7 @@ module PulseMeter
       # @param value event value
       def event_at(time, value = nil)
         multi do
-          interval_id = get_interval_id(time)
+          interval_id = get_interval_id(time_to_redis(time))
           key = raw_data_key(interval_id)
           aggregate_event(key, value)
           command_aggregator.expire(key, raw_data_ttl)
@@ -82,7 +87,7 @@ module PulseMeter
       # @raise ArgumentError if argumets are not valid time objects
       def timeline_within(from, till, skip_optimization = false)
         raise ArgumentError unless from.kind_of?(Time) && till.kind_of?(Time)
-        start_time, end_time = from.to_i, till.to_i
+        start_time, end_time = time_to_redis(from.to_i), time_to_redis(till.to_i)
         actual_interval = optimized_interval(start_time, end_time, skip_optimization)
         start_interval_id = get_interval_id(start_time) + actual_interval
         ids, values = fetch_reduced_interval_data(start_interval_id, actual_interval, end_time)
@@ -108,7 +113,7 @@ module PulseMeter
       # @raise ArgumentError if argumets are not valid time objects
       def drop_within(from, till)
         raise ArgumentError unless from.kind_of?(Time) && till.kind_of?(Time)
-        start_time, end_time = from.to_i, till.to_i
+        start_time, end_time = time_to_redis(from.to_i), time_to_redis(till.to_i)
         current_interval_id = get_interval_id(start_time) + interval
         keys = []
         while current_interval_id < end_time
@@ -145,7 +150,7 @@ module PulseMeter
       # Returns current interval id
       # @return [Fixnum]
       def current_interval_id
-        get_interval_id(Time.now)
+        get_interval_id(time_to_redis(Time.now))
       end
 
       # @abstract Registeres event for current interval identified by key
@@ -180,7 +185,7 @@ module PulseMeter
 
       def sensor_data(interval_id, value)
         value = deflate(value) unless value.nil?
-        SensorData.new(Time.at(interval_id), value)
+        SensorData.new(Time.at(time_from_redis(interval_id)), value)
       end
 
       # Processes event
@@ -231,6 +236,18 @@ module PulseMeter
         end
         res
       end
+
+      def time_converter
+        @time_converter ||= PulseMeter::TimeConverter.new(@timezone)
+      end
+
+      def time_to_redis(time)
+        time_converter.to_redis(time)
+      end
+
+      def time_from_redis(time)
+        time_converter.from_redis(time)
+      end
     end
   end
 end

data/lib/pulse_meter/sensor/timeline_reduce.rb

@@ -30,7 +30,7 @@ module PulseMeter
 
       # Reduces data in all raw intervals
       def reduce_all_raw
-        time = Time.now
+        time = time_to_redis(Time.now)
         min_time = time - reduce_delay  - interval
         max_depth = time - reduce_delay - interval * MAX_INTERVALS
         ids = collect_ids_to_reduce(time, max_depth, min_time)
@@ -42,7 +42,7 @@ module PulseMeter
         while (time > time_from) # go backwards
           time -= interval
           interval_id = get_interval_id(time)
-          next if Time.at(interval_id) > time_to
+          next if interval_id > time_to
 
           reduced_key = data_key(interval_id)
           raw_key = raw_data_key(interval_id)

data/lib/pulse_meter/time_converter.rb

@@ -0,0 +1,26 @@
+require 'tzinfo'
+
+module PulseMeter
+  class TimeConverter
+    def initialize(timezone_name)
+      @tz = TZInfo::Timezone.get(timezone_name)
+    rescue TZInfo::InvalidTimezoneIdentifier
+      @tz = TZInfo::Timezone.get('UTC')
+    end
+
+    def to_redis(time)
+      tz_period.to_local(time.to_i).to_i
+    end
+
+    def from_redis(time)
+      tz_period.to_utc(time.to_i).to_i
+    end
+
+    private
+
+    def tz_period
+      @tz.period_for_utc(Time.now.utc)
+    end
+
+  end
+end

data/pulse_meter_core.gemspec

@@ -15,10 +15,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "pulse_meter_core"
   gem.require_paths = ["lib"]
-  gem.version       = "0.4.13"
+  gem.version       = "0.5.0"
 
-  gem.add_runtime_dependency('redis')
   gem.add_runtime_dependency('json')
+  gem.add_runtime_dependency('redis')
+  gem.add_runtime_dependency('tzinfo')
 
   gem.add_development_dependency('aquarium')
   gem.add_development_dependency('hashie')

data/spec/shared_examples/timeline_sensor.rb

@@ -10,7 +10,8 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
   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 || {}) }
+  let(:timezone){'Europe/Moscow'}
+  let(:good_init_values){ {:timezone => timezone, :ttl => ttl, :raw_data_ttl => raw_data_ttl, :interval => interval, :reduce_delay => reduce_delay}.merge(extra_init_values || {}) }
   let!(:sensor){ described_class.new(name, good_init_values) }
   let(:dummy) {Dummy.new}
   let(:base_class){ PulseMeter::Sensor::Base }
@@ -18,16 +19,22 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
   let(:sample_event) {default_event || 123}
 
   before(:each) do
-    @interval_id = (Time.now.to_i / interval) * interval
-    @prev_interval_id = (Time.now.to_i / interval) * interval - interval
+    @now = Time.now
+    tc = PulseMeter::TimeConverter.new(timezone)
+    
+    @redis_now = tc.to_redis(@now).to_i
+
+    @interval_id = (@redis_now / interval) * interval
+    @prev_interval_id = (@redis_now / interval) * interval - interval
 
     @raw_data_key = sensor.raw_data_key(@interval_id)
+  
     @prev_raw_data_key = sensor.raw_data_key(@prev_interval_id)
 
     @next_raw_data_key = sensor.raw_data_key(@interval_id + interval)
 
-    @start_of_interval = Time.at(@interval_id)
-    @start_of_prev_interval = Time.at(@prev_interval_id)
+    @start_of_interval = Time.at(tc.from_redis(@interval_id))
+    @start_of_prev_interval = Time.at(tc.from_redis(@prev_interval_id))
   end
 
   describe "#dump" do
@@ -66,7 +73,7 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
     it "should write data so that it totally expires after :raw_data_ttl" do
       key_count = redis.keys('*').count
       sensor.event(sample_event)
-      Timecop.freeze(Time.now + raw_data_ttl + 1) do
+      Timecop.freeze(@now + raw_data_ttl + 1) do
         redis.keys('*').count.should == key_count
       end
     end
@@ -90,7 +97,7 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
   end
 
   describe "#event_at" do
-    let(:now) {Time.now}
+    let(:now) {@now}
     it "should write events to redis" do
       expect{
           sensor.event_at(now, sample_event)
@@ -230,14 +237,14 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
   describe "#timeline_within" do
     it "should raise exception unless both arguments are Time objects" do
       [:q, nil, -1].each do |bad_value|
-        expect{ sensor.timeline_within(Time.now, bad_value) }.to raise_exception(ArgumentError)
-        expect{ sensor.timeline_within(bad_value, Time.now) }.to raise_exception(ArgumentError)
+        expect{ sensor.timeline_within(@now, bad_value) }.to raise_exception(ArgumentError)
+        expect{ sensor.timeline_within(bad_value, @now) }.to raise_exception(ArgumentError)
       end
     end
 
     it "should return an array of SensorData objects corresponding to stored data for passed interval" do
       sensor.event(sample_event)
-      now = Time.now
+      now = @now
       timeline = sensor.timeline_within(now - 1, now)
       timeline.should be_kind_of(Array)
       timeline.each{|i| i.should be_kind_of(SensorData) }
@@ -306,8 +313,8 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
     end
 
     it "should request timeline within interval from given number of seconds ago till now" do
-      Timecop.freeze do
-        now = Time.now
+      Timecop.freeze(@now) do
+        now = @now
         ago = interval * 100
         sensor.timeline(ago).should == sensor.timeline_within(now - ago, now)
       end
@@ -332,8 +339,8 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
   describe "#drop_within" do
     it "should raise exception unless both arguments are Time objects" do
       [:q, nil, -1].each do |bad_value|
-        expect{ sensor.drop_within(Time.now, bad_value) }.to raise_exception(ArgumentError)
-        expect{ sensor.drop_within(bad_value, Time.now) }.to raise_exception(ArgumentError)
+        expect{ sensor.drop_within(@now, bad_value) }.to raise_exception(ArgumentError)
+        expect{ sensor.drop_within(bad_value, @now) }.to raise_exception(ArgumentError)
       end
     end
 
@@ -399,7 +406,7 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
     def check_sensor_data(sensor, value)
       data = sensor.timeline(2).first
       data.value.should be_generally_equal(sensor.deflate_safe(value))
-      data.start_time.to_i.should == @interval_id
+      data.start_time.to_i.should == @start_of_interval.to_i
     end
 
     it "should contain summarized value stored by data_key for reduced intervals" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse_meter_core
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -29,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -239,6 +255,7 @@ files:
 - lib/pulse_meter/server/command_line_options.rb
 - lib/pulse_meter/server/config_options.rb
 - lib/pulse_meter/server/sensors.rb
+- lib/pulse_meter/time_converter.rb
 - lib/pulse_meter/udp_server.rb
 - lib/pulse_meter_core.rb
 - pulse_meter_core.gemspec
@@ -294,9 +311,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 887814886917484037
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23