graphiti 1.2.17 → 1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af3b1ec7bee727eb7526b6ce3057576e323f029bdda9f57447021973fa35b2ed
-  data.tar.gz: 34deda0508ba3d23299272cb387cc19a3f90e90ee1f084b930858488dcf1222b
+  metadata.gz: f286647b00c9b97ec5c280e48e4758f31fbee7f00e19d22073b95c8f10956ad6
+  data.tar.gz: bf208a2b4971f7603bf287c2cfe4787b36525a8b6612e62a99b3bacd7cd80b45
 SHA512:
-  metadata.gz: 649b13c8e55456bfe9a06a9c26cdb36cd345e69137b50afc3c0861b77c334841b5cccb993d1b263986bc2e385e2fb8c28a64c718ff734ccffadb5e3b2d7d76eb
-  data.tar.gz: f78993e3439b19afb85520c9955415ac03a4332eefc9f683828a2da0cd999b933f07b50df141e1d305ecd3799c9bef3142d4af2020bb356694ce97872b7f80c9
+  metadata.gz: 1af7ee296afbe6cf900ceb6e3c7fd4e05fd8b0df81d91b748d2b970fdf77245298e755c024c150cde26e86636c3814a20ab45934b810af8ed501b2ec43449549
+  data.tar.gz: f51c1183ede1fd0e4e5aa91ec145b3cd1bc5f7e4633cd61e59232fc6575cb39ca85240fa8590d5b264b29b0522352888b6a7c684cd48a7f4e46b5e47a692155e

data/lib/graphiti/delegates/pagination.rb

@@ -20,13 +20,17 @@ module Graphiti
 
       private
 
+      def pagination_params
+        @pagination_params ||= @proxy.query.params.reject { |key, _| [:action, :controller, :format].include?(key) }
+      end
+
       def pagination_link(page)
         return nil unless @proxy.resource.endpoint
 
         uri = URI(@proxy.resource.endpoint[:url].to_s)
 
         # Overwrite the pagination query params with the desired page
-        uri.query = @proxy.query.hash.merge({
+        uri.query = pagination_params.merge({
           page: {
             number: page,
             size: page_size

data/lib/graphiti/resource.rb

@@ -148,5 +148,15 @@ module Graphiti
       end
       response
     end
+
+    def links?
+      self.class.links.any?
+    end
+
+    def links(model)
+      self.class.links.each_with_object({}) do |(name, blk), memo|
+        memo[name] = instance_exec(model, &blk)
+      end
+    end
   end
 end

data/lib/graphiti/resource/configuration.rb

@@ -199,7 +199,8 @@ module Graphiti
               attributes: {},
               extra_attributes: {},
               sideloads: {},
-              callbacks: {}
+              callbacks: {},
+              links: {}
             }
         end
 
@@ -238,6 +239,10 @@ module Graphiti
         def default_filters
           config[:default_filters]
         end
+
+        def links
+          config[:links]
+        end
       end
 
       def get_attr!(name, flag, options = {})

data/lib/graphiti/resource/dsl.rb

@@ -147,6 +147,10 @@ module Graphiti
           end
         end
 
+        def link(name, &blk)
+          config[:links][name.to_sym] = blk
+        end
+
         def all_attributes
           attributes.merge(extra_attributes)
         end

data/lib/graphiti/serializer.rb

@@ -25,6 +25,7 @@ module Graphiti
     def as_jsonapi(*)
       super.tap do |hash|
         strip_relationships!(hash) if strip_relationships?
+        add_links!(hash)
       end
     end
 
@@ -49,6 +50,12 @@ module Graphiti
 
     private
 
+    def add_links!(hash)
+      return unless @resource.respond_to?(:links?)
+
+      hash[:links] = @resource.links(@object) if @resource.links?
+    end
+
     def strip_relationships!(hash)
       hash[:relationships]&.select! do |name, payload|
         payload.key?(:data)

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.2.17"
+  VERSION = "1.2.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.2.17
+  version: 1.2.18
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable