graphiti 1.3.0 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c694cce2123c7ba03ae53b53b61b9aaa5c353681e28a93722bc73569845ea2e2
-  data.tar.gz: 2305bdf6566d1bcba126dbe893dd64f6f011367151e0a283185fba62781d0d02
+  metadata.gz: cbdb96a78aeac1f48bcea53a3b068638456e703b17fccf68d2f3813270db4bd8
+  data.tar.gz: c1dab2eff065e8ba70193cac81c6c5c44c57f81f9074082887ed7b52f2bcb000
 SHA512:
-  metadata.gz: 3d9d20b0b87720079461b0ce245970da308362616cb4c21c4232fb85c585a62694f3bdb874db3cf8d80e94e02ff3078c119e0a0a46e95dbdb94e439dbf5a1af8
-  data.tar.gz: 9cf83060d95a7789351f3f0979ccf46012238975248159d8a5fccd0e457b512cfc127b3a4295c46f668b80717dfec2152fea025d00a82a1ffcdd42edde9e5c7f
+  metadata.gz: 1a860a2d6cc8bfc494207ddd6bac1643c58ba09148fdf85b07c9198840728ace0f752fefb94bafa6599a97eb5ccfa6408544b08312aca5c6e01d77c874141821
+  data.tar.gz: 4a821372147d76d03a6d3e4dc5dce6ca205464d852892484567f725355459b0d5477418340ed9d53831a0062218e7b9daaf3560a0951c2decd8fd177a499954b

data/CHANGELOG.md

