timed-rediscounter 1.0.0 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abc6230c879819d52482f8d11b8a7a88b8b5f4a9
-  data.tar.gz: e9b4a4336ba02e1062f6ababd6f1fe1760a0a8bb
+  metadata.gz: 4a7b99e435001e68df58db161216416c209fb6dd
+  data.tar.gz: 5abc20bda6f7363fe184041e60c7a2d0015d2ac3
 SHA512:
-  metadata.gz: 777ccd32facd6d3028b8355c6d3011a3fbbed8dd541f5254ecdea9f1c37c28aa57da72fc3ff2a0b1100a2a62b215f0aecc14250054dbd6efbb1ee81777a6a07f
-  data.tar.gz: b0c354cd2aa008f081caa57e327c42e2e7ab0a6594794ebe14ffe75ab2b1344159fbd72817bc55474c04f96a5f93ce520125a9d1d22cca062235efc13d6044e8
+  metadata.gz: 9dbd7645ed21eef5fbe2c7c6041fc7e74562e1094afac61e973f88150310ac560678373be955007a800f7f55624157d362fb0b2cfb23ae6b7352de58be23a328
+  data.tar.gz: a9b9f7228ea7270461a11d12ba95b17c40f23bdb5ce05a9c161bb1ba0347c5f72f1438b8600972869c8b0bfc66c76a02a2c9f3e7aaa80096af53d08e72a83787

data/lib/timed/rediscounter.rb

@@ -7,13 +7,15 @@ require 'active_support/core_ext/hash'
 require "redis"
 
 require "timed/rediscounter/version"
-require "timed/rediscounter/counter"
+
 
 
 
 module Timed
   module Rediscounter
-    extend ActiveSupport::Concern
+    def self.included(mod)
+      mod.extend(ClassMethods)
+    end
 
     def self.redis=(r)
       @redis = r if r.is_a?(Redis)
@@ -64,5 +66,173 @@ module Timed
     end
 
 
+    class Counter
+
+      Periods = [:minute, :hour,   :day,     :month,  :year].freeze
+
+      attr_reader :periods,:key
+      def initialize(key,default_options={})
+        @key = key
+        @periods = (default_options.delete(:periods) || Periods)
+        @redis = (default_options.delete(:redis) || Timed::Rediscounter.redis)
+        raise_if_not_valid_periods(@periods)
+        @default_options = default_options.to_h
+      end
+
+      # Increments all given period keys by a given offset
+      # offset is normally 1
+      # 
+      def incr(options={})
+        opt = @default_options.merge(options).with_indifferent_access
+        offset = opt.fetch(:offset,1).to_i
+        time = opt.fetch(:time,Time.current)
+        periods = (opt[:periods] || @periods)
+        raise_if_not_valid_periods(periods)
+
+        if offset > 0
+          return redis.multi do
+            periods.each do  |period| 
+              redis.hincrby( period_key(period), convert_time_to_period_hash_key(time,period),  offset)
+            end
+          end
+        end
+
+        return []
+      end
+
+      # Returns a Hash by a given range or a period
+      #
+      # example:
+      # history(1.hour.ago..Time.now) or history(1.hour.ago)
+      #
+      #
+      # result:
+      # {2017-09-22 15:00:00 +0200=>0, 2017-09-22 16:00:00 +0200=>0} 
+      # 
+      # optional Parameter period: 
+      # [:minute, :hour,   :day,     :month,  :year]
+      def history(range_arg,period=nil)
+        redis_key, hash_keys =  build_redishash_arguments(range_arg,period)
+        return Hash.new if hash_keys.empty?
+
+        redis.mapped_hmget(redis_key, *hash_keys).inject({}) do |h,(k,v)| 
+          h[Time.at(k)] = v.to_i
+          h
+        end
+      end
+
+      def sum(range_arg,period=nil)
+        redis_key, hash_keys =  build_redishash_arguments(range_arg,period)
+        return 0 if hash_keys.empty?
+        redis.hmget(redis_key, *hash_keys).inject(0){|sum,i| sum += i.to_i}
+      end
+
+      #Expiring all period Keys
+      #
+      #expire_in in seconds
+      def expire_keys(expire_in=nil)
+        expire_in ||= @default_options.fetch(:expire_in, 1.year).to_i
+        redis.multi do 
+          Periods.each { |period| redis.expire period_key(period), expire_in }
+        end
+      end
+
+      #deleting all period keys
+      def delete_keys
+        redis.multi do 
+          Periods.each { |period| redis.del period_key(period) }
+        end
+      end
+
+      #helper to access redis
+      def redis
+        @redis
+      end
+
+      private
+
+      #builds the 
+      def build_redishash_arguments(range_arg,period=nil)
+        case range_arg 
+        when Time,Date
+          range = (range_arg..Time.current)
+        when String
+          range = (Time.parse(range_arg)..Time.current)
+        when Range
+          range = range_arg
+        else
+          ArgumentError.new 
+        end
+        period ||= period_by_range(range)
+        raise_if_not_valid_periods(period) 
+
+        off_set = 1.send(period)
+        hash_keys = Set.new
+
+        start_time = range.first.send("beginning_of_#{period}")
+        end_time = range.last.send("beginning_of_#{period}")
+
+        hash_keys << start_time
+        while (end_time - start_time) >= off_set
+          start_time += off_set
+          hash_keys << start_time
+        end
+
+        return period_key(period), hash_keys.collect(&:to_i)
+      end
+
+      Steps   = [1.hour,  1.day,   1.month,  1.year,  2.year].freeze
+      # Calculate a a valid period by a given range
+      def period_by_range(range)
+        diff = (range.last - range.first).round
+        period = nil
+        Steps.each_with_index do |step,i|
+          if diff <= step
+            period = @periods[i] 
+            break
+          end
+        end
+        #if not found => fallback
+        period ||= ( @periods[Steps.length] || @periods.last ) 
+      end
+
+      def raise_if_not_valid_periods(a)
+        r = case a 
+        when Array
+          return !a.any?{|it| !Periods.include?(it.to_sym)}
+        when Symbol,String
+          return Periods.include?(a.to_sym)
+        else
+          false
+        end
+        raise ArgumentError.new("Not valid periods: #{a} Must contain one or more of #{Periods}") unless r
+      end
+
+
+      def period_key(period)
+        "#{self.class.name}::#{@key}::#{period}"
+      end
+
+      def convert_time_to_period_hash_key(time,period)
+        case time
+        when Time
+          t = time
+        when Date
+          t = time.to_time
+        when String
+          t = Time.parse(time)
+        when Fixnum,Float
+          t = Time.at(time)
+        else 
+          raise ArgumentError.new("Not valid Time")
+        end
+        t.send("beginning_of_#{period}").to_i
+      end
+
+
+
+    end
+
+
   end
 end

data/lib/timed/rediscounter/version.rb

@@ -1,5 +1,5 @@
 module Timed
   module Rediscounter
-    VERSION = "1.0.0"
+    VERSION = "1.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timed-rediscounter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.6
 platform: ruby
 authors:
 - Christopher Geduhn