graphiti 1.2.39 → 1.2.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d2917a607d95ef6d4701b8960ed183fd39923662b034d74fda9f8080f65d534
-  data.tar.gz: 7fc8ec33363e0112c541d05c676c7315b1934876f15875ac0b153bf2fc6cebdd
+  metadata.gz: 1c0d06bf22a3732408737c7c603c500ba8f7c71f339f6782e96d93b290e2db84
+  data.tar.gz: 47f4cadecfe0b119dd2ad3de56ff87a6cd1f59a1d2bda572a98c57d142d4a059
 SHA512:
-  metadata.gz: 6f9867cbf49483cb09a887db26af222e2d74962c07aaf6ece7552a73cf74b625ca49e19ed730c1f383f7706ae10546551d54792b2b09832709aa14829ddd8180
-  data.tar.gz: 746d7900a12437a7a610dc8d4e8737ada319867578349898cc95067d7295c1b04b659dec00e33aec0a9977c33ecafd0a58f9f07da61ec04def6ad8131656351f
+  metadata.gz: 13d3880b37b14c2d22f8702c8a5f09cebd6a2ce4768018f4e109e9d05666d3b0da19d5685462978cd76d3f6f5ac8400283e3298d7d558c96af3077ba83cd2955
+  data.tar.gz: 3470e79878d650afb8ca1bddf70d510b8a0e0fdb208945307ffeb24436ab793428c6627d746200d1eb33718fd23f3e77163fbb97bf9f1147a4283e5388a53b6f

data/lib/graphiti/adapters/abstract.rb

@@ -244,14 +244,15 @@ module Graphiti
       # @param scope The scope object we are chaining
       # @param [Integer] current_page The current page number
       # @param [Integer] per_page The number of results per page
+      # @param [Integer] offset The offset to start from
       # @return the scope
       #
       # @example ActiveRecord default
       #   # via kaminari gem
-      #   def paginate(scope, current_page, per_page)
+      #   def paginate(scope, current_page, per_page, offset)
       #     scope.page(current_page).per(per_page)
       #   end
-      def paginate(scope, current_page, per_page)
+      def paginate(scope, current_page, per_page, offset)
         raise "you must override #paginate in an adapter subclass"
       end
 

data/lib/graphiti/adapters/active_record.rb

@@ -184,8 +184,11 @@ module Graphiti
       end
 
       # (see Adapters::Abstract#paginate)
-      def paginate(scope, current_page, per_page)
-        scope.page(current_page).per(per_page)
+      def paginate(scope, current_page, per_page, offset)
+        scope = scope.page(current_page) if current_page
+        scope = scope.per(per_page) if per_page
+        scope = scope.padding(offset) if offset
+        scope
       end
 
       # (see Adapters::Abstract#count)
@@ -240,7 +243,8 @@ module Graphiti
           children.each do |child|
             if association_type == :many_to_many &&
                 [:create, :update].include?(Graphiti.context[:namespace]) &&
-                !parent.send(association_name).exists?(child.id)
+                !parent.send(association_name).exists?(child.id) &&
+                child.errors.blank?
               parent.send(association_name) << child
             else
               target = association.instance_variable_get(:@target)

data/lib/graphiti/adapters/null.rb

@@ -178,7 +178,7 @@ module Graphiti
       end
 
       # (see Adapters::Abstract#paginate)
-      def paginate(scope, current_page, per_page)
+      def paginate(scope, current_page, per_page, offset)
         scope
       end
 

data/lib/graphiti/delegates/pagination.rb

@@ -30,13 +30,14 @@ module Graphiti
 
         uri = URI(@proxy.resource.endpoint[:url].to_s)
 
+        page_params = {
+          number: page,
+          size: page_size
+        }
+        page_params[:offset] = offset if offset
+
         # Overwrite the pagination query params with the desired page
-        uri.query = pagination_params.merge({
-          page: {
-            number: page,
-            size: page_size
-          }
-        }).to_query
+        uri.query = pagination_params.merge(page: page_params).to_query
         uri.to_s
       end
 
@@ -46,8 +47,11 @@ module Graphiti
         elsif page_size == 0 || item_count == 0
           return nil
         end
