graphiti 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5530b650ab32f95fd4ed881afc07d68b5a252fa416959f19e8cced55de5266d2
-  data.tar.gz: 3054b7eb3cf13f3e6a744690fbc95ef38b010e6f8e7f4f6b9365696e9395c07a
+  metadata.gz: 694b6036077d9ea14373be4b15e8e2d9cfab59253d79ce36d85303aa182a5482
+  data.tar.gz: 64afa2d52f244239c2b099f84500d18446ba04482e2b45447a8c8d9d93164be4
 SHA512:
-  metadata.gz: 25dea9d82d42029ddb9f7cf5f0770005bf69c265531bcac22e89f843381abc29aa40b533ff00920c84a0ecdde2d889b423b16c1585f349e2d1c81abfdf877bdf
-  data.tar.gz: 348f6928dad9f049376b7971924014cf24d458c36159978bdd9996cd7b33da151b49426765361586b46c5a3a410820a57f14854854c349b42e8c79b8a07c4048
+  metadata.gz: 31f0a5953dbbb9526c33d9710528cd1410cf120ce8b036d9d9cbcb3983b62cab77d0adaaf641b9dd3e342e6096eb85a3427353ea58396bdad76593bbcf392161
+  data.tar.gz: 692cb0d0042334e2e92847dc5aee81e2ecb090329b6763adf4d757da205ab61df88e24b3c54230d28285c1cae9007a9ca1c554769ed2d02452fba8afd623d2eb

data/.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request: {}
 
 concurrency:
@@ -33,6 +33,7 @@ jobs:
           - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
         gemfile:
           - Gemfile
           - gemfiles/rails_5_2.gemfile
@@ -42,6 +43,8 @@ jobs:
           - gemfiles/rails_6_graphiti_rails.gemfile
           - gemfiles/rails_7_graphiti_rails.gemfile
           - gemfiles/rails_7_1_graphiti_rails.gemfile
+          - gemfiles/rails_7_2_graphiti_rails.gemfile
+          - gemfiles/rails_8_0_graphiti_rails.gemfile
         appraisal:
           - true
           - false
@@ -49,6 +52,12 @@ jobs:
           - ruby: ruby-head
             gemfile: gemfiles/rails_7_1.gemfile
             appraisal: true
+          - ruby: ruby-head
+            gemfile: gemfiles/rails_7_2_graphiti_rails.gemfile
+            appraisal: true
+          - ruby: ruby-head
+            gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile
+            appraisal: true
           - ruby: ruby-head
             gemfile: Gemfile
             appraisal: false
@@ -70,7 +79,46 @@ jobs:
             appraisal: false
           - gemfile: gemfiles/rails_7_1_graphiti_rails.gemfile
             appraisal: false
-            # Rails 5 can't run on Ruby 3
+          - gemfile: gemfiles/rails_7_2_graphiti_rails.gemfile
+            appraisal: false
+          - gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile
+            appraisal: false
+
+          # Rails 8 needs ruby 3.2 +
+          - gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile
+            ruby: 2.7
+          - gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile
+            ruby: 3.0
+          - gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile
+            ruby: 3.1
+
+          # Rails 7.2 needs ruby 3.1 +
+          - gemfile: gemfiles/rails_7_2_graphiti_rails.gemfile
+            ruby: 2.7
+          - gemfile: gemfiles/rails_7_2_graphiti_rails.gemfile
+            ruby: 3.0
+
+          # Rails 7.1 needs ruby 3.0 +
+          - gemfile: gemfiles/rails_7_1_graphiti_rails.gemfile
+            ruby: 2.7
+          - gemfile: gemfiles/rails_7_1_graphiti_rails.gemfile
+            ruby: 3.0
+
+          # Rails 7.0 needs ruby 3.1 +
+          - gemfile: gemfiles/rails_7_0_graphiti_rails.gemfile
+            ruby: 3.2
+          - gemfile: gemfiles/rails_7_0_graphiti_rails.gemfile
+            ruby: 3.3
+          - gemfile: gemfiles/rails_7_0_graphiti_rails.gemfile
+            ruby: 3.4
+
+          # Rails 6 needs < ruby 3.4
+          - gemfile: gemfiles/rails_6.gemfile
+            ruby: 3.4
+          - gemfile: gemfiles/rails_6_graphiti_rails.gemfile
+            ruby: 3.4
+
+          # Rails 5 can't run on Ruby 3
           - gemfile: gemfiles/rails_5_2.gemfile
             ruby: 3.0
           - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
