graphiti 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac45688980e3b5a1b21c320161e5b8e67610dbcc2e0b4379f072cc86d8ff453f
-  data.tar.gz: f1d4398684f5b44872251db6cbe8155a80b5c96388ebb42b4af45fa17373035c
+  metadata.gz: 1c38c96bcf6d48078c1361d22da7e563506b385b4bfe74b7b0fbdb8bd45ccb3a
+  data.tar.gz: 52e3079715304dc15408f6945f7515a6ba07db792cc55eda66887d2227e533c1
 SHA512:
-  metadata.gz: 47b24e17dafad601b9ac9cf0898a7a838f9a4cedef37e88fd579e0a3b30cd4e14ac322e0b71bc0d0d2a168f04881f9cb2cbcc4d90984a0944440a04f533ca189
-  data.tar.gz: 582d454ccaf706f46308dec57bbfe5db9b44663f84383c482fde1d23bc7e02dfe28045009d03e3607e19d9070f8e206dda99c79d42a0a78ebab88c8d9bd17b2b
+  metadata.gz: ab09db3099f66a44e8a453ee336aa93075b06a5cb46119a505380d08e9a7ae305f58da4a5822e319fb0e74b381537aee556681bcc6b9e353a7d1bec58705b2fa
+  data.tar.gz: 963db95d086610db6bd4600b56db8674804aac397ef4e4bbf687a387d4f2fea10cee7b0842f7d7d2bc89d65387210702d93b810819e5e663a8e7ed46bad9d6f5

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 graphiti changelog
 
