rhcf-timeseries 0.0.6 → 1.0.0

data/spec/lib/rhcf/timeseries/redis_get_strategy_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'redis'
+require 'rhcf/timeseries/manager'
+
+describe Rhcf::Timeseries::RedisGetStrategy do
+  it_behaves_like 'a valid strategy'
+end

data/spec/lib/rhcf/timeseries/redis_hgetall_strategy_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'redis'
+require 'rhcf/timeseries/manager'
+
+describe Rhcf::Timeseries::RedisHgetallStrategy do
+  it_behaves_like 'a valid strategy'
+end

data/spec/lib/rhcf/timeseries/redis_mget_lua_strategy_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'redis'
+require 'rhcf/timeseries/manager'
+
+describe Rhcf::Timeseries::RedisMgetLuaStrategy do
+  it_behaves_like 'a valid strategy'
+end

data/spec/lib/rhcf/timeseries/redis_mget_strategy_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'redis'
+require 'rhcf/timeseries/manager'
+
+describe Rhcf::Timeseries::RedisMgetStrategy do
+  it_behaves_like 'a valid strategy'
+end

data/spec/spec_helper.rb

@@ -4,8 +4,7 @@
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-#require 'simplecov'
-#SimpleCov.start_with?
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f}
 require 'timecop'
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

data/spec/support/database_cleaner.rb

@@ -0,0 +1,14 @@
+require 'database_cleaner'
+RSpec.configure do |config|
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+  end
+end

data/spec/support/simplecov.rb

@@ -0,0 +1,2 @@
+require 'simplecov'
+SimpleCov.start

data/spec/support/valid_strategy_spec.rb

