redis_counters-dumpers 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf28efb0b4f140dae575fd7aa300a1dbb1486ec
-  data.tar.gz: e525a5a8049f12af5c7985a77dc6748901b64181
+  metadata.gz: a60e1ec26471d5763627a8a3ab246e67ef0e9953
+  data.tar.gz: e67d6186b99f2a423fc58ac4e3573aa273541f98
 SHA512:
-  metadata.gz: d808c8e16e3438efc682c06161a51d05612fb02c3fbb286f1cd68fa714eedc25d4be52b76b0b4cae3a579b36c07726abd9946f02f11195ae18958e6535a2c4ae
-  data.tar.gz: d51ac56268477487b776b17fa583b5a5ab020af09acd54ae445d42f3ad4f8c94d34917da02585b2b870f8c0a3c49343579b1de69fc393ab21513d96079acde05
+  metadata.gz: 60efde8a403440f3c6748ad59937ae3bd4d9c748c30e77e5bb531dd915ed30ffea1b2dab5654536bc07611007c7e2084a7d94e5a3dba9809d2652bd883dd4e9d
+  data.tar.gz: ecaf2c8adc08a8bec2e48fa312bd58b7f015141c96c7d063580a410c3088f3f2c7b071fa37a34fd37fbfb83db95cde447a2d1d2d038efc9c7f5db13f64044853

data/.drone.yml

@@ -0,0 +1,21 @@
+build:
+  test:
+    image: abakpress/dind-testing
+    pull: true
+    privileged: true
+    volumes:
+      - /home/data/drone/images:/images
+      - /home/data/drone/gems:/bundle
+    environment:
+      - COMPOSE_FILE_EXT=drone
+      - POSTGRES_IMAGE_TAG=9.6-latest
+      - RUBY_IMAGE_TAG=2.2-latest
+    commands:
+      - wrapdocker docker -v
+
+      - fetch-images
+        --image abakpress/ruby-app:$RUBY_IMAGE_TAG
+        --image abakpress/postgres-db:$POSTGRES_IMAGE_TAG
+
+      - dip provision
+      - dip rspec

data/.gitignore

@@ -7,6 +7,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/spec/internal/log
+/gemfiles
 *.bundle
 *.so
 *.o

data/Appraisals

@@ -1,11 +1,6 @@
-appraise 'rails3.1' do
-  gem 'activesupport', '~> 3.1.0'
-  gem 'activerecord', '~> 3.1.0'
-end
-
 appraise 'rails3.2' do
-  gem 'activesupport', '~> 3.2.0'
-  gem 'activerecord', '~> 3.2.0'
+  gem 'activesupport', '~> 3.2.14'
+  gem 'activerecord', '~> 3.2.14'
 end
 
 appraise 'rails4.0' do

data/Gemfile

@@ -1,13 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in redis_counters-dumpers.gemspec
-
-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/README.md

@@ -1,5 +1,7 @@
 # RedisCounters::Dumpers
 
