redis-objects-daily-counter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a1d7cbeced820236792c71dd5f82f33a0bcfbe9ebc897ad8001d70740ca939b
-  data.tar.gz: 2ca71fab3345471d86ad5ce86866132fae367dfc72bd450b3f8398a40c14015b
+  metadata.gz: 7e0a7c068797a495a2e26fc69aa33991b83b8aaf2f61cbde250e85f79d0d2a0d
+  data.tar.gz: 369237147cc7c2d7edc50c0fb39845a76430d7cf30428d3d0a4a6eef51de194b
 SHA512:
-  metadata.gz: c8810d8da10897dce9c887421acf923b2f5e4ac944c7267dd5d8df61f226dd70e5bd8da55398ada1bc0dfcb2c67c3190f8e3467ef329c2c9f226d43fac091993
-  data.tar.gz: 6fff807b98113bfddde1a0957b8e95f371d054f920b32cff9ddf6376f1e3cefbf6f05efaed83d8193e8463eec63a64fa9d9485e43565e2c5d2026218544df0b0
+  metadata.gz: e41f54c69a341c6a3809c184cc20c6c0f61b0f7635048242986d5e8e4389f7118c7481a68b715c4de3d9bc7f9c05158400816fe0ec3f97ac0dab3e19598b6b4f
+  data.tar.gz: 2c3f6b1170202d799ed729477406179c10a60f19ea96280a269377551fda48870f3dc5912954e57cf69c6c732e027a59efbb3c96570f94ab8d93a84308c4a5fc

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-09-19 14:21:58 UTC using RuboCop version 0.93.1.
+# on 2021-09-23 07:31:02 UTC using RuboCop version 0.93.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,22 +11,6 @@
 Metrics/AbcSize:
   Max: 21
 
-# Offense count: 21
+# Offense count: 41
 Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'lib/redis-objects-daily-counter.rb'
-    - 'lib/redis/annual_counter.rb'
-    - 'lib/redis/base_counter_object.rb'
-    - 'lib/redis/daily_counter.rb'
-    - 'lib/redis/hourly_counter.rb'
-    - 'lib/redis/minutely_counter.rb'
-    - 'lib/redis/monthly_counter.rb'
-    - 'lib/redis/objects/annual_counters.rb'
-    - 'lib/redis/objects/daily_counters.rb'
-    - 'lib/redis/objects/hourly_counters.rb'
-    - 'lib/redis/objects/minutely_counters.rb'
-    - 'lib/redis/objects/monthly_counters.rb'
-    - 'lib/redis/objects/weekly_counters.rb'
-    - 'lib/redis/weekly_counter.rb'
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,74 @@
 # Change log
 
