featurehub-sdk 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc48d48647d7b4aee1a53a733506382f3e6cb021de19ae9c7192a38ff3af38a9
-  data.tar.gz: 499b54873a2cbb87e72dcb815509a8260f12ec0ffa6a4b529ac779acad7c4729
+  metadata.gz: 334643cd1a7037d4a57dd889800927fbb3764840c7debbc789bf27f956af773d
+  data.tar.gz: c59e9eff232a2489079ed20c432a6f28af46e278c426049110aa44138ec74833
 SHA512:
-  metadata.gz: 1f3620cf2da86a7a897efae7c766b00eaf98549c9c9b90dee97f14c67c9d32718cdf4046accfdd887622b80bb44943704fda18acfa179ed90b801c9938bd2130
-  data.tar.gz: f31beae7e13e8261b541ffc211a3a8dad8c49563918d12e178f9390b4d079bcd303d8273f5741986bc1907d12d7e646bf0f62c553527ed87ee83ca77834c1f42
+  metadata.gz: e1fbf9e70a80ba754703f8744175a4e0794a7fd975ced9e28b19dd0520d21e93cf4f5f772a3dac6e00dcd88af2d6ee2880ab5b557cb5817b57d358d1da032b02
+  data.tar.gz: d1ea8f20f72894561fe16e975b73eb3445f8d87ac7817e30ccd732123a56b4a8cb9b057f682e9e80596d234db2c04ab0cf175c2e901f991ba3b6326bbf7afd4b

data/.claude/CLAUDE.md