@@ -87,6 +135,10 @@ jobs:
             ruby: 3.3
           - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
             ruby: 3.3
+          - gemfile: gemfiles/rails_5_2.gemfile
+            ruby: 3.4
+          - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+            ruby: 3.4
     continue-on-error: ${{ matrix.ruby == 'ruby-head' }}
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
@@ -104,7 +156,7 @@ jobs:
   publish:
     name: Release
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     needs: [test]
     steps:
       - name: Dispatch Release

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 graphiti changelog
 
+## [1.8.2](https://github.com/graphiti-api/graphiti/compare/v1.8.1...v1.8.2) (2025-05-20)
+
+
+### Bug Fixes
+
+* prevent context loss by always setting thread and fiber locals ([#497](https://github.com/graphiti-api/graphiti/issues/497)) ([5f45f76](https://github.com/graphiti-api/graphiti/commit/5f45f76f590a8a15e9ae3d47d0673c483da11e66))
+
+## [1.8.1](https://github.com/graphiti-api/graphiti/compare/v1.8.0...v1.8.1) (2025-03-17)
+
 # [1.8.0](https://github.com/graphiti-api/graphiti/compare/v1.7.9...v1.8.0) (2025-03-17)
 
 

data/README.md

@@ -1,22 +1,228 @@
+#### Graphiti
+
 [![CI](https://github.com/graphiti-api/graphiti/actions/workflows/ci.yml/badge.svg)](https://github.com/graphiti-api/graphiti/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/graphiti.svg)](https://badge.fury.io/rb/graphiti)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
 [![semantic-release: angular](https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release)](https://github.com/semantic-release/semantic-release)
 
-<p align="center">
-  <a href="https://www.graphiti.dev/guides">
-    <img " src="https://user-images.githubusercontent.com/55264/54884141-c10ada00-4e43-11e9-866b-e3c01e33a7c7.png" />
-  </a>                                                       
-</p>
-                                                           
-Stylish Graph APIs.
 
-[Website](https://www.graphiti.dev/guides/)
+[![discord](https://img.shields.io/badge/community-discord-8A2BE2?logo=discord)](https://discord.gg/wgqkMBsSRV)
+[![guides](https://img.shields.io/badge/guides-https://www.graphiti.dev-F565A5)](https://www.graphiti.dev)
+
+
+
+<img align="right" src="https://user-images.githubusercontent.com/55264/54884141-c10ada00-4e43-11e9-866b-e3c01e33a7c7.png" alt="Graphiti logo" width="150px" />
+Graphiti is a resource-oriented framework that sits on top of your models (usually ActiveRecord) and exposes them via a JSON:API-compliant interface. It abstracts common concerns like serialization, filtering, sorting, pagination, and sideloading relationships, so you can build powerful APIs with minimal boilerplate. By defining resources instead of controllers and serializers, Graphiti helps you keep your API logic organized, consistent, and easy to maintain.
+
+
+#### Examples 
+Here's an example resource from the [example app](https://github.com/graphiti-api/employee_directory/) just to give you a taste of the possibilities. 
+
+
+```ruby
+class EmployeeResource < ApplicationResource
+  attribute :first_name, :string
+  attribute :last_name, :string
+  attribute :age, :integer
+  attribute :created_at, :datetime, writable: false
+  attribute :updated_at, :datetime, writable: false
+  attribute :title, :string, only: [:filterable, :sortable]
+
+  has_many :positions
+  has_many :tasks
+  many_to_many :teams
+  polymorphic_has_many :notes, as: :notable
+  has_one :current_position, resource: PositionResource do
+    params do |hash|
+      hash[:filter][:current] = true
+    end
+  end
+
+  filter :title, only: [:eq] do
+    eq do |scope, value|
+      scope.joins(:current_position).merge(Position.where(title: value))
+    end
+  end
+
+  sort :title do |scope, value|
+    scope.joins(:current_position).merge(Position.order(title: value))
+  end
+
+  sort :department_name, :string do |scope, value|
+    scope.joins(current_position: :department)
+      .merge(Department.order(name: value))
+  end
+end
+```
+
+A pretty boilerplate controller that just interfaces with the resource
+```ruby
+class EmployeesController < ApplicationController
+  def index
+    employees = EmployeeResource.all(params)
+    respond_with(employees)
+  end
+
+  def show
+    employee = EmployeeResource.find(params)
+    respond_with(employee)
+  end
+
+  def create
+    employee = EmployeeResource.build(params)
+
+    if employee.save
+      render jsonapi: employee, status: 201
+    else
+      render jsonapi_errors: employee
+    end
+  end
+
+  def update
+    employee = EmployeeResource.find(params)
+
+    if employee.update_attributes
+      render jsonapi: employee
+    else
+      render jsonapi_errors: employee
+    end
+  end
+
+  def destroy
+    employee = EmployeeResource.find(params)
+
+    if employee.destroy
+      render jsonapi: { meta: {} }, status: 200
+    else
+      render jsonapi_errors: employee
+    end
+  end
+end
+```
+  
+</details>
+
+
+Now you can query your endpoints simply and powerfully, like: 
+
+
+
+Request:
+```http://localhost:3000/api/v1/employees?filter[title][eq]=Future Government Administrator&filter[age][lt]=40```
+
+<details>
+<summary>JSON-API response</summary>
+
+```json
+{
+  "data": [
+    {
+      "id": "1",
+      "type": "employees",
+      "attributes": {
+        "first_name": "Quinn",
+        "last_name": "Homenick",
+        "age": 36,
+        "created_at": "2025-03-21T23:04:40+00:00",
+        "updated_at": "2025-03-21T23:04:40+00:00"
+      },
+      "relationships": {
+        "positions": {
+          "links": {
+            "related": "/api/v1/positions?filter[employee_id]=1"
+          },
+          "data": [
+            {
+              "type": "positions",
+              "id": "1"
+            },
+            {
+              "type": "positions",
+              "id": "2"
+            }
+          ]
+        },
+        "tasks": {
+          "links": {
+            "related": "/api/v1/tasks?filter[employee_id]=1"
+          }
+        },
+        "teams": {
+          "links": {
+            "related": "/api/v1/teams?filter[employee_id]=1"
+          }
+        },
+        "notes": {
+          "links": {
+            "related": "/api/v1/notes?filter[notable_id]=1&filter[notable_type][eql]=Employee"
+          }
+        },
+        "current_position": {
+          "links": {
+            "related": "/api/v1/positions?filter[current]=true&filter[employee_id]=1"
+          },
+          "data": {
+            "type": "positions",
+            "id": "1"
+          }
+        }
+      }
+    }
+  ],
+  "included": [
+    {
+      "id": "1",
+      "type": "positions",
+      "attributes": {
+        "title": "Future Government Administrator",
+        "active": true
+      },
+      "relationships": {
+        "employee": {
+          "links": {
+            "related": "/api/v1/employees/1"
+          }
+        },
+        "department": {
+          "links": {
+            "related": "/api/v1/departments/3"
+          }
+        }
+      }
+    },
+    {
+      "id": "2",
+      "type": "positions",
+      "attributes": {
+        "title": "Manufacturing Specialist",
+        "active": false
+      },
+      "relationships": {
+        "employee": {
+          "links": {
+            "related": "/api/v1/employees/1"
+          }
+        },
+        "department": {
+          "links": {
+            "related": "/api/v1/departments/2"
+          }
+        }
+      }
+    }
+  ],
+  "meta": {}
+}
+```
+
+</details>
+
+
+
+[Graphiti Guides](https://www.graphiti.dev/guides/)
+
+[Join the Discord](https://discord.gg/wgqkMBsSRV)
 
-[Join the Slack Channel](https://join.slack.com/t/graphiti-api/shared_invite/enQtMjkyMTA3MDgxNTQzLTU5MDI4MDllNTEzOTE1Nzk0ZGJlNTcxZDYzMGY2ZTczMDY2OWZhM2RmNTU0YWNiOWZhZDhkMmU4MzQ5NzIyNWM)
 
-Direct Contact: richmolj@gmail.com
 
-Supports Rails >= 4.1
 
-*Looking for JSONAPI-Suite? You're in the right place. Graphiti is the 1.0 version of JSONAPI Suite. For the deprecated Suite gem, go [here](https://github.com/jsonapi-suite/jsonapi_suite_deprecated)*

data/gemfiles/rails_7_2_graphiti_rails.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.2"
+gem "rspec-rails"
+gem "sqlite3", "~> 2.1"
+gem "database_cleaner"
+gem "graphiti-rails", "~> 0.4.0"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

data/gemfiles/rails_8_0_graphiti_rails.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 8.0"
+gem "rspec-rails"
+gem "sqlite3", "~> 2.1"
+gem "database_cleaner"
+gem "graphiti-rails", "~> 0.4.0"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

data/lib/graphiti/scope.rb

@@ -140,7 +140,7 @@ module Graphiti
       end
       fiber_storage =
         if Fiber.current.respond_to?(:storage)
-          Fiber.current&.storage&.keys&.each_with_object({}) do |key, memo|
+          Fiber.current.storage&.keys&.each_with_object({}) do |key, memo|
             memo[key] = Fiber[key]
           end
         end
@@ -149,27 +149,46 @@ module Graphiti
         self.class.global_thread_pool_executor, Thread.current.object_id, thread_storage, fiber_storage, *args
       ) do |thread_id, thread_storage, fiber_storage, *args|
         wrap_in_rails_executor do
-          execution_context_changed = thread_id != Thread.current.object_id
-          if execution_context_changed
-            thread_storage&.keys&.each_with_object(Thread.current) do |key, thread_current|
-              thread_current[key] = thread_storage[key]
-            end
-            fiber_storage&.keys&.each_with_object(Fiber) do |key, fiber_current|
-              fiber_current[key] = fiber_storage[key]
+          with_thread_locals(thread_storage) do
+            with_fiber_locals(fiber_storage) do
+              Graphiti.broadcast(:global_thread_pool_task_run, self.class.global_thread_pool_stats) do
+                yield(*args)
+              end
             end
           end
+        end
+      end
+    end
 
-          result = Graphiti.broadcast(:global_thread_pool_task_run, self.class.global_thread_pool_stats) do
-            yield(*args)
-          end
+    def with_thread_locals(thread_locals)
+      new_thread_locals = []
+      thread_locals.each do |key, value|
+        if !Thread.current[key]
+          new_thread_locals << key
+        end
+        Thread.current[key] = value
+      end
+      yield
+    ensure
+      new_thread_locals.each do |key|
+        Thread.current[key] = nil
+      end
+    end
 
-          if execution_context_changed
-            thread_storage&.keys&.each { |key| Thread.current[key] = nil }
-            fiber_storage&.keys&.each { |key| Fiber[key] = nil }
-          end
+    def with_fiber_locals(fiber_locals)
+      return yield unless fiber_locals
 
-          result
+      new_fiber_locals = []
+      fiber_locals.each do |key, value|
+        if !Fiber[key]
+          new_fiber_locals << key
         end
+        Fiber[key] = value
+      end
+      yield
+    ensure
+      new_fiber_locals&.each do |key|
+        Fiber[key] = nil
       end
     end
 

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.8.0"
+  VERSION = "1.8.2"
 end

data/package.json

@@ -21,7 +21,7 @@
   },
   "release": {
     "branches": [
-      "master",
+      "main",
       {
         "name": "beta",
         "prerelease": true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.2
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -261,7 +261,9 @@ files:
 - gemfiles/rails_7.gemfile
 - gemfiles/rails_7_1.gemfile
 - gemfiles/rails_7_1_graphiti_rails.gemfile
+- gemfiles/rails_7_2_graphiti_rails.gemfile
 - gemfiles/rails_7_graphiti_rails.gemfile
+- gemfiles/rails_8_0_graphiti_rails.gemfile
 - graphiti.gemspec
 - lib/graphiti.rb
 - lib/graphiti/adapters/abstract.rb