graphiti_graphql 0.1.6 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc07d6560d9c73767aca102d08c8c9f6b31fe09b8f3bb6db266a6566d8c3b50d
-  data.tar.gz: c51c68edca23ae65f7b3c0a6e7f45d9546442d619fcc76f97682dc24e0b01644
+  metadata.gz: 4280e5808da769052de5faf957ad7b7e6b01ee6d5ae7ccd4dd2be210e250da97
+  data.tar.gz: a40b2972d39e385fabab7c06ba64fd02a4b53c7b91c6aba4686b9805da12aae1
 SHA512:
-  metadata.gz: a9338e7a088054719c0f80147587dff04ebc9320c77ccec823798436a6fa671b616d6df8c9970d64bba332254ee8b08f46a7ef380aea0087889f9592446c0b9e
-  data.tar.gz: 5cae58a969a23d6dcb0ee8b80a56af8d42eee6a7b0e6c16a6bba8d7b9d009bc78663cdb9e5520572d95c384a91df3e38b7f756a247c3f8b36697e16022ab8fda
+  metadata.gz: f15781ad3da2924d6315d0942a4d6dbdb11f2dd31dacd93a03076b3cbc853749d72f643a509da76ea90ebd2473ac60258ec44c65f9e70e83540855a0eabc1ac1
+  data.tar.gz: db48fd742bdb61b704af19bb2bcc254cb51190322708f8c435da4871609cb9019e41716d6d089dbd9b69e600b99160b51148c8dee5e6b4d5f6d414fd970e92d2

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    graphiti_graphql (0.1.4)
+    graphiti_graphql (0.1.10)
       activesupport (>= 4.1)
-      graphiti (>= 1.2.36)
+      graphiti (~> 1.3)
       graphql (~> 1.12)
 
 GEM
@@ -28,13 +28,13 @@ GEM
     dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
+    dry-container (0.8.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.0)
-    dry-logic (1.1.0)
+    dry-inflector (0.2.1)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
     dry-types (1.5.1)
@@ -44,7 +44,7 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     google-protobuf (3.15.2)
-    graphiti (1.2.36)
+    graphiti (1.3.0)
       activesupport (>= 4.1)
       concurrent-ruby (~> 1.0)
       dry-types (>= 0.15.0, < 2.0)
@@ -80,7 +80,7 @@ GEM
     rainbow (3.0.0)
     rake (10.5.0)
     regexp_parser (2.0.3)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)

data/bin/bundle

@@ -31,7 +31,7 @@ m = Module.new do
         bundler_version = a
       end
       next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1 || ">= 0.a"
+      bundler_version = $1
       update_index = i
     end
     bundler_version
@@ -61,32 +61,41 @@ m = Module.new do
   end
 
   def bundler_version
-    @bundler_version ||= begin
+    @bundler_version ||=
       env_var_version || cli_arg_version ||
-        lockfile_version || "#{Gem::Requirement.default}.a"
-    end
+        lockfile_version
+  end
+
+  def bundler_requirement
+    return "#{Gem::Requirement.default}.a" unless bundler_version
+
+    bundler_gem_version = Gem::Version.new(bundler_version)
+
+    requirement = bundler_gem_version.approximate_recommendation
+
+    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+
+    requirement += ".a" if bundler_gem_version.prerelease?
+
+    requirement
   end
 
   def load_bundler!
     ENV["BUNDLE_GEMFILE"] ||= gemfile
 
-    # must dup string for RG < 1.8 compatibility
-    activate_bundler(bundler_version.dup)
+    activate_bundler
   end
 
-  def activate_bundler(bundler_version)
-    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
-      bundler_version = "< 2"
-    end
+  def activate_bundler
     gem_error = activation_error_handling do
-      gem "bundler", bundler_version
+      gem "bundler", bundler_requirement
     end
     return if gem_error.nil?
     require_error = activation_error_handling do
       require "bundler/version"
     end
-    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
     exit 42
   end
 

data/graphiti_graphql.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "graphiti", ">= 1.2.36"
+  spec.add_dependency "graphiti", "~> 1.3"
   spec.add_dependency "activesupport", ">= 4.1"
   spec.add_dependency "graphql", "~> 1.12"
 

data/lib/graphiti_graphql/engine.rb

@@ -64,15 +64,15 @@ module GraphitiGraphQL
     end
 
     initializer "graphiti_graphql.define_controller" do
-      app_controller = GraphitiGraphQL.config.federation_application_controller || ::ApplicationController
-      # rubocop:disable Lint/ConstantDefinitionInBlock(Standard)
-      class GraphitiGraphQL::ExecutionController < app_controller
-        register_exception Graphiti::Errors::UnreadableAttribute, message: true
-        def execute
-          params = request.params # avoid strong_parameters
-          render json: Graphiti.gql(params[:query], params[:variables])
+        app_controller = GraphitiGraphQL.config.federation_application_controller || ::ApplicationController
+        # rubocop:disable Lint/ConstantDefinitionInBlock(Standard)
+        class GraphitiGraphQL::ExecutionController < app_controller
+          register_exception Graphiti::Errors::UnreadableAttribute, message: true
+          def execute
+            params = request.params # avoid strong_parameters
+            render json: Graphiti.gql(params[:query], params[:variables])
+          end
         end
-      end
     end
 
     initializer "graphiti_graphql.federation" do

data/lib/graphiti_graphql/federation/loaders/has_many.rb

@@ -15,6 +15,19 @@ module GraphitiGraphQL
 
           @federated_relationship.params_block&.call(@params)
 