+## v0.3.0 (Sep 23, 2021)
+
+### Feature
+
+* [#7](https://github.com/ryz310/redis-object-daily-counter/pull/7) Add daily set ([@ryz310](https://github.com/ryz310))
+
+> You can use `daily_set` in addition to the standard features of Redis::Objects.
+>
+> ```rb
+> class Homepage
+>   include Redis::Objects
+>
+>   daily_set :dau, expireat: -> { Time.now + 2_678_400 } # about a month
+>
+>   def id
+>     1
+>   end
+> end
+>
+> # 2021-04-01
+> homepage.dau << 'user1'
+> homepage.dau << 'user2'
+> homepage.dau << 'user1' # dup ignored
+> puts homepage.dau.members # ['user1', 'user2']
+> puts homepage.dau.length # 2
+> puts homepage.dau.count # alias of #length
+>
+> # 2021-04-02 (next day)
+> puts homepage.dau.members # []
+> homepage.dau.merge('user2', 'user3')
+> puts homepage.dau.members # ['user2', 'user3']
+>
+> # 2021-04-03 (next day)
+> homepage.dau.merge('user4')
+>
+> homepage.dau[Date.new(2021, 4, 1)] # => ['user1', 'user2']
+> homepage.dau[Date.new(2021, 4, 1), 3] # => ['user1', 'user2', 'user3', 'user4']
+> homepage.dau[Date.new(2021, 4, 1)..Date.new(2021, 4, 2)] # => ['user1', 'user2', 'user3']
+>
+> homepage.dau.delete_at(Date.new(2021, 4, 1))
+> homepage.dau.range(Date.new(2021, 4, 1), Date.new(2021, 4, 3)) # => ['user2', 'user3', 'user4']
+> homepage.dau.at(Date.new(2021, 4, 2)) # => #<Redis::Set key="homepage:1:dau:2021-04-02">
+> homepage.dau.at(Date.new(2021, 4, 2)).members # ['user2', 'user3']
+> ```
+
+### Breaking Change
+
+* [#7](https://github.com/ryz310/redis-object-daily-counter/pull/7) Add daily set ([@ryz310](https://github.com/ryz310))
+
+> Rename the method from #delete to #delete_at a73251f
+> 
+> ```rb
+> # Before
+> homepage.pv.delete(Date.new(2021, 4, 1))
+> 
+> # After
+> homepage.pv.delete_at(Date.new(2021, 4, 1))
+> ```
+> 
+> Modify returning value of RecurringAtIntervals#at 1c8cc79
+> 
+> ```rb
+> # Before
+> homepage.pv.at(Date.new(2021, 4, 2)) # => 2
+> 
+> # After
+> homepage.pv.at(Date.new(2021, 4, 2)) # => #<Redis::Counter key="homepage:1:pv:2021-04-02">
+> ```
+
 ## v0.2.0 (Sep 20, 2021)
 
 ### Feature

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redis-objects-daily-counter (0.2.0)
+    redis-objects-daily-counter (0.3.0)
       redis-objects
 
 GEM

data/README.md

@@ -1,8 +1,8 @@
-[![CircleCI](https://circleci.com/gh/ryz310/redis-objects-daily-counter.svg?style=svg)](https://circleci.com/gh/ryz310/redis-objects-daily-counter) [![Gem Version](https://badge.fury.io/rb/redis-objects-daily-counter.svg)](https://badge.fury.io/rb/redis-objects-daily-counter) [![Maintainability](https://api.codeclimate.com/v1/badges/3639d1776e23031b1b31/maintainability)](https://codeclimate.com/github/ryz310/redis-objects-daily-counter/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/3639d1776e23031b1b31/test_coverage)](https://codeclimate.com/github/ryz310/redis-objects-daily-counter/test_coverage) [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=ryz310/redis-objects-daily-counter)](https://dependabot.com)
+[![CircleCI](https://circleci.com/gh/ryz310/redis-objects-daily-counter.svg?style=svg)](https://circleci.com/gh/ryz310/redis-objects-daily-counter) [![Gem Version](https://badge.fury.io/rb/redis-objects-daily-counter.svg)](https://badge.fury.io/rb/redis-objects-daily-counter) [![Maintainability](https://api.codeclimate.com/v1/badges/1e1cb0d70e4f80e0fdd5/maintainability)](https://codeclimate.com/github/ryz310/redis-objects-daily-counter/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/1e1cb0d70e4f80e0fdd5/test_coverage)](https://codeclimate.com/github/ryz310/redis-objects-daily-counter/test_coverage) [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=ryz310/redis-objects-daily-counter)](https://dependabot.com)
 
-# Redis::Objects::Daily::Counter
+# Redis::Objects::Daily::Counter and Daily::Set
 
-This is a gem which extends [Redis::Objects](https://github.com/nateware/redis-objects) gem. Once install this gem, you can use the daily counter, etc. in addition to the standard features of Redis::Objects. These counters are useful for measuring conversions, implementing API rate limiting, and more.
+This is a gem which extends [Redis::Objects](https://github.com/nateware/redis-objects) gem. Once install this gem, you can use the daily counter, the daily set, etc. in addition to the standard features of Redis::Objects. These counters and sets are useful for measuring conversions, implementing API rate limiting, MAU, DAU, and more.
 
 ## Installation
 
@@ -16,12 +16,13 @@ If you want to know about installation and standard usage, please see Redis::Obj
 
 ## Usage
 
-`daily_counter` automatically creates keys that are unique to each object, in the format:
+`daily_counter` and `daily_set` automatically creates keys that are unique to each object, in the format:
 
 ```
 model_name:id:field_name:yyyy-mm-dd
 ```
 
+I recommend using with `expireat` option.
 For illustration purposes, consider this stub class:
 
 ```rb
@@ -29,6 +30,7 @@ class Homepage
   include Redis::Objects
 
   daily_counter :pv, expireat: -> { Time.now + 2_678_400 } # about a month
+  daily_set :dau, expireat: -> { Time.now + 2_678_400 } # about a month
 
   def id
     1
@@ -55,6 +57,8 @@ end_date = Date.new(2021, 4, 2)
 homepage.pv.range(start_date, end_date) # [3, 2]
 ```
 
+### Daily Counter
+
 The daily counter automatically switches the save destination when the date changes.
 You can access past dates counted values like Ruby arrays:
 
@@ -72,14 +76,13 @@ homepage.pv[Date.new(2021, 4, 1)] # => 3
 homepage.pv[Date.new(2021, 4, 1), 3] # => [3, 2, 5]
 homepage.pv[Date.new(2021, 4, 1)..Date.new(2021, 4, 2)] # => [3, 2]
 
-homepage.pv.delete(Date.new(2021, 4, 1))
+homepage.pv.delete_at(Date.new(2021, 4, 1))
 homepage.pv.range(Date.new(2021, 4, 1), Date.new(2021, 4, 3)) # => [0, 2, 5]
-homepage.pv.at(Date.new(2021, 4, 2)) # => 2
+homepage.pv.at(Date.new(2021, 4, 2)) # => #<Redis::Counter key="homepage:1:pv:2021-04-02">
+homepage.pv.at(Date.new(2021, 4, 2)).value # 2
 ```
 
-### Counters
-
-I recommend using with `expireat` option.
+#### Daily Counter Family
 
 * `annual_counter`
     * Key format: `model_name:id:field_name:yyyy`
@@ -95,6 +98,55 @@ I recommend using with `expireat` option.
 * `minutely_counter`
     * Key format: `model_name:id:field_name:yyyy-mm-ddThh:mi`
 
+### Daily Set
+
+The daily set also automatically switches the save destination when the date changes.
+
+```rb
+# 2021-04-01
+homepage.dau << 'user1'
+homepage.dau << 'user2'
+homepage.dau << 'user1' # dup ignored
+puts homepage.dau.members # ['user1', 'user2']
+puts homepage.dau.length # 2
+puts homepage.dau.count # alias of #length
+
+# 2021-04-02 (next day)
+puts homepage.dau.members # []
+
+homepage.dau.merge('user2', 'user3')
+puts homepage.dau.members # ['user2', 'user3']
+
+# 2021-04-03 (next day)
+homepage.dau.merge('user4')
+
+homepage.dau[Date.new(2021, 4, 1)] # => ['user1', 'user2']
+homepage.dau[Date.new(2021, 4, 1), 3] # => ['user1', 'user2', 'user3', 'user4']
+homepage.dau[Date.new(2021, 4, 1)..Date.new(2021, 4, 2)] # => ['user1', 'user2', 'user3']
+
+homepage.dau.delete_at(Date.new(2021, 4, 1))
+homepage.dau.range(Date.new(2021, 4, 1), Date.new(2021, 4, 3)) # => ['user2', 'user3', 'user4']
+homepage.dau.at(Date.new(2021, 4, 2)) # => #<Redis::Set key="homepage:1:dau:2021-04-02">
+homepage.dau.at(Date.new(2021, 4, 2)).members # ['user2', 'user3']
+```
+
+#### Daily Set Family
+
+* `annual_set`
+    * Key format: `model_name:id:field_name:yyyy`
+    * Redis is a highly volatile key-value store, so I don't recommend using it.
+* `monthly_set`
+    * Key format: `model_name:id:field_name:yyyy-mm`
+* `weekly_set`
+    * Key format: `model_name:id:field_name:yyyyWw`
+* `daily_set`
+    * Key format: `model_name:id:field_name:yyyy-mm-dd`
+* `hourly_set`
+    * Key format: `model_name:id:field_name:yyyy-mm-ddThh`
+* `minutely_set`
+    * Key format: `model_name:id:field_name:yyyy-mm-ddThh:mi`
+
+
 ### Timezone
 
 This gem follows Ruby process' time zone, but if you extends Time class by ActiveSupport (e.g. `Time.current`), follows Rails process' timezone.

data/lib/redis/annual_counter.rb

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
 
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
 require "#{File.dirname(__FILE__)}/base_counter_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/annual"
 
 class Redis
-  class AnnualCounter < BaseCounterObject
-    private
-
-    def redis_daily_field_key(date_or_time)
-      date_key = date_or_time.strftime('%Y')
-      [original_key, date_key].flatten.join(':')
-    end
-
-    def next_key(date, length)
-      date.next_year(length - 1)
-    end
+  class AnnualCounter < Counter
+    include RecurringAtIntervals
+    include BaseCounterObject
+    include Annual
   end
 end

data/lib/redis/annual_set.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
+require "#{File.dirname(__FILE__)}/base_set_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/annual"
+
+class Redis
+  class AnnualSet < Set
+    include RecurringAtIntervals
+    include BaseSetObject
+    include Annual
+  end
+end

data/lib/redis/base_counter_object.rb

@@ -1,54 +1,23 @@
 # frozen_string_literal: true
 
 class Redis
-  class BaseCounterObject < Counter
-    def initialize(key, *args)
-      @original_key = key
-      super(redis_daily_field_key(current_time), *args)
-    end
-
-    attr_reader :original_key
+  module BaseCounterObject
+    private
 
-    def [](date_or_time, length = nil)
-      if date_or_time.is_a? Range
-        range(date_or_time.first, date_or_time.max)
-      elsif length
-        case length <=> 0
-        when 1  then range(date_or_time, next_key(date_or_time, length))
-        when 0  then []
-        when -1 then nil  # Ruby does this (a bit weird)
-        end
-      else
-        at(date_or_time)
-      end
+    def get_redis_object(key)
+      Redis::Counter.new(key)
     end
-    alias slice []
 
-    def delete(date_or_time)
-      redis.del(redis_daily_field_key(date_or_time))
+    def get_value_from_redis(key)
+      redis.get(key).to_i
     end
 
-    def range(start_date, end_date)
-      keys = (start_date..end_date).map { |date| redis_daily_field_key(date) }.uniq
+    def get_values_from_redis(keys)
       redis.mget(*keys).map(&:to_i)
     end
 
-    def at(date_or_time)
-      redis.get(redis_daily_field_key(date_or_time)).to_i
-    end
-
-    def current_time
-      @current_time ||= Time.respond_to?(:current) ? Time.current : Time.now
-    end
-
-    private
-
-    def redis_daily_field_key(_date_or_time)
-      raise 'not implemented'
-    end
-
-    def next_key(_date, _length)
-      raise 'not implemented'
+    def delete_from_redis(key)
+      redis.del(key)
     end
   end
 end

data/lib/redis/base_set_object.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class Redis
+  module BaseSetObject
+    private
+
+    def get_redis_object(key)
+      Redis::Set.new(key)
+    end
+
+    def get_value_from_redis(key)
+      vals = redis.smembers(key)
+      vals.nil? ? [] : vals.map { |v| unmarshal(v) }
+    end
+
+    def get_values_from_redis(keys)
+      redis.sunion(*keys).map { |v| unmarshal(v) }
+    end
+
+    def delete_from_redis(key)
+      redis.del(key)
+    end
+  end
+end

data/lib/redis/daily_counter.rb

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
 
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
 require "#{File.dirname(__FILE__)}/base_counter_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/daily"
 
 class Redis
-  class DailyCounter < BaseCounterObject
-    private
-
-    def redis_daily_field_key(date_or_time)
-      date_key = date_or_time.strftime('%Y-%m-%d')
-      [original_key, date_key].flatten.join(':')
-    end
-
-    def next_key(date, length)
-      date + length - 1
-    end
+  class DailyCounter < Counter
+    include RecurringAtIntervals
+    include BaseCounterObject
+    include Daily
   end
 end

data/lib/redis/daily_set.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
+require "#{File.dirname(__FILE__)}/base_set_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/daily"
+
+class Redis
+  class DailySet < Set
+    include RecurringAtIntervals
+    include BaseSetObject
+    include Daily
+  end
+end

data/lib/redis/hourly_counter.rb

@@ -1,26 +1,13 @@
 # frozen_string_literal: true
 
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
 require "#{File.dirname(__FILE__)}/base_counter_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/hourly"
 
 class Redis
-  class HourlyCounter < BaseCounterObject
-    def range(start_time, end_time)
-      keys =
-        (start_time.to_i..end_time.to_i)
-        .step(3600)
-        .map { |integer| redis_daily_field_key(Time.at(integer)) }
-      redis.mget(*keys).map(&:to_i)
-    end
-
-    private
-
-    def redis_daily_field_key(time)
-      time_key = time.strftime('%Y-%m-%dT%H')
-      [original_key, time_key].flatten.join(':')
-    end
-
-    def next_key(time, length)
-      time + 3600 * (length - 1)
-    end
+  class HourlyCounter < Counter
+    include RecurringAtIntervals
+    include BaseCounterObject
+    include Hourly
   end
 end

data/lib/redis/hourly_set.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
+require "#{File.dirname(__FILE__)}/base_set_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/hourly"
+
+class Redis
+  class HourlySet < Set
+    include RecurringAtIntervals
+    include BaseSetObject
+    include Hourly
+  end
+end

data/lib/redis/minutely_counter.rb

@@ -1,26 +1,13 @@
 # frozen_string_literal: true
 
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
 require "#{File.dirname(__FILE__)}/base_counter_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/minutely"
 
 class Redis
-  class MinutelyCounter < BaseCounterObject
-    def range(start_time, end_time)
-      keys =
-        (start_time.to_i..end_time.to_i)
-        .step(60)
-        .map { |integer| redis_daily_field_key(Time.at(integer)) }
-      redis.mget(*keys).map(&:to_i)
-    end
-
-    private
-
-    def redis_daily_field_key(time)
-      time_key = time.strftime('%Y-%m-%dT%H:%M')
-      [original_key, time_key].flatten.join(':')
-    end
-
-    def next_key(time, length)
-      time + 60 * (length - 1)
-    end
+  class MinutelyCounter < Counter
+    include RecurringAtIntervals
+    include BaseCounterObject
+    include Minutely
   end
 end

data/lib/redis/minutely_set.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
+require "#{File.dirname(__FILE__)}/base_set_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/minutely"
+
+class Redis
+  class MinutelySet < Set
+    include RecurringAtIntervals
+    include BaseSetObject
+    include Minutely
+  end
+end

data/lib/redis/monthly_counter.rb

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
 
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
 require "#{File.dirname(__FILE__)}/base_counter_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/monthly"
 
 class Redis
-  class MonthlyCounter < BaseCounterObject
-    private
-
-    def redis_daily_field_key(date_or_time)
-      date_key = date_or_time.strftime('%Y-%m')
-      [original_key, date_key].flatten.join(':')
-    end
-
-    def next_key(date, length)
-      date.next_month(length - 1)
-    end
+  class MonthlyCounter < Counter
+    include RecurringAtIntervals
+    include BaseCounterObject
+    include Monthly
   end
 end

data/lib/redis/monthly_set.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
+require "#{File.dirname(__FILE__)}/base_set_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/monthly"
+
+class Redis
+  class MonthlySet < Set
+    include RecurringAtIntervals
+    include BaseSetObject
+    include Monthly
+  end
+end

data/lib/redis/objects/annual_sets.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'redis/annual_set'
+class Redis
+  module Objects
+    module AnnualSets
+      def self.included(klass)
+        klass.extend ClassMethods
+      end
+
+      # Class methods that appear in your class when you include Redis::Objects.
+      module ClassMethods
+        # Define a new list.  It will function like a regular instance
+        # method, so it can be used alongside ActiveRecord, DataMapper, etc.
+        def annual_set(name, options = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          redis_objects[name.to_sym] = options.merge(type: :set)
+
+          mod = Module.new do
+            define_method(name) do
+              Redis::AnnualSet.new(
+                redis_field_key(name), redis_field_redis(name), redis_options(name)
+              )
+            end
+
+            define_method(:"#{name}=") do |values|
+              set = public_send(name)
+
+              redis.pipelined do
+                set.clear
+                set.merge(*values)
+              end
+            end
+          end
+
+          if options[:global]
+            extend mod
+
+            # dispatch to class methods
+            define_method(name) do
+              self.class.public_send(name)
+            end
+          else
+            include mod
+          end
+        end
+      end
+    end
+  end
+end

data/lib/redis/objects/daily-counter/version.rb

@@ -4,7 +4,7 @@ class Redis
   module Objects
     module Daily
       module Counter
-        VERSION = '0.2.0'
+        VERSION = '0.3.0'
       end
     end
   end

data/lib/redis/objects/daily_sets.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'redis/daily_set'
+class Redis
+  module Objects
+    module DailySets
+      def self.included(klass)
+        klass.extend ClassMethods
+      end
+
+      # Class methods that appear in your class when you include Redis::Objects.
+      module ClassMethods
+        # Define a new list.  It will function like a regular instance
+        # method, so it can be used alongside ActiveRecord, DataMapper, etc.
+        def daily_set(name, options = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          redis_objects[name.to_sym] = options.merge(type: :set)
+
+          mod = Module.new do
+            define_method(name) do
+              Redis::DailySet.new(
+                redis_field_key(name), redis_field_redis(name), redis_options(name)
+              )
+            end
+
+            define_method(:"#{name}=") do |values|
+              set = public_send(name)
+
+              redis.pipelined do
+                set.clear
+                set.merge(*values)
+              end
+            end
+          end
+
+          if options[:global]
+            extend mod
+
+            # dispatch to class methods
+            define_method(name) do
+              self.class.public_send(name)
+            end
+          else
+            include mod
+          end
+        end
+      end
+    end
+  end
+end

data/lib/redis/objects/hourly_sets.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'redis/hourly_set'
+class Redis
+  module Objects
+    module HourlySets
+      def self.included(klass)
+        klass.extend ClassMethods
+      end
+
+      # Class methods that appear in your class when you include Redis::Objects.
+      module ClassMethods
+        # Define a new list.  It will function like a regular instance
+        # method, so it can be used alongside ActiveRecord, DataMapper, etc.
+        def hourly_set(name, options = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          redis_objects[name.to_sym] = options.merge(type: :set)
+
+          mod = Module.new do
+            define_method(name) do
+              Redis::HourlySet.new(
+                redis_field_key(name), redis_field_redis(name), redis_options(name)
+              )
+            end
+
+            define_method(:"#{name}=") do |values|
+              set = public_send(name)
+
+              redis.pipelined do
+                set.clear
+                set.merge(*values)
+              end
+            end
+          end
+
+          if options[:global]
+            extend mod
+
+            # dispatch to class methods
+            define_method(name) do
+              self.class.public_send(name)
+            end
+          else
+            include mod
+          end
+        end
+      end
+    end
+  end
+end

data/lib/redis/objects/minutely_sets.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'redis/minutely_set'
+class Redis
+  module Objects
+    module MinutelySets
+      def self.included(klass)
+        klass.extend ClassMethods
+      end
+
+      # Class methods that appear in your class when you include Redis::Objects.
+      module ClassMethods
+        # Define a new list.  It will function like a regular instance
+        # method, so it can be used alongside ActiveRecord, DataMapper, etc.
+        def minutely_set(name, options = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          redis_objects[name.to_sym] = options.merge(type: :set)
+
+          mod = Module.new do
+            define_method(name) do
+              Redis::MinutelySet.new(
+                redis_field_key(name), redis_field_redis(name), redis_options(name)
+              )
+            end
+
+            define_method(:"#{name}=") do |values|
+              set = public_send(name)
+
+              redis.pipelined do
+                set.clear
+                set.merge(*values)
+              end
+            end
+          end
+
+          if options[:global]
+            extend mod
+
+            # dispatch to class methods
+            define_method(name) do
+              self.class.public_send(name)
+            end
+          else
+            include mod
+          end
+        end
+      end
+    end
+  end
+end

data/lib/redis/objects/monthly_sets.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'redis/monthly_set'
+class Redis
+  module Objects
+    module MonthlySets
+      def self.included(klass)
+        klass.extend ClassMethods
+      end
+
+      # Class methods that appear in your class when you include Redis::Objects.
+      module ClassMethods
+        # Define a new list.  It will function like a regular instance
+        # method, so it can be used alongside ActiveRecord, DataMapper, etc.
+        def monthly_set(name, options = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          redis_objects[name.to_sym] = options.merge(type: :set)
+
+          mod = Module.new do
+            define_method(name) do
+              Redis::MonthlySet.new(
+                redis_field_key(name), redis_field_redis(name), redis_options(name)
+              )
+            end
+
+            define_method(:"#{name}=") do |values|
+              set = public_send(name)
+
+              redis.pipelined do
+                set.clear
+                set.merge(*values)
+              end
+            end
+          end
+
+          if options[:global]
+            extend mod
+
+            # dispatch to class methods
+            define_method(name) do
+              self.class.public_send(name)
+            end
+          else
+            include mod
+          end
+        end
+      end
+    end
+  end
+end

data/lib/redis/objects/weekly_sets.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'redis/weekly_set'
+class Redis
+  module Objects
+    module WeeklySets
+      def self.included(klass)
+        klass.extend ClassMethods
+      end
+
+      # Class methods that appear in your class when you include Redis::Objects.
+      module ClassMethods
+        # Define a new list.  It will function like a regular instance
+        # method, so it can be used alongside ActiveRecord, DataMapper, etc.
+        def weekly_set(name, options = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          redis_objects[name.to_sym] = options.merge(type: :set)
+
+          mod = Module.new do
+            define_method(name) do
+              Redis::WeeklySet.new(
+                redis_field_key(name), redis_field_redis(name), redis_options(name)
+              )
+            end
+
+            define_method(:"#{name}=") do |values|
+              set = public_send(name)
+
+              redis.pipelined do
+                set.clear
+                set.merge(*values)
+              end
+            end
+          end
+
+          if options[:global]
+            extend mod
+
+            # dispatch to class methods
+            define_method(name) do
+              self.class.public_send(name)
+            end
+          else
+            include mod
+          end
+        end
+      end
+    end
+  end
+end

data/lib/redis/recurring_at_intervals/annual.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Redis
+  module RecurringAtIntervals
+    module Annual
+      private
+
+      def redis_daily_field_key(date_or_time)
+        date_key = date_or_time.strftime('%Y')
+        [original_key, date_key].flatten.join(':')
+      end
+
+      def next_key(date, length = 1)
+        date.next_year(length)
+      end
+    end
+  end
+end

data/lib/redis/recurring_at_intervals/daily.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Redis
+  module RecurringAtIntervals
+    module Daily
+      private
+
+      def redis_daily_field_key(date_or_time)
+        date_key = date_or_time.strftime('%Y-%m-%d')
+        [original_key, date_key].flatten.join(':')
+      end
+
+      def next_key(date, length = 1)
+        date + length
+      end
+    end
+  end
+end

data/lib/redis/recurring_at_intervals/hourly.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Redis
+  module RecurringAtIntervals
+    module Hourly
+      private
+
+      def redis_daily_field_key(time)
+        time_key = time.strftime('%Y-%m-%dT%H')
+        [original_key, time_key].flatten.join(':')
+      end
+
+      def next_key(time, length = 1)
+        time + 3600 * length
+      end
+    end
+  end
+end

data/lib/redis/recurring_at_intervals/minutely.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Redis
+  module RecurringAtIntervals
+    module Minutely
+      private
+
+      def redis_daily_field_key(time)
+        time_key = time.strftime('%Y-%m-%dT%H:%M')
+        [original_key, time_key].flatten.join(':')
+      end
+
+      def next_key(time, length = 1)
+        time + 60 * length
+      end
+    end
+  end
+end

data/lib/redis/recurring_at_intervals/monthly.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Redis
+  module RecurringAtIntervals
+    module Monthly
+      private
+
+      def redis_daily_field_key(date_or_time)
+        date_key = date_or_time.strftime('%Y-%m')
+        [original_key, date_key].flatten.join(':')
+      end
+
+      def next_key(date, length = 1)
+        date.next_month(length)
+      end
+    end
+  end
+end

data/lib/redis/recurring_at_intervals/weekly.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Redis
+  module RecurringAtIntervals
+    module Weekly
+      private
+
+      def redis_daily_field_key(date_or_time)
+        date_key = date_or_time.strftime('%YW%W')
+        [original_key, date_key].flatten.join(':')
+      end
+
+      def next_key(date, length = 1)
+        date + 7 * length
+      end
+    end
+  end
+end

data/lib/redis/recurring_at_intervals.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+class Redis
+  module RecurringAtIntervals
+    def initialize(key, *args)
+      @original_key = key
+      super(redis_daily_field_key(current_time), *args)
+    end
+
+    attr_reader :original_key
+
+    def [](date_or_time, length = nil)
+      if date_or_time.is_a? Range
+        range(date_or_time.first, date_or_time.max)
+      elsif length
+        case length <=> 0
+        when 1  then range(date_or_time, next_key(date_or_time, length - 1))
+        when 0  then []
+        when -1 then nil  # Ruby does this (a bit weird)
+        end
+      else
+        get_value_from_redis(redis_daily_field_key(date_or_time))
+      end
+    end
+    alias slice []
+
+    def delete_at(date_or_time)
+      delete_from_redis(redis_daily_field_key(date_or_time))
+    end
+
+    def range(start_date_or_time, end_date_or_time)
+      keys = []
+      date_or_time = start_date_or_time
+
+      loop do
+        break if date_or_time > end_date_or_time
+
+        keys << redis_daily_field_key(date_or_time)
+        date_or_time = next_key(date_or_time)
+      end
+
+      get_values_from_redis(keys)
+    end
+
+    def at(date_or_time)
+      get_redis_object(redis_daily_field_key(date_or_time))
+    end
+
+    def current_time
+      @current_time ||= Time.respond_to?(:current) ? Time.current : Time.now
+    end
+
+    private
+
+    def get_redis_object(_key)
+      raise 'not implemented'
+    end
+
+    def get_value_from_redis(_key)
+      raise 'not implemented'
+    end
+
+    def get_values_from_redis(_keys)
+      raise 'not implemented'
+    end
+
+    def delete_from_redis(_key)
+      raise 'not implemented'
+    end
+
+    def redis_daily_field_key(_date_or_time)
+      raise 'not implemented'
+    end
+
+    def next_key(_date, _length = 1)
+      raise 'not implemented'
+    end
+  end
+end

data/lib/redis/weekly_counter.rb

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
 
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
 require "#{File.dirname(__FILE__)}/base_counter_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/weekly"
 
 class Redis
-  class WeeklyCounter < BaseCounterObject
-    private
-
-    def redis_daily_field_key(date_or_time)
-      date_key = date_or_time.strftime('%YW%W')
-      [original_key, date_key].flatten.join(':')
-    end
-
-    def next_key(date, length)
-      date + 7 * (length - 1)
-    end
+  class WeeklyCounter < Counter
+    include RecurringAtIntervals
+    include BaseCounterObject
+    include Weekly
   end
 end

data/lib/redis/weekly_set.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
+require "#{File.dirname(__FILE__)}/base_set_object"
+require "#{File.dirname(__FILE__)}/recurring_at_intervals/weekly"
+
+class Redis
+  class WeeklySet < Set
+    include RecurringAtIntervals
+    include BaseSetObject
+    include Weekly
+  end
+end

data/lib/redis-objects-daily-counter.rb

@@ -10,6 +10,13 @@ class Redis
   autoload :HourlyCounter, 'redis/hourly_counter'
   autoload :MinutelyCounter, 'redis/minutely_counter'
 
+  autoload :DailySet, 'redis/daily_set'
+  autoload :WeeklySet, 'redis/weekly_set'
+  autoload :MonthlySet, 'redis/monthly_set'
+  autoload :AnnualSet, 'redis/annual_set'
+  autoload :HourlySet, 'redis/hourly_set'
+  autoload :MinutelySet, 'redis/minutely_set'
+
   module Objects
     autoload :DailyCounters, 'redis/objects/daily_counters'
     autoload :WeeklyCounters, 'redis/objects/weekly_counters'
@@ -18,6 +25,13 @@ class Redis
     autoload :HourlyCounters, 'redis/objects/hourly_counters'
     autoload :MinutelyCounters, 'redis/objects/minutely_counters'
 
+    autoload :DailySets, 'redis/objects/daily_sets'
+    autoload :WeeklySets, 'redis/objects/weekly_sets'
+    autoload :MonthlySets, 'redis/objects/monthly_sets'
+    autoload :AnnualSets, 'redis/objects/annual_sets'
+    autoload :HourlySets, 'redis/objects/hourly_sets'
+    autoload :MinutelySets, 'redis/objects/minutely_sets'
+
     class << self
       alias original_included included
 
@@ -31,6 +45,13 @@ class Redis
         klass.send :include, Redis::Objects::AnnualCounters
         klass.send :include, Redis::Objects::HourlyCounters
         klass.send :include, Redis::Objects::MinutelyCounters
+
+        klass.send :include, Redis::Objects::DailySets
+        klass.send :include, Redis::Objects::WeeklySets
+        klass.send :include, Redis::Objects::MonthlySets
+        klass.send :include, Redis::Objects::AnnualSets
+        klass.send :include, Redis::Objects::HourlySets
+        klass.send :include, Redis::Objects::MinutelySets
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects-daily-counter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - ryz310
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-objects
@@ -50,19 +50,39 @@ files:
 - docker-compose.yml
 - lib/redis-objects-daily-counter.rb
 - lib/redis/annual_counter.rb
+- lib/redis/annual_set.rb
 - lib/redis/base_counter_object.rb
+- lib/redis/base_set_object.rb
 - lib/redis/daily_counter.rb
+- lib/redis/daily_set.rb
 - lib/redis/hourly_counter.rb
+- lib/redis/hourly_set.rb
 - lib/redis/minutely_counter.rb
+- lib/redis/minutely_set.rb
 - lib/redis/monthly_counter.rb
+- lib/redis/monthly_set.rb
 - lib/redis/objects/annual_counters.rb
+- lib/redis/objects/annual_sets.rb
 - lib/redis/objects/daily-counter/version.rb
 - lib/redis/objects/daily_counters.rb
+- lib/redis/objects/daily_sets.rb
 - lib/redis/objects/hourly_counters.rb
+- lib/redis/objects/hourly_sets.rb
 - lib/redis/objects/minutely_counters.rb
+- lib/redis/objects/minutely_sets.rb
 - lib/redis/objects/monthly_counters.rb
+- lib/redis/objects/monthly_sets.rb
 - lib/redis/objects/weekly_counters.rb
+- lib/redis/objects/weekly_sets.rb
+- lib/redis/recurring_at_intervals.rb
+- lib/redis/recurring_at_intervals/annual.rb
+- lib/redis/recurring_at_intervals/daily.rb
+- lib/redis/recurring_at_intervals/hourly.rb
+- lib/redis/recurring_at_intervals/minutely.rb
+- lib/redis/recurring_at_intervals/monthly.rb
+- lib/redis/recurring_at_intervals/weekly.rb
 - lib/redis/weekly_counter.rb
+- lib/redis/weekly_set.rb
 - redis-objects-daily-counter.gemspec
 homepage: https://github.com/ryz310/redis-objects-daily-counter
 licenses:
@@ -71,7 +91,7 @@ metadata:
   homepage_uri: https://github.com/ryz310/redis-objects-daily-counter
   source_code_uri: https://github.com/ryz310/redis-objects-daily-counter
   changelog_uri: https://github.com/ryz310/redis-objects-daily-counter/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -86,8 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
 summary: Daily counter within Redis::Objects
 test_files: []