smplkit 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1457724d2c923a56cfc88a4cfbe43c53e27c908944b737a0ffb4b658f0035fed
-  data.tar.gz: c04ecdb00222ed550f975f3dbbee7b39db29e7ca48b945b81bbca7f8a72f318d
+  metadata.gz: d5d5ed1af296c517f09ddd0a76660b157184f3bb763a61ae0fcf727c1a3f5a87
+  data.tar.gz: 487bcd0200af912fcbb1acdf52967e87bf485c1b1ced27fb564cfc96ac4ee41b
 SHA512:
-  metadata.gz: 86481042695d43a1ac553e3fc6acd2727bebda917aaf2b9fc63970ad9488b3119320fdad4435090bce9d185f1c55b48d4ac086af5a6f4a9b32008699f06a6213
-  data.tar.gz: 3322a551e81299287f3b51bd9537868689365c14a03d9f2ec0366d4d2b9fb5e3ea8b7033abe93d2f8d6f1613fd4c559b6f2c69a62a672bf697e460a6576fc042
+  metadata.gz: 78bd324f3ab4c18732cf2a0a4bbef41f761ebf347501d721b941083ee4a06657bbd5f3c48e0113e63522515ed5b15566b47ecc727613925b8df866b4459d4f6e
+  data.tar.gz: f66aa64fdd45800335739c0d5a8fda29e4b8c51d70c94f5412ee1bdc44f09d161ded9eefd5c9252f438796c2063d53dcdad870dd949b4d2872b9751b6c54d974

data/README.md

@@ -100,12 +100,23 @@ This creates `config/initializers/smplkit.rb` with documented examples for the p
 
 ```bash
 bundle install
-bundle exec rspec        # unit tests
+bundle exec rspec        # unit tests — wrapper layer is held to 100% line coverage in CI
 bundle exec rubocop      # lint
-make generate            # regenerate clients (requires Node.js + npx)
+make generate            # regenerate clients
 ```
 
-The repository follows the standard smplkit "every commit lands on `main`" workflow — see CLAUDE.md.
+`make generate` shells out to `npx --yes @openapitools/openapi-generator-cli`,
+so it requires:
+
+- Node.js 18+ (provides `npx`)
+- A JRE 11+ (the openapi-generator JAR runs under Java)
+
+Both are pre-installed on the CI matrix runners. On a developer machine,
+install via Homebrew (`brew install node openjdk`) or your distribution's
+package manager.
+
+The repository follows the standard smplkit "every commit lands on `main`"
+workflow — see CLAUDE.md.
 
 ## License
 

data/lib/smplkit/client.rb

@@ -31,8 +31,8 @@ module Smplkit
     attr_reader :manage, :config, :flags, :logging
 
     # Construct, yield to the block, and close on exit.
-    def self.open(**)
-      client = new(**)
+    def self.open(**kwargs)
+      client = new(**kwargs)
       begin
         yield client
       ensure
@@ -185,19 +185,23 @@ module Smplkit
 
     def schedule_periodic_flush
       @flush_timer = Concurrent::TimerTask.new(execution_interval: PERIODIC_FLUSH_INTERVAL) do
-        next if @closed
-
-        begin
-          @manage.contexts.flush
-          @manage.flags.flush
-          @manage.loggers.flush
-        rescue StandardError => e
-          Smplkit.debug("registration", "periodic flush failed: #{e.class}: #{e.message}")
-        end
+        run_periodic_flush
       end
       @flush_timer.execute
     end
 
+    # Extracted as a private method so the timer body is reachable from
+    # tests without poking into Concurrent::TimerTask internals.
+    def run_periodic_flush
+      return if @closed
+
+      @manage.contexts.flush
+      @manage.flags.flush
+      @manage.loggers.flush
+    rescue StandardError => e
+      Smplkit.debug("registration", "periodic flush failed: #{e.class}: #{e.message}")
+    end
+
     def final_flush
       [@manage.contexts, @manage.flags, @manage.loggers].each do |ns|
         ns.flush

data/lib/smplkit/config/helpers.rb

@@ -40,32 +40,6 @@ module Smplkit
         )
       end
 
-      def build_config_request_body(config)
-        items = {}
-        config.items.each do |item|
-          items[item.name] = {
-            "value" => item.value,
-            "type" => item.type,
-            "description" => item.description
-          }.compact
-        end
-
-        environments = config.environments.each_with_object({}) do |(env, env_obj), out|
-          out[env] = { "values" => env_obj.values_raw }
-        end
-
-        # The Config schema (per the OpenAPI spec) does not include +key+ in
-        # attributes — the resource +id+ carries the customer-facing key.
-        attributes = {
-          "name" => config.name,
-          "description" => config.description,
-          "parent" => config.parent_id,
-          "items" => items,
-          "environments" => environments
-        }.compact
-        { "data" => { "type" => "config", "id" => config.key, "attributes" => attributes } }
-      end
-
       # Deep-merge two Hashes, with +override+ winning. Mirrors the Python
       # +deep_merge+ helper used by the resolver.
       def deep_merge(base, override)

data/lib/smplkit/config_resolution.rb

