where_is_waldo 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce4ac18944bec996440772eed972216ff64975a1be13b4f7f3d0230e5cc0807f
-  data.tar.gz: 80e1f0ba820d24dc5f5d74f7ef4cc31e00ba3f183145d24de17dc24e5bd4b78b
+  metadata.gz: 5bd28c86d109c69fc976eaab788972106493a78b3fbd8e8e2370bae5dc936986
+  data.tar.gz: fd49e94bf3a08dd4350fdc1b8b413ec5d66916ef1ada8c74162044b3ccbdc428
 SHA512:
-  metadata.gz: 877c8e0adf85cb7c8e75f992939c372690d1a928ab3ef4b6a4d64479ba9801ccd74820235db112d4efcab473a0589097165b62edf07824247a1a6be82d6ba32a
-  data.tar.gz: d91ec5e623c3a8e8b7b149d5d9a80d6110ab5f4a8c81cc71bdaa73608afc593efe534bc2dc53c71df067837fb56c1cac9479df52a421f7364d1b545cc7657018
+  metadata.gz: 620c8ce6c899937a25ab39f2858e45c5fa6ac68dc3510cf0e47a5739b36a8f95c24bb3daf385974600ffa652ad32f176a79ac0389286520af7a291bc48cda1e7
+  data.tar.gz: 0ecf65ed538cbffc439428ed3f5acc690e178430ba62a9568fb1b4a1d4cb48f33303aaa9724979f8c1c0ebfc44da5eb35133665345a2dfc2d4a3a224373784d7

data/CHANGELOG.md

