redis_counters-dumpers 1.1.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a60e1ec26471d5763627a8a3ab246e67ef0e9953
-  data.tar.gz: e67d6186b99f2a423fc58ac4e3573aa273541f98
+  metadata.gz: b0cf08857a7fe296b1ccb59f5472630235414c22
+  data.tar.gz: 2739dfa6ab87472f73c49e745c5a17934669e81d
 SHA512:
-  metadata.gz: 60efde8a403440f3c6748ad59937ae3bd4d9c748c30e77e5bb531dd915ed30ffea1b2dab5654536bc07611007c7e2084a7d94e5a3dba9809d2652bd883dd4e9d
-  data.tar.gz: ecaf2c8adc08a8bec2e48fa312bd58b7f015141c96c7d063580a410c3088f3f2c7b071fa37a34fd37fbfb83db95cde447a2d1d2d038efc9c7f5db13f64044853
+  metadata.gz: e4a6bf161dd2330d8e6a2324ea6ae3ae7d8e4e6dd67bdcc9e27f42798749e3e403ade710f90ab991f6bb1aaf36b68623cd127508aeff8b0e77db3bf975f92015
+  data.tar.gz: 66f74d188bb8ed737efcdc9f07ad5e3a8f416f7463b2ef02a9d7dca9f0898617930f09360d377c44a2e8d724b2e9cb44e31d12694b72aa2aff494945fedbc512

data/.drone.yml

@@ -1,21 +1,86 @@
-build:
-  test:
-    image: abakpress/dind-testing
-    pull: true
-    privileged: true
-    volumes:
-      - /home/data/drone/images:/images
-      - /home/data/drone/gems:/bundle
+name: build
+
+kind: pipeline
+type: docker
+
+volumes:
+  - name: rubygems
+    host:
+      path: /home/data/drone/rubygems
+  - name: images
+    host:
+      path: /home/data/drone/images
+  - name: bundle
+    host:
+      path: /home/data/drone/gems
+  - name: keys
+    host:
+      path: /home/data/drone/key_cache
+
+spec_step_common: &spec_step_common
+  image: abakpress/dind-testing:1.0.3
+  pull: if-not-exists
+  privileged: true
+  volumes:
+    - name: images
+      path: /images
+    - name: bundle
+      path: /bundle
+    - name: keys
+      path: /ssh_keys
+  commands:
+    - prepare-build
+
+    - fetch-images
+      --image whilp/ssh-agent
+      --image abakpress/ruby-app:$RUBY_IMAGE_TAG
+      --image abakpress/postgres-db:$POSTGRES_IMAGE_TAG
+      --image redis:$REDIS_IMAGE_TAG
+
+    - dip ssh add -T -v /ssh_keys -k /ssh_keys/id_rsa
+    - dip provision
+    - dip rspec
+
+steps:
+  - name: Tests Ruby 2.2
     environment:
-      - COMPOSE_FILE_EXT=drone
-      - POSTGRES_IMAGE_TAG=9.6-latest
-      - RUBY_IMAGE_TAG=2.2-latest
-    commands:
-      - wrapdocker docker -v
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.2
+      RUBY_IMAGE_TAG: 2.2-latest
+      POSTGRES_IMAGE_TAG: 9.6-latest
+      REDIS_IMAGE_TAG: 4-alpine
+      RAILS_ENV: test
+    <<: *spec_step_common
+
+  - name: Tests Ruby 2.3
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.3
+      RUBY_IMAGE_TAG: 2.3-latest
+      POSTGRES_IMAGE_TAG: 9.6-latest
+      REDIS_IMAGE_TAG: 4-alpine
+      RAILS_ENV: test
+    <<: *spec_step_common
 
-      - fetch-images
-        --image abakpress/ruby-app:$RUBY_IMAGE_TAG
-        --image abakpress/postgres-db:$POSTGRES_IMAGE_TAG
+  - name: Tests Ruby 2.4
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.4
+      RUBY_IMAGE_TAG: 2.4-latest
+      POSTGRES_IMAGE_TAG: 9.6-latest
+      REDIS_IMAGE_TAG: 4-alpine
+      RAILS_ENV: test
+    <<: *spec_step_common
 
