graphiti 2.0.0.beta.4 → 2.0.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f1b385d0a7623788b2a492d98d2175d1964d320ea48f988f73bffb30ab9439
-  data.tar.gz: a95f11de0a07753144d5c4d057ae0b4bb90e2f61c5906996bd29f7fa09998657
+  metadata.gz: cdd882c646fa88d0ac6522b7725ad6132b7ad890043822f5e2a2ce8af3f0fc4c
+  data.tar.gz: 687c64e9c5e6d2931a09bde9f5595b965e36f1a090d863fa17b9edf11559533f
 SHA512:
-  metadata.gz: 7f00afaae7e44289e89d5d29e56e3539953e2c13befcc6c2d5dbb95c9b8904ca6103c3651ebabb6227f9e43f50f22ee4b845d1d9235244e363a1c08089363c47
-  data.tar.gz: a6f82ed9556a22d2ddd76710877af8f39cfca470cad5a12a05d99ef5d54fc6d03a5c0e549026307cd71b6a6323c51e4889164acd94a38a0d371e0c74fe54760a
+  metadata.gz: 1907226aa19ad065b0affe66f5ea22bb7149fd11aef92d225d7b433a5c67111bde2d7ef5911e633c5ea9059559ff903654c21f835099b5e15e72fdf7ab59cc9b
+  data.tar.gz: 91fd8e83a1452d29ffb45076b94a9eeb316c4e508a2f6565c5e079e6c54a184eede79da45ecb9d25f340f395551d907e10eb152e05666387792c434ed5fb4361

data/.github/workflows/docs.yml

@@ -1,10 +1,9 @@
 name: Docs
 
-# Publishes the documentation site from beta so the deploy is exercised well
-# before it matters. Pages serves this repo under /graphiti/, and the root of
-# graphiti.dev comes from graphiti-api.github.io, so nothing here can affect
-# the live 1.x site. When the domain moves to this repo, drop DOCS_BASE_URL so
-# baseUrl returns to "/" and add website/static/CNAME.
+# Publishes the documentation site from beta. graphiti.dev now points at this
+# repo via website/static/CNAME, so this deploy is the live site: the 1.x
+# Jekyll site is frozen under website/static/1.13 and ships with every build,
+# and graphiti-api.github.io no longer serves the domain.
 on:
   push:
     branches: [beta]
@@ -39,8 +38,6 @@ jobs:
 
       - name: Build
         working-directory: website
-        env:
-          DOCS_BASE_URL: /graphiti/
         run: npm run build
 
       - name: Publish to gh-pages

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 graphiti changelog
 
