redis_counters 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21ad3dea600e503c5c78e5f7b1c2c44df42b9c6c
-  data.tar.gz: daa6aaaf6b4f4e9e4900d019c5bbbb9c0d675936
+  metadata.gz: a7e6d0cc5b4ca4ed565bb19a6d630460ca7f83a9
+  data.tar.gz: b7962325e5af14aa63f6231b9053cc8d5f020b66
 SHA512:
-  metadata.gz: 4a59daf0d09208f4779758224ae19e03cc54dbea4623c4dac78a9aaf334a921513040c5cf60317f3f16528399b011b3faa8a759c2f21bdf02c8061a2593f9631
-  data.tar.gz: 9afa7121c971ae69a1c5c2b868f42f871d6d28eef44394f7be8e52946b6e6fcfe8e7b35d831668debf33415b259ea7aad6bb14d494123d3522c9e8c7fdc0e022
+  metadata.gz: ea9edd7ea8fbc50f901de96b70cf51ea983c5e8bc07e0017bdddb844af3b4ec0f2105996b9dd200d7c0e5021955bc017af63e3240ec97af24ff824d3d6ea9f2b
+  data.tar.gz: 03a615b5e096b657e5e1982e3b568167b71b463d57d820e28062dc890b6af109e717de64ab3a7e64cffca2afbc5c0a5e14d27ebe03828772a8c4d721cff680c3

data/.drone.yml

@@ -0,0 +1,22 @@
+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.3-latest
+      - SPHINX_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
+        --image abakpress/sphinx-index:$SPHINX_IMAGE_TAG
+
+      - dip provision
+      - dip rspec

data/.rspec

@@ -0,0 +1,5 @@
+--color
+--tty
+--format progress
+--order random
+--backtrace

data/Gemfile

@@ -1,6 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'json', '< 2' if RUBY_VERSION < '2'
-gem 'activesupport', '< 5' if RUBY_VERSION < '2'
-
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # RedisCounters
 