-      - dip provision
-      - dip rspec
+  - name: release
+    image: abakpress/gem-publication:latest
+    pull: if-not-exists
+    when:
+      event: push
+      branch: master
+      status: success
+    volumes:
+      - name: rubygems
+        path: /root/.gem
+    commands:
+      - release-gem --public

data/.gitignore

@@ -14,3 +14,4 @@
 *.o
 *.a
 mkmf.log
+/.idea/

data/Appraisals

@@ -1,14 +1,11 @@
-appraise 'rails3.2' do
-  gem 'activesupport', '~> 3.2.14'
-  gem 'activerecord', '~> 3.2.14'
+if RUBY_VERSION < '2.4'
+  appraise 'rails4.0' do
+    gem 'activesupport', '~> 4.0.0'
+    gem 'activerecord', '~> 4.0.0'
+  end
 end
 
-appraise 'rails4.0' do
-  gem 'activesupport', '~> 4.0.0'
-  gem 'activerecord', '~> 4.0.0'
-end
-
-appraise 'rails4.1' do
-  gem 'activesupport', '~> 4.1.0'
-  gem 'activerecord', '~> 4.1.0'
+appraise 'rails4.2' do
+  gem 'activesupport', '~> 4.2.0'
+  gem 'activerecord', '~> 4.2.0'
 end

data/CHANGELOG.md

@@ -1,8 +1,55 @@
+# v1.2.3
 
-#### [Current]
- * 2015-09-10 [1f96c39](../../commit/1f96c39) - __(Zhidkov Denis)__ feat: add source_conditions method
- * 2015-02-19 [8885300](../../commit/8885300) - __(bibendi)__ add group_by method
+* 2021-08-06 [fb93322](../../commit/fb93322) - __(TamarinEA)__ chore: add rubygems volume 
+* 2021-08-05 [ea4350e](../../commit/ea4350e) - __(TamarinEA)__ Release 1.2.3 
+* 2021-08-05 [06cc372](../../commit/06cc372) - __(TamarinEA)__ chore: add ruby 2.4 support 
 
-#### v0.0.1
- * 2015-01-26 [86918bd](../../commit/86918bd) - __(bibendi)__ initial code base
- * 2015-01-26 [a238032](../../commit/a238032) - __(bibendi)__ initial
+# v1.2.2
+
+* 2018-12-21 [6dd9509](../../commit/6dd9509) - __(Oleg Perminov)__ fix: add type text to updating expression 
+https://jira.railsc.ru/browse/CRM-4532
+
+* 2018-12-13 [b197e2a](../../commit/b197e2a) - __(Oleg Perminov)__ feature: add flexibility to persistent types 
+https://jira.railsc.ru/browse/CRM-4532
+
+# v1.2.1
+
+* 2018-12-27 [dca67bc](../../commit/dca67bc) - __(Andrew N. Shalaev)__ feature: add autopublication to rubygems.org 
+* 2018-12-26 [21b57c8](../../commit/21b57c8) - __(Andrew N. Shalaev)__ fix: constraint pg gem 
+* 2018-12-21 [2f4ceab](../../commit/2f4ceab) - __(Andrew N. Shalaev)__ feature: add support for redis >= v4 
+
+# v1.2.0
+
+* 2017-11-13 [bd94a94](../../commit/bd94a94) - __(Artem Napolskih)__ fix: specs for redis_counters 1.5 
+* 2017-11-13 [5641228](../../commit/5641228) - __(Artem Napolskih)__ chore: remove hstore dependency 
+
+# v1.1.0
+
+Ограничение activesupport нужно, чтобы собрался бандл.
+
+* 2017-06-21 [fc29058](../../commit/fc29058) - __(Pavel Galkin)__ feat: matching_expr option for destination 
+https://jira.railsc.ru/browse/CK-862 - пункт 4.
+
+* 2017-06-20 [d21a7d8](../../commit/d21a7d8) - __(Pavel Galkin)__ chore: update infrastructure 
+
+# v1.0.0
+
+* 2016-10-14 [704ad6d](../../commit/704ad6d) - __(Semyon Pupkov)__ Bump version 
+* 2016-09-05 [0bf4850](../../commit/0bf4850) - __(vadshalamov)__ feature: позволит не задавать increment_fields 
+* 2016-08-31 [b5c9bd9](../../commit/b5c9bd9) - __(vadshalamov)__ feature: добавит hstore в список возможных полей 
+* 2016-08-31 [3b0235c](../../commit/3b0235c) - __(vadshalamov)__ feature: позволит передавать набор аргументов для дампа 
+* 2016-07-18 [caa913e](../../commit/caa913e) - __(Stanislav Gordanov)__ feat: добавит enum тип в список возможных полей 
+* 2016-05-27 [bbb7119](../../commit/bbb7119) - __(Michail Merkushin)__ fix: Remove CTE favor temp table 
+https://jira.railsc.ru/browse/PC4-17052
+
+# v0.1.0
+
+* 2015-09-10 [1f96c39](../../commit/1f96c39) - __(Zhidkov Denis)__ feat: add source_conditions method 
+Adds ability to specify WHERE-clause for select query from source tmp-table
+
+* 2015-02-19 [8885300](../../commit/8885300) - __(bibendi)__ add group_by method 
+
+# v0.0.1
+
+* 2015-01-26 [86918bd](../../commit/86918bd) - __(bibendi)__ initial code base 
+* 2015-01-26 [a238032](../../commit/a238032) - __(bibendi)__ initial 

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'activerecord-postgres-hstore', require: false
+gem 'simple_hstore_accessor', '~> 0.2', require: false
+gem 'pg', '~> 0.11'
+
 gemspec