@@ -3,6 +3,61 @@
 Notable changes to where_is_waldo. Format loosely follows
 [Keep a Changelog](https://keepachangelog.com/).
 
+## Unreleased
+
+## 0.1.11 - 2026-10-27
+
+### Fixed
+
+- **The install generator emitted the pre-0.1.5 schema.** It wrote a unique
+  index on the session column alone, while 0.1.5 moved presence rows to being
+  keyed by `(subject, session)` precisely so two authenticated subjects who
+  collide on a session id cannot upsert onto each other's row — session ids are
+  client-supplied in some setups, and a reused JWT `jti` is enough. The adapter
+  has scoped every session lookup by both columns since; only the generator
+  lagged, so every app installed after 0.1.5 got a schema the library had
+  already moved away from and needed a follow-up migration to correct. An
+  unused second migration template carrying the right index (and a hardcoded
+  `Migration[7.0]`) has been removed rather than left as a second answer.
+
+- **The install generator overwrote an existing ActionCable connection.**
+  Installing into an app that already authenticates its own cable connection
+  replaced that file with the turnkey one, silently dropping whatever the app
+  did beyond what this library needs — container scoping and token bookkeeping
+  in the cases seen. Existing channel files are now kept, and the post-install
+  message names them and states what the channel requires of a connection
+  (`current_user` and `session_id`).
+
+### Changed
+
+- **The Redis adapter is now tested against a real server, on both redis-rb 5
+  and 6.** Its existing spec runs against `MockRedis`, a pure-Ruby fake with no
+  protocol layer, so it could not see wire-format changes at all. redis-rb 6
+  defaults to RESP3, which types several replies differently from RESP2 —
+  `SMEMBERS` among them, and this adapter feeds that result straight into
+  `filter_map` and `all?`. Nothing in the adapter's command set behaves
+  differently between the two, but that was previously unverified rather than
+  known.
+
+  - New integration spec drives the adapter against a live Redis. It skips when
+    no server is reachable, so contributors are not required to run one.
+  - CI adds an `rspec-redis` job with a Redis service, run as a matrix over
+    redis-rb 5.x and 6.x, and fails rather than skips if the service is missing
+    — a silent skip would read as a pass.
+  - Development dependency widened from `~> 5.0` to `>= 5.0, < 7`. The gem has
+    no runtime dependency on `redis` and never has, so this constrains nothing
+    for consumers; it only lets the library test what consumers actually use.
+  - README documents supported client versions, and that `protocol: 2` is not
+    needed.
+
+  The committed lockfile stays on redis 5.x, which keeps `mock_redis` at
+  0.53.0 for every existing spec. `mock_redis` 0.53.0 depends on `redis ~> 5`,
+  so resolving against redis 6 forces it down to 0.48.1 — that happens only
+  inside the redis 6 CI leg, which runs the real-server spec alone and never
+  touches MockRedis. No mock-based spec changed the double it runs against.
+
+  No runtime code changed.
+
 ## 0.1.10
 
 ### Added

data/README.md

@@ -41,6 +41,13 @@ rails generate where_is_waldo:install --adapter=redis --subject_column=user_id
 npm install @byscott-io/where-is-waldo @rails/actioncable
 ```
 
+Installing into an app that already has `app/channels/application_cable/`?
+Those files are kept, never overwritten — the generator only adds what is
+missing, and says which it left alone. The presence channel needs the
+connection to identify **`current_user`** and **`session_id`**; add them to
+your own connection, or `include WhereIsWaldo::JwtConnection` (corebyscott
+apps) to get both from the JWT.
+
 ### 2. Configure
 
 ```ruby
@@ -148,6 +155,20 @@ WhereIsWaldo.configure do |config|
 end
 ```
 
+#### Redis adapter and client versions
+
+The gem does not depend on `redis`. Choosing `:redis` means supplying your own
+client, so you pick the version.
+
+`redis-rb` 5.x and 6.x are both supported and both run in CI against a real
+server. Version 6 switched to RESP3 by default, which changes reply types for
+some commands; none of the commands this adapter uses behave differently, and
+the integration spec exists to keep that true. Nothing here needs `protocol: 2`.
+
+The adapter stores presence under keys prefixed by `config.redis_prefix`
+(default `where_is_waldo`) and sets a TTL on session keys, so it does not need a
+cleanup job the way the database adapter does.
+
 ### Querying Presence
 
 ```ruby

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/lib/generators/where_is_waldo/install/install_generator.rb

@@ -32,9 +32,17 @@ module WhereIsWaldo
       end
 
       def create_channels
-        template "connection.rb.tt", "app/channels/application_cable/connection.rb"
-        template "channel.rb.tt", "app/channels/application_cable/channel.rb"
-        template "presence_channel.rb.tt", "app/channels/presence_channel.rb"
+        # NEVER overwrite an app's existing cable connection or channel base.
+        # A host app that already authenticates ActionCable has its auth,
+        # container scoping and session identity in those files, and the
+        # turnkey versions here provide only what this library needs -- so
+        # replacing them silently drops whatever else they did. Installing
+        # into an existing app is the common case, not the exception.
+        @kept_channels = []
+
+        copy_channel "connection.rb.tt", "app/channels/application_cable/connection.rb"
+        copy_channel "channel.rb.tt", "app/channels/application_cable/channel.rb"
+        copy_channel "presence_channel.rb.tt", "app/channels/presence_channel.rb"
       end
 
       def show_post_install_message
@@ -54,10 +62,34 @@ module WhereIsWaldo
         say "       <App />"
         say "     </PresenceProvider>"
         say ""
+        report_kept_channels
       end
 
       private
 
+      # Say plainly what was left alone. A silent skip is as confusing as a
+      # silent overwrite: the install looks complete and presence then fails
+      # because the app's own connection exposes no session identity.
+      def report_kept_channels
+        return if @kept_channels.blank?
+
+        say "Kept your existing files (not overwritten):", :yellow
+        @kept_channels.each { |f| say "  - #{f}" }
+        say ""
+        say "  WhereIsWaldo's channel reads connection.current_user and"
+        say "  connection.session_id. If your connection does not identify"
+        say "  both, add them -- or include WhereIsWaldo::JwtConnection."
+        say ""
+      end
+
+      def copy_channel(source, destination)
+        if File.exist?(File.join(destination_root, destination))
+          @kept_channels << destination
+        else
+          template source, destination
+        end
+      end
+
       def migration_version
         "[#{ActiveRecord::VERSION::STRING.to_f}]"
       end

data/lib/generators/where_is_waldo/install/templates/migration.rb.tt

@@ -14,7 +14,12 @@ class CreatePresences < ActiveRecord::Migration<%= migration_version %>
       t.timestamps
     end
 
-    add_index :presences, :<%= session_column %>, unique: true
+    # (subject, session) must be unique TOGETHER, never session alone. Session
+    # ids are not globally unique -- they are client-supplied in some setups,
+    # and a reused JWT jti is enough -- so keying on the session alone lets two
+    # authenticated subjects upsert onto each other's presence row. This is the
+    # keying the adapter uses: every session lookup scopes by both columns.
+    add_index :presences, [ :<%= subject_column %>, :<%= session_column %> ], unique: true
     add_index :presences, :last_heartbeat
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: where_is_waldo
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Scott Gibson
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +83,22 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +215,6 @@ files:
 - lib/generators/where_is_waldo/install/install_generator.rb
 - lib/generators/where_is_waldo/install/templates/channel.rb.tt
 - lib/generators/where_is_waldo/install/templates/connection.rb.tt
-- lib/generators/where_is_waldo/install/templates/create_presences.rb.tt
 - lib/generators/where_is_waldo/install/templates/initializer.rb.tt
 - lib/generators/where_is_waldo/install/templates/migration.rb.tt
 - lib/generators/where_is_waldo/install/templates/presence_channel.rb.tt
@@ -228,7 +232,6 @@ metadata:
   changelog_uri: https://github.com/byscott-io/where_is_waldo/blob/master/CHANGELOG.md
   allowed_push_host: https://rubygems.org
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -243,8 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Real-time presence tracking for Rails + React applications
 test_files: []

data/lib/generators/where_is_waldo/install/templates/create_presences.rb.tt

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-class Create<%= table_name.camelize %> < ActiveRecord::Migration[7.0]
-  def change
-    create_table :<%= table_name %> do |t|
-      # Identifiers - column names are configurable
-      t.string :<%= session_column %>, null: false    # Unique session/connection identifier
-      t.bigint :<%= subject_column %>, null: false    # Who (user, member, student, etc.)
-
-      # Timestamps
-      t.datetime :connected_at, null: false
-      t.datetime :last_heartbeat, null: false
-      t.datetime :last_activity
-
-      # Activity state
-      t.boolean :tab_visible, default: true, null: false
-      t.boolean :subject_active, default: true, null: false
-
-      # Extensible metadata
-      t.<%= json_column_type %> :metadata
-
-      t.timestamps
-    end
-
-    # (subject, session) must be unique together. Keying by session alone
-    # would let two authenticated subjects that happen to collide on a
-    # session id (client-supplied values, JWT jti reuse, etc.) upsert onto
-    # each other's row.
-    add_index :<%= table_name %>, [:<%= subject_column %>, :<%= session_column %>], unique: true
-
-    # Session lookups (heartbeat, disconnect, session_status) always scope
-    # by (subject, session); the composite unique index above serves those.
-    # Query by subject alone
-    add_index :<%= table_name %>, :<%= subject_column %>
-
-    # Cleanup old records
-    add_index :<%= table_name %>, :last_heartbeat
-
-<% if subject_table.present? -%>
-    # Foreign key to subject table
-    add_foreign_key :<%= table_name %>, :<%= subject_table %>, column: :<%= subject_column %>
-<% end -%>
-  end
-end