+          if (first = @params.delete(:first))
+            @params[:page] ||= {}
+            @params[:page][:size] = first
+          end
+          if (after = @params.delete(:after))
+            @params[:page] ||= {}
+            @params[:page][:after] = after
+          end
+          if (before = @params.delete(:before))
+            @params[:page] ||= {}
+            @params[:page][:before] = before
+          end
+
           if ids.length > 1 && @params[:page]
             raise Graphiti::Errors::UnsupportedPagination
           elsif !@params[:page]

data/lib/graphiti_graphql/runner.rb

@@ -282,11 +282,23 @@ module GraphitiGraphQL
     def gather_pages(params, selection, variable_hash, chained_name = nil)
       pages = {}.tap do |p|
         selection.arguments.each do |arg|
-          if arg.name == "page"
+          if ["page", "first", "after", "before"].include?(arg.name)
             value = if arg.value.respond_to?(:name) # is a variable
-              variable_hash[arg.value.name].to_h
+              variable_hash[arg.value.name]
             else
-              arg.value.to_h
+              arg.value
+            end
+
+            next unless value
+
+            value = if arg.name == "first"
+              {size: value}
+            elsif arg.name == "after"
+              {after: value}
+            elsif arg.name == "before"
+              {before: value}
+            else
+              value.to_h
             end
 
             if chained_name
@@ -304,6 +316,13 @@ module GraphitiGraphQL
         params[:page] ||= {}
         params[:page].merge!(pages)
       end
+
+      (selection.try(:selections) || []).each do |sub|
+        if sub.try(:name) == "pageInfo"
+          params[:fields] ||= {}
+          params[:fields][:page_info] = sub.selections.map(&:name).map(&:underscore).join(",")
+        end
+      end
     end
 
     def gather_stats(params, selection, variable_hash, chained_name = nil)

data/lib/graphiti_graphql/schema.rb

@@ -93,11 +93,16 @@ module GraphitiGraphQL
       query_class = Class.new(existing_query || self.class.base_object)
       # NB MUST be Query or federation-ruby will break things
       query_class.graphql_name "Query"
+      query_class.field_class BaseField
 
-      get_entrypoints(entrypoint_resources).each do |resource|
+      # Ensure all types are generated, even if they aren't in a top-level Query
+      # We might now want to expose the query, but do want to federate the Type
+      graphiti_schema.resources.each do |resource|
         next if resource.remote?
         generate_type(resource)
+      end
 
+      get_entrypoints(entrypoint_resources).each do |resource|
         add_index(query_class, resource)
         add_show(query_class, resource)
       end
@@ -145,22 +150,46 @@ module GraphitiGraphQL
         [type],
         "List #{resource.graphql_class_name(false).pluralize}",
         null: false
+
+      # Stats currently only supported on top level
       if top_level
+        klass.field :page_info, PageInfoType, null: false
         klass.field :stats, generate_stat_class(resource), null: false
       end
       register(name, klass)
       klass
     end
 
+    # def edge_type(name, type)
+    #   if (registered = type_registry[name])
+    #     return registered[:type]
+    #   end
+
+    #   klass = Class.new(BaseObject) do
+    #     graphql_name "#{name}Edge"
+    #     field :cursor, String, null: false
+    #     field :node, type, null: false
+    #   end
+    #   type_registry[name] = {type: klass}
+    #   klass
+    # end
+
     def add_index(query_class, resource)
       field_name = resource.graphql_entrypoint.to_s.underscore.to_sym
       field = query_class.field field_name,
         generate_connection_type(resource, top_level: true),
-        null: false
+        null: false,
+        connection: false
       @query_fields[field_name] = resource
       define_arguments_for_sideload_field(field, resource)
     end
 
+    def apply_connection_args(field)
+      field.argument :after, "String", "Cursor to paginate after", required: false
+      field.argument :before, "String", "Cursor to paginate before", required: false
+      field.argument :first, "Int", "Same as page.size", required: false
+    end
+
     def add_show(query_class, resource)
       field_name = resource.graphql_entrypoint.to_s.underscore.singularize.to_sym
       field = query_class.field field_name,
@@ -222,6 +251,7 @@ module GraphitiGraphQL
           field.argument :sort, [sort_type], required: false
         end
         field.argument :page, PageType, required: false
+        apply_connection_args(field)
 
         unless resource.filters.empty?
           filter_type = generate_filter_type(field, resource)
@@ -375,6 +405,8 @@ module GraphitiGraphQL
         end
       end
 
+      klass.field :_cursor, String, null: false
+
       register(type_name, klass, resource, poly_parent)
 
       resource.sideloads.each_pair do |name, sideload|
@@ -477,9 +509,19 @@ module GraphitiGraphQL
     end
 
     class PageType < GraphQL::Schema::InputObject
-      graphql_name "Page"
+      graphql_name "PageInput"
       argument :size, Int, required: false
       argument :number, Int, required: false
+      argument :after, String, required: false
+      argument :before, String, required: false
+    end
+
+    class PageInfoType < BaseObject
+      graphql_name "PageInfo"
+      field :has_next_page, Boolean, null: false
+      field :has_previous_page, Boolean, null: false
+      field :start_cursor, String, null: true
+      field :end_cursor, String, null: true
     end
 
     class SortDirType < GraphQL::Schema::Enum

data/lib/graphiti_graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGraphQL
-  VERSION = "0.1.6"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.10
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphiti
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.36
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.36
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: GraphQL support for Graphiti