@@ -12,6 +12,7 @@ Features:
 Fixes:
 - [282] Support model names including "Resource"
 - [313](https://github.com/graphiti-api/graphiti/pull/313) Sort remote resources in schema generation
+- [374](https://github.com/graphiti-api/graphiti/pull/374) Trim leading spaces from error messages
 
 ## 1.1.0
 

data/lib/graphiti/delegates/pagination.rb

@@ -24,7 +24,9 @@ module Graphiti
       end
 
       def has_previous_page?
-        current_page != 1
+        current_page != 1 ||
+          !!pagination_params.try(:[], :page).try(:[], :after) ||
+          !!pagination_params.try(:[], :page).try(:[], :offset)
       end
 
       private

data/lib/graphiti/errors.rb

@@ -35,7 +35,7 @@ module Graphiti
       end
 
       def message
-        <<-MSG
+        <<~MSG
           The adapter #{@adapter.class} does not implement method '#{@method}', which was requested for attribute '#{@attribute}'. Add this method to your adapter to support this filter operator.
         MSG
       end
@@ -49,7 +49,7 @@ module Graphiti
       end
 
       def message
-        <<-MSG
+        <<~MSG
           #{@parent_resource_class} sideload :#{@name} - #{@message}
         MSG
       end
@@ -78,7 +78,7 @@ module Graphiti
       end
 
       def message
-        <<-MSG
+        <<~MSG
           #{@resource_class}: Tried to pass block to .#{@method_name}, which only accepts a method name.
         MSG
       end
@@ -90,7 +90,7 @@ module Graphiti
       end
 
       def message
-        <<-MSG
+        <<~MSG
           #{@resource_class}: Tried to perform write operation. Writes are not supported for remote resources - hit the endpoint directly.
         MSG
       end
@@ -105,7 +105,7 @@ module Graphiti
       end
 
       def message
-        <<-MSG
+        <<~MSG
           #{@resource.class}: Tried to filter #{@filter_name.inspect} on operator #{@operator.inspect}, but not supported! Supported operators are #{@supported}.
         MSG
       end
@@ -118,7 +118,7 @@ module Graphiti
       end
 
       def message
-        <<-MSG
+        <<~MSG
           #{@sideload.parent_resource.class.name}: tried to sideload #{@sideload.name.inspect}, but more than one #{@sideload.parent_resource.model.name} was passed!
 
           This is because you marked the sideload #{@sideload.name.inspect} with single: true
@@ -139,7 +139,7 @@ module Graphiti
       end
 
       def message
-        <<-MSG
+        <<~MSG
           #{@resource.class.name}: tried to sort on attribute #{@attribute.inspect}, but passed #{@direction.inspect} when only #{@allowlist.inspect} is supported.
         MSG
       end
@@ -152,7 +152,7 @@ module Graphiti
       end
 
       def message
-        <<-MSG
+        <<~MSG
           #{@resource_class.name}: called .on_extra_attribute #{@name.inspect}, but extra attribute #{@name.inspect} does not exist!
         MSG
       end
@@ -173,7 +173,7 @@ module Graphiti
         else
           "value #{@value.inspect}"
         end
-        msg = <<-MSG
+        msg = <<~MSG
           #{@resource.class.name}: tried to filter on #{@filter.keys[0].inspect}, but passed invalid #{value_string}.
         MSG
         msg << "\nAllowlist: #{allow.inspect}" if allow
@@ -190,7 +190,7 @@ module Graphiti
       end
 
       def message
-        <<-MSG
+        <<~MSG
           #{@resource_class.name} You declared an attribute or filter of type "#{@enum_type}" without providing a list of permitted values, which is required.
 
           When declaring an attribute:
@@ -214,7 +214,7 @@ module Graphiti
       end
 
       def message
-        <<-MSG
+        <<~MSG
           #{@resource_class.name}: Cannot link to sideload #{@sideload.name.inspect}!
 
           Make sure the endpoint "#{@sideload.resource.endpoint[:full_path]}" exists with action #{@action.inspect}, or customize the endpoint for #{@sideload.resource.class.name}.

data/lib/graphiti/hash_renderer.rb

@@ -215,11 +215,11 @@ module Graphiti
         end
 
         if fields.include?(:start_cursor)
-          info[:startCursor] = serializers.first.cursor
+          info[:startCursor] = serializers.first.try(:cursor)
         end
 
         if fields.include?(:end_cursor)
-          info[:endCursor] = serializers.last.cursor
+          info[:endCursor] = serializers.last.try(:cursor)
         end
 
         hash[top_level_key][:pageInfo] = info

data/lib/graphiti/resource/dsl.rb

@@ -9,7 +9,11 @@ module Graphiti
           opts = args.extract_options!
           type_override = args[0]
 
-          if (att = get_attr(name, :filterable, raise_error: :only_unsupported))
+          if (att = (attributes[name] || extra_attributes[name]))
+            # We're opting in to filtering, so force this
+            # UNLESS the filter is guarded at the attribute level
+            att[:filterable] = true if att[:filterable] == false
+
             aliases = [name, opts[:aliases]].flatten.compact
             operators = FilterOperators.build(self, att[:type], opts, &blk)
 
@@ -23,6 +27,8 @@ module Graphiti
             end
 
             required = att[:filterable] == :required || !!opts[:required]
+            schema = !!opts[:via_attribute_dsl] ? att[:schema] : opts[:schema] != false
+
             config[:filters][name.to_sym] = {
               aliases: aliases,
               name: name.to_sym,
@@ -32,6 +38,7 @@ module Graphiti
               single: !!opts[:single],
               dependencies: opts[:dependent],
               required: required,
+              schema: schema,
               operators: operators.to_hash,
               allow_nil: opts.fetch(:allow_nil, filters_accept_nil_by_default),
               deny_empty: opts.fetch(:deny_empty, filters_deny_empty_by_default)
@@ -130,7 +137,7 @@ module Graphiti
           options[:sortable] ? sort(name) : config[:sorts].delete(name)
 
           if options[:filterable]
-            filter(name, allow: options[:allow])
+            filter(name, allow: options[:allow], via_attribute_dsl: true)
           else
             config[:filters].delete(name)
           end

data/lib/graphiti/schema.rb

@@ -197,7 +197,7 @@ module Graphiti
     def filters(resource)
       {}.tap do |f|
         resource.filters.each_pair do |name, filter|
-          next unless resource.attributes[name][:schema]
+          next unless resource.filters[name][:schema]
 
           config = {
             type: filter[:type].to_s,

data/lib/graphiti/serializer.rb

@@ -25,8 +25,9 @@ module Graphiti
 
         # See #requested_relationships
         def self.relationship(name, options = {}, &block)
+          prev = Util::Hash.deep_dup(field_condition_blocks)
           super
-          field_condition_blocks.delete(name)
+          self.field_condition_blocks = prev
           _register_condition(relationship_condition_blocks, name, options)
         end
 

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.3.0"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.4
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-08 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -361,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs