graphiti 1.7.6 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b24f6cdaff2ef5d86296f1dea302a9cf9b0f9ac33486b7f00e90b6e81e8f7761
-  data.tar.gz: 8f32c45f3a57cfa376527634724d2b0a4325f3c86d5de942f8719982fc2b3dab
+  metadata.gz: e36dfd471013c8ead523d885a475968aeb18947a268e7b7a68e03e10dcc9fd0d
+  data.tar.gz: a07c6145a4528154dc2592850c434225bfd607038bd80b55ee39efbbac803cb2
 SHA512:
-  metadata.gz: 9e6b37a1b10c8240f19c8dc5cf3c6cd366d4ffba77bd6192ca292d914b291af9bc2e55e29fdf352f60c8368495d7afcf627233d94a5c6ef6946a00cde6821d0a
-  data.tar.gz: 075cabe78b3e2c8c668a58d85fc335f357e022e9d2d25aaaaf2cce87a01f7da0f6cd1108e7c8da4d42cb763cac450ee92f1a8419325f6997f1de3fee9d20f35d
+  metadata.gz: f6cb999efba286de44b69bfb7a3a56333dbf78c2f51b3dc9359f0fff3da867a8a7bdc98cfa55cbef5f44e3146350d09a729f5d2edc43fb50dd02e264d30f1034
+  data.tar.gz: faebd5bf5f20ba3a6df4494c1f45aec44c630afd8841b78daad0e5e575bcd0932560e776c38fe38be77a4d6efd7dd1d59b184ae37ec449778f952b32cbd69562

data/.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request: {}
 
 concurrency:
@@ -14,7 +14,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.0"
@@ -94,7 +94,7 @@ jobs:
       - name: Set up Appraisal
         if: matrix.appraisal
         run: echo "APPRAISAL_INITIALIZED=true" >> $GITHUB_ENV
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -111,4 +111,4 @@ jobs:
         uses: benc-uk/workflow-dispatch@v1
         with:
           workflow: Generate New Release
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 graphiti changelog
 
