graphiti 1.3.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30f5b9382256603c1f3f8f4ab8c4e614804c1a2e2152617d7b19892bca6bd465
-  data.tar.gz: 948837bfa0f8deee2f44849aba9df2bb18f2fdf532a1caaab92b16c7d9ba91fd
+  metadata.gz: 4ac18e95dbeb97600ec5027bf94e58724e652f5c77dd0d83f122651a04b9676f
+  data.tar.gz: 4691d5f4f4e037e6d2d5100e84789ea53b6084d884e22bdf1f55b6a3a0e7981d
 SHA512:
-  metadata.gz: 4fe6fff9c219fd463378bbdc793f648cbeffe27c61c191f11e2aab4723e952d2d8f7cc26b334255e12adca3e9d819b1bbde17697a6621f11a28151d2649d6d9c
-  data.tar.gz: becca9eaa17f328a99669e1e855a4024862b45d1902ddf30de597f7b33e3f52e4145b0f1dba1542a0d144ba2bc1bdec280ad9d8fa599a102ead9efb5260e1ab3
+  metadata.gz: 36401cebf8a89402bdbafccf234a98d988df2f642ff00d4ee51030857ce98b008f91d3ca80b7f05e64a2a3ab79f872c225c1d79cf3d1c531e9ff61e74b4f7280
+  data.tar.gz: 73601e0ee6d54235a54c4db54baab90313e735ae81806520354a8f75890de6ec7fb3025952ed972f15fe493230a97a50a2e41e82b7f957739b21177355743479

data/.github/probots.yml

@@ -0,0 +1,2 @@
+enabled:
+  - cla

data/.github/workflows/ci.yml

@@ -28,10 +28,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - "2.6"
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
+          - "3.3"
         gemfile:
           - Gemfile
           - gemfiles/rails_5_2.gemfile
@@ -40,12 +41,13 @@ jobs:
           - gemfiles/rails_5_2_graphiti_rails.gemfile
           - gemfiles/rails_6_graphiti_rails.gemfile
           - gemfiles/rails_7_graphiti_rails.gemfile
+          - gemfiles/rails_7_1_graphiti_rails.gemfile
         appraisal:
           - true
           - false
         include:
           - ruby: ruby-head
-            gemfile: Gemfile
+            gemfile: gemfiles/rails_7_1.gemfile
             appraisal: true
           - ruby: ruby-head
             gemfile: Gemfile
@@ -66,7 +68,9 @@ jobs:
             appraisal: false
           - gemfile: gemfiles/rails_7_graphiti_rails.gemfile
             appraisal: false
-          # Rails 5 can't run on Ruby 3
+          - gemfile: gemfiles/rails_7_1_graphiti_rails.gemfile
+            appraisal: false
+            # 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
@@ -75,11 +79,14 @@ jobs:
             ruby: 3.1
           - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
             ruby: 3.1
-          # Raise 7 can't run on 2.6
-          - gemfile: gemfiles/rails_7.gemfile
-            ruby: 2.6
-          - gemfile: gemfiles/rails_7_graphiti_rails.gemfile
-            ruby: 2.6
+          - gemfile: gemfiles/rails_5_2.gemfile
+            ruby: 3.2
+          - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+            ruby: 3.2
+          - gemfile: gemfiles/rails_5_2.gemfile
+            ruby: 3.3
+          - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+            ruby: 3.3
     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 }}
@@ -94,3 +101,14 @@ jobs:
           bundler-cache: true
       - name: Run tests
         run: bundle exec rspec
+  publish:
+    name: Release
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    needs: [test]
+    steps:
+      - name: Dispatch Release
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: Generate New Release
+          token: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/release.yml