@@ -83,3 +83,4 @@ Type definitions live in [sig/feature_hub/featurehub.rbs](sig/feature_hub/featur
 - RuboCop: max line length 120, metrics cops disabled, documentation disabled
 - Tests mirror lib structure: `spec/feature_hub/sdk/**/*_spec.rb`
 - Use `instance_double` for mocking, `aggregate_failures` for multiple assertions
+- after making changes run `bundle exec rubocop -a` to autocorrect minor offences and understand what major offences may have been introduced and fix them  

data/.dockerignore

@@ -0,0 +1,12 @@
+/bin
+/sig
+/spec
+/.rpsec
+/.rubocop.yml
+/*.md
+/.github
+/examples/rails-example
+/examples/sinatra/logs
+/.git
+/.idea
+/.claude

data/.rubocop.yml

@@ -35,8 +35,6 @@ Metrics/CyclomaticComplexity:
 Naming/FileName:
   Enabled: false
 
-Gemspec/DeprecatedAttributeAssignment:
-  Enabled: true
 Gemspec/DeprecatedAttributeAssignment: # new in 1.30
   Enabled: true
 Gemspec/RequireMFA: # new in 1.23

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.1.1] - 2026-05-01
+
+- expose Feature Properties capability
+- wrap poll in case of transient timeout or similar error to allow it to continue
+
+## [2.1.0] - 2026-04-14
+        
+- Once the Config is closed it won't reopen
+- Added Memcache cache that operates on the same general principles as Redis.
+It requires Dalli to be available in your dependencies at least 4.x.
+- The requirement for faraday 2+ has been relaxed, just faraday is now required in
+the gemspec. It has been tested with 2 and 1.
+- Redis session store has been updated so it only uses two keys
+
 ## [2.0.1] - 2026-03-27
 
 - Remove `FeatureHub::Sdk.default_logger`; logger now defaults to `nil` instead of a stdout DEBUG logger

data/Gemfile

@@ -9,16 +9,16 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
-gem "rubocop", "~> 1.21"
+gem "rubocop", "~> 1.86"
 
 gem "simplecov", "~> 0.21"
 
 gem "concurrent-ruby", "~> 1.3"
 
-gem "faraday", "~> 2"
+gem "faraday"
 
 gem "murmurhash3", "~> 0.1.7"
 
 gem "sem_version", "~> 2.0.0"
 
-gem "ld-eventsource", "~> 2.5.1"
+gem "ld-eventsource", "~> 2.6.0"

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    featurehub-sdk (2.0.1)
+    featurehub-sdk (2.1.1)
       concurrent-ruby (~> 1.3)
-      faraday (~> 2)
-      ld-eventsource (~> 2.5.1)
+      faraday
+      ld-eventsource (>= 2.5.1, < 2.7.0)
       murmurhash3 (~> 0.1.7)
       sem_version (~> 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.8)
-      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     concurrent-ruby (1.3.6)
     connection_pool (3.0.2)
+    dalli (4.3.3)
+      logger
     diff-lcs (1.6.2)
     docile (1.4.1)
     domain_name (0.6.20240107)
@@ -25,39 +25,27 @@ GEM
       logger
     faraday-net_http (3.4.2)
       net-http (~> 0.5)
-    ffi (1.17.3-arm64-darwin)
-    ffi (1.17.3-x86_64-darwin)
-    ffi (1.17.3-x86_64-linux-gnu)
-    ffi-compiler (1.3.2)
-      ffi (>= 1.15.5)
-      rake
-    http (5.3.1)
-      addressable (~> 2.8)
+    http (6.0.2)
       http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      llhttp-ffi (~> 0.5.0)
-    http-cookie (1.1.0)
+      llhttp (~> 0.6.1)
+    http-cookie (1.1.4)
       domain_name (~> 0.5)
-    http-form_data (2.3.0)
-    json (2.19.2)
+    json (2.19.3)
     language_server-protocol (3.17.0.5)
-    ld-eventsource (2.5.1)
+    ld-eventsource (2.6.0)
       concurrent-ruby (~> 1.0)
-      http (>= 4.4.1, < 6.0.0)
+      http (>= 4.4.1, < 7.0.0)
     lint_roller (1.1.0)
-    llhttp-ffi (0.5.1)
-      ffi-compiler (~> 1.0)
-      rake (~> 13.0)
+    llhttp (0.6.1)
     logger (1.7.0)
     murmurhash3 (0.1.7)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    parallel (1.27.0)
-    parser (3.3.10.0)
+    parallel (1.28.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    prism (1.6.0)
-    public_suffix (6.0.2)
+    prism (1.9.0)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
@@ -65,7 +53,7 @@ GEM
       redis-client (>= 0.22.0)
     redis-client (0.28.0)
       connection_pool
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -79,20 +67,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
-    rubocop (1.82.0)
+    rubocop (1.86.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.48.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     ruby-progressbar (1.13.0)
     sem_version (2.0.1)
     simplecov (0.22.0)
@@ -113,60 +101,55 @@ PLATFORMS
 
 DEPENDENCIES
   concurrent-ruby (~> 1.3)
-  faraday (~> 2)
+  dalli (~> 4)
+  faraday
   featurehub-sdk!
-  ld-eventsource (~> 2.5.1)
+  ld-eventsource (~> 2.6.0)
   murmurhash3 (~> 0.1.7)
   rake (~> 13.0)
   redis (~> 5)
   rspec (~> 3.0)
-  rubocop (~> 1.21)
+  rubocop (~> 1.86)
   sem_version (~> 2.0.0)
   simplecov (~> 0.21)
 
 CHECKSUMS
-  addressable (2.8.8) sha256=7c13b8f9536cf6364c03b9d417c19986019e28f7c00ac8132da4eb0fe393b057
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
   concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
+  dalli (4.3.3) sha256=ae58aa3442b0d9e129898f56bc6e3a0f8b6149523e723b3eb124a05ae9a2da0c
   diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
   docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e
   domain_name (0.6.20240107) sha256=5f693b2215708476517479bf2b3802e49068ad82167bcd2286f899536a17d933
   faraday (2.14.0) sha256=8699cfe5d97e55268f2596f9a9d5a43736808a943714e3d9a53e6110593941cd
   faraday-net_http (3.4.2) sha256=f147758260d3526939bf57ecf911682f94926a3666502e24c69992765875906c
-  featurehub-sdk (2.0.1)
-  ffi (1.17.3-arm64-darwin) sha256=0c690555d4cee17a7f07c04d59df39b2fba74ec440b19da1f685c6579bb0717f
-  ffi (1.17.3-x86_64-darwin) sha256=1f211811eb5cfaa25998322cdd92ab104bfbd26d1c4c08471599c511f2c00bb5
-  ffi (1.17.3-x86_64-linux-gnu) sha256=3746b01f677aae7b16dc1acb7cb3cc17b3e35bdae7676a3f568153fb0e2c887f
-  ffi-compiler (1.3.2) sha256=a94f3d81d12caf5c5d4ecf13980a70d0aeaa72268f3b9cc13358bcc6509184a0
-  http (5.3.1) sha256=c50802d8e9be3926cb84ac3b36d1a31fbbac383bc4cbecdce9053cb604231d7d
-  http-cookie (1.1.0) sha256=38a5e60d1527eebc396831b8c4b9455440509881219273a6c99943d29eadbb19
-  http-form_data (2.3.0) sha256=cc4eeb1361d9876821e31d7b1cf0b68f1cf874b201d27903480479d86448a5f3
-  json (2.19.2) sha256=e7e1bd318b2c37c4ceee2444841c86539bc462e81f40d134cf97826cb14e83cf
+  featurehub-sdk (2.1.1)
+  http (6.0.2) sha256=be337816fb45cee712eeb0829a16d9300c9d2b87b38b771d177d7a59f77e8b83
+  http-cookie (1.1.4) sha256=8dd8011dedcae5f91af2671b7ba878c4a9e89f0f6384790c1f4cdd176f5e3ada
+  json (2.19.3) sha256=289b0bb53052a1fa8c34ab33cc750b659ba14a5c45f3fcf4b18762dc67c78646
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
-  ld-eventsource (2.5.1) sha256=19cb44b7d3f91f76b7401a1b74293b32c723389b2d6f9d81ecb803c628ac1b25
+  ld-eventsource (2.6.0) sha256=e70b34226972d3c729c92787de7f342de08340f7249393aa8b1d4b4e3f0b062d
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
-  llhttp-ffi (0.5.1) sha256=9a25a7fc19311f691a78c9c0ac0fbf4675adbd0cca74310228fdf841018fa7bc
+  llhttp (0.6.1) sha256=9da187ecf6407265465919cc0d691210ef79e38fa6e86e5e45593bdf25b50146
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
   murmurhash3 (0.1.7) sha256=370a2ce2e9ab0711e51554e530b5f63956927a6554a296855f42a1a4a5ed0936
   net-http (0.9.1) sha256=25ba0b67c63e89df626ed8fac771d0ad24ad151a858af2cc8e6a716ca4336996
-  parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
-  parser (3.3.10.0) sha256=ce3587fa5cc55a88c4ba5b2b37621b3329aadf5728f9eafa36bbd121462aabd6
-  prism (1.6.0) sha256=bfc0281a81718c4872346bc858dc84abd3a60cae78336c65ad35c8fbff641c6b
-  public_suffix (6.0.2) sha256=bfa7cd5108066f8c9602e0d6d4114999a5df5839a63149d3e8b0f9c1d3558394
+  parallel (1.28.0) sha256=33e6de1484baf2524792d178b0913fc8eb94c628d6cfe45599ad4458c638c970
+  parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54
+  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
   redis (5.4.1) sha256=b5e675b57ad22b15c9bcc765d5ac26f60b675408af916d31527af9bd5a81faae
   redis-client (0.28.0) sha256=888892f9cd8787a41c0ece00bdf5f556dfff7770326ce40bb2bc11f1bfec824b
-  regexp_parser (2.11.3) sha256=ca13f381a173b7a93450e53459075c9b76a10433caadcb2f1180f2c741fc55a4
+  regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb
   rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
   rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
   rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
   rspec-mocks (3.13.7) sha256=0979034e64b1d7a838aaaddf12bf065ea4dc40ef3d4c39f01f93ae2c66c62b1c
   rspec-support (3.13.6) sha256=2e8de3702427eab064c9352fe74488cc12a1bfae887ad8b91cba480ec9f8afb2
-  rubocop (1.82.0) sha256=237b7dc24952d7ec469a9593c7a5283315515e2e7dc24ac91532819c254fc4ec
-  rubocop-ast (1.48.0) sha256=22df9bbf3f7a6eccde0fad54e68547ae1e2a704bf8719e7c83813a99c05d2e76
+  rubocop (1.86.1) sha256=44415f3f01d01a21e01132248d2fd0867572475b566ca188a0a42133a08d4531
+  rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   sem_version (2.0.1) sha256=6d97d4f67e28546ba90b3c290f901d6c8031ddb8e08bce962139739c4d40b183
   simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5

data/Makefile

@@ -0,0 +1,12 @@
+e2e:
+	docker build -t todo-server:e2e --progress=plain -f examples/sinatra/Dockerfile .
+
+run-e2e: e2e
+
+cop:
+	bundle exec rubocop -a
+
+spec:
+	bundle exec rspec
+
+ci: cop spec

data/README.md

@@ -295,34 +295,87 @@ The file path defaults to `featurehub-overrides.yaml` or the `FEATUREHUB_LOCAL_Y
 
 ## Caching feature state in Redis
 
-`RedisSessionStore` persists feature values from a `FeatureHubRepository` to Redis. On startup it replays cached features into the repository, then listens for live updates and writes newer versions back. A background timer re-reads all features periodically so updates from other processes are picked up automatically.
+`RedisSessionStore` persists feature values from a `FeatureHubRepository` to Redis. On startup it replays cached features into the repository, then listens for live updates and writes newer versions back. A background timer periodically re-reads a SHA key so that updates published by other processes are picked up automatically.
 
 > **Warning:** Do not use `RedisSessionStore` with server-evaluated features. Each server-evaluated context resolves to different values; sharing a single Redis key across processes will cause them to overwrite each other's state.
 
+Multi-process writes are safe: the store uses SHA256-based change detection and Redis `WATCH`/`MULTI`/`EXEC` to atomically update both keys and prevent races between concurrent writers.
+
+Pass a `FeatureHubConfig` as the second argument — the store reads `repository` and `environment_id` from it and registers itself as a raw update listener automatically.
+
 ```ruby
 # Requires the 'redis' gem: gem 'redis', '~> 5'
 store = FeatureHub::Sdk::RedisSessionStore.new(
   "redis://localhost:6379",
-  config.repository,
+  config,                       # FeatureHubConfig — NOT config.repository
   {
-    prefix:    "myapp",       # Redis key prefix (default: "featurehub")
-    namespace: 0,             # Redis DB index (default: 0)
-    timeout:   60,            # Seconds between periodic reloads (default: 30)
-    password:  "secret",      # Optional Redis password
-    logger:    my_logger      # Optional logger (default: SDK default logger)
+    prefix:             "myapp", # Redis key prefix (default: "featurehub")
+    db:                 0,       # Redis DB index (default: 0)
+    refresh_timeout:    300,     # Seconds between periodic SHA checks (default: 300)
+    backoff_timeout:    500,     # Milliseconds to wait between WATCH retries (default: 500)
+    retry_update_count: 10,      # Maximum WATCH retry attempts per write (default: 10)
+    logger:             my_logger # Optional logger
   }
 )
 
-# Register it so it also receives live updates
-config.register_raw_update_listener(store)
-
 # Shut down cleanly
 store.close
 ```
 
+You can also pass an existing Redis client instead of a connection string (e.g. a RedisCluster client or a pre-configured `Redis` instance):
+
+```ruby
+redis = Redis.new(url: "redis://localhost:6379", db: 1)
+store = FeatureHub::Sdk::RedisSessionStore.new(redis, config)
+```
+
+You can also pass a `RedisSessionStoreOptions` object directly:
+
+```ruby
+opts = FeatureHub::Sdk::RedisSessionStoreOptions.new(prefix: "myapp", db: 2)
+store = FeatureHub::Sdk::RedisSessionStore.new("redis://localhost:6379", config, opts)
+```
+
 Redis keys used:
-- `{prefix}_ids` — a Redis SET of feature IDs
-- `{prefix}_{id}` — the JSON-encoded feature state for each feature
+- `{prefix}_{environment_id}` — JSON-encoded array of all feature states
+- `{prefix}_{environment_id}_sha` — SHA256 fingerprint used for cross-process change detection
+
+## Caching feature state in Memcache
+
+`MemcacheSessionStore` persists feature values from a `FeatureHubRepository` to Memcache. On startup it reads any previously saved features from Memcache and replays them into the repository, then listens for live updates and writes newer versions back. A background timer periodically re-reads a SHA key so that updates published by other processes are picked up automatically.
+
+> **Warning:** Do not use `MemcacheSessionStore` with server-evaluated features. Each server-evaluated context resolves to different values; sharing a single Memcache key across processes will cause them to overwrite each other's state.
+
+Multi-process writes are safe: the store uses SHA256-based change detection and Dalli's compare-and-set (`cas`) to prevent races between concurrent writers.
+
+```ruby
+# Requires the 'dalli' gem: gem 'dalli', '~> 5'
+store = FeatureHub::Sdk::MemcacheSessionStore.new(
+  "localhost:11211",
+  config,
+  {
+    prefix:             "myapp",  # Key prefix (default: "featurehub")
+    refresh_timeout:    300,      # Seconds between periodic SHA checks (default: 300)
+    backoff_timeout:    500,      # Milliseconds to wait between CAS retries (default: 500)
+    retry_update_count: 10,       # Maximum CAS retry attempts per write (default: 10)
+    logger:             my_logger # Optional logger (default: SDK default logger)
+  }
+)
+
+# Shut down cleanly
+store.close
+```
+
+You can also pass an existing `Dalli::Client` instead of a connection string:
+
+```ruby
+dalli = Dalli::Client.new("localhost:11211", serializer: JSON)
+store = FeatureHub::Sdk::MemcacheSessionStore.new(dalli, config)
+```
+
+Memcache keys used:
+- `{prefix}_{environment_id}` — JSON-encoded array of all feature states
+- `{prefix}_{environment_id}_sha` — SHA256 fingerprint used for cross-process change detection
 
 ## Custom raw update listeners
 
@@ -346,7 +399,7 @@ end
 config.register_raw_update_listener(MyAuditListener.new)
 ```
 
-Callbacks are dispatched asynchronously via `Concurrent::Future`. The `source` parameter will be `"streaming"`, `"polling"`, `"local-yaml"`, `"redis-store"`, or `"unknown"`.
+Callbacks are dispatched asynchronously via `Concurrent::Future`. The `source` parameter will be `"streaming"`, `"polling"`, `"local-yaml"`, `"redis-store"`, `"memcache-store"`, or `"unknown"`.
 
 All listeners are closed automatically when `config.close` or `repository.close` is called.
 

data/examples/sinatra/Dockerfile

@@ -1,31 +1,31 @@
-FROM ruby:3.3.10-bookworm
+FROM phusion/passenger-ruby33:latest
 
 MAINTAINER info@featurehub.io
-ENV BUNDLER_VERSION 2.3.15
+ENV BUNDLER_VERSION 4.0.3
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt update && \
-    apt install -y gnupg wget tzdata apt-transport-https dirmngr gnupg curl && \
-    curl https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key-2025.txt | gpg --dearmor | tee /etc/apt/trusted.gpg.d/phusion.gpg >/dev/null && \
-        sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger bookworm main > /etc/apt/sources.list.d/passenger.list' && \
-        apt-get update && \
-        apt-get install -y nginx passenger
-
-#ENV BUNDLE_PATH /bundle
-RUN passenger-config build-native-support
+# The purpose of this Dockerfile is to build a test to-do server that can be used against the
+# e2e tests. It *MUST* test the SDK on the current HEAD, so the file is complicated and awkward
+# and not like a typical deploy.
 
 RUN echo 'gem: --no-document' >> ~/.gemrc && \
     gem update --system && \
     gem install bundler -v ${BUNDLER_VERSION}  --force
 
+RUN gem uninstall logger -v 1.6.0
+
 # set up nsswitch
 COPY examples/sinatra/conf/nsswitch.conf /etc/nsswitch.conf
 
-RUN mkdir -p /app/featurehub
 COPY examples/sinatra/conf/nginx.conf /etc/nginx/nginx.conf
-COPY . /app/
+ADD . /app/featurehub
 WORKDIR /app/featurehub
-RUN cd /app/featurehub && bundle install
-ADD examples/sinatra/ /app/featurehub
+RUN rm Gemfile Gemfile.lock && cd examples/sinatra && bundle config set --local deployment 'true' --without 'development test' path 'vendor/bundle'
+RUN cd /app/featurehub/examples/sinatra && cat .bundle/config && mkdir logs
+RUN cd /app/featurehub/examples/sinatra && bundle install
+RUN chown -R nobody /app
+ENV BUNDLE_PATH=/app/featurehub/examples/sinatra/vendor/bundle
 
-CMD /usr/sbin/nginx -g \'daemon off;\'
+USER root
+CMD /usr/sbin/nginx -g 'daemon off;'
+#CMD /usr/bin/bash

data/examples/sinatra/Gemfile

@@ -4,7 +4,11 @@ source "https://rubygems.org"
 
 ruby "3.3.10"
 
+# 5 prevents us using ruby 3.2 which while EOL is still in our build
+gem "dalli", "~> 4"
 gem "featurehub-sdk", path: "../.."
+# this is just to test 1.x works OK
+gem "faraday", "~> 1"
 gem "rack"
 gem "redis"
 gem "sinatra"

data/examples/sinatra/Gemfile.lock

@@ -1,30 +1,50 @@
 PATH
   remote: ../..
   specs:
-    featurehub-sdk (2.0.0)
+    featurehub-sdk (2.1.1)
       concurrent-ruby (~> 1.3)
-      faraday (~> 2)
-      ld-eventsource (~> 2.5.1)
+      faraday
+      ld-eventsource (>= 2.5.1, < 2.7.0)
       murmurhash3 (~> 0.1.7)
       sem_version (~> 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.9)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     concurrent-ruby (1.3.6)
     connection_pool (3.0.2)
     daemons (1.4.1)
+    dalli (4.3.3)
+      logger
     domain_name (0.6.20240107)
     eventmachine (1.2.7)
-    faraday (2.14.1)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
-    faraday-net_http (3.4.2)
-      net-http (~> 0.5)
+    faraday (1.10.5)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.1)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.4)
     ffi (1.17.3-x86_64-darwin)
+    ffi (1.17.3-x86_64-linux-gnu)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
@@ -36,7 +56,6 @@ GEM
     http-cookie (1.1.0)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    json (2.19.2)
     ld-eventsource (2.5.1)
       concurrent-ruby (~> 1.0)
       http (>= 4.4.1, < 6.0.0)
@@ -44,11 +63,10 @@ GEM
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
     logger (1.7.0)
+    multipart-post (2.4.1)
     murmurhash3 (0.1.7)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    net-http (0.9.1)
-      uri (>= 0.11.1)
     public_suffix (7.0.5)
     rack (2.2.6.4)
     rack-protection (2.2.3)
@@ -72,7 +90,6 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     tilt (2.1.0)
-    uri (1.1.1)
 
 PLATFORMS
   x86_64-darwin-21
@@ -80,6 +97,8 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  dalli (~> 4)
+  faraday (~> 1)
   featurehub-sdk!
   rack
   redis

data/examples/sinatra/README.adoc

@@ -4,7 +4,23 @@ This is a simple todo server example that we use to run our Cucumber tests again
 to ensure that the SDK is operating as expected. Please read the `application.rb`
 for details on how it works, it is fairly simple.
 
-It can be built into a Passenger dockerfile using the `build.sh` script and started
-using `docker_start.sh`
+NOTE: The `Dockerfile` is intended for use in the e2e tests in the pipeline and is not a general use-case sample. It uses Passenger, Sinatra and the FeatureHub SDK on this specific branch. It is, as such, constructed from the root directory (using the `Makefile`).
 
+We typically want to run one cache and then two copies of the server. We would normally disconnect the primary server (running on 8099) from edge, leaving the second server running (8100) and writing to the cache.
 
+To disconnect from edge, call `curl localhost:8099/health/disconnect`
+
+The tests should still pass as the primary server is picking up changes from the cache.
+
+== Redis
+
+----
+docker run -d -p 6379:6379 --name redis redis
+
+----
+
+== Memcache
+
+----
+docker run -p 11211:11211 --name memcache -d memcached
+----