data/dip.yml

@@ -1,9 +1,10 @@
 version: '1'
 
 environment:
-  DOCKER_RUBY_VERSION: 2.2
-  RUBY_IMAGE_TAG: 2.2-latest
+  DOCKER_RUBY_VERSION: 2.4
+  RUBY_IMAGE_TAG: 2.4-latest
   POSTGRES_IMAGE_TAG: 9.6-latest
+  REDIS_IMAGE_TAG: 4-alpine
   COMPOSE_FILE_EXT: development
 
 compose:
@@ -42,5 +43,6 @@ interaction:
 provision:
   - docker volume create --name bundler_data
   - dip bundle config --local https://gems.railsc.ru/ ${APRESS_GEMS_CREDENTIALS}
-  - dip bundle install --full-index
+  - dip clean
+  - dip bundle install
   - dip appraisal install

data/docker-compose.yml

@@ -9,11 +9,17 @@ services:
       - TEST_DB_HOST=db
       - TEST_DB_NAME=docker
       - TEST_DB_USERNAME=postgres
+      - TEST_REDIS_HOST=redis
     command: bash
     depends_on:
       - db
+      - redis
 
   db:
     image: abakpress/postgres-db:$POSTGRES_IMAGE_TAG
     environment:
       - POSTGRES_DB=docker
+
+  redis:
+    image: redis:$REDIS_IMAGE_TAG
+    command: 'redis-server --bind 0.0.0.0'

data/lib/redis_counters/dumpers/destination.rb

@@ -18,6 +18,8 @@ module RedisCounters
       extend Forwardable
       include ::RedisCounters::Dumpers::Dsl::Destination
 
+      VALUE_DELIMITER = ','.freeze
+
       # Ссылка на родительский движек - дампер.
       attr_accessor :engine
 
@@ -76,6 +78,9 @@ module RedisCounters
       # Returns String
       attr_accessor :matching_expr
 
+      # Разделитель значений, String.
+      attr_accessor :value_delimiter
+
       def initialize(engine)
         @engine = engine
         @fields_map = HashWithIndifferentAccess.new
@@ -174,7 +179,16 @@ module RedisCounters
       end
 
       def updating_expression
-        increment_fields.map { |field| "#{field} = COALESCE(target.#{field}, 0) + source.#{field}" }.join(', ')
+        increment_fields.map do |field|
+          case model.columns_hash[field.to_s].type
+          when :datetime, :date
+            "#{field} = source.#{field}"
+          when :text, :string
+            "#{field} = array_to_string(ARRAY[source.#{field}, target.#{field}], '#{delimiter}')"
+          else
+            "#{field} = COALESCE(target.#{field}, 0) + source.#{field}"
+          end
+        end.join(', ')
       end
 
       def matching_expression
