red_blocks 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ba95013b534cdd836ff25acded9eec935aea998a
-  data.tar.gz: 82cad15362d7a10e4d20d6505a45dc6087f5b9da
+SHA256:
+  metadata.gz: 55b03475a362f7e4f4de3da9a17d8ce3f8ba45a65018abb7b5400a256d951732
+  data.tar.gz: 1be31a031e4a2c999e64b5fd6d2395cf0b7b0b54d6e6b21026fb25dd11e68654
 SHA512:
-  metadata.gz: 166fdb842bc2e19bb191c49128ddc7213960a038be20bbf68a75c24e7fb0720679bd46eeb614478b6df4ac1bb2a0ded9a4fc13698298e9b52dec3d6e51a3809d
-  data.tar.gz: 4fd75e66d99f6cf0b20ba359cb71f6de1bf0073c49c93c600a45d0350be3850e3634f1fe7b79a176fcae3970c1736cdd2ed51e3698bc8792444011e59f5f093e
+  metadata.gz: 3b0a7f6a2cc0a1329f6d424e4a32118e4650c511b27fbb6fcad147de6d5d2582a2d1405376fdeaa123af5ddf87b3955fd7e43bba8d3fba552f05916670c4bc13
+  data.tar.gz: e38ad3d62403cca86668277a04a3bdbab95c2059a14e6920136d80098e58b673d6902adea81e03625af92f7d5970afe99c3b990c16ab321bbd3a4eb6041f680e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## CHANGELOG
 
+### v0.1.7 / 2023-06-21
+- Make compatible to redis gem 5 series @KeiSakam https://github.com/Altech/red_blocks/pull/13
+
+### v0.1.6 / 2022-09-02
+- Make ComposedSet#update! safe to Redis connection lost by @stomk https://github.com/Altech/red_blocks/pull/12
+
 ### v0.1.0 / 2017-12-05
 
 First release.

data/README.md

@@ -50,8 +50,4 @@ In general, there are some advantages by using RedBlocks.
 gem 'red_blocks'
 ```
 
-## Classes
-
-TODO: document
-
-[This entry](http://takenos.link/post/173086712782/redis-sorted-set-in-oop) describes the usage of RedBlocks (in japanese).
+[This entry](https://qiita.com/Altech/items/db48e7906c90d542c732) and [this slide](http://speakerdeck.com/altech/object-oriented-abstraction-of-redis-sorted-set) describe the usage of RedBlocks (in japanese).

data/lib/red_blocks/composed_set.rb

@@ -27,8 +27,10 @@ module RedBlocks
 
     def update!
       disabled_sets.each(&:update!)
-      compose_sets!
-      RedBlocks.client.expire(key, expiration_time)
+      RedBlocks.client.pipelined do |pipeline|
+        compose_sets!(pipeline)
+        pipeline.expire(key, expiration_time)
+      end
     end
 
     def cache_time
@@ -41,13 +43,13 @@ module RedBlocks
 
     private
 
-    def compose_sets!
+    def compose_sets!(pipeline)
       raise NotImplementedError
     end
 
     def disabled_sets
-      ttls = RedBlocks.client.pipelined do
-        @sets.each { |set| RedBlocks.client.ttl(set.key) }
+      ttls = RedBlocks.client.pipelined do |pipeline|
+        @sets.each { |set| pipeline.ttl(set.key) }
       end
       @sets.zip(ttls).select do |set, ttl|
         set.disabled?(ttl)

data/lib/red_blocks/intersection_set.rb

@@ -2,15 +2,13 @@ module RedBlocks
   class IntersectionSet < ComposedSet
     private
 
-    def compose_sets!
+    def compose_sets!(pipeline)
       sets = @sets.to_a
       if sets.size > 0
-        RedBlocks.client.zinterstore(key, sets.map(&:key), weights: sets.map(&:weight), aggregate: score_func)
+        pipeline.zinterstore(key, sets.map(&:key), weights: sets.map(&:weight), aggregate: score_func)
       else
-        RedBlocks.client.pipelined do
-          RedBlocks.client.del(key)
-          RedBlocks.client.zadd(key, normalize_entries([]))
-        end
+        pipeline.del(key)
+        pipeline.zadd(key, normalize_entries([]))
       end
     end
   end

data/lib/red_blocks/operations.rb

@@ -3,9 +3,9 @@
 module RedBlocks::Operations
   def self.delete(set_or_pattern)
     keys = self.keys(set_or_pattern)
-    RedBlocks.client.pipelined do
+    RedBlocks.client.pipelined do |pipeline|
       keys.each do |key|
-        RedBlocks.client.del(key)
+        pipeline.del(key)
       end
     end
   end

data/lib/red_blocks/set.rb

@@ -6,10 +6,10 @@ module RedBlocks
     def update!(get_result = self.get)
       entries = normalize_entries(validate_entries!(get_result))
       removed_ids = self.ids(paginator: Paginator.all, update_if_disabled: false) - entries.map(&:last)
-      RedBlocks.client.pipelined do
-        RedBlocks.client.zrem(key, removed_ids) if removed_ids.size > 0
-        RedBlocks.client.zadd(key, entries)
-        RedBlocks.client.expire(key, expiration_time)
+      RedBlocks.client.pipelined do |pipeline|
+        pipeline.zrem(key, removed_ids) if removed_ids.size > 0
+        pipeline.zadd(key, entries)
+        pipeline.expire(key, expiration_time)
       end
       nil
     end

data/lib/red_blocks/subtraction_set.rb

@@ -40,8 +40,8 @@ module RedBlocks
     private
 
     def disabled_sets
-      ttls = RedBlocks.client.pipelined do
-        sets.each { |set| RedBlocks.client.ttl(set.key) }
+      ttls = RedBlocks.client.pipelined do |pipeline|
+        sets.each { |set| pipeline.ttl(set.key) }
       end
       sets.zip(ttls).select do |set, ttl|
         set.disabled?(ttl)

data/lib/red_blocks/union_set.rb

@@ -2,15 +2,13 @@ module RedBlocks
   class UnionSet < ComposedSet
     private
 
-    def compose_sets!
+    def compose_sets!(pipeline)
       sets = @sets.to_a
       if sets.size > 0
-        RedBlocks.client.zunionstore(key, sets.map(&:key), weights: sets.map(&:weight), aggregate: score_func)
+        pipeline.zunionstore(key, sets.map(&:key), weights: sets.map(&:weight), aggregate: score_func)
       else
-        RedBlocks.client.pipelined do
-          RedBlocks.client.del(key)
-          RedBlocks.client.zadd(key, normalize_entries([]))
-        end
+        pipeline.del(key)
+        pipeline.zadd(key, normalize_entries([]))
       end
     end
   end

data/lib/red_blocks/version.rb

@@ -1,3 +1,3 @@
 module RedBlocks
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/red_blocks.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.4.0'
 
-  spec.add_dependency "redis", ">= 3.3", "< 5.0"
+  spec.add_dependency "redis", ">= 3.3", "< 6.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red_blocks
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Altech
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -19,7 +19,7 @@ dependencies:
         version: '3.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ homepage: https://github.com/Altech/red_blocks
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,9 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Object-oriented abstraction of Redis sorted set.
 test_files: []