-[![Dolly](http://dolly.railsc.ru/badges/abak-press/redis_counters/master)](http://dolly.railsc.ru/projects/36/builds/latest/?ref=master)
+[![Build Status](https://drone.railsc.ru/api/badges/abak-press/redis_counters/status.svg)](https://drone.railsc.ru/abak-press/redis_counters)
 [![Code Climate](https://codeclimate.com/github/abak-press/redis_counters/badges/gpa.svg)](https://codeclimate.com/github/abak-press/redis_counters)
 [![Test Coverage](https://codeclimate.com/github/abak-press/redis_counters/badges/coverage.svg)](https://codeclimate.com/github/abak-press/redis_counters/coverage)
 

data/dip.yml

@@ -0,0 +1,41 @@
+version: '1'
+
+environment:
+  DOCKER_RUBY_VERSION: 2.2
+  RUBY_IMAGE_TAG: 2.2-latest
+  COMPOSE_FILE_EXT: development
+  RAILS_ENV: test
+
+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
+
+  rspec:
+    service: app
+    command: bundle exec rspec
+
+  clean:
+    service: app
+    command: rm -f Gemfile.lock gemfiles/*.gemfile.*
+
+provision:
+  - docker volume create --name bundler_data
+  - dip clean
+  - dip bundle 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,9 @@
+version: '2'
+
+services:
+  app:
+    image: abakpress/ruby-app:$RUBY_IMAGE_TAG
+    environment:
+      - BUNDLE_PATH=/bundle/$DOCKER_RUBY_VERSION
+      - BUNDLE_CONFIG=/app/.bundle/config
+    command: bash

data/lib/redis_counters.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'redis_counters/version'
 require 'redis_counters/base_counter'
 require 'redis_counters/hash_counter'
@@ -12,10 +11,9 @@ require 'active_support'
 require 'active_support/core_ext'
 
 module RedisCounters
-
   def create_counter(redis, opts)
     BaseCounter.create(redis, opts)
   end
 
   module_function :create_counter
-end
+end

data/lib/redis_counters/base_counter.rb

@@ -1,11 +1,8 @@
-# coding: utf-8
 require 'forwardable'
 require 'active_support/core_ext/class/attribute'
 
 module RedisCounters
-
   # Базовый класс счетчика на основе Redis.
-
   class BaseCounter
     extend Forwardable
 
@@ -22,10 +19,13 @@ module RedisCounters
     # opts - Hash - хеш опций счетчика:
     #        counter_name - Symbol/String - идентификатор счетчика.
     #        key_delimiter - String - разделитель ключа (опционально).
-    #        value_delimiter - String - разделитель значений (опционально).
+    #        value_delimiter - Array[String] или String, разделитель значений. Если это массив, то первый элемент будет
+    #                          считатся новым разделителем, а второй старым. Все данные будут записываться, используя
+    #                          новый. Старый будет использоваться только для старых данных. Так что если надо сменить
+    #                          делимитр у счётчика, например с ':' на '�', то сперва надо будет установить его на ['�',
+    #                          ':'], а после дампа старых данных в БД, на '�'.
     #
     # Returns RedisCounters::BaseCounter.
-    #
     def self.create(redis, opts)
       counter_class = opts.fetch(:counter_class).to_s.constantize
       counter_class.new(redis, opts)
@@ -80,5 +80,4 @@ module RedisCounters
 
     def_delegator :redis, :multi, :transaction
   end
-
-end
+end

data/lib/redis_counters/clusterize_and_partitionize.rb

@@ -191,4 +191,4 @@ module RedisCounters
       result
     end
   end
-end
+end

data/lib/redis_counters/hash_counter.rb

@@ -1,11 +1,8 @@
-# coding: utf-8
 require 'redis_counters/base_counter'
 require 'redis_counters/clusterize_and_partitionize'
 
 module RedisCounters
-
   # Счетчик на основе redis-hash, с возможностью партиционирования и кластеризации значений.
-
   class HashCounter < BaseCounter
     include ClusterizeAndPartitionize
 
@@ -24,7 +21,11 @@ module RedisCounters
         group_params = [field_name]
       end
 
-      group_params.join(value_delimiter)
+      if value_delimiter.is_a?(Array)
+        group_params.join(value_delimiter.first)
+      else
+        group_params.join(value_delimiter)
+      end
     end
 
     def field_name
@@ -43,12 +44,26 @@ module RedisCounters
     # cluster - Array - листовой кластер - массив параметров однозначно идентифицирующий кластер.
     # partition - Array - листовая партиция - массив параметров однозначно идентифицирующий партицию.
     #
-    # Returns Array of WithIndifferentAccess.
-    #
+    # Returns Array of HashWithIndifferentAccess.
     def partition_data(cluster, partition)
       keys = group_keys.dup.unshift(:value)
+
+      if delimiter_is_ary = value_delimiter.is_a?(Array)
+        new_delim, old_delim = value_delimiter
+      end
+
       redis.hgetall(key(partition, cluster)).inject(Array.new) do |result, (key, value)|
-        values = key.split(value_delimiter, -1).unshift(format_value(value))
+        values = if delimiter_is_ary
+                   if key.include?(new_delim)
+                     key.split(new_delim, -1)
+                   else
+                     key.split(old_delim, -1)
+                   end
+                 else
+                   key.split(value_delimiter, -1)
+                 end
+
+        values = values.map(&:presence).unshift(format_value(value))
         values.delete_at(1) unless group_keys.present?
         result << Hash[keys.zip(values)].with_indifferent_access
       end
@@ -66,5 +81,4 @@ module RedisCounters
       @float_mode ||= options.fetch(:float_mode, false)
     end
   end
-
 end

data/lib/redis_counters/version.rb

@@ -1,3 +1,3 @@
 module RedisCounters
-  VERSION = '1.4.0'
-end
+  VERSION = '1.5.0'.freeze
+end

data/redis_counters.gemspec

@@ -16,7 +16,7 @@ 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 'activesupport', '>= 3.0', '< 5'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'cane', '>= 2.6.0'
   spec.add_development_dependency 'bundler-audit'
-  spec.add_development_dependency 'apress-changelogger'
+  spec.add_development_dependency 'pry-byebug'
 end

data/spec/redis_counters/hash_counter_spec.rb

@@ -257,7 +257,7 @@ describe RedisCounters::HashCounter do
       it { expect(counter.data(partitions).first[:param4]).to eq '1' }
       it { expect(counter.data(partitions).second[:value]).to eq 5 }
       it { expect(counter.data(partitions).second[:param3]).to eq '31' }
-      it { expect(counter.data(partitions).second[:param4]).to eq '' }
+      it { expect(counter.data(partitions).second[:param4]).to eq nil }
     end
 
     context 'when group_keys given' do
@@ -446,6 +446,68 @@ describe RedisCounters::HashCounter do
     it { expect(counter.data.third[:value]).to eq 3 }
   end
 
+  context 'two delimiters' do
+    let(:options) do
+      {
+        counter_name:    :test_counter,
+        group_keys:      [:title, :url],
+        partition_keys:  [:date],
+        key_delimiter:   '&',
+        value_delimiter: %W(\uFFFD :)
+      }
+    end
+    let(:partition) { {title: 'Main', url: 'http://example.com', date: '2017-04-21'} }
+
+    before { counter.increment(partition) }
+
+    it 'uses the first (new) delimiter for writing' do
+      expect(counter.send(:field)).to eq('Main�http://example.com')
+      expect(counter.data).to eq([{'value' => 1, 'title' => 'Main', 'url' => 'http://example.com'}])
+    end
+  end
+
+  context 'new delimiter added when there is data separated by the old one' do
+    let(:options) do
+      {
+        counter_name:    :test_counter,
+        group_keys:      [:title, :url],
+        partition_keys:  [:date],
+        key_delimiter:   '&',
+        value_delimiter: %W(\uFFFD :)
+      }
+    end
+    let(:partition) { {title: 'Main', url: 'http://example.com', date: '2017-04-21'} }
+
+    before do
+      redis.hincrbyfloat('test_counter&2017-04-21', 'Main:/about', 1.0)
+    end
+
+    it 'understands the old delimiter' do
+      expect(counter.data).to eq([{'value' => 1, 'title' => 'Main', 'url' => '/about'}])
+    end
+  end
+
+  context 'new delimiter added and there is data separated by it but contains the old delimiter' do
+    let(:options) do
+      {
+        counter_name:    :test_counter,
+        group_keys:      [:title, :url],
+        partition_keys:  [:date],
+        key_delimiter:   '&',
+        value_delimiter: %W(\uFFFD :)
+      }
+    end
+    let(:partition) { {title: 'Main', url: 'http://example.com', date: '2017-04-21'} }
+
+    before do
+      redis.hincrbyfloat('test_counter&2017-04-21', 'Main�http://example.com', 1.0)
+    end
+
+    it 'uses the new delimiter' do
+      expect(counter.data).to eq([{'value' => 1, 'title' => 'Main', 'url' => 'http://example.com'}])
+    end
+  end
+
   context 'when check custom increment' do
     let(:options) { {
       :counter_name => :test_counter,
@@ -459,4 +521,4 @@ describe RedisCounters::HashCounter do
     it { expect(redis.hexists('test_counter', 'test_field')).to be_true }
     it { expect(redis.hget('test_counter', 'test_field').to_f).to be_within(0.001).of value*0.2.to_f }
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,11 @@
-require 'rubygems'
 require 'bundler/setup'
 require 'rspec'
 require 'mock_redis'
 require 'timecop'
-
 require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-
 require 'simplecov'
+require 'pry-byebug'
+
 SimpleCov.start('test_frameworks')
 
 require 'redis_counters'
@@ -18,7 +16,4 @@ Dir[File.join(support_dir, '**', '*.rb')].each { |f| require f }
 
 RSpec.configure do |config|
   config.backtrace_exclusion_patterns = [/lib\/rspec\/(core|expectations|matchers|mocks)/]
-  config.color_enabled = true
-  config.formatter = 'documentation'
-  config.order = 'random'
-end
+end

metadata

@@ -1,169 +1,175 @@
 --- !ruby/object:Gem::Specification
 name: redis_counters
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Artem Napolskih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
   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
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
+- !ruby/object:Gem::Dependency
   name: mock_redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
+- !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: apress-changelogger
+- !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'
 description: 
 email:
 - napolskih@gmail.com
@@ -171,12 +177,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".drone.yml"
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - Makefile
 - README.md
 - Rakefile
+- dip.yml
+- docker-compose.development.yml
+- docker-compose.drone.yml
+- docker-compose.yml
 - lib/redis_counters.rb
 - lib/redis_counters/base_counter.rb
 - lib/redis_counters/bucket.rb
@@ -215,12 +227,12 @@ 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: []