@@ -0,0 +1,119 @@
+require 'redis'
+require 'rhcf/timeseries/manager'
+RSpec.shared_examples 'a valid strategy' do
+  let(:redis){Redis.new}
+  let(:manager) { Rhcf::Timeseries::Manager.new(connection: redis, strategy: described_class) }
+  let(:start_time){  Time.parse("2000-01-01 00:00:00") }
+
+  before do
+    Timecop.travel(start_time)
+    manager.store("views/product/15", {"web/firefox/3" => 1})
+
+    Timecop.travel(15.minutes) #00:00:15
+    manager.store("views/product/13", {"web/firefox/3" => 1}, Time.now)
+    manager.store("views/product/13", {"web/firefox/3" => 1}, Time.now)
+    manager.store("views/product/13", {"web/firefox/3" => 0}, Time.now)
+
+    Timecop.travel(15.minutes) #00:00:30
+    manager.store("views/product/15", {"web/ie/6" => 3})
+
+    Timecop.travel(15.minutes) #00:00:45
+    manager.store("views/product/15", {"web/ie/6" => 2})
+
+    Timecop.travel(15.minutes) #00:00:00
+    manager.store("views/product/11", {"web/ie/5" => 2})
+
+    Timecop.travel(15.minutes) #00:00:15
+    manager.store("views/product/11", {"web/chrome/11"=> 4})
+
+    Timecop.travel(15.minutes) #00:00:30
+    manager.store("views/product/11", {"web/chrome/11"=> 2})
+  end
+
+  it "is similar to redistat" do
+
+    expect(manager.find("views/product", start_time, start_time + 55.minutes).total(:ever)).to  eq({
+      "web" => 16.0,
+      "web/chrome" => 6.0,
+      "web/chrome/11" => 6.0,
+      "web/firefox" => 3.0,
+      "web/firefox/3" => 3.0,
+      "web/ie" => 7.0,
+      "web/ie/5" => 2.0,
+      "web/ie/6" => 5.0
+    })
+
+    expect(manager.find("views/product", start_time, start_time + 55.minutes).total(:year)).to eq({
+      "web" => 16.0,
+      "web/chrome" => 6.0,
+      "web/chrome/11" => 6.0,
+      "web/firefox" => 3.0,
+      "web/firefox/3" => 3.0,
+      "web/ie" => 7.0,
+      "web/ie/5" => 2.0,
+      "web/ie/6" => 5.0
+    })
+
+    expect( manager.find("views/product", start_time, start_time + 55.minutes).total ).to eq({
+      'web' => 8,
+      'web/firefox' => 3,
+      'web/firefox/3' => 3,
+      'web/ie' => 5,
+      'web/ie/6' => 5,
+    })
+
+    expect(manager.find("views/product/15", start_time, start_time + 55.minutes).points(:minute)).to eq([
+      {:moment=>"2000-01-01T00:00", :values=>{"web/firefox"=>1, "web/firefox/3"=>1, "web"=>1}},
+      {:moment=>"2000-01-01T00:30", :values=>{"web"=>3, "web/ie/6"=>3, "web/ie"=>3}},
+      {:moment=>"2000-01-01T00:45", :values=>{"web"=>2, "web/ie/6"=>2, "web/ie"=>2}}
+    ])
+
+    expect(manager.find("views/product/13", start_time, start_time + 55.minutes).points(:minute)).to eq([
+      {:moment=>"2000-01-01T00:15", :values=>{"web/firefox"=>2, "web/firefox/3"=>2, "web"=>2}},
+    ])
+
+    expect(manager.find("views/product", start_time, start_time + 55.minutes).points(:minute)).to eq([
+      {:moment=>"2000-01-01T00:00", :values=>{"web/firefox"=>1, "web/firefox/3"=>1, "web"=>1}},
+      {:moment=>"2000-01-01T00:15", :values=>{"web/firefox"=>2, "web/firefox/3"=>2, "web"=>2}},
+      {:moment=>"2000-01-01T00:30", :values=>{"web"=>3, "web/ie/6"=>3, "web/ie"=>3}},
+      {:moment=>"2000-01-01T00:45", :values=>{"web"=>2, "web/ie/6"=>2, "web/ie"=>2}}
+    ])
+
+    expect(manager.find("views", start_time, start_time + 55.minutes).points(:minute)).to eq([
+      {:moment=>"2000-01-01T00:00", :values=>{"web/firefox"=>1, "web/firefox/3"=>1, "web"=>1}},
+      {:moment=>"2000-01-01T00:15", :values=>{"web/firefox"=>2, "web/firefox/3"=>2, "web"=>2}},
+      {:moment=>"2000-01-01T00:30", :values=>{"web"=>3, "web/ie/6"=>3, "web/ie"=>3}},
+      {:moment=>"2000-01-01T00:45", :values=>{"web"=>2, "web/ie/6"=>2, "web/ie"=>2}}
+    ])
+
+    expect(manager.find("views", start_time).points(:hour)).to eq([
+      {
+        :moment=>"2000-01-01T00",
+        :values=> {
+          "web/ie"=>5.0,
+          "web"=>8.0,
+          "web/firefox"=>3.0,
+          "web/ie/6"=>5.0,
+          "web/firefox/3"=>3.0}
+      },{
+        :moment=>"2000-01-01T01",
+        :values=>{
+          "web/ie"=>2.0,
+          "web/chrome"=>6.0,
+          "web/chrome/11"=>6.0,
+          "web"=>8.0,
+          "web/ie/5"=>2.0
+        }
+      }
+    ])
+  end
+
+  let(:filter) { Rhcf::Timeseries::Filter.new([:source, :browser], browser: 'firefox.*' )}
+  it "can find with filter" do
+
+    expect(manager.find("views", start_time, start_time + 55.minutes, filter).points(:minute)).to eq([
+      {:moment=>"2000-01-01T00:00", :values=>{"web/firefox"=>1, "web/firefox/3"=>1}},
+      {:moment=>"2000-01-01T00:15", :values=>{"web/firefox"=>2, "web/firefox/3"=>2}},
+    ])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhcf-timeseries
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Romeu Fonseca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem to allow your system to keep record of time series on rhcf
 email:
 - romeu.hcf@gmail.com
