jsonapi-renderer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ccb0dad8d132bc0c9faa63ed697f2b081b8d734e
-  data.tar.gz: 55d657476428b0d6c484963fb01ea24f628d826e
+SHA256:
+  metadata.gz: ebb3c77141d2eab3df3c86e6801b1566d940a7355a8018fa6682f06dfa184a94
+  data.tar.gz: bc4eea2b4d56daccd7d27feefb354e674a709443a4f504793430821c7bbdbb72
 SHA512:
-  metadata.gz: a8a4a13a02cd3214d4fe6605af7d6d96cc5218d2a566f541a702477030d94c9d5b402e177b6cbce40ed420e705bffb317c1c4f05d3a7cac9622972a667b57c03
-  data.tar.gz: d8666ed16a3e328e6eed21ac79585e72319fca38a149d06f1ce17bee706259aa227bc875dcf7c7463aee678434aac6884f5d87fe1869e0cc75932bd75a658467
+  metadata.gz: 0603897244768c28ad4b1545718f8d46f53e2aeeab4698ec192af4a239b7c56adbe28a000ae81d5210b8b2f69958473bd956ede4142f29c0ede91f3da49ad2b3
+  data.tar.gz: e140f8d78ee9015f099599a69a1e965734d77431c717e9262eedf73b31d1d9339dfa57d89b1ca1e462d8ea318de347a554d0bf22c077ae3c746f87242a7995aa

data/README.md

@@ -120,7 +120,7 @@ supporting the `fetch_multi` method.
 When using caching, the serializable resources must implement an
 additional `jsonapi_cache_key` method:
 ```ruby
-  # Returns a cache key for the resource, parametered by the `include` and
+  # Returns a cache key for the resource, parameterized by the `include` and
   #   `fields` options.
   # @param options [Hash]
   #   @option fields [Set<Symbol>, Nil] The requested fields, or nil.

data/lib/jsonapi/include_directive.rb

@@ -16,6 +16,8 @@ module JSONAPI
     def initialize(include_args, options = {})
       include_hash = Parser.parse_include_args(include_args)
       @hash = include_hash.each_with_object({}) do |(key, value), hash|
+        raise InvalidKey, key unless valid?(key)
+
         hash[key] = self.class.new(value, options)
       end
       @options = options
@@ -68,5 +70,18 @@ module JSONAPI
 
       string_array.join(',')
     end
+
+    class InvalidKey < StandardError; end
+
+    private
+
+    def valid?(key)
+      key.match(valid_json_key_name_regex)
+    end
+
+    def valid_json_key_name_regex
+      # https://jsonapi.org/format/#document-member-names
+      /^(?![\s\-_])[\u0080-\u10FFFFA-Za-z0-9*]+(?<![\s\-_])$/
+    end
   end
 end

data/lib/jsonapi/renderer/cached_resources_processor.rb

@@ -15,9 +15,14 @@ module JSONAPI
       end
 
       def process_resources
+        # NOTE(beauby): This is necessary for cache keys consistency.
+        @include_rels = @include_rels.each_with_object({}) do |(k, v), h|
+          h[k] = v.to_a.sort!
+        end
+
         [@primary, @included].each do |resources|
           cache_hash = cache_key_map(resources)
-          processed_resources = @cache.fetch_multi(cache_hash.keys) do |key|
+          processed_resources = @cache.fetch_multi(*cache_hash.keys) do |key|
             res, include, fields = cache_hash[key]
             json = res.as_jsonapi(include: include, fields: fields).to_json
 

data/lib/jsonapi/renderer/document.rb

@@ -11,7 +11,7 @@ module JSONAPI
         @errors  = params.fetch(:errors,  [])
         @meta    = params[:meta]
         @links   = params[:links] || {}
-        @fields  = _symbolize_fields(params[:fields] || {})
+        @fields  = _canonize_fields(params[:fields] || {})
         @jsonapi = params[:jsonapi]
         @include = JSONAPI::IncludeDirective.new(params[:include] || {})
         @relationship = params[:relationship]
@@ -91,9 +91,9 @@ module JSONAPI
         end
       end
 
-      def _symbolize_fields(fields)
+      def _canonize_fields(fields)
         fields.each_with_object({}) do |(k, v), h|
-          h[k.to_sym] = v.map(&:to_sym)
+          h[k.to_sym] = v.map(&:to_sym).sort!
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-renderer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Lucas Hosseini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Render JSONAPI documents.