@@ -0,0 +1,36 @@
+---
+name: Generate New Release
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          persist-credentials: false
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.1"
+      - name: Build
+        run: |
+          gem install bundler
+          git submodule update --init --recursive
+          bundle install --jobs 4 --retry 3
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
+        run: node_modules/.bin/semantic-release

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /gemfiles/*.lock
 /tmp/
+node_modules
 .byebug_history
 spec/.rspec-examples
 spec/dummy/log/*

data/Appraisals

@@ -42,3 +42,18 @@ appraise "rails-7-graphiti-rails" do
   gem "database_cleaner"
   gem "graphiti-rails", "~> 0.4.0"
 end
+
+appraise "rails-7-1" do
+  gem "rails", "~> 7.1"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.4.0"
+  gem "database_cleaner"
+end
+
+appraise "rails-7-1-graphiti-rails" do
+  gem "rails", "~> 7.1"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.4.0"
+  gem "database_cleaner"
+  gem "graphiti-rails", "~> 0.4.0"
+end

data/CHANGELOG.md

@@ -1,4 +1,27 @@
-## Unreleased
+graphiti changelog
+
+# [1.5.0](https://github.com/graphiti-api/graphiti/compare/v1.4.0...v1.5.0) (2024-03-18)
+
+
+### Features
+
+* add before_sideload hook ([#371](https://github.com/graphiti-api/graphiti/issues/371)) ([f68b61f](https://github.com/graphiti-api/graphiti/commit/f68b61ff09ec61ecf23acc5bc37d0accba14aeed))
+
+## 1.4.0, Sun March 17th 2024
+Features: 
+- [461](https://github.com/graphiti-api/graphiti/pull/461), [463](https://github.com/graphiti-api/graphiti/pull/463) Add support for Rails 7.1 + Ruby 3.2 + Ruby 3.3
+
+Fixes: 
+- [464](https://github.com/graphiti-api/graphiti/pull/464) Check for url presence before trying to append
+- [407](https://github.com/graphiti-api/graphiti/pull/407) Sort types in generated schema
+- [421](https://github.com/graphiti-api/graphiti/pull/421) Re-use resource class for remote sideloads to avoid memory leak
+- [452](https://github.com/graphiti-api/graphiti/pull/452) Resolve inconsistency for filters containing curly brackets
+- [446](https://github.com/graphiti-api/graphiti/pull/446) Fix private call
+
+## 1.3.9, May 25th 2022
+Use an options hash for log subscriber instead of positional arguments
+
+## 1.x ?? 
 
 Features:
 - [329](https://github.com/graphiti-api/graphiti/pull/329) Propagate `extra_fields` to related resource links.

data/Gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
+  gem "database_cleaner"
   gem "pry"
   gem "pry-byebug", platform: [:mri]
   gem "appraisal"

data/gemfiles/rails_7_1.gemfile

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

data/gemfiles/rails_7_1_graphiti_rails.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.4.0"
+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/configuration.rb

@@ -15,6 +15,7 @@ module Graphiti
     attr_accessor :pagination_links
     attr_accessor :typecast_reads
     attr_accessor :raise_on_missing_sidepost
+    attr_accessor :before_sideload
 
     attr_reader :debug, :debug_models
 

data/lib/graphiti/debugger.rb

@@ -140,7 +140,6 @@ module Graphiti
         params ||= {}
         params = params.to_unsafe_h if params.respond_to?(:to_unsafe_h)
         params.reject! { |k, v| [:controller, :action, :format, :debug].include?(k.to_sym) }
-        params.reject! { |k, v| k.to_sym == :include }
         params.deep_symbolize_keys
       end
 

data/lib/graphiti/query.rb

@@ -76,11 +76,14 @@ module Graphiti
       end
     end
 
+    class RemoteSideloadResource < ::Graphiti::Resource
+      self.remote = "_remote_sideload_".freeze
+      self.abstract_class = true # exclude from schema
+    end
+
     def resource_for_sideload(sideload)
       if @resource.remote?
-        Class.new(Graphiti::Resource) {
-          self.remote = "_remote_sideload_"
-        }.new
+        RemoteSideloadResource.new
       else
         sideload.resource
       end

data/lib/graphiti/resource/dsl.rb

@@ -205,7 +205,7 @@ module Graphiti
             options[name] ||= send(:"relationships_#{name}_by_default")
           end
         end
-        private :attribute_option
+        private :relationship_option
       end
     end
   end

data/lib/graphiti/resource/sideloading.rb

@@ -68,7 +68,7 @@ module Graphiti
           model_ref = model
           has_many name, opts do
             params do |hash|
-              hash[:filter][:"#{as}_type"] = { eql: model_ref.name }
+              hash[:filter][:"#{as}_type"] = {eql: model_ref.name}
             end
 
             instance_eval(&blk) if blk
@@ -82,7 +82,7 @@ module Graphiti
           model_ref = model
           has_one name, opts do
             params do |hash|
-              hash[:filter][:"#{as}_type"] = { eql: model_ref.name }
+              hash[:filter][:"#{as}_type"] = {eql: model_ref.name}
             end
 
             instance_eval(&blk) if blk

data/lib/graphiti/resource_proxy.rb

@@ -153,11 +153,13 @@ module Graphiti
       success
     end
 
-    def update_attributes
+    def update
       data
       save(action: :update)
     end
 
+    alias update_attributes update # standard:disable Style/Alias
+
     def include_hash
       @include_hash ||= begin
         base = @payload ? @payload.include_hash : {}

data/lib/graphiti/schema.rb

@@ -42,7 +42,7 @@ module Graphiti
 
     def generate_types
       {}.tap do |types|
-        Graphiti::Types.map.each_pair do |name, config|
+        Graphiti::Types.map.sort.each_entry do |name, config|
           types[name] = config.slice(:kind, :description)
         end
       end

data/lib/graphiti/scope.rb

@@ -43,6 +43,7 @@ module Graphiti
         parent_resource = @resource
         graphiti_context = Graphiti.context
         resolve_sideload = -> {
+          Graphiti.config.before_sideload&.call(graphiti_context)
           Graphiti.context = graphiti_context
           sideload.resolve(results, q, parent_resource)
           @resource.adapter.close if concurrent

data/lib/graphiti/scoping/filter.rb

@@ -193,14 +193,14 @@ module Graphiti
       # Find the quoted strings
       quotes = value.scan(/{{.*?}}/)
       # remove them from the rest
-      quotes.each { |q| value.gsub!(q, "") }
+      non_quotes = quotes.inject(value) { |v, q| v.gsub(q, "") }
       # remove the quote characters from the quoted strings
       quotes.each { |q| q.gsub!("{{", "").gsub!("}}", "") }
       # merge everything back together into an array
       value = if singular_filter
-        Array(value) + quotes
+        Array(non_quotes) + quotes
       else
-        Array(value.split(",")) + quotes
+        Array(non_quotes.split(",")) + quotes
       end
       # remove any blanks that are left
       value.reject! { |v| v.length.zero? }

data/lib/graphiti/util/link.rb

@@ -48,6 +48,7 @@ module Graphiti
 
       def on_demand_links(url)
         return url unless Graphiti.config.links_on_demand
+        return unless url
 
         url << if url.include?("?")
           "&links=true"

data/lib/graphiti/util/serializer_relationships.rb

@@ -118,7 +118,7 @@ module Graphiti
         cache_key = :"#{@sideload.object_id}-#{action}"
         return if self.class.validated_link_cache.include?(cache_key)
         prc = Graphiti.config.context_for_endpoint
-        unless prc.call(sideload.resource.endpoint[:full_path], action)
+        unless prc.call(sideload.resource.endpoint[:full_path].to_s, action)
           raise Errors::InvalidLink.new(@resource_class, sideload, action)
         end
         self.class.validated_link_cache << cache_key

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.3.9"
+  VERSION = "1.5.0"
 end

data/lib/graphiti.rb

@@ -1,5 +1,6 @@
 require "json"
 require "forwardable"
+require "uri"
 require "active_support/core_ext/string"
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/class/attribute"
@@ -83,7 +84,12 @@ module Graphiti
   end
 
   def self.log(msg, color = :white, bold = false)
-    colored = ActiveSupport::LogSubscriber.new.send(:color, msg, color, bold)
+    colored = if ::ActiveSupport.version >= Gem::Version.new("7.1")
+      ActiveSupport::LogSubscriber.new.send(:color, msg, color, bold: bold)
+    else
+      ActiveSupport::LogSubscriber.new.send(:color, msg, color, bold)
+    end
+
     logger.debug(colored)
   end
 
@@ -131,7 +137,6 @@ require "graphiti/resource_proxy"
 require "graphiti/request_validator"
 require "graphiti/request_validators/validator"
 require "graphiti/request_validators/update_validator"
-require "graphiti/query"
 require "graphiti/scope"
 require "graphiti/deserializer"
 require "graphiti/renderer"
@@ -170,6 +175,7 @@ require "graphiti/extensions/extra_attribute"
 require "graphiti/extensions/boolean_attribute"
 require "graphiti/extensions/temp_id"
 require "graphiti/serializer"
+require "graphiti/query"
 require "graphiti/debugger"
 
 if defined?(ActiveRecord)

data/package.json

@@ -0,0 +1,110 @@
+{
+  "name": "graphiti",
+  "version": "1.4.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/graphiti-api/graphiti.git"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/graphiti-api/graphiti/issues"
+  },
+  "homepage": "https://graphiti.dev",
+  "scripts": {
+    "semantic-release": "semantic-release"
+  },
+  "devDependencies": {
+    "semantic-release-rubygem": "^1.2.0",
+    "semantic-release": "^19.0.3",
+    "@semantic-release/changelog": "^6.0.1",
+    "@semantic-release/git": "^10.0.1" 
+  },
+  "release": {
+    "branches": [
+      "master",
+      {
+        "name": "beta",
+        "prerelease": true
+      },
+      {
+        "name": "alpha",
+        "prerelease": true
+      }
+    ],
+    "plugins": [
+      [
+        "@semantic-release/commit-analyzer",
+        {
+          "releaseRules": [
+            {
+              "type": "*!",
+              "release": "major"
+            },
+            {
+              "type": "feat",
+              "release": "minor"
+            },
+            {
+              "type": "build",
+              "release": "patch"
+            },
+            {
+              "type": "ci",
+              "release": "patch"
+            },
+            {
+              "type": "chore",
+              "release": "patch"
+            },
+            {
+              "type": "docs",
+              "release": "patch"
+            },
+            {
+              "type": "refactor",
+              "release": "patch"
+            },
+            {
+              "type": "style",
+              "release": "patch"
+            },
+            {
+              "type": "test",
+              "release": "patch"
+            }
+          ],
+          "parserOpts": {
+            "noteKeywords": [
+              "BREAKING CHANGE",
+              "BREAKING CHANGES",
+              "BREAKING",
+              "BREAKING CHANGE!",
+              "BREAKING CHANGES!",
+              "BREAKING!"
+            ]
+          }
+        }
+      ],
+      "@semantic-release/release-notes-generator",
+      [
+        "@semantic-release/changelog",
+        {
+          "changelogTitle": "graphiti changelog",
+          "changelogFile": "CHANGELOG.md"
+        }
+      ],
+      "@semantic-release/github",
+      [
+        "@semantic-release/git",
+        {
+          "assets": [
+            "CHANGELOG.md"
+          ],
+          "message": "${nextRelease.version} CHANGELOG [skip ci]\n\n${nextRelease.notes}"
+        }
+      ]
+    ],
+    "debug": true,
+    "dryRun": false
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.5.0
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -212,7 +212,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/probots.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".standard.yml"
@@ -251,6 +253,8 @@ files:
 - gemfiles/rails_6.gemfile
 - gemfiles/rails_6_graphiti_rails.gemfile
 - gemfiles/rails_7.gemfile
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_1_graphiti_rails.gemfile
 - gemfiles/rails_7_graphiti_rails.gemfile
 - graphiti.gemspec
 - lib/graphiti.rb
@@ -336,6 +340,7 @@ files:
 - lib/graphiti/util/transaction_hooks_recorder.rb
 - lib/graphiti/util/validation_response.rb
 - lib/graphiti/version.rb
+- package.json
 homepage: https://github.com/graphiti-api/graphiti
 licenses:
 - MIT