@@ -110,14 +138,25 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/rhcf/extensions/fixnum.rb
 - lib/rhcf/timeseries.rb
-- lib/rhcf/timeseries/redis.rb
+- lib/rhcf/timeseries/constants.rb
+- lib/rhcf/timeseries/manager.rb
+- lib/rhcf/timeseries/query.rb
+- lib/rhcf/timeseries/redis_strategies.rb
 - lib/rhcf/timeseries/version.rb
 - rhcf-timeseries.gemspec
 - spec/lib/rhcf/timeseries/TODO
-- spec/lib/rhcf/timeseries/redis_spec.rb
-- spec/lib/rhcf/timeseries/result_spec.rb
+- spec/lib/rhcf/timeseries/manager_spec.rb
+- spec/lib/rhcf/timeseries/query_spec.rb
+- spec/lib/rhcf/timeseries/redis_get_strategy_spec.rb
+- spec/lib/rhcf/timeseries/redis_hgetall_strategy_spec.rb
+- spec/lib/rhcf/timeseries/redis_mget_lua_strategy_spec.rb
+- spec/lib/rhcf/timeseries/redis_mget_strategy_spec.rb
 - spec/spec_helper.rb
+- spec/support/database_cleaner.rb
+- spec/support/simplecov.rb
+- spec/support/valid_strategy_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -144,6 +183,13 @@ specification_version: 4
 summary: Redistat inspired redis time series.
 test_files:
 - spec/lib/rhcf/timeseries/TODO
-- spec/lib/rhcf/timeseries/redis_spec.rb
-- spec/lib/rhcf/timeseries/result_spec.rb
+- spec/lib/rhcf/timeseries/manager_spec.rb
+- spec/lib/rhcf/timeseries/query_spec.rb
+- spec/lib/rhcf/timeseries/redis_get_strategy_spec.rb
+- spec/lib/rhcf/timeseries/redis_hgetall_strategy_spec.rb
+- spec/lib/rhcf/timeseries/redis_mget_lua_strategy_spec.rb
+- spec/lib/rhcf/timeseries/redis_mget_strategy_spec.rb
 - spec/spec_helper.rb
+- spec/support/database_cleaner.rb
+- spec/support/simplecov.rb
+- spec/support/valid_strategy_spec.rb

data/lib/rhcf/timeseries/redis.rb