+## [1.7.8](https://github.com/graphiti-api/graphiti/compare/v1.7.7...v1.7.8) (2025-03-16)
+
+
+### Bug Fixes
+
+* compare URI-decoded path params ([#482](https://github.com/graphiti-api/graphiti/issues/482)) ([20b80dd](https://github.com/graphiti-api/graphiti/commit/20b80dd35bfa4e2f677af3fb9472def6da668149))
+* correct issue with many_to_many when one of the models has a prefix to the intersection model association ([#449](https://github.com/graphiti-api/graphiti/issues/449)) ([dc28a4f](https://github.com/graphiti-api/graphiti/commit/dc28a4f72fe4c577e23ced102a0b5e7063ba8026))
+* lazy constantize relation resources ([#492](https://github.com/graphiti-api/graphiti/issues/492)) ([3cc2983](https://github.com/graphiti-api/graphiti/commit/3cc298399b4dc8970a2beed49b333396c76bd218))
+
+## [1.7.7](https://github.com/graphiti-api/graphiti/compare/v1.7.6...v1.7.7) (2025-03-15)
+
+
+### Bug Fixes
+
+* change class attribute behavior on endpoint method to work in ruby 3.2+ ([#493](https://github.com/graphiti-api/graphiti/issues/493)) ([04f1f3c](https://github.com/graphiti-api/graphiti/commit/04f1f3c783bfe18e6568cc21924d417a82234135))
+
 ## [1.7.6](https://github.com/graphiti-api/graphiti/compare/v1.7.5...v1.7.6) (2024-11-06)
 
 

data/lib/graphiti/adapters/active_record/many_to_many_sideload.rb

@@ -1,7 +1,6 @@
 class Graphiti::Adapters::ActiveRecord::ManyToManySideload < Graphiti::Sideload::ManyToMany
   def through_table_name
-    @through_table_name ||= parent_resource_class.model
-      .reflections[through.to_s].klass.table_name
+    @through_table_name ||= resource_class.model.reflections[through.to_s].klass.table_name
   end
 
   def through_relationship_name

data/lib/graphiti/adapters/null.rb

@@ -168,6 +168,14 @@ module Graphiti
         scope
       end
 
+      def filter_uuid_eq(scope, attribute, value)
+        scope
+      end
+
+      def filter_uuid_not_eq(scope, attribute, value)
+        scope
+      end
+
       def base_scope(model)
         {}
       end

data/lib/graphiti/configuration.rb

@@ -18,6 +18,7 @@ module Graphiti
     attr_accessor :before_sideload
 
     attr_reader :debug, :debug_models
+    attr_reader :uri_decoder
 
     attr_writer :schema_path
     attr_writer :cache_rendering
@@ -37,6 +38,8 @@ module Graphiti
       self.debug = ENV.fetch("GRAPHITI_DEBUG", true)
       self.debug_models = ENV.fetch("GRAPHITI_DEBUG_MODELS", false)
 
+      @uri_decoder = infer_uri_decoder
+
       # FIXME: Don't duplicate graphiti-rails efforts
       if defined?(::Rails.root) && (root = ::Rails.root)
         config_file = root.join(".graphiticfg.yml")
@@ -85,6 +88,33 @@ module Graphiti
     ensure
       send(:"#{key}=", original)
     end
+
+    def uri_decoder=(decoder)
+      unless decoder.respond_to?(:call)
+        raise "uri_decoder must respond to `call`."
+      end
+
+      @uri_decoder = decoder
+    end
+
+    private
+
+    def infer_uri_decoder
+      if defined?(::ActionDispatch::Journey::Router::Utils)
+        # available in all supported versions of Rails.
+        # This method should be preferred for comparing URI path segments
+        # to params, as it is the exact decoder used in the Rails router.
+        @uri_decoder = ::ActionDispatch::Journey::Router::Utils.method(:unescape_uri)
+      elsif URI.respond_to?(:decode_uri_component)
+        # available in Ruby >= 3.2
+        @uri_decoder = URI.method(:decode_uri_component)
+      end
+    rescue => e
+      Kernel.warn("Error inferring Graphiti uri_decoder: #{e}")
+    ensure
+      # fallback
+      @uri_decoder ||= :itself.to_proc
+    end
   end
 
   msg = "Use graphiti-rails's `config.graphiti.respond_to_formats`"

data/lib/graphiti/resource/links.rb

@@ -8,10 +8,17 @@ module Graphiti
       def endpoint
         if (endpoint = super)
           endpoint
-        else
+        elsif !@__skip_inference
           self.endpoint = infer_endpoint
         end
       end
+
+      def endpoint=(value)
+        # changes introduced in Ruby 3.2 and above require some extra hoops
+        # to allow .endpoint = nil to work properly
+        @__skip_inference = value.blank?
+        super
+      end
     end
 
     included do
@@ -74,12 +81,12 @@ module Graphiti
         endpoints.any? do |e|
           has_id = params[:id] || params[:data].try(:[], :id)
           path = request_path
-          if [:update, :show, :destroy].include?(context_namespace) && has_id
+          if [:update, :show, :destroy].include?(action) && has_id
             path = request_path.split("/")
-            path.pop if path.last == has_id.to_s
+            path.pop if Graphiti::Util::UriDecoder.decode_uri(path.last) == has_id.to_s
             path = path.join("/")
           end
-          e[:full_path].to_s == path && e[:actions].include?(context_namespace)
+          e[:full_path].to_s == path && e[:actions].include?(action)
         end
       end
 

data/lib/graphiti/sideload.rb

@@ -21,7 +21,7 @@ module Graphiti
       @name = name
       validate_options!(opts)
       @parent_resource_class = opts[:parent_resource]
-      @resource_class = opts[:resource]
+      @resource_class_name = opts[:resource]
       @primary_key = opts[:primary_key]
       @foreign_key = opts[:foreign_key]
       @type = opts[:type]
@@ -177,7 +177,8 @@ module Graphiti
     end
 
     def resource_class
-      @resource_class ||= infer_resource_class
+      @resource_class ||= (@resource_class_name.is_a?(String) ? @resource_class_name.constantize : @resource_class_name) ||
+        infer_resource_class
     end
 
     def scope(parents)

data/lib/graphiti/util/uri_decoder.rb

@@ -0,0 +1,9 @@
+module Graphiti
+  module Util
+    module UriDecoder
+      def self.decode_uri(uri)
+        Graphiti.config.uri_decoder.call(uri)
+      end
+    end
+  end
+end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.7.6"
+  VERSION = "1.7.8"
 end

data/lib/graphiti.rb

@@ -190,6 +190,7 @@ require "graphiti/serializer"
 require "graphiti/query"
 require "graphiti/debugger"
 require "graphiti/util/cache_debug"
+require "graphiti/util/uri_decoder"
 
 if defined?(ActiveRecord)
   require "graphiti/adapters/active_record"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.8
 platform: ruby
 authors:
 - Lee Richmond
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-06 00:00:00.000000000 Z
+date: 2025-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -204,7 +204,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.beta.4
-description: 
+description:
 email:
 - richmolj@gmail.com
 executables:
@@ -339,6 +339,7 @@ files:
 - lib/graphiti/util/sideload.rb
 - lib/graphiti/util/simple_errors.rb
 - lib/graphiti/util/transaction_hooks_recorder.rb
+- lib/graphiti/util/uri_decoder.rb
 - lib/graphiti/util/validation_response.rb
 - lib/graphiti/version.rb
 - package.json
@@ -346,7 +347,7 @@ homepage: https://github.com/graphiti-api/graphiti
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -362,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs
 test_files: []