+[![Build Status](https://drone.railsc.ru/api/badges/abak-press/redis_counters-dumpers/status.svg)](https://drone.railsc.ru/abak-press/redis_counters-dumpers)
+
 Dump statistics from Redis to DB
 
 ## Installation

data/dip.yml

@@ -0,0 +1,46 @@
+version: '1'
+
+environment:
+  DOCKER_RUBY_VERSION: 2.2
+  RUBY_IMAGE_TAG: 2.2-latest
+  POSTGRES_IMAGE_TAG: 9.6-latest
+  COMPOSE_FILE_EXT: development
+
+compose:
+  files:
+    - docker-compose.yml
+    - docker-compose.${COMPOSE_FILE_EXT}.yml
+
+interaction:
+  sh:
+    service: app
+
+  irb:
+    service: app
+    command: irb
+
+  bundle:
+    service: app
+    command: bundle
+
+  rake:
+    service: app
+    command: bundle exec rake
+
+  appraisal:
+    service: app
+    command: bundle exec appraisal
+
+  rspec:
+    service: app
+    command: bundle exec appraisal bundle exec rspec
+
+  clean:
+    service: app
+    command: rm -f Gemfile.lock gemfiles/*.gemfile.*
+
+provision:
+  - docker volume create --name bundler_data
+  - dip bundle config --local https://gems.railsc.ru/ ${APRESS_GEMS_CREDENTIALS}
+  - dip bundle install --full-index
+  - dip appraisal install

data/docker-compose.development.yml

@@ -0,0 +1,13 @@
+version: '2'
+
+services:
+  app:
+    volumes:
+      - .:/app
+      - ../:/localgems
+      - bundler-data:/bundle
+
+volumes:
+  bundler-data:
+    external:
+      name: bundler_data

data/docker-compose.drone.yml

@@ -0,0 +1,7 @@
+version: '2'
+
+services:
+  app:
+    volumes:
+      - .:/app
+      - /bundle:/bundle

data/docker-compose.yml

@@ -0,0 +1,19 @@
+version: '2'
+
+services:
+  app:
+    image: abakpress/ruby-app:$RUBY_IMAGE_TAG
+    environment:
+      - BUNDLE_PATH=/bundle/$DOCKER_RUBY_VERSION
+      - BUNDLE_CONFIG=/app/.bundle/config
+      - TEST_DB_HOST=db
+      - TEST_DB_NAME=docker
+      - TEST_DB_USERNAME=postgres
+    command: bash
+    depends_on:
+      - db
+
+  db:
+    image: abakpress/postgres-db:$POSTGRES_IMAGE_TAG
+    environment:
+      - POSTGRES_DB=docker

data/lib/redis_counters/dumpers/destination.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'forwardable'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/object/blank'
@@ -65,6 +64,18 @@ module RedisCounters
       # Условия соединяются через AND.
       attr_accessor :source_conditions
 
+      # Public: Опциональное выражение для определения одинаковых записей в исходной (source) и целевой (target)
+      # таблицах. Эту опцию имеет смысл использовать если например нужно добавить функцию на какую-нибудь колонку,
+      # например:
+      #
+      # matching_expr <<-SQL
+      #   (source.company_id, source.date, coalesce(source.referer, '')) =
+      #     (target.company_id, target.date, coalesce(target.referer, ''))
+      # SQL
+      #
+      # Returns String
+      attr_accessor :matching_expr
+
       def initialize(engine)
         @engine = engine
         @fields_map = HashWithIndifferentAccess.new
@@ -167,6 +178,10 @@ module RedisCounters
       end
 
       def matching_expression
+        matching_expr || default_matching_expr
+      end
+
+      def default_matching_expr
         source_key_fields = key_fields.map { |field| "source.#{field}" }.join(', ')
         target_key_fields = key_fields.map { |field| "target.#{field}" }.join(', ')
         "(#{source_key_fields}) = (#{target_key_fields})"

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

@@ -1,4 +1,3 @@
-# coding: utf-8
 module RedisCounters
   module Dumpers
     module Dsl

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

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'active_support/concern'
 require_relative 'base'
 
@@ -13,6 +12,7 @@ module RedisCounters
           alias_method :destination, :target
 
           setter :model
+          setter :matching_expr
 
           varags_setter :fields
           varags_setter :key_fields

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

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'active_support/concern'
 require_relative 'base'
 

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

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'active_support/concern'
 require 'redis_counters/dumpers/engine'
 

data/lib/redis_counters/dumpers/engine.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'forwardable'
 require 'callbacks_rb'
 require 'active_support/core_ext/hash/indifferent_access'

data/lib/redis_counters/dumpers/list.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'active_support/core_ext/hash/indifferent_access'
 require_relative 'dsl/list'
 

data/lib/redis_counters/dumpers/version.rb

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

data/redis_counters-dumpers.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'redis_counters/dumpers/version'
@@ -17,20 +16,23 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '>= 3.0'
-  spec.add_dependency 'activerecord', '>= 3.0'
-  spec.add_dependency 'pg'
-  spec.add_dependency 'redis', '>= 3.0'
-  spec.add_dependency 'redis-namespace', '>= 1.3'
-  spec.add_dependency 'callbacks_rb', '>= 0.0.1'
-  spec.add_dependency 'redis_counters', '>= 1.3'
+  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-given', '>= 3.5'
   spec.add_development_dependency 'appraisal', '>= 1.0.2'
   spec.add_development_dependency 'mock_redis'
-  spec.add_development_dependency 'apress-changelogger'
+  spec.add_development_dependency 'combustion'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'test-unit'
 end

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

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

data/spec/internal/config/database.yml

@@ -0,0 +1,5 @@
+test:
+  adapter: postgresql
+  host: <%= ENV.fetch('TEST_DB_HOST', 'localhost') %>
+  database: <%= ENV.fetch('TEST_DB_NAME', 'docker') %>
+  username: <%= ENV.fetch('TEST_DB_USERNAME', 'docker') %>

data/spec/internal/db/schema.rb

@@ -46,4 +46,10 @@ ActiveRecord::Schema.define do
   end
 
   add_index :stats_agg_totals, [:record_id], unique: true
+
+  create_table :nullable_stats do |t|
+    t.date :date, null: false
+    t.integer :value, null: false, default: 0
+    t.string :payload
+  end
 end

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

@@ -83,23 +83,23 @@ describe RedisCounters::Dumpers::Engine do
         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 }
+      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(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 }
 
       context 'with source conditions' do
         let(:dumper) do
@@ -145,19 +145,19 @@ describe RedisCounters::Dumpers::Engine do
           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 }
+        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 }
 
-        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 }
+        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 }
 
-        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 }
+        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
 
@@ -209,10 +209,68 @@ describe RedisCounters::Dumpers::Engine do
         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") }
+      it { expect(Stat.count).to eq 6 }
+      it { expect(Stat.where(entity_type: 'Type1').count).to eq 5 }
+      it { expect(Stat.where(entity_type: 'Type2').count).to eq 1 }
+      it { expect(Stat.where(record_id: 3, entity_type: 'Type1').first.params).to eq("a" => "1") }
+    end
+
+    context 'matching_expr is specified' do
+      let(:dumper) do
+        RedisCounters::Dumpers::Engine.build do
+          name :nullable_stats
+
+          fields date: :date,
+                 value: :integer,
+                 payload: :string
+
+          destination do
+            model NullableStat
+            take :date, :value, :payload
+            key_fields :date, :value, :payload
+            increment_fields :value
+            condition 'target.date = :date'
+            matching_expr <<-EXPR
+              (source.date, coalesce(source.payload, '')) =
+                (target.date, coalesce(target.payload, ''))
+            EXPR
+          end
+
+          on_before_merge do |dumper, _|
+            dumper.common_params = {date: dumper.args[:date].strftime('%Y-%m-%d')}
+          end
+        end
+      end
+
+      let(:counter) do
+        RedisCounters.create_counter(
+          Redis.current,
+          counter_class: RedisCounters::HashCounter,
+          counter_name: :nullable_stats,
+          group_keys: [:payload],
+          partition_keys: [:date]
+        )
+      end
+
+      before do
+        counter.increment(date: date_s, value: 1, payload: 'foobar')
+        counter.increment(date: date_s, value: 1, payload: nil)
+
+        dumper.process!(counter, date: date)
+        counter.delete_all!
+
+        counter.increment(date: date_s, value: 1, payload: 'foobar')
+        counter.increment(date: date_s, value: 1, payload: nil)
+
+        dumper.process!(counter, date: date)
+        counter.delete_all!
+      end
+
+      it 'treats nulls as equal to each other because they are coalesced to an empty string' do
+        expect(NullableStat.count).to eq(2)
+        expect(NullableStat.find_by_payload('foobar').value).to eq(2)
+        expect(NullableStat.find_by_payload(nil).value).to eq(2)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-require 'bundler/setup'
 require 'redis_counters/dumpers'
 
 if ::ActiveRecord::VERSION::MAJOR < 4
@@ -11,7 +9,7 @@ require 'combustion'
 Combustion.initialize! :active_record
 
 require 'rspec/rails'
-require 'rspec/given'
+require 'pry-byebug'
 
 require 'mock_redis'
 require 'redis'

metadata

@@ -1,225 +1,273 @@
 --- !ruby/object:Gem::Specification
 name: redis_counters-dumpers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Merkushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
-  name: activesupport
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
-  name: activerecord
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
-  name: pg
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.3'
   type: :runtime
-  name: redis
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: callbacks_rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.0.1
   type: :runtime
-  name: redis-namespace
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: redis_counters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '1.3'
   type: :runtime
-  name: callbacks_rb
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !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: '1.3'
+        version: '0'
   type: :runtime
-  name: redis_counters
   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: '1.7'
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
-  name: bundler
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
-  name: rake
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
-  name: rspec
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
-  name: rspec-rails
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 1.0.2
   type: :development
-  name: rspec-given
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: mock_redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
   type: :development
-  name: appraisal
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-  name: mock_redis
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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'
+- !ruby/object:Gem::Dependency
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-  name: apress-changelogger
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - bibendi@bk.ru
@@ -227,20 +275,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".drone.yml"
+- ".gitignore"
+- ".rspec"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
-- Makefile
 - README.md
-- Rakefile
-- gemfiles/.gitignore
-- gemfiles/rails3.1.gemfile
-- gemfiles/rails3.2.gemfile
-- gemfiles/rails4.0.gemfile
-- gemfiles/rails4.1.gemfile
+- dip.yml
+- docker-compose.development.yml
+- docker-compose.drone.yml
+- docker-compose.yml
 - lib/redis_counters/dumpers.rb
 - lib/redis_counters/dumpers/destination.rb
 - lib/redis_counters/dumpers/dsl/base.rb
@@ -251,13 +297,13 @@ files:
 - lib/redis_counters/dumpers/list.rb
 - lib/redis_counters/dumpers/version.rb
 - redis_counters-dumpers.gemspec
+- spec/internal/app/models/nullable_stat.rb
 - 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
-- spec/internal/config/.gitignore
+- spec/internal/config/database.yml
 - spec/internal/db/schema.rb
-- spec/internal/log/.gitignore
 - spec/lib/redis_counters/dumpers/engine_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/abak-press/redis_counters-dumpers
@@ -270,27 +316,27 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.4.6
 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/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
-- spec/internal/config/.gitignore
+- spec/internal/config/database.yml
 - spec/internal/db/schema.rb
-- spec/internal/log/.gitignore
 - spec/lib/redis_counters/dumpers/engine_spec.rb
 - spec/spec_helper.rb

data/Makefile

@@ -1,28 +0,0 @@
-RAILS_ENV = test
-BUNDLE = RAILS_ENV=${RAILS_ENV} bundle
-BUNDLE_OPTIONS = -j 2
-RSPEC = rspec
-APPRAISAL = appraisal
-
-all: test
-
-test: config/database bundler/install appraisal/install
-	${BUNDLE} exec ${APPRAISAL} ${RSPEC} spec 2>&1
-
-config/database:
-	touch spec/internal/config/database.yml
-	echo 'test:' >> spec/internal/config/database.yml
-	echo '  adapter: postgresql' >> spec/internal/config/database.yml
-	echo '  database: docker' >> spec/internal/config/database.yml
-	echo '  username: docker' >> spec/internal/config/database.yml
-	echo '  host: localhost' >> spec/internal/config/database.yml
-	echo '  min_messages: warning' >> spec/internal/config/database.yml
-
-bundler/install:
-	if ! gem list bundler -i > /dev/null; then \
-	  gem install bundler; \
-	fi
-	${BUNDLE} install ${BUNDLE_OPTIONS}
-
-appraisal/install:
-	${BUNDLE} exec ${APPRAISAL} install

data/Rakefile

@@ -1,2 +0,0 @@
-require "bundler/gem_tasks"
-

data/gemfiles/.gitignore

@@ -1 +0,0 @@
-*.gemfile.lock

data/gemfiles/rails3.1.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 3.1.0"
-gem "activerecord", "~> 3.1.0"
-
-group :development, :test do
-  gem "combustion", :github => "pat/combustion", :ref => "7d0d24c3f36ce0eb336177fc493be0721bc26665"
-end
-
-gemspec :path => "../"

data/gemfiles/rails3.2.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 3.2.0"
-gem "activerecord", "~> 3.2.0"
-
-group :development, :test do
-  gem "combustion", :github => "pat/combustion", :ref => "7d0d24c3f36ce0eb336177fc493be0721bc26665"
-end
-
-gemspec :path => "../"

data/gemfiles/rails4.0.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 4.0.0"
-gem "activerecord", "~> 4.0.0"
-
-group :development, :test do
-  gem "combustion", :github => "pat/combustion", :ref => "7d0d24c3f36ce0eb336177fc493be0721bc26665"
-end
-
-gemspec :path => "../"

data/gemfiles/rails4.1.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 4.1.0"
-gem "activerecord", "~> 4.1.0"
-
-group :development, :test do
-  gem "combustion", :github => "pat/combustion", :ref => "7d0d24c3f36ce0eb336177fc493be0721bc26665"
-end
-
-gemspec :path => "../"

data/spec/internal/config/.gitignore

@@ -1 +0,0 @@
-database.yml

data/spec/internal/log/.gitignore

@@ -1 +0,0 @@
-*.log