+# [2.0.0-beta.5](https://github.com/graphiti-api/graphiti/compare/v2.0.0-beta.4...v2.0.0-beta.5) (2026-08-07)
+
+
+### Bug Fixes
+
+* drop the relationship guard install notice ([c204312](https://github.com/graphiti-api/graphiti/commit/c20431214e126cb8e72c82022ee4c852b10a024b))
+* keep rake task helpers out of the global namespace ([0a41a60](https://github.com/graphiti-api/graphiti/commit/0a41a6022fa4c9151948714c31db367aee330e22)), closes [graphiti-api/graphiti-rails#91](https://github.com/graphiti-api/graphiti-rails/issues/91)
+
+
+### Features
+
+* add rspec matchers for resource relationships and attributes ([70525f7](https://github.com/graphiti-api/graphiti/commit/70525f7e10c511aa0c867ecc873f63f1790b8247)), closes [graphiti-api/graphiti_spec_helpers#14](https://github.com/graphiti-api/graphiti_spec_helpers/issues/14)
+* let the resource generator name the controller ([6ea7141](https://github.com/graphiti-api/graphiti/commit/6ea714181f3da011cae9f42477b4c3681a7a90ff)), closes [graphiti-api/graphiti-rails#53](https://github.com/graphiti-api/graphiti-rails/issues/53)
+
 # [2.0.0-beta.4](https://github.com/graphiti-api/graphiti/compare/v2.0.0-beta.3...v2.0.0-beta.4) (2026-08-07)
 
 

data/docs/concepts/links.md

@@ -170,11 +170,11 @@ end
 
 ### Pagination Links {#pagination-links}
 
-Requesting big collections can result into slow responses sometimes. In order to avoid this, you could use [pagination](https://jsonapi.org/format/#fetching-pagination). It'll break your response into smaller pieces that will make your server responds faster. Paginations links can be present in your response in the following ways:
+Requesting large collections can make for slow responses. [Pagination](https://jsonapi.org/format/#fetching-pagination) breaks the response into smaller pieces, and pagination links tell the client how to walk them. They can appear in a response two ways.
 
 #### Showing by default {#pagination-links-showing-by-default}
 
-With this configuration, all the responses will return the pagination links
+Every collection response returns pagination links:
 
 ```ruby
 Graphiti.configure do |c|
@@ -184,7 +184,7 @@ end
 
 #### When requested {#pagination-links-when-requested}
 
-You can showing the pagination links when it was requested in the URL with `?pagination_links=true`
+Links are rendered only when the request asks for them with `?pagination_links=true`. Worth doing when the collection is large: the `last` link needs a total count, so rendering links costs a `stat(:total, :count)` on every request that gets them.
 
 ```ruby
 Graphiti.configure do |c|

data/docs/upgrading.md

@@ -13,9 +13,8 @@ Four things, and three of them fail loudly if you skip them.
 
 **1. Drop three gems.** `graphiti-rails`, `graphiti_spec_helpers` and `graphiti_errors` are now part of `graphiti` itself.
 
-```diff
-# Gemfile
-+ gem "graphiti"
+```diff title="Gemfile"
++ gem "graphiti", "~> 2.0.0.beta" # follows the betas and picks up 2.0 final when it ships
 - gem "graphiti-rails"
 - gem "graphiti_spec_helpers"
 - gem "graphiti_errors"
@@ -31,18 +30,14 @@ class ApplicationController < ActionController::Base
 end
 ```
 
-Skipping this fails at boot rather than at request time: a controller calling `sideload_allowlist` raises `NoMethodError` while its class body loads, so the app stops starting.
-
-If the controller already has `include Graphiti::Rails`, replace that line rather than adding to it. The old spelling still sets the controller up, so nothing breaks mid-upgrade, but it warns and goes away in the next major version.
+If the controller already has `include Graphiti::Rails`, replace it with `include Graphiti::Rails::Controller`. 
 
 <details>
 <summary>What the include actually brings, and what a controller without it loses</summary>
 
 Until 2.0, Graphiti added itself to **every** controller in the application: an `around_action` wrapping each request in a Graphiti context, another wrapping it in the debugger, and a catch-all exception handler, on Devise controllers, admin controllers, HTML pages, everything.
 
-`Graphiti::Rails::Controller` now bundles all of it, and where you include it decides the blast radius. `ApplicationController` matches 1.x behavior. An API base class scopes it and leaves the rest of the app alone.
-
-A controller without it gets no Graphiti context, no debugger, and none of Graphiti's exception handlers, so if a resource action sees an empty `Graphiti.context`, this include is what is missing.
+`Graphiti::Rails::Controller` now bundles all of it, and including it is required. Including it in `ApplicationController` matches 1.x behavior. Including it in an API base class scopes it and leaves the rest of the app alone. A controller without it gets no Graphiti context, no debugger, and none of Graphiti's exception handlers, so if a resource action sees an empty `Graphiti.context`, this include is what is missing.
 
 The class-level DSL travels with it, which is the one failure you see before a request is ever served:
 

data/graphiti.gemspec

@@ -18,24 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 3.2"
 
-  # TODO: remove once the 1.12 upgrade window has passed
-  spec.post_install_message = <<~MSG
-    Graphiti: relationship readable:/writable: guards are now enforced.
-
-    Symbols, strings, and procs passed to a relationship's readable/writable
-    guards were always interpreted as true and never actually called before this
-    conditional relationship change. They are now evaluated per-request, where
-    unreadable relationships are omitted from responses and includes, and unwritable
-    relationships reject writes.
-
-    To list every affected relationship in your app:
-
-      bin/rails runner 'puts Graphiti.guarded_relationships'
-
-    Audit these before deploying. Apps using schema.json will also see affected 
-    relationships flagged as "became guarded" by the schema check.
-  MSG
-
   spec.add_dependency "jsonapi-serializable", "~> 0.3.0"
   spec.add_dependency "jsonapi-renderer", "~> 0.2", ">= 0.2.2"
   spec.add_dependency "dry-types", ">= 0.15.0", "< 2.0"

data/lib/generators/graphiti/resource_generator.rb

@@ -32,6 +32,12 @@ module Graphiti
       aliases: ["--model", "-m"],
       desc: "Specify to use attributes from a particular model"
 
+    # No short alias: -c is already --omit-comments.
+    class_option :controller,
+      banner: "Name",
+      type: :string,
+      desc: "Generate the controller under this name instead of the resource's, e.g. Api::V1::Posts"
+
     desc "This generator creates a resource file at app/resources, as well as corresponding controller/specs/route/etc"
     def generate_all
       generate_model
@@ -125,8 +131,23 @@ module Graphiti
       defined?(::Responders)
     end
 
+    # Api::V1::Posts, Api::V1::PostsController and api/v1/posts all name the
+    # same controller. Normalizing here means the class name, the file path and
+    # the route all come from one place.
+    def controller_class_name
+      @controller_class_name ||= begin
+        given = options[:controller]
+        base = given ? given.sub(/Controller\z/, "").camelize : model_klass.name
+        "#{base.pluralize}Controller"
+      end
+    end
+
+    def controller_path
+      controller_class_name.sub(/Controller\z/, "").underscore
+    end
+
     def generate_controller
-      to = File.join("app/controllers", class_path, "#{file_name.pluralize}_controller.rb")
+      to = File.join("app/controllers", "#{controller_path}_controller.rb")
       template("controller.rb.erb", to)
     end
 
@@ -142,6 +163,9 @@ module Graphiti
 
     def generate_route
       code = "resources :#{file_name.pluralize}"
+      # Rails would otherwise infer the controller from the route name, which
+      # is only right when the controller was named after the resource.
+      code << %(, controller: "#{controller_path}") if options[:controller]
       code << %(, only: [#{actions.map { |a| ":#{a}" }.join(", ")}]) if actions.length < 5
       code << "\n"
       inject_into_file "config/routes.rb", after: /ApplicationResource.*$\n/ do

data/lib/generators/graphiti/templates/controller.rb.erb

@@ -1,5 +1,5 @@
 <% module_namespacing do -%>
-class <%= model_klass.name.pluralize %>Controller < ApplicationController
+class <%= controller_class_name %> < ApplicationController
   <%- if actions?('index') -%>
   def index
     <%= file_name.pluralize %> = <%= resource_klass %>.all(params)

data/lib/graphiti/rails/rake_helpers.rb

@@ -0,0 +1,42 @@
+require "graphiti/rails/test_helpers"
+
+module Graphiti
+  module Rails
+    # Rake's `namespace` takes a block, and a block does not open a new definee,
+    # so helpers defined inside one are defined on Object and turn up in every
+    # request spec in the host app. They live here to stay off that namespace.
+    module RakeHelpers
+      extend TestHelpers
+
+      module_function
+
+      # ::Rails throughout, because bare Rails resolves to Graphiti::Rails here.
+      def session
+        @session ||= ActionDispatch::Integration::Session.new(::Rails.application)
+      end
+
+      def setup_rails!
+        ::Rails.application.eager_load!
+        ::Rails.application.config.cache_classes = true
+        ::Rails.application.config.action_controller.perform_caching = false
+      end
+
+      def make_request(path, debug = false)
+        if path.split("/").length == 2
+          path = "#{ApplicationResource.endpoint_namespace}#{path}"
+        end
+        path << if path.include?("?")
+          "&cache=bust"
+        else
+          "?cache=bust"
+        end
+        path = "#{path}&debug=true" if debug
+        handle_request_exceptions do
+          headers = {Authorization: ENV["AUTHORIZATION_HEADER"]}.compact
+          session.get(path.to_s, headers: headers)
+        end
+        JSON.parse(session.response.body)
+      end
+    end
+  end
+end

data/lib/graphiti/spec_helpers/matchers.rb

@@ -0,0 +1,196 @@
+module Graphiti
+  module SpecHelpers
+    # Assertions against a resource's DSL. The schema specs cannot cover
+    # adapter-dependent options (primary key, foreign key, and so on) because
+    # the schema does not carry them; these read the resource config directly.
+    module Matchers
+      class BaseMatcher
+        GRAPHITI_OPTS = [].freeze
+        GRAPHITI_CONFIG_KEY = ""
+        EXPECTED_ACTION = ""
+
+        def description
+          "#{self.class::EXPECTED_ACTION} #{target}"
+        end
+
+        def failure_message
+          "expected that #{resource.class} would #{self.class::EXPECTED_ACTION} #{target}\n#{@opt_failures.join("\n")}"
+        end
+
+        def failure_message_when_negated
+          "expected that #{resource.class} would not #{self.class::EXPECTED_ACTION} #{target}"
+        end
+
+        def opt_failure_message(opt, expected, actual)
+          "expected that #{opt} would be #{expected}, was #{actual}"
+        end
+
+        def does_not_match?(resource)
+          !matches?(resource)
+        end
+
+        def matches?(resource)
+          @resource = resource
+
+          expected? && expected_opts?
+        end
+
+        def with_options(opts)
+          @opts = opts
+          self
+        end
+
+        private
+
+        def actual_opts
+          self.class::GRAPHITI_OPTS & opts.keys
+        end
+
+        def config
+          @config ||= resource.class.config[self.class::GRAPHITI_CONFIG_KEY][target]
+        end
+
+        def expected_opts?
+          return false unless config
+
+          actual_opts.map { |opt| assert_opt(opt) }.all?(true)
+        end
+      end
+
+      class RelationMatcher < BaseMatcher
+        GRAPHITI_OPTS = %i[primary_key foreign_key resource readable writable link single].freeze
+        GRAPHITI_CONFIG_KEY = :sideloads
+        EXPECTED_ACTION = ""
+
+        def initialize(target)
+          @target = target
+          @opts = {}
+          @opt_failures = []
+        end
+
+        private
+
+        attr_reader :target, :opts, :resource
+
+        def assert_opt(opt)
+          asserted_opt = opt == :resource ? :resource_class : opt
+          return true if config.send(asserted_opt) == opts[opt]
+
+          @opt_failures << opt_failure_message(opt, opts[opt], config.send(asserted_opt))
+          false
+        end
+
+        def expected?
+          config && config.type == relation_name
+        end
+
+        # BelongsToMatcher -> :belongs_to, matching Sideload#type.
+        def relation_name
+          self.class.name.demodulize.gsub("Matcher", "").underscore.to_sym
+        end
+      end
+
+      class BelongsToMatcher < RelationMatcher
+        EXPECTED_ACTION = "belong to"
+      end
+
+      class HasManyMatcher < RelationMatcher
+        EXPECTED_ACTION = "have many"
+      end
+
+      class HasOneMatcher < RelationMatcher
+        EXPECTED_ACTION = "have one"
+      end
+
+      class ResourceDSLMatcher < BaseMatcher
+        def initialize(target, type)
+          @target = target
+          @type = type
+          @opts = {}
+          @opt_failures = []
+        end
+
+        private
+
+        attr_reader :target, :type, :opts, :resource
+
+        def expected?
+          config && assert_type
+        end
+
+        def assert_type
+          return true if config[:type] == type
+
+          @opt_failures << opt_failure_message("type", type, config[:type])
+          false
+        end
+
+        def assert_opt(opt)
+          return true if config[opt] == opts[opt]
+
+          @opt_failures << opt_failure_message(opt, opts[opt], config[opt])
+          false
+        end
+      end
+
+      class ExposeAttributeMatcher < ResourceDSLMatcher
+        GRAPHITI_OPTS = %i[writable readable sortable filterable].freeze
+        GRAPHITI_CONFIG_KEY = :attributes
+        EXPECTED_ACTION = "expose"
+      end
+
+      class FilterAttributeMatcher < ResourceDSLMatcher
+        GRAPHITI_OPTS = %i[allow deny single required allow_nil deny_empty].freeze
+        GRAPHITI_CONFIG_KEY = :filters
+        EXPECTED_ACTION = "filter"
+      end
+
+      # @param [Symbol] relation
+      #
+      # @example expect(subject).to belong_to_resource(:user)
+      # @example expect(subject).to belong_to_resource(:user).with_options(foreign_key: :user_id, resource: UserResource)
+      # @example expect(subject).not_to belong_to_resource(:user)
+      def belong_to_resource(relation)
+        BelongsToMatcher.new(relation)
+      end
+
+      # @param [Symbol] relation
+      #
+      # @example expect(subject).to have_many_resources(:posts)
+      # @example expect(subject).to have_many_resources(:posts).with_options(foreign_key: :post_id, resource: PostResource)
+      # @example expect(subject).not_to have_many_resources(:posts)
+      def have_many_resources(relation)
+        HasManyMatcher.new(relation)
+      end
+
+      # @param [Symbol] relation
+      #
+      # @example expect(subject).to have_one_resource(:post)
+      # @example expect(subject).to have_one_resource(:post).with_options(foreign_key: :post_id, resource: PostResource)
+      # @example expect(subject).not_to have_one_resource(:post)
+      def have_one_resource(relation)
+        HasOneMatcher.new(relation)
+      end
+
+      # @param [Symbol] attribute
+      # @param [Symbol] type
+      #
+      # @example expect(subject).to expose_attribute(:name, :string)
+      # @example expect(subject).to expose_attribute(:name, :string).with_options(writable: false)
+      # @example expect(subject).not_to expose_attribute(:name, :string)
+      def expose_attribute(attribute, type)
+        ExposeAttributeMatcher.new(attribute, type)
+      end
+
+      # @param [Symbol] attribute
+      # @param [Symbol] type
+      #
+      # @example expect(subject).to filter_attribute(:name, :string)
+      # @example expect(subject).to filter_attribute(:name, :string).with_options(allow_nil: false)
+      # @example expect(subject).not_to filter_attribute(:name, :string)
+      def filter_attribute(attribute, type)
+        FilterAttributeMatcher.new(attribute, type)
+      end
+    end
+  end
+end

data/lib/graphiti/spec_helpers/rspec.rb

@@ -120,6 +120,7 @@ module Graphiti
 
         ::RSpec.configure do |rspec|
           rspec.include_context "graphiti resource testing", type: :resource
+          rspec.include Graphiti::SpecHelpers::Matchers, type: :resource
         end
       end
 

data/lib/graphiti/spec_helpers.rb

@@ -11,6 +11,7 @@ require "graphiti/spec_helpers/helpers"
 require "graphiti/spec_helpers/node"
 require "graphiti/spec_helpers/errors_proxy"
 require "graphiti/spec_helpers/errors"
+require "graphiti/spec_helpers/matchers"
 
 module Graphiti
   module SpecHelpers

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "2.0.0.beta.4"
+  VERSION = "2.0.0.beta.5"
 end

data/lib/tasks/graphiti.rake

@@ -1,52 +1,27 @@
-namespace :graphiti do
-  include Graphiti::Rails::TestHelpers
-
-  def session
-    @session ||= ActionDispatch::Integration::Session.new(Rails.application)
-  end
+require "graphiti/rails/rake_helpers"
 
-  def setup_rails!
-    Rails.application.eager_load!
-    Rails.application.config.cache_classes = true
-    Rails.application.config.action_controller.perform_caching = false
-  end
-
-  def make_request(path, debug = false)
-    if path.split("/").length == 2
-      path = "#{ApplicationResource.endpoint_namespace}#{path}"
-    end
-    path << if path.include?("?")
-      "&cache=bust"
-    else
-      "?cache=bust"
-    end
-    path = "#{path}&debug=true" if debug
-    handle_request_exceptions do
-      headers = {Authorization: ENV["AUTHORIZATION_HEADER"]}.compact
-      session.get(path.to_s, headers: headers)
-    end
-    JSON.parse(session.response.body)
-  end
+namespace :graphiti do
+  helpers = Graphiti::Rails::RakeHelpers
 
   desc "Execute request without web server."
   task :request, [:path, :debug] => [:environment] do |_, args|
-    setup_rails!
+    helpers.setup_rails!
     Graphiti.logger = Graphiti.stdout_logger
     Graphiti::Debugger.preserve = true
     require "pp"
     path, debug = args[:path], args[:debug]
     puts "Graphiti Request: #{path}"
-    json = make_request(path, debug)
+    json = helpers.make_request(path, debug)
     pp json
     Graphiti::Debugger.flush if debug
   end
 
   desc "Execute benchmark without web server."
   task :benchmark, [:path, :requests] => [:environment] do |_, args|
-    setup_rails!
+    helpers.setup_rails!
     took = Benchmark.ms {
       args[:requests].to_i.times do
-        make_request(args[:path])
+        helpers.make_request(args[:path])
       end
     }
     puts "Took: #{(took / args[:requests].to_f).round(2)}ms"

data/website/docusaurus.config.js

@@ -1,16 +1,41 @@
 // @ts-check
 const {themes} = require('prism-react-renderer');
 
+const codeBlockTheme = (theme, backgroundColor) => ({
+  ...theme,
+  plain: {...theme.plain, backgroundColor},
+});
+
+// Docusaurus prepends baseUrl to navbar and Link hrefs, but not to raw HTML
+// like announcementBar content, so that markup has to build its own absolute
+// paths. Always has a trailing slash.
+const baseUrl = process.env.DOCS_BASE_URL || '/';
+
+// The theme's strikethrough and underline on diff lines are inline styles, so
+// CSS cannot undo them. Colour and the +/- signs already carry it.
+const withoutDiffDecoration = (theme) => ({
+  ...theme,
+  styles: theme.styles.map(({types, style}) =>
+    types.some((type) => type === 'inserted' || type === 'deleted')
+      ? {types, style: {...style, textDecorationLine: undefined}}
+      : {types, style}
+  ),
+});
+
 /** @type {import('@docusaurus/types').Config} */
 const config = {
   title: 'Graphiti',
   tagline: 'Stylish Graph APIs',
   favicon: 'img/favicon.ico',
 
-  url: 'https://www.graphiti.dev',
-  // Project pages serve this repo under /graphiti/ until the domain moves
-  // here from graphiti-api.github.io, so the deploy sets DOCS_BASE_URL.
-  baseUrl: process.env.DOCS_BASE_URL || '/',
+  // Apex, matching the CNAME. This feeds canonical tags and sitemap.xml, so it
+  // has to agree with the host actually serving the site or the two split
+  // search ranking between them.
+  url: 'https://graphiti.dev',
+  // graphiti.dev resolves to this repo, so the site serves from the root.
+  // DOCS_BASE_URL still overrides it for a build served from the project-pages
+  // path, which is what /graphiti/ was during the beta.
+  baseUrl,
   organizationName: 'graphiti-api',
   projectName: 'graphiti',
 
@@ -75,7 +100,7 @@ const config = {
           {from: ['/cookbooks/customizing-sideloads'], to: '/topics/customizing-sideloads'},
           {from: ['/cookbooks/hopping-relationships'], to: '/topics/hopping-relationships'},
 
-          {from: ['/js/introduction'], to: '/js'},
+          {from: ['/js/introduction'], to: '/js/'},
           {
             from: [
               '/js/reads/index',
@@ -100,11 +125,24 @@ const config = {
             to: '/js/writes',
           },
         ],
+
+        // The 2.0 docs were staged under /graphiti/ for the whole beta, so
+        // those URLs are in the wild. createRedirects sees every generated
+        // route, which the static /1.13/ tree is not: that one is by hand.
+        createRedirects(existingPath) {
+          return [`/graphiti${existingPath}`];
+        },
       },
     ],
   ],
 
   themeConfig: {
+    announcementBar: {
+      // Changing the id un-dismisses the bar for everyone who has closed it.
+      id: 'graphiti-2-0-beta',
+      content: `Graphiti 2.0 is in beta, and the docs have been reorganized to describe it. <a href="${baseUrl}1.13/">Docs for 1.x</a>.`,
+      isCloseable: true,
+    },
     colorMode: {
       // Dark for a first-time visitor. Flip respectPrefersColorScheme to true
       // to follow the OS setting instead, in which case defaultMode only
@@ -122,19 +160,37 @@ const config = {
           position: 'right',
           // 1.x stays as the original Jekyll site, frozen under /1.13.
           //
-          // target '_self' is required. Without it the router treats this as
-          // an in-app route, finds no match, and renders the 404 page even
-          // though the file is served fine.
+          // The pathname:// prefix is required. It is Docusaurus' escape hatch
+          // for a path that is served statically but is not an app route:
+          // without it the link renders as a react-router push, which finds no
+          // match and shows the 404 page even though the file is served fine.
+          // The prefix is stripped before baseUrl is applied, and it also makes
+          // the link count as external, hence target '_self' to keep it from
+          // opening in a new tab.
           dropdownItemsAfter: [
-            {href: '/1.13/', label: '1.x', target: '_self'},
+            {href: 'pathname:///1.13/', label: '1.x', target: '_self'},
           ],
         },
         {href: 'https://github.com/graphiti-api/graphiti', label: 'GitHub', position: 'right'},
         {href: 'https://discord.gg/wgqkMBsSRV', label: 'Discord', position: 'right'},
       ],
     },
-    footer: {style: 'dark', copyright: `Graphiti is released under the MIT license.`},
-    prism: {theme: themes.github, darkTheme: themes.dracula, additionalLanguages: ['ruby', 'bash', 'json', 'http']},
+    footer: {
+      style: 'dark',
+      copyright: [
+        'Originally created by <a href="https://github.com/richmolj">Lee Richmond</a>,',
+        '<a href="https://github.com/wadetandy">Wade Tandy</a>, and',
+        '<a href="https://github.com/wagenet">Peter Wagenet</a>.',
+        'Maintained by <a href="https://github.com/jkeen">Jeff Keen</a>',
+        'with <a href="https://github.com/graphiti-api/graphiti/graphs/contributors">many contributors</a>.',
+        '<br />Graphiti is released under the MIT license.',
+      ].join(' '),
+    },
+    prism: {
+      theme: withoutDiffDecoration(themes.oneLight),
+      darkTheme: withoutDiffDecoration(codeBlockTheme(themes.oneDark, '#21252b')),
+      additionalLanguages: ['ruby', 'bash', 'json', 'http', 'diff'],
+    },
   },
 };
 

data/website/src/css/custom.css

@@ -21,7 +21,7 @@
   --docusaurus-highlighted-code-line-bg: rgba(255, 102, 217, 0.12);
 }
 
-[data-theme='dark'] {
+html[data-theme='dark'] {
   --ifm-color-primary: #ff66d9;
   --ifm-color-primary-dark: #ff45d1;
   --ifm-color-primary-darker: #ff34cd;
@@ -32,10 +32,13 @@
 
   --ifm-background-color: #292e33;
   --ifm-navbar-background-color: #292e33;
-  --ifm-footer-background-color: #21252a;
   --docusaurus-highlighted-code-line-bg: rgba(255, 102, 217, 0.2);
 }
 
+html[data-theme='dark'] .footer--dark {
+  --ifm-footer-background-color: #21252a;
+}
+
 .navbar__title { font-family: 'Bungee', cursive; font-weight: 400; font-size: 1.35rem; }
 
 /* Black sets tight at display sizes and needs more room above it than a
@@ -56,3 +59,27 @@
   vertical-align: baseline;
   padding: 0.15em 0.3em;
 }
+
+/* The bar is full-bleed on every page, so it takes a tint of the brand pink
+   rather than the pink itself, which at that width reads as a promo banner.
+   Docusaurus hashes the class name, hence the prefix selector. */
+.theme-announcement-bar  {
+  background: #fdeef7;
+  color: #7a1758;
+  font-size: 1.1rem;
+  border-bottom: 1px solid rgba(224, 40, 157, 0.25);
+  font-weight: 500;
+}
+
+[data-theme='dark'] .theme-announcement-bar  {
+  background: #33272f;
+  color: #ffcbf1;
+  border-bottom-color: rgba(255, 102, 217, 0.25);
+}
+
+/* The link and the close button both carry their own colour, so they drift
+   from the bar's text unless told to inherit it. */
+.theme-announcement-bar  a,
+.theme-announcement-bar  button {
+  color: inherit;
+}

data/website/static/1.13/assets/main.css

@@ -14890,7 +14890,7 @@ a.header:hover {
   position: fixed;
   width: 100%;
   /*background: url("https://www.toptal.com/designers/subtlepatterns/patterns/connectwork.png");*/
-  background: url("/assets/img/fancy-cushion.png");
+  background: url("/1.13/assets/img/fancy-cushion.png");
   /*background: url("https://www.toptal.com/designers/subtlepatterns/patterns/dark-honeycomb.png");*/
   border-bottom: 1px solid black;
   box-shadow: 1px 1px 15px -2px black;
@@ -14976,7 +14976,7 @@ body {
   color: rgb(76.5, 76.5, 76.5);
 }
 body.layout-home {
-  background-image: url("/assets/img/home-bg.jpg");
+  background-image: url("/1.13/assets/img/home-bg.jpg");
   background-attachment: fixed;
   background-position: center;
   background-repeat: no-repeat;
@@ -15124,10 +15124,10 @@ h4 {
 }
 
 #cover-image.prod-bg {
-  background-image: url("/jsonapi_suite/assets/img/sunrise.png") !important;
+  background-image: url("/1.13/assets/img/sunrise.png") !important;
 }
 #cover-image.dev-bg {
-  background-image: url("/assets/img/sunrise.png") !important;
+  background-image: url("/1.13/assets/img/sunrise.png") !important;
 }
 
 .solution img {

data/website/static/CNAME

@@ -0,0 +1 @@
+graphiti.dev

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.4
+  version: 2.0.0.beta.5
 platform: ruby
 authors:
 - Lee Richmond
@@ -359,6 +359,7 @@ files:
 - lib/graphiti/rails/debugging.rb
 - lib/graphiti/rails/exception_handlers.rb
 - lib/graphiti/rails/railtie.rb
+- lib/graphiti/rails/rake_helpers.rb
 - lib/graphiti/rails/responders.rb
 - lib/graphiti/rails/test_helpers.rb
 - lib/graphiti/renderer.rb
@@ -400,6 +401,7 @@ files:
 - lib/graphiti/spec_helpers/errors.rb
 - lib/graphiti/spec_helpers/errors_proxy.rb
 - lib/graphiti/spec_helpers/helpers.rb
+- lib/graphiti/spec_helpers/matchers.rb
 - lib/graphiti/spec_helpers/node.rb
 - lib/graphiti/spec_helpers/rspec.rb
 - lib/graphiti/stats/dsl.rb
@@ -459,7 +461,9 @@ files:
 - website/static/1.13/assets/img/backend.gif
 - website/static/1.13/assets/img/conformity.png
 - website/static/1.13/assets/img/error_payload.png
+- website/static/1.13/assets/img/fancy-cushion.png
 - website/static/1.13/assets/img/gh.png
+- website/static/1.13/assets/img/home-bg.jpg
 - website/static/1.13/assets/img/lifecycle.gif
 - website/static/1.13/assets/img/logo-500.png
 - website/static/1.13/assets/img/logo.png
@@ -472,6 +476,7 @@ files:
 - website/static/1.13/assets/img/rest2.gif
 - website/static/1.13/assets/img/rest3.gif
 - website/static/1.13/assets/img/rethink-rest-graffiti.jpg
+- website/static/1.13/assets/img/sunrise.png
 - website/static/1.13/assets/img/why.png
 - website/static/1.13/assets/js/highlight.pack.js
 - website/static/1.13/assets/main.css
@@ -550,6 +555,7 @@ files:
 - website/static/1.13/tutorial/step_7.html
 - website/static/1.13/tutorial/step_8.html
 - website/static/1.13/tutorial/step_9.html
+- website/static/CNAME
 - website/static/assets/img/error_payload.png
 - website/static/assets/img/legacy/legacy-0378a3bb39.png
 - website/static/assets/img/legacy/legacy-05bbd3e5fd.png
@@ -572,14 +578,6 @@ homepage: https://github.com/graphiti-api/graphiti
 licenses:
 - MIT
 metadata: {}
-post_install_message: "Graphiti: relationship readable:/writable: guards are now enforced.\n\nSymbols,
-  strings, and procs passed to a relationship's readable/writable\nguards were always
-  interpreted as true and never actually called before this\nconditional relationship
-  change. They are now evaluated per-request, where\nunreadable relationships are
-  omitted from responses and includes, and unwritable\nrelationships reject writes.\n\nTo
-  list every affected relationship in your app:\n\n  bin/rails runner 'puts Graphiti.guarded_relationships'\n\nAudit
-  these before deploying. Apps using schema.json will also see affected \nrelationships
-  flagged as \"became guarded\" by the schema check.\n"
 rdoc_options: []
 require_paths:
 - lib