+## [2.0.1](https://github.com/graphiti-api/graphiti/compare/v2.0.0...v2.0.1) (2026-09-02)
+
+
+### Bug Fixes
+
+* count distinct on the primary key rather than every column ([be85c18](https://github.com/graphiti-api/graphiti/commit/be85c18b695bf482f95ae72496600b40e3531c44)), closes [#439](https://github.com/graphiti-api/graphiti/issues/439)
+* keep the request body out of pagination links ([64040f2](https://github.com/graphiti-api/graphiti/commit/64040f200c307062d0b04204013e35963cec4ceb)), closes [#369](https://github.com/graphiti-api/graphiti/issues/369)
+* read flags through one coercion ([72a39a7](https://github.com/graphiti-api/graphiti/commit/72a39a7c126e2d6d89fb4a829cad20efd207df4d))
+* respect polymorphic_name when sideposting ([45d9eb7](https://github.com/graphiti-api/graphiti/commit/45d9eb73b1dba2e4587ee67387f0c3117c9c4fcf)), closes [#437](https://github.com/graphiti-api/graphiti/issues/437)
+* stop the debugger requiring an id on every model ([8111b68](https://github.com/graphiti-api/graphiti/commit/8111b6897bd735bed84a63c312a6a01cf69317a1)), closes [#152](https://github.com/graphiti-api/graphiti/issues/152)
+
 # [2.0.0](https://github.com/graphiti-api/graphiti/compare/v1.13.3...v2.0.0) (2026-09-01)
 
 

data/lib/graphiti/adapters/active_record.rb

@@ -198,7 +198,7 @@ module Graphiti
       # (see Adapters::Abstract#count)
       def count(scope, attr)
         if attr.to_sym == :total
-          scope.distinct.count(:all)
+          scope.distinct.count(distinct_count_column(scope))
         else
           scope.distinct.count(attr)
         end
@@ -281,6 +281,10 @@ module Graphiti
         # Nothing to do in the else case, happened when we merged foreign key
       end
 
+      def polymorphic_type_value(parent_object)
+        parent_object.class.polymorphic_name
+      end
+
       def save(model_instance)
         model_instance.save
         model_instance
@@ -309,6 +313,13 @@ module Graphiti
 
       private
 
+      def distinct_count_column(scope)
+        primary_key = scope.klass.primary_key
+        return :all unless primary_key.is_a?(String)
+
+        scope.klass.arel_table[primary_key]
+      end
+
       def column_for(scope, name)
         table = scope.klass.arel_table
         if (other = scope.attribute_alias(name))

data/lib/graphiti/adapters/persistence/associations.rb

@@ -61,13 +61,17 @@ module Graphiti
             update_foreign_type(attrs, x, null: true) if x[:is_polymorphic]
           else
             if x[:sideload].polymorphic_has_one? || x[:sideload].polymorphic_has_many?
-              attrs[:"#{x[:sideload].polymorphic_as}_type"] = parent_object.class.name
+              attrs[:"#{x[:sideload].polymorphic_as}_type"] = polymorphic_type_value(parent_object)
             end
             attrs[x[:foreign_key]] = parent_object.send(x[:primary_key])
             update_foreign_type(attrs, x) if x[:is_polymorphic]
           end
         end
 
+        def polymorphic_type_value(parent_object)
+          parent_object.class.name
+        end
+
         def update_foreign_type(attrs, x, null: false)
           grouping_field = x[:sideload].parent.grouper.field_name
           attrs[grouping_field] = null ? nil : x[:sideload].group_name

data/lib/graphiti/configuration.rb

@@ -72,11 +72,8 @@ module Graphiti
       Debugger.debug_models = @debug_models
     end
 
-    # every value comes back from ENV as a string and "false" is truthy
     def coerce_flag(val)
-      return false if ["false", "0", ""].include?(val.to_s.strip.downcase)
-
-      !!val
+      Types.flag(val)
     end
 
     def with_option(key, value)

data/lib/graphiti/debugger.rb

@@ -63,12 +63,14 @@ module Graphiti
       end
 
       private def results(raw_results)
-        raw_results.map { |r| "[#{r.class.name}, #{r.id.inspect}]" }.join(", ")
+        raw_results.map { |r|
+          identifier = r.respond_to?(:id) ? r.id.inspect : "no id"
+          "[#{r.class.name}, #{identifier}]"
+        }.join(", ")
       end
 
       private def on_sideload_data(payload, params, took)
         sideload = payload[:sideload]
-        results = results(payload[:results])
         add_chunk(payload[:resource], payload[:parent]) do |logs, json|
           logs << [" \\_ #{sideload.name}", :yellow, true]
           json[:name] = sideload.name
@@ -79,14 +81,13 @@ module Graphiti
           end
           logs << ["    #{query}", :cyan, true]
           json[:query] = query
-          logs << ["    Returned Models: #{results}"] if debug_models
+          logs << ["    Returned Models: #{results(payload[:results])}"] if debug_models
           logs << ["    Took: #{took}ms", :magenta, true]
           json[:took] = took
         end
       end
 
       private def on_primary_data(payload, params, took)
-        results = results(payload[:results])
         add_chunk(payload[:resource], payload[:parent]) do |logs, json|
           logs << [""]
           logs << ["=== Graphiti Debug", :green, true]
@@ -96,7 +97,7 @@ module Graphiti
           query = "#{payload[:resource].class.name}.#{payload[:action]}(#{params.inspect})"
           logs << [query, :cyan, true]
           json[:query] = query
-          logs << ["Returned Models: #{results}"] if debug_models
+          logs << ["Returned Models: #{results(payload[:results])}"] if debug_models
           logs << ["Took: #{took}ms", :magenta, true]
           json[:took] = took
         end

data/lib/graphiti/delegates/pagination.rb

@@ -32,7 +32,7 @@ module Graphiti
       private
 
       def pagination_params
-        @pagination_params ||= @proxy.query.params.except(:action, :controller, :format)
+        @pagination_params ||= @proxy.query.params.except(:action, :controller, :format, :data, :included)
       end
 
       def pagination_link(page)

data/lib/graphiti/query.rb

@@ -2,7 +2,6 @@ require "digest"
 
 module Graphiti
   class Query
-    TRUTHY_LINKS = [true, "true"].freeze
     LINKLESS_FORMATS = [:json, :xml, "json", "xml"].freeze
 
     attr_reader :resource, :association_name, :params, :action
@@ -80,7 +79,7 @@ module Graphiti
     def links_requested?
       return @links_requested if defined?(@links_requested)
 
-      @links_requested = TRUTHY_LINKS.include?(@params[:links])
+      @links_requested = Types.flag(@params[:links])
     end
 
     def suppress_links?
@@ -107,11 +106,11 @@ module Graphiti
 
     def page_links_requested?
       [@params[:page_links], @params[:pagination_links]]
-        .any? { |value| [true, "true"].include?(value) }
+        .any? { |value| Types.flag(value) }
     end
 
     def debug_requested?
-      !!@params[:debug]
+      Types.flag(@params[:debug])
     end
 
     def hash

data/lib/graphiti/schema.rb

@@ -11,7 +11,11 @@ module Graphiti
       new(resources).generate
     end
 
-    def self.generate!(resources = nil, path: Graphiti.config.schema_path, force: ENV["FORCE_SCHEMA"] == "true")
+    def self.forced?
+      Types.flag(ENV["FORCE_SCHEMA"])
+    end
+
+    def self.generate!(resources = nil, path: Graphiti.config.schema_path, force: forced?)
       result = check(resources, path: path)
       return result.errors if !force && !result.compatible?
 

data/lib/graphiti/spec_helpers/rspec.rb

@@ -131,7 +131,7 @@ module Graphiti
         ::RSpec.describe "Graphiti Schema" do
           it "generates a backwards-compatible schema" do
             check = Graphiti::Schema.check(resources, path: path || Graphiti.config.schema_path)
-            forced = ENV["FORCE_SCHEMA"] == "true"
+            forced = Graphiti::Schema.forced?
             check.write! if check.compatible? || forced
 
             expect(check.compatible? || forced).to eq(true), check.message

data/lib/graphiti/types.rb

@@ -222,6 +222,12 @@ module Graphiti
       map[key.to_sym] = value
     end
 
+    def self.flag(value)
+      self[:boolean][:params].call(value.to_s.strip)
+    rescue Dry::Types::CoercionError
+      false
+    end
+
     def self.name_for(key)
       key = key.to_sym
       type = map[key]

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/tasks/graphiti.rake

@@ -9,7 +9,7 @@ namespace :graphiti do
     Graphiti.logger = Graphiti.stdout_logger
     Graphiti::Debugger.preserve = true
     require "pp"
-    path, debug = args[:path], args[:debug]
+    path, debug = args[:path], Graphiti::Types.flag(args[:debug])
     puts "Graphiti Request: #{path}"
     json = helpers.make_request(path, debug)
     pp json
@@ -20,7 +20,7 @@ namespace :graphiti do
     desc "Write the schema file. Refuses backwards-incompatible changes unless FORCE_SCHEMA=true. Takes an optional path, defaulting to Graphiti.config.schema_path."
     task :generate, [:path] => [:environment] do |_, args|
       check = Graphiti::Schema.check(path: helpers.schema_path(args[:path]))
-      abort check.message unless check.compatible? || ENV["FORCE_SCHEMA"] == "true"
+      abort check.message unless check.compatible? || Graphiti::Schema.forced?
 
       puts "Schema written: #{check.write!}"
     end
@@ -49,12 +49,15 @@ namespace :graphiti do
 
   desc "Execute benchmark without web server."
   task :benchmark, [:path, :requests] => [:environment] do |_, args|
+    requests = args[:requests].to_i
+    abort "Needs a request count, as in graphiti:benchmark[/path,100]" unless requests > 0
+
     helpers.setup_rails!
     took = Benchmark.ms {
-      args[:requests].to_i.times do
+      requests.times do
         helpers.make_request(args[:path])
       end
     }
-    puts "Took: #{(took / args[:requests].to_f).round(2)}ms"
+    puts "Took: #{(took / requests).round(2)}ms"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Lee Richmond