redis_counters-dumpers 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be0aa7c67e74438f7bad1434ffb9f606d81d9f2
-  data.tar.gz: 93c77edc5d86974e29a26607bc3bf086263b0acd
+  metadata.gz: baf28efb0b4f140dae575fd7aa300a1dbb1486ec
+  data.tar.gz: e525a5a8049f12af5c7985a77dc6748901b64181
 SHA512:
-  metadata.gz: 8e22229c899e2a94b309164023ba10e1d1536037214feb3d5a1ef52cd5b71dcbd585f988bb765f23887f07d5317cb603ee706455c6b585fc90114cd708bfb24e
-  data.tar.gz: d9a35017f37676ffa039f0c9c9f24833e390bae5473454a07dc0d4602886bd890438832193b92eed8697357765c71b440e6aa1bf7617116a3d2bac9dc163c0c8
+  metadata.gz: d808c8e16e3438efc682c06161a51d05612fb02c3fbb286f1cd68fa714eedc25d4be52b76b0b4cae3a579b36c07726abd9946f02f11195ae18958e6535a2c4ae
+  data.tar.gz: d51ac56268477487b776b17fa583b5a5ab020af09acd54ae445d42f3ad4f8c94d34917da02585b2b870f8c0a3c49343579b1de69fc393ab21513d96079acde05

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+
+#### [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
+
+#### v0.0.1
+ * 2015-01-26 [86918bd](../../commit/86918bd) - __(bibendi)__ initial code base
+ * 2015-01-26 [a238032](../../commit/a238032) - __(bibendi)__ initial

data/Gemfile

@@ -4,6 +4,10 @@ source 'https://rubygems.org'
 
 group :development, :test do
   gem 'combustion', github: 'pat/combustion', ref: '7d0d24c3f36ce0eb336177fc493be0721bc26665'
+  gem 'activerecord-postgres-hstore', require: false
+  gem 'simple_hstore_accessor', '~> 0.2', require: false
 end
 
+gem 'rack', '< 2' if RUBY_VERSION < '2.2.0'
+
 gemspec

data/lib/redis_counters/dumpers/destination.rb

@@ -58,53 +58,96 @@ module RedisCounters
       # Условия соеденяются через AND.
       attr_accessor :conditions
 
+      # Список дополнительных условий, которые применяются для выборки из source-таблицы для обновления
+      # target, Array of String.
+      # Каждое условие представляет собой строку - часть SQL выражения, которое может включать именованные
+      # параметры из числа доступных в хеше общих параметров дампера: engine.common_params.
+      # Условия соединяются через AND.
+      attr_accessor :source_conditions
+
       def initialize(engine)
         @engine = engine
         @fields_map = HashWithIndifferentAccess.new
         @conditions = []
+        @source_conditions = []
       end
 
       def merge
+        sql = generate_query
+        sql = model.send(:sanitize_sql, [sql, engine.common_params])
+        connection.execute sql
+      end
+
+      def_delegator :model, :connection
+      def_delegator :model, :quoted_table_name, :target_table
+      def_delegator :engine, :temp_table_name, :source_table
+
+      protected
+
+      def generate_query
         target_fields = fields.join(', ')
+        temp_source = "_source_#{source_table}"
+
+        query = create_temp_table_query(temp_source)
+
+        if increment_fields.present?
+          query.concat(insert_with_update_query(temp_source, target_fields))
+        else
+          query.concat(insert_without_update_query(temp_source, target_fields))
+        end
+
+        query.concat(drop_temp_table_query(temp_source))
+        query
+      end
+
+      def create_temp_table_query(temp_source)
+        <<-SQL
+          CREATE TEMP TABLE #{temp_source} ON COMMIT DROP AS
+            SELECT #{selected_fields_expression}
+            FROM #{source_table}
+            #{source_conditions_expression}
+            #{group_by_expression};
+        SQL
+      end
 