@@ -197,6 +211,10 @@ module RedisCounters
 
         "WHERE #{source_conditions.map { |source_condition| "(#{source_condition})" }.join(' AND ')}"
       end
+
+      def delimiter
+        value_delimiter || VALUE_DELIMITER
+      end
     end
   end
 end

data/lib/redis_counters/dumpers/dsl/destination.rb

@@ -13,6 +13,7 @@ module RedisCounters
 
           setter :model
           setter :matching_expr
+          setter :value_delimiter
 
           varags_setter :fields
           varags_setter :key_fields

data/lib/redis_counters/dumpers/engine.rb

@@ -234,10 +234,16 @@ module RedisCounters
       end
 
       def redis_session
-        @redis_session ||= begin
-          redis = ::Redis.new(counter.redis.client.options)
-          ::Redis::Namespace.new(counter.redis.namespace, :redis => redis)
-        end
+        return @redis_session if defined?(@redis_session)
+
+        client = if Gem::Version.new(::Redis::VERSION) < Gem::Version.new('4')
+                   counter.redis.client
+                 else
+                   counter.redis._client
+                 end
+        redis = ::Redis.new(client.options)
+
+        @redis_session = ::Redis::Namespace.new(counter.redis.namespace, redis: redis)
       end
 
       def create_temp_table

data/lib/redis_counters/dumpers/version.rb

@@ -1,5 +1,5 @@
 module RedisCounters
   module Dumpers
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.3'.freeze
   end
 end

data/redis_counters-dumpers.gemspec

@@ -18,21 +18,17 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '>= 3.0', '< 5'
   spec.add_runtime_dependency 'activerecord', '>= 3.0'
-  spec.add_runtime_dependency 'pg'
   spec.add_runtime_dependency 'redis', '>= 3.0'
   spec.add_runtime_dependency 'redis-namespace', '>= 1.3'
   spec.add_runtime_dependency 'callbacks_rb', '>= 0.0.1'
   spec.add_runtime_dependency 'redis_counters', '>= 1.3'
-  spec.add_runtime_dependency 'activerecord-postgres-hstore'
-  spec.add_runtime_dependency 'simple_hstore_accessor', '~> 0.2'
 
   spec.add_development_dependency 'bundler', '>= 1.7'
   spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'rspec', '>= 3.2'
-  spec.add_development_dependency 'rspec-rails', '>= 3.2'
+  spec.add_development_dependency 'rspec-rails', '~> 3.9.1'
   spec.add_development_dependency 'appraisal', '>= 1.0.2'
   spec.add_development_dependency 'mock_redis'
   spec.add_development_dependency 'combustion'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'test-unit'
 end

data/spec/internal/app/models/realtime_stat.rb

@@ -0,0 +1,2 @@
+class RealtimeStat < ActiveRecord::Base
+end

data/spec/internal/db/schema.rb

@@ -27,7 +27,7 @@ ActiveRecord::Schema.define do
     t.hstore :params
   end
 
-  add_index :stats_by_days, [:record_id, :column_id, :date], unique: true
+  add_index :stats_by_days, [:record_id, :column_id, :date, :params], unique: true, name: :uq
 
   create_table :stats_totals do |t|
     t.integer :record_id, null: false
@@ -37,7 +37,7 @@ ActiveRecord::Schema.define do
     t.hstore :params
   end
 
-  add_index :stats_totals, [:record_id, :column_id], unique: true
+  add_index :stats_totals, [:record_id, :column_id, :params], unique: true
 
   create_table :stats_agg_totals do |t|
     t.integer :record_id, null: false
@@ -52,4 +52,12 @@ ActiveRecord::Schema.define do
     t.integer :value, null: false, default: 0
     t.string :payload
   end
+
+  create_table :realtime_stats do |t|
+    t.integer :record_id, null: false
+    t.integer :column_id, null: false
+    t.integer :hits, null: false, default: 0
+    t.timestamp :date
+    t.string :params
+  end
 end

data/spec/lib/redis_counters/dumpers/engine_spec.rb

@@ -26,6 +26,7 @@ describe RedisCounters::Dumpers::Engine do
         key_fields :record_id, :column_id, :params
         increment_fields :hits
         map :hits, to: :value
+        map :params, to: "COALESCE(params, '')"
       end
 
       destination do
@@ -59,105 +60,241 @@ describe RedisCounters::Dumpers::Engine do
   end
 
   before do
-    allow(dumper).to receive(:redis_session).and_return(MockRedis.new)
+    allow(dumper).to receive(:redis_session).and_return(Redis.new(host: ENV['TEST_REDIS_HOST']))
   end
 
   describe '#process!' do
     context 'when increment_fields specified' do
-      before do
-        counter.increment(date: prev_date_s, record_id: 1, column_id: 100, subject: '', params: '')
-        counter.increment(date: prev_date_s, record_id: 1, column_id: 200, subject: '', params: '')
-        counter.increment(date: prev_date_s, record_id: 1, column_id: 200, subject: '', params: '')
-        counter.increment(date: prev_date_s, record_id: 2, column_id: 100, subject: nil, params: '')
+      context 'without source conditions' do
+        before do
+          counter.increment(date: prev_date_s, record_id: 1, column_id: 100, subject: '', params: '')
+          counter.increment(date: prev_date_s, record_id: 1, column_id: 200, subject: '', params: '')
+          counter.increment(date: prev_date_s, record_id: 1, column_id: 200, subject: '', params: '')
+          counter.increment(date: prev_date_s, record_id: 2, column_id: 100, subject: nil, params: '')
 
-        params = {a: 1}.stringify_keys.to_s[1..-2]
-        counter.increment(date: prev_date_s, record_id: 3, column_id: 300, subject: nil, params: params)
+          params = {a: 1}.stringify_keys.to_s[1..-2]
+          counter.increment(date: prev_date_s, record_id: 3, column_id: 300, subject: nil, params: params)
 
-        dumper.process!(counter, date: prev_date)
+          dumper.process!(counter, date: prev_date)
 
-        counter.increment(date: date_s, record_id: 1, column_id: 100, subject: '', params: '')
-        counter.increment(date: date_s, record_id: 1, column_id: 200, subject: '', params: '')
-        counter.increment(date: date_s, record_id: 1, column_id: 200, subject: '', params: '')
-        counter.increment(date: date_s, record_id: 2, column_id: 100, subject: nil, params: '')
+          counter.increment(date: date_s, record_id: 1, column_id: 100, subject: '', params: '')
+          counter.increment(date: date_s, record_id: 1, column_id: 200, subject: '', params: '')
+          counter.increment(date: date_s, record_id: 1, column_id: 200, subject: '', params: '')
+          counter.increment(date: date_s, record_id: 2, column_id: 100, subject: nil, params: '')
 
-        dumper.process!(counter, date: date)
-      end
+          dumper.process!(counter, date: date)
+        end
 
-      it { expect(StatsByDay.count).to eq 7 }
-      it { expect(StatsByDay.where(record_id: 1, column_id: 100, date: prev_date).first.hits).to eq 1 }
-      it { expect(StatsByDay.where(record_id: 1, column_id: 200, date: prev_date).first.hits).to eq 2 }
-      it { expect(StatsByDay.where(record_id: 2, column_id: 100, date: prev_date).first.hits).to eq 1 }
-      it { expect(StatsByDay.where(record_id: 3, column_id: 300, date: prev_date).first.params).to eq("a" => "1") }
-      it { expect(StatsByDay.where(record_id: 1, column_id: 100, date: date).first.hits).to eq 1 }
-      it { expect(StatsByDay.where(record_id: 1, column_id: 200, date: date).first.hits).to eq 2 }
-      it { expect(StatsByDay.where(record_id: 2, column_id: 100, date: date).first.hits).to eq 1 }
+        it { expect(StatsByDay.count).to eq 7 }
+        it { expect(StatsByDay.where(record_id: 1, column_id: 100, date: prev_date).first.hits).to eq 1 }
+        it { expect(StatsByDay.where(record_id: 1, column_id: 200, date: prev_date).first.hits).to eq 2 }
+        it { expect(StatsByDay.where(record_id: 2, column_id: 100, date: prev_date).first.hits).to eq 1 }
+        it { expect(StatsByDay.where(record_id: 3, column_id: 300, date: prev_date).first.params).to eq("a" => "1") }
+        it { expect(StatsByDay.where(record_id: 1, column_id: 100, date: date).first.hits).to eq 1 }
+        it { expect(StatsByDay.where(record_id: 1, column_id: 200, date: date).first.hits).to eq 2 }
+        it { expect(StatsByDay.where(record_id: 2, column_id: 100, date: date).first.hits).to eq 1 }
 
-      it { expect(StatsTotal.count).to eq 4 }
-      it { expect(StatsTotal.where(record_id: 1, column_id: 100).first.hits).to eq 2 }
-      it { expect(StatsTotal.where(record_id: 1, column_id: 200).first.hits).to eq 4 }
-      it { expect(StatsTotal.where(record_id: 2, column_id: 100).first.hits).to eq 2 }
+        it { expect(StatsTotal.count).to eq 4 }
+        it { expect(StatsTotal.where(record_id: 1, column_id: 100).first.hits).to eq 2 }
+        it { expect(StatsTotal.where(record_id: 1, column_id: 200).first.hits).to eq 4 }
+        it { expect(StatsTotal.where(record_id: 2, column_id: 100).first.hits).to eq 2 }
 
-      it { expect(StatsAggTotal.count).to eq 3 }
-      it { expect(StatsAggTotal.where(record_id: 1).first.hits).to eq 6 }
-      it { expect(StatsAggTotal.where(record_id: 2).first.hits).to eq 2 }
+        it { expect(StatsAggTotal.count).to eq 3 }
+        it { expect(StatsAggTotal.where(record_id: 1).first.hits).to eq 6 }
+        it { expect(StatsAggTotal.where(record_id: 2).first.hits).to eq 2 }
+      end
 
       context 'with source conditions' do
+        context 'when incremented field class is integer' do
+          let(:dumper) do
+            RedisCounters::Dumpers::Engine.build do
+              name :stats_totals
+              fields record_id: :integer,
+                     column_id: :integer,
+                     value: :integer,
+                     date: :date
+
+              destination do
+                model StatsByDay
+                take :record_id, :column_id, :hits, :date
+                key_fields :record_id, :column_id, :date
+                increment_fields :hits
+                map :hits, to: :value
+                condition 'target.date = :date'
+                source_condition 'column_id = 100'
+              end
+
+              destination do
+                model StatsTotal
+                take :record_id, :column_id, :hits
+                key_fields :record_id, :column_id
+                increment_fields :hits
+                map :hits, to: :value
+                source_condition 'column_id = 100'
+              end
+
+              destination do
+                model StatsAggTotal
+                take :record_id, :hits
+                key_fields :record_id
+                increment_fields :hits
+                map :hits, to: 'sum(value)'
+                group_by :record_id
+                source_condition 'column_id = 100'
+              end
+
+              on_before_merge do |dumper, _connection|
+                dumper.common_params = {date: dumper.args[:date].strftime('%Y-%m-%d')}
+              end
+            end
+          end
+
+          before do
+            counter.increment(date: prev_date_s, record_id: 1, column_id: 100, subject: '', params: '')
+            counter.increment(date: prev_date_s, record_id: 1, column_id: 200, subject: '', params: '')
+            counter.increment(date: prev_date_s, record_id: 1, column_id: 200, subject: '', params: '')
+            counter.increment(date: prev_date_s, record_id: 2, column_id: 100, subject: nil, params: '')
+
+            params = {a: 1}.stringify_keys.to_s[1..-2]
+            counter.increment(date: prev_date_s, record_id: 3, column_id: 300, subject: nil, params: params)
+
+            dumper.process!(counter, date: prev_date)
+
+            counter.increment(date: date_s, record_id: 1, column_id: 100, subject: '', params: '')
+            counter.increment(date: date_s, record_id: 1, column_id: 200, subject: '', params: '')
+            counter.increment(date: date_s, record_id: 1, column_id: 200, subject: '', params: '')
+            counter.increment(date: date_s, record_id: 2, column_id: 100, subject: nil, params: '')
+
+            dumper.process!(counter, date: date)
+          end
+
+          it { expect(StatsByDay.count).to eq 4 }
+          it { expect(StatsByDay.where(record_id: 1, column_id: 100, date: prev_date).first.hits).to eq 1 }
+          it { expect(StatsByDay.where(record_id: 2, column_id: 100, date: prev_date).first.hits).to eq 1 }
+          it { expect(StatsByDay.where(record_id: 1, column_id: 100, date: date).first.hits).to eq 1 }
+          it { expect(StatsByDay.where(record_id: 2, column_id: 100, date: date).first.hits).to eq 1 }
+
+          it { expect(StatsTotal.count).to eq 2 }
+          it { expect(StatsTotal.where(record_id: 1, column_id: 100).first.hits).to eq 2 }
+          it { expect(StatsTotal.where(record_id: 2, column_id: 100).first.hits).to eq 2 }
+
+          it { expect(StatsAggTotal.count).to eq 2 }
+          it { expect(StatsAggTotal.where(record_id: 1).first.hits).to eq 2 }
+          it { expect(StatsAggTotal.where(record_id: 2).first.hits).to eq 2 }
+        end
+      end
+
+      context 'when incremented field class is string' do
         let(:dumper) do
           RedisCounters::Dumpers::Engine.build do
-            name :stats_totals
+            name :realtime_stats
             fields record_id: :integer,
                    column_id: :integer,
                    value: :integer,
-                   date: :date
+                   params: :string,
+                   date: :timestamp
 
             destination do
-              model StatsByDay
-              take :record_id, :column_id, :hits, :date
-              key_fields :record_id, :column_id, :date
-              increment_fields :hits
+              model RealtimeStat
+              take :record_id, :column_id, :date, :hits, :params
+              key_fields :record_id, :column_id
+              increment_fields :hits, :params
+              value_delimiter '; '
               map :hits, to: :value
-              condition 'target.date = :date'
-              source_condition 'column_id = 100'
+              condition 'target.date::date = :date::date'
             end
+          end
+        end
+
+        before do
+          counter.increment(date: date, record_id: 1, column_id: 100, subject: '', params: 'abc')
+          dumper.common_params = {date: date, params: 'abc'}
+          dumper.process!(counter, date: date)
+
+          counter.increment(date: date, record_id: 1, column_id: 100, subject: '', params: 'xyz')
+          dumper.common_params = {date: date, params: 'xyz'}
+          dumper.process!(counter, date: date)
+        end
+
+        it do
+          expect(RealtimeStat.count).to eq 1
+          expect(RealtimeStat.first.params).to eq 'xyz; abc'
+        end
+      end
+
+      context 'when incremented field class is text' do
+        let(:dumper) do
+          RedisCounters::Dumpers::Engine.build do
+            name :realtime_stats
+            fields record_id: :integer,
+                   column_id: :integer,
+                   value: :integer,
+                   params: :text,
+                   date: :timestamp
 
             destination do
-              model StatsTotal
-              take :record_id, :column_id, :hits
+              model RealtimeStat
+              take :record_id, :column_id, :date, :hits, :params
               key_fields :record_id, :column_id
-              increment_fields :hits
+              increment_fields :hits, :params
               map :hits, to: :value
-              source_condition 'column_id = 100'
+              condition 'target.date::date = :date::date'
             end
+          end
+        end
 
-            destination do
-              model StatsAggTotal
-              take :record_id, :hits
-              key_fields :record_id
-              increment_fields :hits
-              map :hits, to: 'sum(value)'
-              group_by :record_id
-              source_condition 'column_id = 100'
-            end
+        before do
+          counter.increment(date: date, record_id: 1, column_id: 100, subject: '', params: 'abc')
+          dumper.common_params = {date: date, params: 'abc'}
+          dumper.process!(counter, date: date)
+
+          counter.increment(date: date, record_id: 1, column_id: 100, subject: '', params: 'xyz')
+          dumper.common_params = {date: date, params: 'xyz'}
+          dumper.process!(counter, date: date)
+        end
+
+        it do
+          expect(RealtimeStat.count).to eq 1
+          expect(RealtimeStat.first.params).to eq 'xyz,abc'
+        end
+      end
+
+      context 'when incremented field class is date or time' do
+        let(:current_time) { Date.today.to_time }
+        let(:dumper) do
+          RedisCounters::Dumpers::Engine.build do
+            name :realtime_stats
+            fields record_id: :integer,
+                   column_id: :integer,
+                   value: :integer,
+                   params: :string,
+                   date: :timestamp
 
-            on_before_merge do |dumper, _connection|
-              dumper.common_params = {date: dumper.args[:date].strftime('%Y-%m-%d')}
+            destination do
+              model RealtimeStat
+              take :record_id, :column_id, :hits, :params, :date
+              key_fields :record_id, :column_id
+              increment_fields :hits, :date
+              map :hits, to: :value
+              condition 'target.date::date = :date::date'
             end
           end
         end
 
-        it { expect(StatsByDay.count).to eq 4 }
-        it { expect(StatsByDay.where(record_id: 1, column_id: 100, date: prev_date).first.hits).to eq 1 }
-        it { expect(StatsByDay.where(record_id: 2, column_id: 100, date: prev_date).first.hits).to eq 1 }
-        it { expect(StatsByDay.where(record_id: 1, column_id: 100, date: date).first.hits).to eq 1 }
-        it { expect(StatsByDay.where(record_id: 2, column_id: 100, date: date).first.hits).to eq 1 }
+        before do
+          counter.increment(date: date, record_id: 1, column_id: 100, subject: '', params: '')
+          dumper.common_params = {date: current_time}
+          dumper.process!(counter, date: date)
 
-        it { expect(StatsTotal.count).to eq 2 }
-        it { expect(StatsTotal.where(record_id: 1, column_id: 100).first.hits).to eq 2 }
-        it { expect(StatsTotal.where(record_id: 2, column_id: 100).first.hits).to eq 2 }
+          counter.increment(date: date, record_id: 1, column_id: 100, subject: '', params: '')
+          dumper.common_params = {date: current_time}
+          dumper.process!(counter, date: date)
+        end
 
-        it { expect(StatsAggTotal.count).to eq 2 }
-        it { expect(StatsAggTotal.where(record_id: 1).first.hits).to eq 2 }
-        it { expect(StatsAggTotal.where(record_id: 2).first.hits).to eq 2 }
+        it 'update incremented date' do
+          expect(RealtimeStat.count).to eq 1
+          expect(RealtimeStat.first.date).to eq current_time
+        end
       end
     end
 

data/spec/spec_helper.rb

@@ -1,19 +1,13 @@
 require 'redis_counters/dumpers'
 
-if ::ActiveRecord::VERSION::MAJOR < 4
-  require 'activerecord-postgres-hstore'
-  require 'simple_hstore_accessor'
-end
-
 require 'combustion'
 Combustion.initialize! :active_record
 
 require 'rspec/rails'
 require 'pry-byebug'
 
-require 'mock_redis'
 require 'redis'
-Redis.current = MockRedis.new
+Redis.current = Redis.new(host: ENV['TEST_REDIS_HOST'])
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_counters-dumpers
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.3
 platform: ruby
 authors:
 - Merkushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,20 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -114,34 +100,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: activerecord-postgres-hstore
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simple_hstore_accessor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -188,16 +146,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.9.1
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -254,20 +212,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  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: 
 email:
 - bibendi@bk.ru
@@ -298,6 +242,7 @@ files:
 - lib/redis_counters/dumpers/version.rb
 - redis_counters-dumpers.gemspec
 - spec/internal/app/models/nullable_stat.rb
+- spec/internal/app/models/realtime_stat.rb
 - spec/internal/app/models/stat.rb
 - spec/internal/app/models/stats_agg_total.rb
 - spec/internal/app/models/stats_by_day.rb
@@ -326,12 +271,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Dump statistics from Redis to DB
 test_files:
 - spec/internal/app/models/nullable_stat.rb
+- spec/internal/app/models/realtime_stat.rb
 - spec/internal/app/models/stat.rb
 - spec/internal/app/models/stats_agg_total.rb
 - spec/internal/app/models/stats_by_day.rb