graphql-anycable 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0437da8b1214b8c5aa81733cd8b0b4449a527f9d7f487e3d0e97034ffefea2e
-  data.tar.gz: ef6d5a734dfc73824e2a37e7b3d3bcd47eb3af597b99a9d91a7aa41c7fc85797
+  metadata.gz: 4eb249dbc6328d60349c77133acf85310aed8327970a566a29948150e273ccd4
+  data.tar.gz: 63ed46c57e0edcaab0070bc76b7302d132c08e66d82e4df50952eea179df1d46
 SHA512:
-  metadata.gz: eae7c1026142f0d4360d556af37eeae4937e9cde79bf0e05a8aed6a3dac9e40a6445f7970b11bc9c8a25def13ee42d1c0507452d6c168805452dc9a7d8fb1c30
-  data.tar.gz: f2985e19bad56f101099ca1da605f0eb62b606034d595530c86bbd672b146b65ef7f54212813fdf110dba961dfaa14e400bab390505828b4a8dc7fa289039155
+  metadata.gz: eaf554708a593aba20f54f3fe02f8cb841253e61a2485da7761d7ac68a33f0f154bee17c8f9642697692e26d98a603e507ae48da847a7303809657a6c3f8bdad
+  data.tar.gz: 4d48e480589166950e962f08f70ce38f0022a306608315ff1b3509f75211ef5902e9cafe803551cfd645fd55fc759057d3d6c0e0a4002a2a28850933a958a641

data/.github/workflows/test.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    name: "GraphQL-Ruby ${{ matrix.graphql }} (interpreter: ${{ matrix.interpreter }} with AnyCable ${{ matrix.anycable }}, use_client_id: ${{ matrix.client_id }}) on Ruby ${{ matrix.ruby }}"
+    name: "GraphQL-Ruby ${{ matrix.graphql }} (interpreter: ${{ matrix.interpreter }}, use_client_id: ${{ matrix.client_id }}) on Ruby ${{ matrix.ruby }}"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -18,25 +18,25 @@ jobs:
         include:
           - ruby: "3.0"
             graphql: '~> 1.12.0'
-            anycable: '~> 1.1.0'
             client_id: 'false'
             interpreter: yes
+            anycable_rails: '~> 1.2'
           - ruby: 2.7
             graphql: '~> 1.12.0'
-            anycable: '~> 1.1.0'
             client_id: 'false'
             interpreter: yes
+            anycable_rails: '~> 1.2.0'
           - ruby: 2.6
             graphql: '~> 1.11.0'
-            anycable: '~> 1.0.0'
             client_id: 'true'
             interpreter: no
+            anycable_rails: '~> 1.0'
     container:
       image: ruby:${{ matrix.ruby }}
       env:
         CI: true
         GRAPHQL_RUBY_VERSION: ${{ matrix.graphql }}
-        ANYCABLE_VERSION: ${{ matrix.anycable }}
+        ANYCABLE_RAILS_VERSION: ${{ matrix.anycable_rails }}
         GRAPHQL_ANYCABLE_USE_CLIENT_PROVIDED_UNIQ_ID: ${{ matrix.client_id }}
     steps:
       - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.2 - 2022-03-11