-        sql = <<-SQL
+      def drop_temp_table_query(temp_source)
+        <<-SQL
+          DROP TABLE #{temp_source};
+        SQL
+      end
+
+      def insert_with_update_query(temp_source, target_fields)
+        <<-SQL
           WITH
-            source AS
-            (
-              SELECT #{selected_fields_expression}
-              FROM #{source_table}
-              #{group_by_expression}
-            ),
             updated AS
             (
               UPDATE #{target_table} target
               SET
                 #{updating_expression}
-              FROM source
+              FROM #{temp_source} AS source
               WHERE #{matching_expression}
                 #{extra_conditions}
               RETURNING target.*
             )
           INSERT INTO #{target_table} (#{target_fields})
             SELECT #{target_fields}
-            FROM source
+            FROM #{temp_source} as source
             WHERE NOT EXISTS (
               SELECT 1
               FROM updated target
               WHERE #{matching_expression}
                 #{extra_conditions}
-          )
+          );
         SQL
-
-        sql = model.send(:sanitize_sql, [sql, engine.common_params])
-        connection.execute sql
       end
 
-      def_delegator :model, :connection
-      def_delegator :model, :quoted_table_name, :target_table
-      def_delegator :engine, :temp_table_name, :source_table
-
-      protected
+      def insert_without_update_query(temp_source, target_fields)
+        <<-SQL
+          INSERT INTO #{target_table} (#{target_fields})
+            SELECT #{target_fields}
+            FROM #{temp_source} as source;
+        SQL
+      end
 
       def selected_fields_expression
         full_fields_map.map { |target_field, source_field| "#{source_field} as #{target_field}" }.join(', ')
@@ -133,6 +176,12 @@ module RedisCounters
         result = conditions.map { |condition| "(#{condition})" }.join(' AND ')
         result.present? ? "AND #{result}" : result
       end