-        @last_page = (item_count / page_size)
-        @last_page += 1 if item_count % page_size > 0
+
+        count = item_count
+        count = item_count - offset if offset
+        @last_page = (count / page_size)
+        @last_page += 1 if count % page_size > 0
         @last_page
       end
 
@@ -82,6 +86,14 @@ module Graphiti
         @current_page ||= (page_param[:number] || 1).to_i
       end
 
+      def offset
+        @offset ||= begin
+          if (value = page_param[:offset])
+            value.to_i
+          end
+        end
+      end
+
       def page_size
         @page_size ||= (page_param[:size] ||
                         @proxy.resource.default_page_size ||

data/lib/graphiti/query.rb

@@ -32,7 +32,9 @@ module Graphiti
     end
 
     def pagination_links?
-      if Graphiti.config.pagination_links_on_demand
+      if action == :find
+        false
+      elsif Graphiti.config.pagination_links_on_demand
         [true, "true"].include?(@params[:pagination_links])
       else
         Graphiti.config.pagination_links
@@ -193,7 +195,7 @@ module Graphiti
               end
             elsif nested?(name)
               hash[name.to_s.split(".").last.to_sym] = value
-            elsif top_level? && [:number, :size].include?(name.to_sym)
+            elsif top_level? && [:number, :size, :offset].include?(name.to_sym)
               hash[name.to_sym] = value.to_i
             end
           end

data/lib/graphiti/scoping/filter.rb

@@ -171,14 +171,18 @@ module Graphiti
       type = Graphiti::Types[filter[:type]]
       array_or_string = [:string, :array].include?(type[:canonical_name])
       if (arr = value.scan(/\[.*?\]/)).present? && array_or_string
-        value = arr.map { |json|
-          begin
-            JSON.parse(json)
-          rescue
-            raise Errors::InvalidJSONArray.new(resource, value)
-          end
-        }
-        value = value[0] if value.length == 1
+        begin
+          value = arr.map { |json|
+            begin
+              JSON.parse(json)
+            rescue
+              raise Errors::InvalidJSONArray.new(resource, value)
+            end
+          }
+          value = value[0] if value.length == 1
+        rescue Errors::InvalidJSONArray => e
+          raise(e) if type[:canonical_name] == :array
+        end
       else
         value = parse_string_arrays(value, !!filter[:single])
       end

data/lib/graphiti/scoping/paginate.rb

@@ -33,12 +33,24 @@ module Graphiti
 
     # Apply default pagination proc via the Resource adapter
     def apply_standard_scope
-      resource.adapter.paginate(@scope, number, size)
+      meth = resource.adapter.method(:paginate)
+
+      if meth.arity == 4 # backwards-compat
+        resource.adapter.paginate(@scope, number, size, offset)
+      else
+        resource.adapter.paginate(@scope, number, size)
+      end
     end
 
     # Apply the custom pagination proc
     def apply_custom_scope
-      resource.instance_exec(@scope, number, size, resource.context, &custom_scope)
+      resource.instance_exec \
+        @scope,
+        number,
+        size,
+        resource.context,
+        offset,
+        &custom_scope
     end
 
     private
@@ -51,6 +63,12 @@ module Graphiti
       @page_param ||= (query_hash[:page] || {})
     end
 
+    def offset
+      if (value = page_param[:offset])
+        value.to_i
+      end
+    end
+
     def number
       (page_param[:number] || 1).to_i
     end

data/lib/graphiti/sideload.rb

@@ -137,11 +137,16 @@ module Graphiti
     end
 
     def link_extra_fields
+      return unless context&.respond_to?(:params)
+
       extra_fields_name = [association_name, resource.type].find { |param|
         context.params.dig(:extra_fields, param)
       }
 
-      {resource.type => context.params.dig(:extra_fields, extra_fields_name)} if extra_fields_name
+      if extra_fields_name
+        extra_fields = context.params.dig(:extra_fields, extra_fields_name)
+        {resource.type => extra_fields}
+      end
     end
 
     # The parent resource is a remote,

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.2.39"
+  VERSION = "1.2.44"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.2.39
+  version: 1.2.44
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-06-25 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.0.6
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs