timed-rediscounter 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad3846ba1020380b3c61805ec42926d803ce47f8
-  data.tar.gz: 00d190036cca8293da2e1737a38173ab5eaf0db0
+  metadata.gz: 3ab171bfcc29c9c01be174d50a66d73d5cd17c66
+  data.tar.gz: 696ebb57d229433cdb0501d4bddcab570e25edfe
 SHA512:
-  metadata.gz: 3ad65fc08d34f3443e79b4e4acc907536623d79d205ac06fd0c8622cb7d0b7251d0f053e99f0f85364c546d08ace3f708b4bc1d7c09266586074020167a20658
-  data.tar.gz: 4dbdb39929f5160d2429c0dd14c359b87b494a28d40e6f219ec357beb9d6d24ae30c95b7043fe5a9d9d396aa264acfc0cb75855773f7908288531599f6f85693
+  metadata.gz: 53088c48c58c7244c5fa60b8460fe547ba91da289e33219ed377ae1d7a468320faf67d3e09b8c15bc25dac820a89eded9a0b74be29a432779d4316faa11cebbc
+  data.tar.gz: c755cdf26a99c8c715826893e5631a91a043b6700d64d36dd7b528957ea5cf1d91fddb5cf5da1f8c8f9fad54737a96cbbfb7f47644ec751c654f2e6d3bdd8335

data/README.md

@@ -1,8 +1,5 @@
 # Timed::Rediscounter
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/timed/rediscounter`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
@@ -48,8 +45,6 @@ obj.test1.incr()
 obj.test1.incr(offset: 10)
 #if you want to increment for a specific timestamp
 obj.test1.incr(time: 10.years.ago)
-#if you want to increment for a specific timestamp
-obj.test1.incr(time: 10.years.ago)
 #if you only want to increment for specific periods
 obj.test1.incr(periods: [:year])
 
@@ -57,12 +52,25 @@ obj.test1.incr(periods: [:year])
 ##Results
 
 #return a timestamp hash with timestamp as key and count as value
-obj.history(1.minute.ago)
+obj.test1.history(1.minute.ago)
+
+
+#optional with step as second argument. 
+#normally the step will be calculated by given range
+obj.test1.history(1.year.ago,:minute) 
+
 
 #returns the sum in the given range
-obj.sum(1.minute.ago..Time.now) #or obj.sum(1.minute.ago)
+obj.test1.sum(1.minute.ago..Time.now) #or obj.sum(1.minute.ago)
+
 
+```
 
+## Deleting and expiring
+
+```ruby
+obj.test1.delete_keys
+obj.test1.expire_keys(10) #in seconds
 ```
 
 ## Development

data/lib/timed/rediscounter.rb

@@ -70,13 +70,15 @@ module Timed
 
       Periods = [:minute, :hour,   :day,     :month,  :year].freeze
 
-      attr_reader :periods,:key
+      attr_reader :periods,:key,:expires_in
+
       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
+        @expires_in = @default_options.fetch(:expires_in, 2.year.to_i)
       end
 
       # Increments all given period keys by a given offset
@@ -89,15 +91,20 @@ module Timed
         periods = (opt[:periods] || @periods)
         raise_if_not_valid_periods(periods)
 
+        result = []
         if offset != 0
-          return redis.multi do
+
+          redis.multi do
             periods.each do  |period| 
-              redis.hincrby( period_key(period), convert_time_to_period_hash_key(time,period),  offset)
+              p_key = period_key(period)
+              result << (redis.hincrby p_key, convert_time_to_period_hash_key(time,period),  offset)
+              redis.expire  p_key, @expires_in if @expires_in 
             end
           end
+
         end
 
-        return []
+        return result.collect(&:value)
       end
 
       # Returns a Hash by a given range or a period
@@ -121,6 +128,17 @@ module Timed
         end
       end
 
+      def summed_up_history(range_arg,period=nil)
+        redis_key, hash_keys =  build_redishash_arguments(range_arg,period)
+        h = {}
+        return h if hash_keys.empty?
+        redis.mapped_hmget(redis_key, *hash_keys).inject(0) do |s,(k,v)| 
+          h[Time.at(k)] = (s += v.to_i)
+          s
+        end
+        return h
+      end
+
       def sum(range_arg,period=nil)
         redis_key, hash_keys =  build_redishash_arguments(range_arg,period)
         return 0 if hash_keys.empty?
@@ -130,8 +148,7 @@ module Timed
       #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
+      def expire_keys(expire_in=@expires_in)
         redis.multi do 
           Periods.each { |period| redis.expire period_key(period), expire_in }
         end
@@ -155,7 +172,7 @@ module Timed
       def build_redishash_arguments(range_arg,period=nil)
         case range_arg 
         when Time,Date
-          range = (range_arg..Time.current)
+          range = (range_arg.to_time..Time.current)
         when String
           range = (Time.parse(range_arg)..Time.current)
         when Range

data/lib/timed/rediscounter/version.rb

@@ -1,5 +1,5 @@
 module Timed
   module Rediscounter
-    VERSION = "1.0.8"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timed-rediscounter
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - Christopher Geduhn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A timed counter based on redis hashes