+
+      def source_conditions_expression
+        return if source_conditions.blank?
+
+        "WHERE #{source_conditions.map { |source_condition| "(#{source_condition})" }.join(' AND ')}"
+      end
     end
   end
 end

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

@@ -28,6 +28,10 @@ module RedisCounters
           def condition(value)
             destination.conditions << value
           end
+
+          def source_condition(value)
+            destination.source_conditions << value
+          end
         end
 
         module ClassMethods

data/lib/redis_counters/dumpers/engine.rb

@@ -59,7 +59,7 @@ module RedisCounters
     #     end
     #   end
     #
-    #   dumper.process!(counter, Date.yesterday)
+    #   dumper.process!(counter, date: Date.yesterday)
     #
     # В результате все данные счетчика за вчера, будут
     # смерджены в целевые таблицы, по ключевым полям: company_id и date,
@@ -100,7 +100,7 @@ module RedisCounters
       attr_accessor :common_params
 
       attr_reader :counter
-      attr_reader :date
+      attr_reader :args
 
       # callbacks
 
@@ -127,12 +127,13 @@ module RedisCounters
       # Public: Производит перенос данных счетчика.
       #
       # counter - экземпляр счетчика.
-      # date    - Date - дата, за которую производится перенос данных.
+      # args    - Hash - набор аргументов(кластер и/или партиции) для переноса данных.
       #
       # Returns Fixnum - кол-во обработанных строк.
       #
-      def process!(counter, date)
-        @counter, @date = counter, date
+      def process!(counter, args = {})
+        @counter = counter
+        @args = args
 
         db_transaction do
           merge_data
@@ -185,7 +186,7 @@ module RedisCounters
       end
 
       def fill_temp_table
-        @rows_processed = counter.data(:date => formatted_date) do |batch|
+        @rows_processed = counter.data(args) do |batch|
           @current_batch = batch
           prepare_batch
           insert_batch
@@ -225,8 +226,8 @@ module RedisCounters
 
       def delete_from_redis
         redis_session.pipelined do |redis|
-          counter.partitions(:date => formatted_date).each do |partition|
-            counter.delete_partition_direct!(partition, redis)
+          counter.partitions(args).each do |partition|
+            counter.delete_partition_direct!(args.merge(partition), redis)
           end
         end
 
@@ -265,24 +266,20 @@ module RedisCounters
                             'character varying(4000)'
                           when :integer, :serial, :number
                             'integer'
-                          when :date
-                            'date'
-                          when :timestamp
-                            'timestamp'
-                          when :boolean
-                            'boolean'
+                          when :date, :timestamp, :boolean, :hstore
+                            type.to_s
                           else
-                            raise 'Unknown datatype %s for %s field' % [type, field]
+                            if type.is_a?(Array) && type.first == :enum
+                              type.last.fetch(:name)
+                            else
+                              raise 'Unknown datatype %s for %s field' % [type, field]
+                            end
                           end
 
           "#{field} #{pg_field_type}"
         end.join(',')
       end
 
-      def formatted_date
-        date.strftime(DATE_FORMAT)
-      end
-
       def db_connection
         destinations.first.connection
       end

data/lib/redis_counters/dumpers/version.rb

@@ -1,5 +1,5 @@
 module RedisCounters
   module Dumpers
-    VERSION = '0.1.0'
+    VERSION = '1.0.0'
   end
 end

data/redis_counters-dumpers.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'callbacks_rb', '>= 0.0.1'
   spec.add_dependency 'redis_counters', '>= 1.3'
 
-
   spec.add_development_dependency 'bundler', '>= 1.7'
   spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'rspec', '>= 3.2'

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

@@ -0,0 +1,3 @@
+class Stat < ActiveRecord::Base
+  store_accessor :params
+end

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

@@ -1,2 +1,3 @@
 class StatsByDay < ActiveRecord::Base
+  store_accessor :params
 end

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

@@ -1,2 +1,3 @@
 class StatsTotal < ActiveRecord::Base
+  store_accessor :params
 end

data/spec/internal/db/schema.rb

@@ -1,9 +1,30 @@
 ActiveRecord::Schema.define do
+  execute <<-SQL
+    CREATE TYPE subject_types AS ENUM ('');
+  SQL
+
+  if ::ActiveRecord::VERSION::MAJOR < 4
+    execute <<-SQL
+      CREATE EXTENSION IF NOT EXISTS hstore;
+    SQL
+  else
+    enable_extension :hstore
+  end
+
+  create_table :stats do |t|
+    t.integer :record_id, null: false
+    t.string :entity_type, null: false
+    t.datetime :date, null: false
+    t.hstore :params
+  end
+
   create_table :stats_by_days do |t|
     t.integer :record_id, null: false
     t.integer :column_id, null: false
     t.date :date, null: false
     t.integer :hits, null: false, default: 0
+    t.column :subject, :subject_types
+    t.hstore :params
   end
 
   add_index :stats_by_days, [:record_id, :column_id, :date], unique: true
@@ -12,6 +33,8 @@ ActiveRecord::Schema.define do
     t.integer :record_id, null: false
     t.integer :column_id, null: false
     t.integer :hits, null: false, default: 0
+    t.column :subject, :subject_types
+    t.hstore :params
   end
 
   add_index :stats_totals, [:record_id, :column_id], unique: true
@@ -19,6 +42,7 @@ ActiveRecord::Schema.define do
   create_table :stats_agg_totals do |t|
     t.integer :record_id, null: false
     t.integer :hits, null: false, default: 0
+    t.column :subject, :subject_types
   end
 
   add_index :stats_agg_totals, [:record_id], unique: true

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

@@ -7,12 +7,14 @@ describe RedisCounters::Dumpers::Engine do
       fields record_id: :integer,
              column_id: :integer,
              value: :integer,
-             date: :date
+             date: :date,
+             subject: [:enum, {name: :subject_types}],
+             params: :hstore
 
       destination do
         model StatsByDay
-        take :record_id, :column_id, :hits, :date
-        key_fields :record_id, :column_id, :date
+        take :record_id, :column_id, :hits, :date, :params
+        key_fields :record_id, :column_id, :date, :params
         increment_fields :hits
         map :hits, to: :value
         condition 'target.date = :date'
@@ -20,8 +22,8 @@ describe RedisCounters::Dumpers::Engine do
 
       destination do
         model StatsTotal
-        take :record_id, :column_id, :hits
-        key_fields :record_id, :column_id
+        take :record_id, :column_id, :hits, :params
+        key_fields :record_id, :column_id, :params
         increment_fields :hits
         map :hits, to: :value
       end
@@ -36,7 +38,7 @@ describe RedisCounters::Dumpers::Engine do
       end
 
       on_before_merge do |dumper, _connection|
-        dumper.common_params = {date: dumper.date.strftime('%Y-%m-%d')}
+        dumper.common_params = {date: dumper.args[:date].strftime('%Y-%m-%d')}
       end
     end
   end
@@ -51,7 +53,7 @@ describe RedisCounters::Dumpers::Engine do
     RedisCounters.create_counter(Redis.current,
       counter_class: RedisCounters::HashCounter,
       counter_name: :record_hits_by_day,
-      group_keys: [:record_id, :column_id],
+      group_keys: [:record_id, :column_id, :subject, :params],
       partition_keys: [:date]
     )
   end
@@ -61,37 +63,156 @@ describe RedisCounters::Dumpers::Engine do
   end
 
   describe '#process!' do
-    before do
-      counter.increment(date: prev_date_s, record_id: 1, column_id: 100)
-      counter.increment(date: prev_date_s, record_id: 1, column_id: 200)
-      counter.increment(date: prev_date_s, record_id: 1, column_id: 200)
-      counter.increment(date: prev_date_s, record_id: 2, column_id: 100)
+    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: '')
 