@@ -28,12 +28,14 @@ module Smplkit
       "telemetry" => true
     }.freeze
 
-    ResolvedConfig = Data.define(
-      :api_key, :base_domain, :scheme, :environment, :service, :debug, :telemetry
+    ResolvedConfig = Struct.new(
+      :api_key, :base_domain, :scheme, :environment, :service, :debug, :telemetry,
+      keyword_init: true
     )
 
-    ResolvedManagementConfig = Data.define(
-      :api_key, :base_domain, :scheme, :debug
+    ResolvedManagementConfig = Struct.new(
+      :api_key, :base_domain, :scheme, :debug,
+      keyword_init: true
     )
 
     module_function

data/lib/smplkit/errors.rb

@@ -23,8 +23,8 @@ module Smplkit
       h
     end
 
-    def to_json(*)
-      JSON.generate(to_h, *)
+    def to_json(*args)
+      JSON.generate(to_h, *args)
     end
   end
 

data/lib/smplkit/flags/helpers.rb

@@ -47,30 +47,6 @@ module Smplkit
           rules: rules
         )
       end
-
-      # Build the JSON body for a Flag create/update request.
-      def build_flag_request_body(flag)
-        environments = flag.environments.each_with_object({}) do |(env_key, env), out|
-          out[env_key] = {
-            "enabled" => env.enabled,
-            "default" => env.default,
-            "rules" => env.rules.map { |r| { "logic" => r.logic, "value" => r.value, "description" => r.description } }
-          }
-        end
-
-        attributes = {
-          "id" => flag.id,
-          "name" => flag.name,
-          "type" => flag.type,
-          "default" => flag.default,
-          "description" => flag.description,
-          "environments" => environments
-        }
-        values = flag.values
-        attributes["values"] = values.map { |v| { "name" => v.name, "value" => v.value } } if values
-
-        { "data" => { "type" => "flag", "id" => flag.id, "attributes" => attributes.compact } }
-      end
     end
   end
 end

data/lib/smplkit/flags/models.rb

@@ -6,7 +6,7 @@ module Smplkit
     #
     # Lives in +Flag#values+. Frozen — author values via +Flag#add_value+ /
     # +Flag#remove_value+ / +Flag#clear_values+.
-    FlagValue = Data.define(:name, :value)
+    FlagValue = Struct.new(:name, :value, keyword_init: true)
 
     # A single targeting rule on a +Flag+.
     #

data/lib/smplkit/logging/client.rb

@@ -102,7 +102,11 @@ module Smplkit
 
         return unless @adapters.empty?
 
+        # :nocov: defensive log — unreachable in practice because stdlib
+        # +Logger+ is always present, so +StdlibLoggerAdapter+ is always
+        # constructible.
         Smplkit.debug("registration", "no logging adapters loaded; runtime features disabled")
+        # :nocov:
       end
 
       def observe_logger(_adapter, raw_name, level)

data/lib/smplkit/logging/helpers.rb

@@ -38,32 +38,6 @@ module Smplkit
           updated_at: attrs["updated_at"]
         )
       end
-
-      def build_logger_body(logger)
-        attributes = {
-          "name" => logger.name,
-          "resolved_level" => logger.resolved_level&.to_s,
-          "level" => logger.level&.to_s,
-          "service" => logger.service,
-          "environment" => logger.environment,
-          "log_group_id" => logger.log_group_id,
-          "managed" => logger.managed,
-          "description" => logger.description
-        }.compact
-        { "data" => { "type" => "logger", "id" => logger.id, "attributes" => attributes } }
-      end
-
-      def build_log_group_body(group)
-        attributes = {
-          "key" => group.key,
-          "name" => group.name,
-          "level" => group.level&.to_s,
-          "description" => group.description,
-          "parent_id" => group.parent_id,
-          "environments" => group.environments
-        }.compact
-        { "data" => { "type" => "log_group", "id" => group.key, "attributes" => attributes } }
-      end
     end
   end
 end

data/lib/smplkit/ws.rb

@@ -90,14 +90,16 @@ module Smplkit
     def stop
       Smplkit.debug("websocket", "stopping shared WebSocket")
       @closed = true
-      @connection_status = "disconnected"
       close_active_connection
       thread = @ws_thread
       @ws_thread = nil
-      return unless thread
-
-      thread.join(2.0)
-      thread.kill if thread.alive?
+      if thread
+        thread.join(2.0)
+        thread.kill if thread.alive?
+      end
+      # Set authoritatively after the thread is dead so a racing connect
+      # call (which also sets "connecting") cannot clobber this value.
+      @connection_status = "disconnected"
     end
 
     # ----- URL builder ----------------------------------------------
@@ -169,6 +171,8 @@ module Smplkit
     end
 
     def connect(task)
+      return if @closed
+
       url = build_ws_url
       @connection_status = "connecting"
       Smplkit.debug("websocket", "connecting to #{safe_url}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smplkit
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Smpl Solutions LLC
@@ -13,44 +13,62 @@ dependencies:
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.39'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.39'
+        version: '2.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.79'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.95'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.79'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.95'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.26'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.26'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -570,7 +588,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.3'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="