+
+### Fixed
+
+- AnyCable 1.3.0 compatibility. [@palkan] [#21](https://github.com/anycable/graphql-anycable/pull/21)
+- Redis.rb 5.0 compatibility. [@palkan] [#21](https://github.com/anycable/graphql-anycable/pull/21)
+
 ## 1.1.1 - 2021-12-06
 
 ### Fixed

data/Gemfile

@@ -9,7 +9,7 @@ gemspec
 
 gem "graphql",  ENV.fetch("GRAPHQL_RUBY_VERSION", "~> 1.12")
 gem "anycable", ENV.fetch("ANYCABLE_VERSION", "~> 1.0")
-gem "anycable-rails", ENV.fetch("ANYCABLE_VERSION", "~> 1.0"), require: false
+gem "anycable-rails", ENV.fetch("ANYCABLE_RAILS_VERSION", "~> 1.2")
 
 group :development, :test do
   gem "pry"

data/README.md

@@ -144,7 +144,7 @@ GraphQL-AnyCable uses [anyway_config] to configure itself. There are several pos
     GRAPHQL_ANYCABLE_USE_CLIENT_PROVIDED_UNIQ_ID=false
     ```
 
- 2. YAML configuration files:
+ 2. YAML configuration files (note that this is `config/graphql_anycable.yml`, *not* `config/anycable.yml`):
 
     ```yaml
     # config/graphql_anycable.yml

data/lib/graphql/anycable/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module AnyCable
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/lib/graphql/subscriptions/anycable_subscriptions.rb

@@ -79,9 +79,9 @@ module GraphQL
         return if fingerprints.empty?
 
         fingerprint_subscription_ids = Hash[fingerprints.zip(
-          redis.pipelined do
+          redis.pipelined do |pipeline|
             fingerprints.map do |fingerprint|
-              redis.smembers(SUBSCRIPTIONS_PREFIX + fingerprint)
+              pipeline.smembers(SUBSCRIPTIONS_PREFIX + fingerprint)
             end
           end
         )]
@@ -160,16 +160,16 @@ module GraphQL
           events: events.map { |e| [e.topic, e.fingerprint] }.to_h.to_json,
         }
 
-        redis.multi do
-          redis.sadd(CHANNEL_PREFIX + channel_uniq_id, subscription_id)
-          redis.mapped_hmset(SUBSCRIPTION_PREFIX + subscription_id, data)
+        redis.multi do |pipeline|
+          pipeline.sadd(CHANNEL_PREFIX + channel_uniq_id, subscription_id)
+          pipeline.mapped_hmset(SUBSCRIPTION_PREFIX + subscription_id, data)
           events.each do |event|
-            redis.zincrby(FINGERPRINTS_PREFIX + event.topic, 1, event.fingerprint)
-            redis.sadd(SUBSCRIPTIONS_PREFIX + event.fingerprint, subscription_id)
+            pipeline.zincrby(FINGERPRINTS_PREFIX + event.topic, 1, event.fingerprint)
+            pipeline.sadd(SUBSCRIPTIONS_PREFIX + event.fingerprint, subscription_id)
           end
           next unless config.subscription_expiration_seconds
-          redis.expire(CHANNEL_PREFIX + channel_uniq_id, config.subscription_expiration_seconds)
-          redis.expire(SUBSCRIPTION_PREFIX + subscription_id, config.subscription_expiration_seconds)
+          pipeline.expire(CHANNEL_PREFIX + channel_uniq_id, config.subscription_expiration_seconds)
+          pipeline.expire(SUBSCRIPTION_PREFIX + subscription_id, config.subscription_expiration_seconds)
         end
       end
 
@@ -191,19 +191,19 @@ module GraphQL
         events = redis.hget(SUBSCRIPTION_PREFIX + subscription_id, :events)
         events = events ? JSON.parse(events) : {}
         fingerprint_subscriptions = {}
-        redis.pipelined do
+        redis.pipelined do |pipeline|
           events.each do |topic, fingerprint|
-            redis.srem(SUBSCRIPTIONS_PREFIX + fingerprint, subscription_id)
-            score = redis.zincrby(FINGERPRINTS_PREFIX + topic, -1, fingerprint)
+            pipeline.srem(SUBSCRIPTIONS_PREFIX + fingerprint, subscription_id)
+            score = pipeline.zincrby(FINGERPRINTS_PREFIX + topic, -1, fingerprint)
             fingerprint_subscriptions[FINGERPRINTS_PREFIX + topic] = score
           end
           # Delete subscription itself
-          redis.del(SUBSCRIPTION_PREFIX + subscription_id)
+          pipeline.del(SUBSCRIPTION_PREFIX + subscription_id)
         end
         # Clean up fingerprints that doesn't have any subscriptions left
-        redis.pipelined do
+        redis.pipelined do |pipeline|
           fingerprint_subscriptions.each do |key, score|
-            redis.zremrangebyscore(key, '-inf', '0') if score.value.zero?
+            pipeline.zremrangebyscore(key, '-inf', '0') if score.value.zero?
           end
         end
         delete_legacy_subscription(subscription_id)
@@ -252,7 +252,7 @@ module GraphQL
       end
 
       def write_subscription_id(channel, val)
-        channel.connection.socket.istate["sid"] = val
+        channel.connection.anycable_socket.istate["sid"] = val
         channel.instance_variable_set(:@__sid__, val)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-anycable
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anycable