-      dumper.process!(counter, prev_date)
+        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)
 
-      counter.increment(date: date_s, record_id: 1, column_id: 100)
-      counter.increment(date: date_s, record_id: 1, column_id: 200)
-      counter.increment(date: date_s, record_id: 1, column_id: 200)
-      counter.increment(date: date_s, record_id: 2, column_id: 100)
+        dumper.process!(counter, date: prev_date)
 
-      dumper.process!(counter, 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
+
+      Then { expect(StatsByDay.count).to eq 7 }
+      And { expect(StatsByDay.where(record_id: 1, column_id: 100, date: prev_date).first.hits).to eq 1 }
+      And { expect(StatsByDay.where(record_id: 1, column_id: 200, date: prev_date).first.hits).to eq 2 }
+      And { expect(StatsByDay.where(record_id: 2, column_id: 100, date: prev_date).first.hits).to eq 1 }
+      And { expect(StatsByDay.where(record_id: 3, column_id: 300, date: prev_date).first.params).to eq("a" => "1") }
+      And { expect(StatsByDay.where(record_id: 1, column_id: 100, date: date).first.hits).to eq 1 }
+      And { expect(StatsByDay.where(record_id: 1, column_id: 200, date: date).first.hits).to eq 2 }
+      And { expect(StatsByDay.where(record_id: 2, column_id: 100, date: date).first.hits).to eq 1 }
+
+      And { expect(StatsTotal.count).to eq 4 }
+      And { expect(StatsTotal.where(record_id: 1, column_id: 100).first.hits).to eq 2 }
+      And { expect(StatsTotal.where(record_id: 1, column_id: 200).first.hits).to eq 4 }
+      And { expect(StatsTotal.where(record_id: 2, column_id: 100).first.hits).to eq 2 }
+
+      And { expect(StatsAggTotal.count).to eq 3 }
+      And { expect(StatsAggTotal.where(record_id: 1).first.hits).to eq 6 }
+      And { expect(StatsAggTotal.where(record_id: 2).first.hits).to eq 2 }
+
+      context 'with source conditions' 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
+
+        Then { expect(StatsByDay.count).to eq 4 }
+        And { expect(StatsByDay.where(record_id: 1, column_id: 100, date: prev_date).first.hits).to eq 1 }
+        And { expect(StatsByDay.where(record_id: 2, column_id: 100, date: prev_date).first.hits).to eq 1 }
+        And { expect(StatsByDay.where(record_id: 1, column_id: 100, date: date).first.hits).to eq 1 }
+        And { expect(StatsByDay.where(record_id: 2, column_id: 100, date: date).first.hits).to eq 1 }
+
+        And { expect(StatsTotal.count).to eq 2 }
+        And { expect(StatsTotal.where(record_id: 1, column_id: 100).first.hits).to eq 2 }
+        And { expect(StatsTotal.where(record_id: 2, column_id: 100).first.hits).to eq 2 }
+
+        And { expect(StatsAggTotal.count).to eq 2 }
+        And { expect(StatsAggTotal.where(record_id: 1).first.hits).to eq 2 }
+        And { expect(StatsAggTotal.where(record_id: 2).first.hits).to eq 2 }
+      end
     end
 
-    Then { expect(StatsByDay.count).to eq 6 }
-    And { expect(StatsByDay.where(record_id: 1, column_id: 100, date: prev_date).first.hits).to eq 1 }
-    And { expect(StatsByDay.where(record_id: 1, column_id: 200, date: prev_date).first.hits).to eq 2 }
-    And { expect(StatsByDay.where(record_id: 2, column_id: 100, date: prev_date).first.hits).to eq 1 }
-    And { expect(StatsByDay.where(record_id: 1, column_id: 100, date: date).first.hits).to eq 1 }
-    And { expect(StatsByDay.where(record_id: 1, column_id: 200, date: date).first.hits).to eq 2 }
-    And { expect(StatsByDay.where(record_id: 2, column_id: 100, date: date).first.hits).to eq 1 }
-
-    And { expect(StatsTotal.count).to eq 3 }
-    And { expect(StatsTotal.where(record_id: 1, column_id: 100).first.hits).to eq 2 }
-    And { expect(StatsTotal.where(record_id: 1, column_id: 200).first.hits).to eq 4 }
-    And { expect(StatsTotal.where(record_id: 2, column_id: 100).first.hits).to eq 2 }
-
-    And { expect(StatsAggTotal.count).to eq 2 }
-    And { expect(StatsAggTotal.where(record_id: 1).first.hits).to eq 6 }
-    And { expect(StatsAggTotal.where(record_id: 2).first.hits).to eq 2 }
+    context 'when increment_fields not specified' do
+      let(:dumper) do
+        RedisCounters::Dumpers::Engine.build do
+          name :stats
+          fields record_id: :integer,
+                 entity_type: :string,
+                 date: :timestamp,
+                 params: :hstore
+
+          destination do
+            model Stat
+            take :record_id, :entity_type, :date, :params
+            key_fields :record_id, :entity_type, :date, :params
+          end
+
+          on_before_merge do |dumper, _connection|
+            dumper.common_params = {entity_type: dumper.args[:entity_type]}
+          end
+        end
+      end
+
+      let(:counter) do
+        RedisCounters.create_counter(
+          Redis.current,
+          counter_class: RedisCounters::HashCounter,
+          counter_name: :all_stats,
+          value_delimiter: ';',
+          group_keys: [:date, :record_id, :params],
+          partition_keys: [:entity_type]
+        )
+      end
+
+      let(:date) { Time.now.utc }
+
+      before do
+        counter.increment(entity_type: 'Type1', date: date, record_id: 1, params: '')
+        counter.increment(entity_type: 'Type2', date: date, record_id: 1, params: '')
+        counter.increment(entity_type: 'Type1', date: date - 1.minute, record_id: 1, params: '')
+        counter.increment(entity_type: 'Type1', date: date - 10.minutes, record_id: 1, params: '')
+        counter.increment(entity_type: 'Type1', date: date, record_id: 2, params: '')
+
+        params = {a: 1}.stringify_keys.to_s[1..-2]
+        counter.increment(entity_type: 'Type1', date: date, record_id: 3, params: params)
+
+        dumper.process!(counter, entity_type: 'Type1')
+        dumper.process!(counter, entity_type: 'Type2')
+      end
+
+      Then { expect(Stat.count).to eq 6 }
+      And { expect(Stat.where(entity_type: 'Type1').count).to eq 5 }
+      And { expect(Stat.where(entity_type: 'Type2').count).to eq 1 }
+      And { expect(Stat.where(record_id: 3, entity_type: 'Type1').first.params).to eq("a" => "1") }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -2,6 +2,11 @@
 require 'bundler/setup'
 require 'redis_counters/dumpers'
 
+if ::ActiveRecord::VERSION::MAJOR < 4
+  require 'activerecord-postgres-hstore'
+  require 'simple_hstore_accessor'
+end
+
 require 'combustion'
 Combustion.initialize! :active_record
 

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: redis_counters-dumpers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Merkushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -24,8 +23,8 @@ dependencies:
         version: '3.0'
   type: :runtime
   name: activesupport
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -38,8 +37,8 @@ dependencies:
         version: '3.0'
   type: :runtime
   name: activerecord
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -52,8 +51,8 @@ dependencies:
         version: '0'
   type: :runtime
   name: pg
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -66,8 +65,8 @@ dependencies:
         version: '3.0'
   type: :runtime
   name: redis
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -80,8 +79,8 @@ dependencies:
         version: '1.3'
   type: :runtime
   name: redis-namespace
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -94,8 +93,8 @@ dependencies:
         version: 0.0.1
   type: :runtime
   name: callbacks_rb
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -108,8 +107,8 @@ dependencies:
         version: '1.3'
   type: :runtime
   name: redis_counters
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -122,8 +121,8 @@ dependencies:
         version: '1.7'
   type: :development
   name: bundler
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -136,8 +135,8 @@ dependencies:
         version: '10.0'
   type: :development
   name: rake
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -150,8 +149,8 @@ dependencies:
         version: '3.2'
   type: :development
   name: rspec
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -164,8 +163,8 @@ dependencies:
         version: '3.2'
   type: :development
   name: rspec-rails
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -178,8 +177,8 @@ dependencies:
         version: '3.5'
   type: :development
   name: rspec-given
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -192,8 +191,8 @@ dependencies:
         version: 1.0.2
   type: :development
   name: appraisal
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -206,8 +205,8 @@ dependencies:
         version: '0'
   type: :development
   name: mock_redis
-- !ruby/object:Gem::Dependency
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -220,6 +219,7 @@ dependencies:
         version: '0'
   type: :development
   name: apress-changelogger
+  prerelease: false
 description: 
 email:
 - bibendi@bk.ru
@@ -230,6 +230,7 @@ files:
 - .gitignore
 - .rspec
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -250,6 +251,7 @@ files:
 - lib/redis_counters/dumpers/list.rb
 - lib/redis_counters/dumpers/version.rb
 - redis_counters-dumpers.gemspec
+- spec/internal/app/models/stat.rb
 - spec/internal/app/models/stats_agg_total.rb
 - spec/internal/app/models/stats_by_day.rb
 - spec/internal/app/models/stats_total.rb
@@ -278,11 +280,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Dump statistics from Redis to DB
 test_files:
+- spec/internal/app/models/stat.rb
 - spec/internal/app/models/stats_agg_total.rb
 - spec/internal/app/models/stats_by_day.rb
 - spec/internal/app/models/stats_total.rb