redis_counters 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 98ed479650224ea88e6e4bd246261c38f9aad322
-  data.tar.gz: 935fca9f98e46caed3bb0fec2326297659bfae0e
+SHA256:
+  metadata.gz: ee8632f37abf5f884a41073d7da1d6af0d03a42124aa5667bcd4c867872f4a23
+  data.tar.gz: 5999cedae855634e290a58b1bc17fbbb5ab596d57ff48a6847c8e85bda013809
 SHA512:
-  metadata.gz: fad9d9cf5db41a260a2f40c4893ced84ada4a40c350ad383455edd9867cd3581b881af2bb3cd73262b95363fc8a8f02e0ed74ec65b1203d8379edf888f25c1bf
-  data.tar.gz: 889bf55c4d9d95fc056130aa5cf72db60784e3f3a29af928799db2c0e1cebfcf77d9b3eb572c7e1eb62801d43e92ae2f340a91a9a42c9491055cc77515f9fc6d
+  metadata.gz: 800be8089bfe3444442ac06c0c49c656aa73bcfc06282de92949a89dfc40035198ba472ae8b7d75ff9cfde680a04af96e1e97f7497b601dde17e6205fb4d4243
+  data.tar.gz: ec6cd875271549cff1ebce5b0febe55d4901c8f956aa5e436a3d427ec3ac83096058d87912b33e7162e8da475db713d8b1468bbe5c7675bb2d0f156810f7259b

data/.drone.yml

@@ -41,24 +41,6 @@ spec_step_common: &spec_step_common
     - dip rspec
 
 steps:
-  - name: Tests Ruby 2.2
-    environment:
-      COMPOSE_FILE_EXT: drone
-      DOCKER_RUBY_VERSION: 2.2
-      RUBY_IMAGE_TAG: 2.2-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
-      REDIS_IMAGE_TAG: 4-alpine
-      RAILS_ENV: test
-    <<: *spec_step_common
-
   - name: Tests Ruby 2.4
     environment:
       COMPOSE_FILE_EXT: drone

data/Appraisals

@@ -1,9 +1,4 @@
-if RUBY_VERSION < '2.4'
-  appraise 'rails4.0' do
-    gem 'activesupport', '~> 4.0.0'
-  end
-end
-
+# frozen_string_literal: true
 appraise 'rails4.2' do
   gem 'activesupport', '~> 4.2.0'
 end

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+# v1.5.2
+
+* 2022-05-05 [9c3a157](../../commit/9c3a157) - __(Igor Prudnikov)__ Release 1.5.2 
+* 2022-05-05 [fb05645](../../commit/fb05645) - __(Igor Prudnikov)__ fix: fix hash counter with delimeters containing non-utf8 data 
+https://jira.railsc.ru/browse/BPC-20533
+
+* 2022-05-05 [e10e51d](../../commit/e10e51d) - __(Igor Prudnikov)__ chore: remove older ruby versions support 
+
 # v1.5.1
 
-* 2021-08-06 [3302af4](../../commit/3302af4) - __(TamarinEA)__ Release 1.5.1 
 * 2021-08-06 [09ed078](../../commit/09ed078) - __(TamarinEA)__ chore: support ruby 2.4 and use redis in test 
 
 # v1.5.0

data/Gemfile

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'nokogiri', '< 1.11.0', require: false
+gem 'parallel', '< 1.21.0'
+gem 'racc', ' < 1.6.0', require: false

data/dip.yml

@@ -1,8 +1,8 @@
 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
   REDIS_IMAGE_TAG: 4-alpine
   COMPOSE_FILE_EXT: development
   RAILS_ENV: test

data/lib/redis_counters/hash_counter.rb

@@ -1,5 +1,6 @@
 require 'redis_counters/base_counter'
 require 'redis_counters/clusterize_and_partitionize'
+require 'string_tools'
 
 module RedisCounters
   # Счетчик на основе redis-hash, с возможностью партиционирования и кластеризации значений.
@@ -53,6 +54,7 @@ module RedisCounters
       end
 
       redis.hgetall(key(partition, cluster)).inject(Array.new) do |result, (key, value)|
+        key = key.dup.to_utf8
         values = if delimiter_is_ary
                    if key.include?(new_delim)
                      key.split(new_delim, -1)

data/lib/redis_counters/version.rb

@@ -1,3 +1,3 @@
 module RedisCounters
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.5.2'.freeze
 end

data/redis_counters.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport', '>= 4.0', '< 5'
+  spec.add_runtime_dependency 'string_tools'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/spec/redis_counters/hash_counter_spec.rb

@@ -504,6 +504,27 @@ describe RedisCounters::HashCounter do
     end
   end
 
+  context 'when non-utf8 data contains delimeters' do
+    let(:options) do
+      {
+        counter_name:    :test_counter,
+        group_keys:      [:title, :url],
+        partition_keys:  [:date],
+        key_delimiter:   '&',
+        value_delimiter: '|'
+      }
+    end
+    let(:partition) { {title: "Erg\xE4nzendes", url: 'http://example.com', date: '2022-05-04'} }
+
+    before do
+      redis.hincrbyfloat('test_counter&2022-05-04', "Erg\xE4nzendes|http://example.com", 1.0)
+    end
+
+    it 'successfully splits data' do
+      expect(counter.data).to eq([{'value' => 1, 'title' => 'Ergänzendes', 'url' => 'http://example.com'}])
+    end
+  end
+
   context 'when check custom increment' do
     let(:options) { {
       :counter_name => :test_counter,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_counters
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Artem Napolskih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: string_tools
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -251,8 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Redis Counters