jsonapi-materializer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2f61a86bda571eb041aa543a16338d80c82b742708f90be0c321e45f27eb97e
-  data.tar.gz: fb22fbb7a3998c2ca6563c85a65b12980fae019feb96972523850c8074160485
+  metadata.gz: b51f422840742a6b80b48de2c10d75b2530a630d13e0caecb0c598f79089081e
+  data.tar.gz: ffbf502f4377b1814cb6ba7c8f7d5b3cd01d792ccc4fa047ccd1e2c448f83f19
 SHA512:
-  metadata.gz: 1a27fc6d325e69296ae5ce9e73a21caf13194eba084b71f127a81574c63fe839cba0be3701b2be43f812efa7e9d22428f20891d46703eb30fe7d2cba73d2f3b8
-  data.tar.gz: 7c661026d63ac185e4f7d01db31b83547945d3903c14775273dbe06b05455a57209286efc5237c764b26853c3a8bfe733c4064aa3b081e1fd38e287a675a36c3
+  metadata.gz: 6bb8dc1d59f884f503c4e6f993c331a69d41b7e7619f34fa2296f5cb0597e82cf128d55f27b15f2523e6d7ea1c603ed4cb8abb87c65da3d78dd2197484e4348e
+  data.tar.gz: 7689dec65ec8f3a81751c054345ae19e51d5ef1dd64245ce7bccc6226b373f168f69eeb1c51254f635a69d89e5ae70ea176eb708d98f7e234ef013a507c57756

data/lib/jsonapi/materializer/collection.rb

@@ -22,38 +22,16 @@ module JSONAPI
 
       def as_json(*)
         {
-          links: if pagination
-                   {
-                     first: (links_pagination.expand(offset: 1, limit: limit_value).to_s unless total_pages.zero? || first_page?),
-                     prev: (links_pagination.expand(offset: prev_page, limit: limit_value).to_s unless total_pages.zero? || first_page?),
-                     self: (links_self unless total_pages.zero?),
-                     next: (links_pagination.expand(offset: next_page, limit: limit_value).to_s unless total_pages.zero? || last_page?),
-                     last: (links_pagination.expand(offset: total_pages, limit: limit_value).to_s unless total_pages.zero? || last_page?)
-                   }.compact
-                 else
-                   {}
-                 end,
-          data: resources,
-          included:
-        }.transform_values(&:presence).compact
+          links: pagination,
+          included:,
+          meta:
+        }.transform_values(&:presence).compact.merge(data: resources)
       end
 
       private def materializers
         @materializers ||= object.map { |subobject| self.class.module_parent.new(object: subobject, selects:, includes:) }
       end
 
-      private def links_pagination
-        Addressable::Template.new(
-          "#{origin}/#{type}?page[offset]={offset}&page[limit]={limit}"
-        )
-      end
-
-      private def links_self
-        Addressable::Template.new(
-          "#{origin}/#{type}"
-        ).pattern
-      end
-
       private def origin
         self.class.module_parent.instance_variable_get(:@origin)
       end
@@ -74,6 +52,36 @@ module JSONAPI
         @includes || []
       end
 
+      private def pagination
+        if @pagination
+          {
+            first: (pagination_link_template.expand(offset: 1, limit: limit_value).to_s unless total_pages.zero? || first_page?),
+            prev: (pagination_link_template.expand(offset: prev_page, limit: limit_value).to_s unless total_pages.zero? || first_page?),
+            self: (self_link_template unless total_pages.zero?),
+            next: (pagination_link_template.expand(offset: next_page, limit: limit_value).to_s unless total_pages.zero? || last_page?),
+            last: (pagination_link_template.expand(offset: total_pages, limit: limit_value).to_s unless total_pages.zero? || last_page?)
+          }.compact
+        else
+          {}
+        end
+      end
+
+      private def pagination_link_template
+        Addressable::Template.new(
+          "#{origin}/#{type}?page[offset]={offset}&page[limit]={limit}"
+        )
+      end
+
+      private def self_link_template
+        Addressable::Template.new(
+          "#{origin}/#{type}"
+        ).pattern
+      end
+
+      private def meta
+        {}
+      end
+
       private def included
         @included ||= materializers.flat_map do |materializer|
           includes.flat_map do |path|

data/lib/jsonapi/materializer/resource/relationship.rb

@@ -24,8 +24,7 @@ module JSONAPI
             links: {
               self: links_self,
               related: links_related
-            },
-            meta: {}
+            }
           }.transform_values(&:presence).compact
         end
 

data/lib/jsonapi/materializer/version.rb

@@ -2,6 +2,6 @@
 
 module JSONAPI
   module Materializer
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-materializer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Kurtis Rainbolt-Greene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2023-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport