jpie 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b40ba16f3f137fa6f71b5f03a5aae566168c602ecab473c8804991a5b37ed70f
-  data.tar.gz: ea9ba44be05ef07e7306ff0772377277f8f25eab9c199fbe2d3f7be7fc2477ac
+  metadata.gz: d80d347b9e33b07e48e743d38c6e8dce2423888c49f8b727b52c3f093b835d45
+  data.tar.gz: befcf097a0471378554ec98e328546be5426d812ac48ea2428da42b71221b783
 SHA512:
-  metadata.gz: 216f53ac57192799de8c9864b72d19da9c9284600c4e6b5807ef3c1aca501986411a5a110cfd5ae862066ab033c9b8d85002cb1a1c5a9232129221d2228356d0
-  data.tar.gz: d59596b504c0c69d9783ab590fdf70053ee7728def4ecc38902cb32f70d6313d81bfda425307bb8e0673e47daa808829df37e163cfe97c12767307ab29515ee9
+  metadata.gz: b01847d08978c2df2e270e36e231bbf21cfc93824a1c9519c2b982d819777050a21df3252183819f218c4d44b420f8161f9857c5add05900a663f11be87405b6
+  data.tar.gz: 8c89e6f2502308dddf7b72edffd8e58603bf664b7b6401ab9b7d100ad55024f25f2df46791b45d0097b6647a1de1fda7ef17363cc8ec83fd6f8e3691e2598302

data/.claude/skills/root-cause-analysis/SKILL.md

@@ -20,6 +20,8 @@ Do NOT use when the cause is already known and verified, or for routine implemen
 
 **Find root cause before attempting fixes.** Quick patches mask underlying issues. If you are trying fixes without understanding why they might work, you are guessing—stop and investigate.
 
+Do not change code just to pass specs, and do not change specs just to make them pass. Specs must test real functionality; both code and specs should be fixed so that they correctly reflect and verify the intended behaviour.
+
 ## Problem definition (observable symptom only)
 
 Define the problem in terms of **what is observed**, not assumed cause:

data/.cursor/agents/systematic-debugging.md

@@ -9,6 +9,8 @@ You are a systematic debugging specialist for the json_api gem (JPie). Your only
 
 **ALWAYS find root cause before attempting fixes.** Symptom fixes are failure. Quick patches mask underlying issues. If you are trying fixes without understanding why they might work, you are guessing—stop and investigate.
 
+Do not recommend changing code just to pass specs, or changing specs just to make them pass. Specs must test real functionality; recommend fixes that make code and specs correctly reflect and verify intended behaviour.
+
 ## Four phases (complete in order)
 
 ### Phase 1: Investigation

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jpie (2.1.0)
+    jpie (2.1.2)
       actionpack (~> 8.1, >= 8.1.0)
       pg_query (>= 4)
       prosopite (>= 1)

data/lib/json_api/resources/resource_loader.rb

@@ -17,25 +17,27 @@ module JSONAPI
     end
 
     def self.find(resource_type, namespace: nil)
-      return find_namespaced(resource_type, namespace) if namespace.present?
+      candidates = []
 
-      find_flat(resource_type, namespace)
-    end
+      # Namespaced resource, e.g. "widgets" with namespace "api/v1" → API::V1::WidgetResource
+      candidates << build_resource_class_name(resource_type, namespace) if namespace
 
-    def self.find_namespaced(resource_type, namespace)
-      namespaced_class = build_resource_class_name(resource_type, namespace)
-      namespaced_class.constantize
-    rescue NameError
-      raise MissingResourceClass.new(resource_type, namespace:) unless JSONAPI.configuration.namespace_fallback
+      # Flat resource, e.g. "widgets" → WidgetResource
+      if !namespace || JSONAPI.configuration.namespace_fallback
+        candidates << build_resource_class_name(resource_type,
+                                                nil,)
+      end
 
-      find_flat(resource_type, namespace)
+      resolve(candidates) || raise(MissingResourceClass.new(resource_type, namespace:))
     end
 
-    def self.find_flat(resource_type, namespace)
-      flat_class = build_resource_class_name(resource_type, nil)
-      flat_class.constantize
-    rescue NameError
-      raise MissingResourceClass.new(resource_type, namespace:)
+    def self.find_for_model(model_class, namespace: nil)
+      return ActiveStorageBlobResource if active_storage_blob?(model_class)
+
+      effective_namespace = namespace || extract_namespace_from_model(model_class)
+      candidates = model_candidates(model_class, effective_namespace)
+
+      resolve(candidates) || raise(MissingResourceClass.new(model_class.name, namespace: effective_namespace))
     end
 
     def self.build_resource_class_name(resource_type, namespace)
@@ -45,35 +47,42 @@ module JSONAPI
       "#{namespace.to_s.camelize}::#{base}"
     end
 
-    def self.find_for_model(model_class, namespace: nil)
-      return ActiveStorageBlobResource if active_storage_blob?(model_class)
+    # Builds an ordered list of candidate class names for a model, including
+    # STI base class candidates as a fallback.
+    def self.model_candidates(model_class, namespace)
+      candidates = candidates_for_class(model_class, namespace)
 
-      find_resource_for_model(model_class, namespace)
+      if sti_subclass?(model_class)
+        base = model_class.base_class
+        base_ns = extract_namespace_from_model(base) || namespace
+        candidates.concat(candidates_for_class(base, base_ns))
+      end
+
+      candidates
     end
 
-    def self.find_resource_for_model(model_class, namespace)
-      effective_namespace = namespace || extract_namespace_from_model(model_class)
+    def self.candidates_for_class(model_class, namespace)
       resource_type = model_class.name.demodulize.underscore.pluralize
+      candidates = []
 
-      find(resource_type, namespace: effective_namespace)
-    rescue MissingResourceClass
-      try_flat_full_name_resource(model_class) || find_base_class_resource(model_class, effective_namespace)
-    end
+      # Namespaced resource matching the model's namespace, e.g. API::V1::Widget → API::V1::WidgetResource
+      candidates << build_resource_class_name(resource_type, namespace) if namespace
 
-    def self.try_flat_full_name_resource(model_class)
-      return nil unless model_class.name.include?("::")
+      # Flat-combined name for namespaced models, e.g. Ticket::User → TicketUserResource
+      candidates << "#{model_class.name.gsub("::", "")}Resource" if model_class.name.include?("::")
 
-      "#{model_class.name.gsub("::", "")}Resource".constantize
-    rescue NameError
-      nil
-    end
+      # Standard flat resource using demodulized model name, e.g. User → UserResource
+      candidates << build_resource_class_name(resource_type, nil)
 
-    def self.find_base_class_resource(model_class, effective_namespace)
-      raise MissingResourceClass, model_class.name unless sti_subclass?(model_class)
+      candidates
+    end
 
-      base_resource_type = model_class.base_class.name.demodulize.underscore.pluralize
-      base_namespace = extract_namespace_from_model(model_class.base_class) || effective_namespace
-      find(base_resource_type, namespace: base_namespace)
+    def self.resolve(candidates)
+      candidates.each do |name|
+        klass = name.safe_constantize
+        return klass if klass
+      end
+      nil
     end
 
     def self.active_storage_blob?(model_class)

data/lib/json_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONAPI
-  VERSION = "2.1.0"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpie
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Emil Kampp