redis-objects-daily-counter 0.3.0 → 0.4.0

data/lib/redis/objects/periodical_hashes.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'redis/periodical_hash_key'
+
+Redis::PERIODICALS.each do |periodical| # rubocop:disable Metrics/BlockLength
+  new_module = Module.new
+  new_module.module_eval <<~RUBY, __FILE__, __LINE__ + 1
+    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 hash key.  It will function like a regular instance
+      # method, so it can be used alongside ActiveRecord, DataMapper, etc.
+      def #{periodical}_hash_key(name, options = {})
+        redis_objects[name.to_sym] = options.merge(type: :dict)
+
+        mod = Module.new do
+          define_method(name) do
+            Redis::#{periodical.capitalize}HashKey.new(
+              redis_field_key(name), redis_field_redis(name), redis_options(name)
+            )
+          end
+
+          define_method(:"#\{name\}=") do |values|
+            hash_key = public_send(name)
+
+            redis.pipelined do
+              hash_key.clear
+              hash_key.bulk_set(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
+  RUBY
+  Redis::Objects.const_set("#{periodical.capitalize}Hashes", new_module)
+end

data/lib/redis/objects/periodical_sets.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'redis/periodical_set'
+
+Redis::PERIODICALS.each do |periodical| # rubocop:disable Metrics/BlockLength
+  new_module = Module.new
+  new_module.module_eval <<~RUBY, __FILE__, __LINE__ + 1
+    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 #{periodical}_set(name, options = {})
+        redis_objects[name.to_sym] = options.merge(type: :set)
+
+        mod = Module.new do
+          define_method(name) do
+            Redis::#{periodical.capitalize}Set.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
+  RUBY
+  Redis::Objects.const_set("#{periodical.capitalize}Sets", new_module)
+end

data/lib/redis/periodical_counter.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
+require "#{File.dirname(__FILE__)}/base_counter_object"
+
+Redis::PERIODICALS.each do |periodical|
+  require "#{File.dirname(__FILE__)}/recurring_at_intervals/#{periodical}"
+
+  new_class = Class.new(Redis::Counter) do
+    include Redis::RecurringAtIntervals
+    include Redis::BaseCounterObject
+    include const_get("Redis::RecurringAtIntervals::#{periodical.capitalize}")
+  end
+  Redis.const_set("#{periodical.capitalize}Counter", new_class)
+end

data/lib/redis/periodical_hash_key.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
+require "#{File.dirname(__FILE__)}/base_hash_key_object"
+
+Redis::PERIODICALS.each do |periodical|
+  require "#{File.dirname(__FILE__)}/recurring_at_intervals/#{periodical}"
+
+  new_class = Class.new(Redis::HashKey) do
+    include Redis::RecurringAtIntervals
+    include Redis::BaseHashKeyObject
+    include const_get("Redis::RecurringAtIntervals::#{periodical.capitalize}")
+  end
+  Redis.const_set("#{periodical.capitalize}HashKey", new_class)
+end

data/lib/redis/periodical_set.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "#{File.dirname(__FILE__)}/recurring_at_intervals"
+require "#{File.dirname(__FILE__)}/base_set_object"
+
+Redis::PERIODICALS.each do |periodical|
+  require "#{File.dirname(__FILE__)}/recurring_at_intervals/#{periodical}"
+
+  new_class = Class.new(Redis::Set) do
+    include Redis::RecurringAtIntervals
+    include Redis::BaseSetObject
+    include const_get("Redis::RecurringAtIntervals::#{periodical.capitalize}")
+  end
+  Redis.const_set("#{periodical.capitalize}Set", new_class)
+end

data/lib/redis/recurring_at_intervals.rb

@@ -15,7 +15,7 @@ class Redis
       elsif length
         case length <=> 0
         when 1  then range(date_or_time, next_key(date_or_time, length - 1))
-        when 0  then []
+        when 0  then empty_value
         when -1 then nil  # Ruby does this (a bit weird)
         end
       else

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

@@ -3,34 +3,20 @@
 require 'redis-objects'
 
 class Redis
-  autoload :DailyCounter, 'redis/daily_counter'
-  autoload :WeeklyCounter, 'redis/weekly_counter'
-  autoload :MonthlyCounter, 'redis/monthly_counter'
-  autoload :AnnualCounter, 'redis/annual_counter'
-  autoload :HourlyCounter, 'redis/hourly_counter'
-  autoload :MinutelyCounter, 'redis/minutely_counter'
+  PERIODICALS = %w[daily weekly monthly annual hourly minutely].freeze
 
-  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'
+  PERIODICALS.each do |periodical|
+    autoload :"#{periodical.capitalize}Counter", 'redis/periodical_counter'
+    autoload :"#{periodical.capitalize}HashKey", 'redis/periodical_hash_key'
+    autoload :"#{periodical.capitalize}Set", 'redis/periodical_set'
+  end
 
   module Objects
-    autoload :DailyCounters, 'redis/objects/daily_counters'
-    autoload :WeeklyCounters, 'redis/objects/weekly_counters'
-    autoload :MonthlyCounters, 'redis/objects/monthly_counters'
-    autoload :AnnualCounters, 'redis/objects/annual_counters'
-    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'
+    PERIODICALS.each do |periodical|
+      autoload :"#{periodical.capitalize}Counters", 'redis/objects/periodical_counters'
+      autoload :"#{periodical.capitalize}Hashes", 'redis/objects/periodical_hashes'
+      autoload :"#{periodical.capitalize}Sets", 'redis/objects/periodical_sets'
+    end
 
     class << self
       alias original_included included
@@ -39,19 +25,11 @@ class Redis
         original_included(klass)
 
         # Pull in each object type
-        klass.send :include, Redis::Objects::DailyCounters
-        klass.send :include, Redis::Objects::WeeklyCounters
-        klass.send :include, Redis::Objects::MonthlyCounters
-        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
+        PERIODICALS.each do |periodical|
+          klass.send :include, const_get("Redis::Objects::#{periodical.capitalize}Counters")
+          klass.send :include, const_get("Redis::Objects::#{periodical.capitalize}Hashes")
+          klass.send :include, const_get("Redis::Objects::#{periodical.capitalize}Sets")
+        end
       end
     end
   end

data/redis-objects-daily-counter.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_dependency 'redis-objects'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects-daily-counter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - ryz310
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-objects
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gem_comet.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -49,31 +50,16 @@ files:
 - bin/setup
 - 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_hash_key_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/objects/periodical_counters.rb
+- lib/redis/objects/periodical_hashes.rb
+- lib/redis/objects/periodical_sets.rb
+- lib/redis/periodical_counter.rb
+- lib/redis/periodical_hash_key.rb
+- lib/redis/periodical_set.rb
 - lib/redis/recurring_at_intervals.rb
 - lib/redis/recurring_at_intervals/annual.rb
 - lib/redis/recurring_at_intervals/daily.rb
@@ -81,8 +67,6 @@ files:
 - 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:
@@ -99,14 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: Daily counter within Redis::Objects

data/lib/redis/annual_counter.rb

@@ -1,13 +0,0 @@
-# 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 < Counter
-    include RecurringAtIntervals
-    include BaseCounterObject
-    include Annual
-  end
-end

data/lib/redis/annual_set.rb

@@ -1,13 +0,0 @@
-# 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/daily_counter.rb

@@ -1,13 +0,0 @@
-# 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 < Counter
-    include RecurringAtIntervals
-    include BaseCounterObject
-    include Daily
-  end
-end

data/lib/redis/daily_set.rb

@@ -1,13 +0,0 @@
-# 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,13 +0,0 @@
-# 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 < Counter
-    include RecurringAtIntervals
-    include BaseCounterObject
-    include Hourly
-  end
-end

data/lib/redis/hourly_set.rb

@@ -1,13 +0,0 @@
-# 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,13 +0,0 @@
-# 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 < Counter
-    include RecurringAtIntervals
-    include BaseCounterObject
-    include Minutely
-  end
-end

data/lib/redis/minutely_set.rb

@@ -1,13 +0,0 @@
-# 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,13 +0,0 @@
-# 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 < Counter
-    include RecurringAtIntervals
-    include BaseCounterObject
-    include Monthly
-  end
-end

data/lib/redis/monthly_set.rb

@@ -1,13 +0,0 @@
-# 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_counters.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'redis/annual_counter'
-class Redis
-  module Objects
-    module AnnualCounters
-      class << self
-        def included(klass)
-          klass.extend ClassMethods
-        end
-      end
-
-      module ClassMethods
-        def annual_counter(name, options = {}) # rubocop:disable Metrics/MethodLength
-          options[:start] ||= 0
-          options[:type]  ||= (options[:start]).zero? ? :increment : :decrement
-          redis_objects[name.to_sym] = options.merge(type: :counter)
-
-          mod = Module.new do
-            define_method(name) do
-              Redis::AnnualCounter.new(
-                redis_field_key(name), redis_field_redis(name), redis_options(name)
-              )
-            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/annual_sets.rb

@@ -1,49 +0,0 @@
-# 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_counters.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'redis/daily_counter'
-class Redis
-  module Objects
-    module DailyCounters
-      class << self
-        def included(klass)
-          klass.extend ClassMethods
-        end
-      end
-
-      module ClassMethods
-        def daily_counter(name, options = {}) # rubocop:disable Metrics/MethodLength
-          options[:start] ||= 0
-          options[:type]  ||= (options[:start]).zero? ? :increment : :decrement
-          redis_objects[name.to_sym] = options.merge(type: :counter)
-
-          mod = Module.new do
-            define_method(name) do
-              Redis::DailyCounter.new(
-                redis_field_key(name), redis_field_redis(name), redis_options(name)
-              )
-            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_sets.rb

@@ -1,49 +0,0 @@
-# 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