@@ -1,269 +0,0 @@
-require 'date'
-
-class Fixnum
-  def minutes
-    self * 60
-  end
-
-  def hours
-    self.minutes * 60
-  end
-
-  def days
-    self.hours * 24
-  end
-
-  def seconds
-    self
-  end
-
-  def weeks
-    self.days * 7
-  end
-
-  def years
-    self.days * 365
-  end
-
-  alias_method :day, :days
-  alias_method :week, :weeks
-  alias_method :hour, :hours
-  alias_method :second, :seconds
-  alias_method :minute, :minutes
-  alias_method :year, :years
-end
-
-class NilLogger
-  def log(*args)
-
-  end
-
-  alias_method :warn, :log
-  alias_method :debug, :log
-  alias_method :info, :log
-  alias_method :error, :log
-end
-
-module Rhcf
-  module Timeseries
-
-    class Result
-      def initialize(subject, from, to, series)
-        if from > to
-          fail ArgumentError, "Argument 'from' can not be bigger then 'to'"
-        end
-        @series = series
-        @subject = subject
-        @from = from
-        @to = to
-      end
-
-      def total(resolution_id=nil)
-        accumulator={}
-        points(resolution_id || better_resolution[:id]) do |data|
-          data[:values].each do |key, value|
-            accumulator[key]||=0
-            accumulator[key]+=value
-          end
-        end
-        accumulator
-      end
-
-      def points(resolution_id)
-        list =[]
-
-        point_range(resolution_id) do |point|
-          values = {}
-
-          @series.events_for_subject_on(@subject, point, resolution_id).each do |event|
-            value = @series.get('point', @subject, event, resolution_id, point)
-            values[event] = value.to_i
-          end
-
-          next if values.empty?
-          data =  {moment: point, values: values }
-          if block_given?
-            yield data
-          else
-            list << data
-          end
-        end
-        list unless block_given?
-      end
-
-      def point_range(resolution_id)
-        resolution = @series.resolution(resolution_id)
-        span = resolution[:span]
-        ptr = @from.dup
-        while ptr < @to
-          point = @series.resolution_value_at(ptr, resolution_id)
-          yield point
-          ptr += span.to_i
-        end
-      rescue FloatDomainError
-        # OK
-      end
-
-      def better_resolution
-        span = @to.to_time - @from.to_time
-
-        resolutions = @series.resolutions.sort_by{|h| h[:span]}.reverse
-        5.downto(1) do |div|
-          res = resolutions.find{|r| r[:span] < span / div }
-          return res if res
-        end
-        return nil
-      end
-    end
-
-
-    class Redis
-
-      RESOLUTIONS_MAP={
-        :ever => {span:Float::INFINITY, formatter: "ever", ttl: (2 * 366).days},
-        :year => {span: 365.days,formatter: "%Y", ttl: (2 * 366).days},
-        :week => {span: 1.week, formatter: "%Y-CW%w", ttl: 90.days},
-        :month => {span: 30.days, formatter: "%Y-%m", ttl: 366.days},
-        :day => {span: 1.day, formatter: "%Y-%m-%d", ttl: 30.days},
-        :hour => {span: 1.hour, formatter: "%Y-%m-%dT%H", ttl: 24.hours},
-        :minute => {span: 1.minute, formatter: "%Y-%m-%dT%H:%M", ttl: 120.minutes},
-        :second => {span: 1, formatter: "%Y-%m-%dT%H:%M:%S", ttl: 1.hour},
-        :"5seconds" => {span: 5.seconds, formatter: ->(time){ [time.strftime("%Y-%m-%dT%H:%M:") ,  time.to_i % 60/5, '*',5].join('') }, ttl: 1.hour},
-        :"5minutes" => {span: 5.minutes, formatter: ->(time){ [time.strftime("%Y-%m-%dT%H:") ,  (time.to_i/60) % 60/5, '*',5].join('') }, ttl: 3.hour},
-        :"15minutes" => {span: 15.minutes, formatter: ->(time){ [time.strftime("%Y-%m-%dT%H:") ,  (time.to_i/60) % 60/15, '*',15].join('') }, ttl: 24.hours}
-
-      }
-      DEFAULT_RESOLUTIONS = RESOLUTIONS_MAP.keys
-      NAMESPACE_SEPARATOR = '|'
-
-      attr_reader :logger
-
-      def initialize(logger, redis,  options = {})
-        @resolution_ids = options[:resolutions] || DEFAULT_RESOLUTIONS
-        @prefix = options[:prefix] || self.class.name
-        @logger = logger || NilLogger.new
-        @connection_to_use = redis
-      end
-
-      def on_connection(conn)
-        old_connection = @connection_to_use
-        @connection_to_use = conn
-        yield self
-        @connection_to_use = old_connection
-      end
-
-      def redis_connection_to_use
-        @connection_to_use || fail("No redis connection given")
-      end
-
-      def store(subject, event_point_hash, moment = Time.now, descend_subject = true, descend_event = true)
-        resolutions = resolutions_of(moment)
-
-        descend(subject, descend_subject) do |subject_path|
-          event_point_hash.each do |event, point_value|
-            descend(event, descend_event) do |event_path|
-              resolutions.each do |res|
-                resolution_name, resolution_value = *res
-                store_point_value(subject_path, event_path, resolution_name, resolution_value, point_value)
-              end
-            end
-          end
-        end
-      end
-
-      def resolutions_of(moment)
-        @resolution_ids.collect do |res_id|
-          [res_id, resolution_value_at(moment, res_id)]
-        end
-      end
-
-      def resolution_value_at(moment, res_id)
-        res_config = RESOLUTIONS_MAP[res_id]
-        if res_config.nil?
-          fail "No resolution config for id: #{res_id.class}:#{res_id}"
-        end
-
-        time_resolution_formater = res_config[:formatter]
-        case time_resolution_formater
-        when String
-          moment.strftime(time_resolution_formater)
-        when Proc
-          time_resolution_formater.call(moment)
-        else
-          fail ArgumentError, "Unexpected moment formater type #{time_resolution_formater.class}"
-        end
-      end
-
-      def descend(path, do_descend = true , &block)
-        return if path.empty? or path == "."
-        block.call(path)
-        descend(File.dirname(path), do_descend, &block) if do_descend
-      end
-
-      def store_point_event( resolution_name, resolution_value, subject_path, event_path)
-        key = [@prefix, 'event_set', resolution_name, resolution_value, subject_path].join(NAMESPACE_SEPARATOR)
-        logger.debug("EVENTSET SADD #{key} -> #{event_path}")
-        redis_connection_to_use.sadd(key, event_path)
-      end
-
-      def store_point_value( subject_path, event_path, resolution_name, resolution_value, point_value)
-        store_point_event(resolution_name, resolution_value, subject_path, event_path)
-
-        key = [@prefix, 'point' ,subject_path, event_path, resolution_name, resolution_value].join(NAMESPACE_SEPARATOR)
-        logger.debug("SETTING KEY #{key}")
-        redis_connection_to_use.incrby(key, point_value)
-        redis_connection_to_use.expire(key, RESOLUTIONS_MAP[resolution_name][:ttl])
-      end
-
-      def find(subject, from, to = Time.now)
-        Rhcf::Timeseries::Result.new(subject, from, to, self)
-      end
-
-      def flush!
-        every_key{|a_key| delete_key(a_key)}
-      end
-
-      def every_key(pattern=nil, &block)
-        pattern = [@prefix, pattern,'*'].compact.join(NAMESPACE_SEPARATOR)
-        redis_connection_to_use.keys(pattern).each do |key|
-          yield key
-        end
-      end
-
-      def delete_key(a_key)
-        logger.debug("DELETING KEY #{a_key}")
-        redis_connection_to_use.del(a_key)
-      end
-
-      def keys(*a_key)
-        fail "GIVEUP"
-        a_key = [@prefix, a_key].flatten.join(NAMESPACE_SEPARATOR)
-        logger.debug("FINDING KEY #{a_key}")
-        redis_connection_to_use.keys(a_key).collect{|k| k.split(NAMESPACE_SEPARATOR)[1,1000].join(NAMESPACE_SEPARATOR) }
-      end
-
-      def get(*a_key)
-        a_key = [@prefix, a_key].flatten.join(NAMESPACE_SEPARATOR)
-        logger.debug("GETTING KEY #{a_key}")
-        redis_connection_to_use.get(a_key)
-      end
-
-
-      def resolution(id)
-        res = RESOLUTIONS_MAP[id]
-        fail ArgumentError, "Invalid resolution name #{id} for this time series" if res.nil?
-        res.merge(:id => id)
-      end
-
-      def resolutions
-        @_resolutions ||= @resolution_ids.map { |id| resolution(id) }
-      end
-
-      def events_for_subject_on(subject, point, resolution_id)
-        key = [@prefix, 'event_set', resolution_id, point, subject].join(NAMESPACE_SEPARATOR)
-        logger.debug("EVENTSET SMEMBERS #{key}")
-        redis_connection_to_use.smembers(key)
-      end
-    end
-  end
-end