active_model_serializers 0.10.7 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c3a5900ed1c671e57b90ea00e3130ad3a5fe4939a6a1c36e1481dbdeeef3199
-  data.tar.gz: 59ed63aa89861c650f87ba5bfeb5dfc90c997cd8fe4542129f28d1194d3c24ff
+  metadata.gz: 7232014fa13e7bf11951db024282a8518806ccdd81aead05ce694398e8f16439
+  data.tar.gz: 8337471a240ac4e1931fd71fbfbbf096e8bb5989ce51bce920d2f266aa0ac775
 SHA512:
-  metadata.gz: 0ee2569a69953e286d63861bb01a37836ee9b25463980da1dc561815e0d7e7902aa1b1d344b265bb50f3c41b1e93ea6cfec2ba241c5314511d4a55a5082f5ce0
-  data.tar.gz: d011e2d950d8b7869d4f49139d23cf994f2b1f6e8319aa2a3ff018d4f1c578d24bb64cfe632c912e91edd92e0f5945fa58a1a7742b611ef33c5a4d0a14dfbc70
+  metadata.gz: 33a114c6a2f87df622d820e8d04b9ce3099891a83f30527d93c159f0014a4fc3a60f883884b6d3a16fa4daf9f65cce1a57410eee4111391351c4199a73e8ca1c
+  data.tar.gz: 5ac71dcb57c2fd16b328cc849b948c6ae0d8cc6d409a1f0b3c942033c439e37c8c8fd8df3be5d80a8a153cb86e38d5cfe93a40fc553f09db739514759ca935a2

data/.travis.yml

@@ -40,6 +40,8 @@ matrix:
   # - { rvm: jruby-head,     jdk: oraclejdk8, env: "RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
   exclude:
   - { rvm: 2.1.10,        env: RAILS_VERSION=master }
+  - { rvm: 2.2.8,        env: RAILS_VERSION=master }
+  - { rvm: 2.3.5,        env: RAILS_VERSION=master }
   - { rvm: 2.1.10,        env: RAILS_VERSION=5.0 }
   - { rvm: 2.1.10,        env: RAILS_VERSION=5.1 }
   - { rvm: 2.4.2,         env: RAILS_VERSION=4.1 }

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 0.10.x
 
-### [master (unreleased)](https://github.com/rails-api/active_model_serializers/compare/v0.10.7...0-10-stable)
+### [master (unreleased)](https://github.com/rails-api/active_model_serializers/compare/v0.10.8...0-10-stable)
 
 Breaking changes:
 
@@ -8,8 +8,23 @@ Features:
 
 Fixes:
 
+
 Misc:
 
+### [v0.10.8 (2018-11-01)](https://github.com/rails-api/active_model_serializers/compare/v0.10.7...v0.10.8)
+
+Features:
+- [#2279](https://github.com/rails-api/active_model_serializers/pull/2279) Support condition options in serializer link statements
+
+Fixes:
+
+- [#2296](https://github.com/rails-api/active_model_serializers/pull/2296) Fixes #2295 (@Hirurg103)
+  - Fix finding of namespaced serializer and non-namespaced model.
+- [#2289](https://github.com/rails-api/active_model_serializers/pull/2289) Fixes #2255 (@f-mer)
+  - Fix autoloading race condition, especially in Rails 5.
+- [#2299](https://github.com/rails-api/active_model_serializers/pull/2299) Fixes #2270 (@chau-bao-long via #2276)
+  - Fix reflection thread-safety bug
+
 ### [v0.10.7 (2017-11-14)](https://github.com/rails-api/active_model_serializers/compare/v0.10.6...v0.10.7)
 
 Regressions Fixed From v0.10.6:

data/Gemfile

@@ -54,9 +54,9 @@ group :test do
   gem 'sqlite3', platform: (@windows_platforms + [:ruby])
   platforms :jruby do
     if version == 'master' || version >= '5'
-      gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' # github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+      gem 'activerecord-jdbcsqlite3-adapter', '~> 50'
     else
-      gem 'activerecord-jdbcsqlite3-adapter'
+      gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.0'
     end
   end
   gem 'codeclimate-test-reporter', require: false

data/README.md

@@ -266,8 +266,8 @@ to know about, but not part of ActiveModelSerializers.)
 
 - An `ActiveRecord::Base` object.
 - Any Ruby object that passes the
-  [Lint](http://www.rubydoc.info/github/rails-api/active_model_serializers/ActiveModel/Serializer/Lint/Tests)
-  [code](https://github.com/rails-api/active_model_serializers/blob/master/lib/active_model/serializer/lint.rb).
+  [Lint](https://www.rubydoc.info/gems/active_model_serializers/ActiveModel/Serializer/Lint/Tests)
+  [(code)](lib/active_model/serializer/lint.rb).
 
 ActiveModelSerializers provides a
 [`ActiveModelSerializers::Model`](https://github.com/rails-api/active_model_serializers/blob/master/lib/active_model_serializers/model.rb),

data/active_model_serializers.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   # 'activesupport', rails_versions
   # 'i18n,
   # 'tzinfo'
-  # 'minitest'
+  spec.add_development_dependency 'minitest', ['~> 5.0', '< 5.11']
   # 'thread_safe'
 
   spec.add_runtime_dependency 'jsonapi-renderer', ['>= 0.1.1.beta1', '< 0.3']

data/docs/general/serializers.md

@@ -65,7 +65,7 @@ Where:
   - `virtual_value:`
   - `polymorphic:` defines if polymorphic relation type should be nested in serialized association.
   - `type:` the resource type as used by JSON:API, especially on a `belongs_to` relationship.
-  - `class_name:` used to determine `type` when `type` not given
+  - `class_name:` the (String) model name used to determine `type`, when `type` is not given. e.g. `class_name: "Comment"` would imply the type `comments`
   - `foreign_key:` used by JSON:API on a `belongs_to` relationship to avoid unnecessarily loading the association object.
   - `namespace:` used when looking up the serializer and `serializer` is not given.  Falls back to the parent serializer's `:namespace` instance options, which, when present, comes from the render options. See [Rendering#namespace](rendering.md#namespace] for more details.
 - optional: `&block` is a context that returns the association's attributes.
@@ -81,6 +81,7 @@ e.g.
 ```ruby
 has_one :bio
 has_one :blog, key: :site
+has_one :blog, class_name: "Blog"
 has_one :maker, virtual_value: { id: 1 }
 
 has_one :blog do |serializer|
@@ -114,6 +115,7 @@ e.g.
 has_many :comments
 has_many :comments, key: :reviews
 has_many :comments, serializer: CommentPreviewSerializer
+has_many :comments, class_name: "Comment"
 has_many :reviews, virtual_value: [{ id: 1 }, { id: 2 }]
 has_many :comments, key: :last_comments do
   last(1)
@@ -127,6 +129,7 @@ e.g.
 ```ruby
 belongs_to :author, serializer: AuthorPreviewSerializer
 belongs_to :author, key: :writer
+belongs_to :author, class_name: "Author"
 belongs_to :post
 belongs_to :blog
 def blog
@@ -235,6 +238,15 @@ link :other, 'https://example.com/resource'
 link(:posts) { link_author_posts_url(object) }
 ```
 
+Just like attributes, links also support conditions in options
+```ruby
+link(:secret, if: :internal?) { object.secret_link }
+
+def internal?
+  instance_options[:context] == :internal
+end
+```
+
 #### #object
 
 The object being serialized.
@@ -294,7 +306,7 @@ end
 Whether you write the method as above or as `object.comments.where(created_by: scope)`
 is a matter of preference (assuming `scope_name` has been set).
 
-Keep in mind that the scope can be set to any available controller reference. This can be utilized to provide access to any other data scopes or presentation helpers. 
+Keep in mind that the scope can be set to any available controller reference. This can be utilized to provide access to any other data scopes or presentation helpers.
 
 ##### Controller Authorization Context
 
@@ -381,7 +393,7 @@ class PostsController < ActionController::Base
   end
 end
 ```
-Note that any controller reference which provides the desired scope is acceptable, such as another controller method for loading a different resource or reference to helpers. For example, `ActionController::API` does not include `ActionView::ViewContext`, and would need a different reference for passing any helpers into a serializer via `serialization_scope`. 
+Note that any controller reference which provides the desired scope is acceptable, such as another controller method for loading a different resource or reference to helpers. For example, `ActionController::API` does not include `ActionView::ViewContext`, and would need a different reference for passing any helpers into a serializer via `serialization_scope`.
 
 #### #read_attribute_for_serialization(key)
 
@@ -474,7 +486,7 @@ the `ActiveModel::Serializer.serializer_for` method to return a serializer class
 ```ruby
 class MySerializer < ActiveModel::Serializer
   def self.serializer_for(model, options)
-    return SparseAdminSerializer if model.class == 'Admin'
+    return SparseAdminSerializer if model.class.name == 'Admin'
     super
   end
 

data/lib/active_model/serializer.rb

@@ -18,16 +18,17 @@ module ActiveModel
     # @see #serializable_hash for more details on these valid keys.
     SERIALIZABLE_HASH_VALID_KEYS = [:only, :except, :methods, :include, :root].freeze
     extend ActiveSupport::Autoload
-    autoload :Adapter
-    autoload :Null
-    autoload :Attribute
-    autoload :Association
-    autoload :Reflection
-    autoload :SingularReflection
-    autoload :CollectionReflection
-    autoload :BelongsToReflection
-    autoload :HasOneReflection
-    autoload :HasManyReflection
+    eager_autoload do
+      autoload :Adapter
+      autoload :Null
+      autoload :Attribute
+      autoload :Link
+      autoload :Association
+      autoload :Reflection
+      autoload :BelongsToReflection
+      autoload :HasOneReflection
+      autoload :HasManyReflection
+    end
     include ActiveSupport::Configurable
     include Caching
 
@@ -275,9 +276,14 @@ module ActiveModel
     #   link(:self) { "http://example.com/resource/#{object.id}" }
     # @example
     #   link :resource, "http://example.com/resource"
+    # @example
+    #   link(:callback, if: :internal?), { "http://example.com/callback" }
     #
-    def self.link(name, value = nil, &block)
-      _links[name] = block || value
+    def self.link(name, *args, &block)
+      options = args.extract_options!
+      # For compatibility with the use case of passing link directly as string argument
+      # without block, we are creating a wrapping block
+      _links[name] = Link.new(name, options, block || ->(_serializer) { args.first })
     end
 
     # Set the JSON API meta attribute of a serializer.
@@ -341,7 +347,7 @@ module ActiveModel
       return Enumerator.new {} unless object
 
       Enumerator.new do |y|
-        self.class._reflections.each do |key, reflection|
+        (self.instance_reflections ||= self.class._reflections.deep_dup).each do |key, reflection|
           next if reflection.excluded?(self)
           next unless include_directive.key?(key)
 
@@ -405,6 +411,6 @@ module ActiveModel
 
     protected
 
-    attr_accessor :instance_options
+    attr_accessor :instance_options, :instance_reflections
   end
 end

data/lib/active_model/serializer/collection_serializer.rb

@@ -19,11 +19,10 @@ module ActiveModel
 
       # @api private
       def serializable_hash(adapter_options, options, adapter_instance)
-        include_directive = ActiveModel::Serializer.include_directive_from_options(adapter_options)
-        adapter_options[:cached_attributes] ||= ActiveModel::Serializer.cache_read_multi(self, adapter_instance, include_directive)
-        adapter_opts = adapter_options.merge(include_directive: include_directive)
+        options[:include_directive] ||= ActiveModel::Serializer.include_directive_from_options(adapter_options)
+        options[:cached_attributes] ||= ActiveModel::Serializer.cache_read_multi(self, adapter_instance, options[:include_directive])
         serializers.map do |serializer|
-          serializer.serializable_hash(adapter_opts, options, adapter_instance)
+          serializer.serializable_hash(adapter_options, options, adapter_instance)
         end
       end
 
@@ -48,8 +47,7 @@ module ActiveModel
         # 4. key may be nil for empty collection and no serializer option
         key &&= key.pluralize
         # 5. fail if the key cannot be determined
-        key || fail(ArgumentError, 'Cannot infer root key from collection type. Please
-                 specify the root or each_serializer option, or render a JSON String')
+        key || fail(ArgumentError, 'Cannot infer root key from collection type. Please specify the root or each_serializer option, or render a JSON String')
       end
       # rubocop:enable Metrics/CyclomaticComplexity
 

data/lib/active_model/serializer/lazy_association.rb

@@ -76,6 +76,7 @@ module ActiveModel
         serializer_options[:serializer_context_class] = association_options.fetch(:parent_serializer).class
         serializer = reflection_options.fetch(:serializer, nil)
         serializer_options[:serializer] = serializer if serializer
+        serializer_options[:namespace]  = reflection_options[:namespace] if reflection_options[:namespace]
         serializer_class.new(object, serializer_options)
       end
 

data/lib/active_model/serializer/link.rb

@@ -0,0 +1,21 @@
+require 'active_model/serializer/field'
+
+module ActiveModel
+  class Serializer
+    # Holds all the data about a serializer link
+    #
+    # @example
+    #   class PostSerializer < ActiveModel::Serializer
+    #     link :callback, if: :internal? do
+    #       object.callback_link
+    #     end
+    #
+    #     def internal?
+    #       instance_options[:internal] == true
+    #     end
+    #   end
+    #
+    class Link < Field
+    end
+  end
+end

data/lib/active_model/serializer/reflection.rb

@@ -151,6 +151,9 @@ module ActiveModel
       # @yield [ActiveModel::Serializer]
       # @return [:nil, associated resource or resource collection]
       def value(serializer, include_slice)
+        # NOTE(BF): This method isn't thread-safe because the _reflections class attribute is not thread-safe
+        # Therefore, when we build associations from reflections, we dup the entire reflection instance.
+        # Better solutions much appreciated!
         @object = serializer.object
         @scope = serializer.scope
 

data/lib/active_model/serializer/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Serializer
-    VERSION = '0.10.7'.freeze
+    VERSION = '0.10.8'.freeze
   end
 end

data/lib/active_model_serializers.rb

@@ -5,16 +5,19 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/json'
 module ActiveModelSerializers
   extend ActiveSupport::Autoload
-  autoload :Model
-  autoload :Callbacks
-  autoload :Deserialization
-  autoload :SerializableResource
-  autoload :Logging
-  autoload :Test
-  autoload :Adapter
-  autoload :JsonPointer
-  autoload :Deprecate
-  autoload :LookupChain
+  eager_autoload do
+    autoload :Model
+    autoload :Callbacks
+    autoload :SerializableResource
+    autoload :SerializationContext
+    autoload :Logging
+    autoload :Test
+    autoload :Adapter
+    autoload :JsonPointer
+    autoload :Deprecate
+    autoload :LookupChain
+    autoload :Deserialization
+  end
 
   class << self; attr_accessor :logger; end
   self.logger = ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT))
@@ -46,6 +49,11 @@ module ActiveModelSerializers
     $VERBOSE = original_verbose
   end
 
+  def self.eager_load!
+    super
+    ActiveModel::Serializer.eager_load!
+  end
+
   require 'active_model/serializer/version'
   require 'active_model/serializer'
   require 'active_model/serializable_resource'

data/lib/active_model_serializers/adapter/json_api.rb

@@ -22,14 +22,16 @@ module ActiveModelSerializers
   module Adapter
     class JsonApi < Base
       extend ActiveSupport::Autoload
-      autoload :Jsonapi
-      autoload :ResourceIdentifier
-      autoload :Relationship
-      autoload :Link
-      autoload :PaginationLinks
-      autoload :Meta
-      autoload :Error
-      autoload :Deserialization
+      eager_autoload do
+        autoload :Jsonapi
+        autoload :ResourceIdentifier
+        autoload :Link
+        autoload :PaginationLinks
+        autoload :Meta
+        autoload :Error
+        autoload :Deserialization
+        autoload :Relationship
+      end
 
       def self.default_key_transform
         :dash
@@ -480,7 +482,8 @@ module ActiveModelSerializers
       #   }.reject! {|_,v| v.nil? }
       def links_for(serializer)
         serializer._links.each_with_object({}) do |(name, value), hash|
-          result = Link.new(serializer, value).as_json
+          next if value.excluded?(serializer)
+          result = Link.new(serializer, value.block).as_json
           hash[name] = result if result
         end
       end

data/lib/active_model_serializers/railtie.rb

@@ -5,6 +5,8 @@ require 'action_controller/serialization'
 
 module ActiveModelSerializers
   class Railtie < Rails::Railtie
+    config.eager_load_namespaces << ActiveModelSerializers
+
     config.to_prepare do
       ActiveModel::Serializer.serializers_cache.clear
     end

data/test/action_controller/serialization_test.rb

@@ -457,13 +457,19 @@ module ActionController
       end
 
       def test_render_event_is_emitted
-        subscriber = ::ActiveSupport::Notifications.subscribe('render.active_model_serializers') do |name|
-          @name = name
+        subscriber = ::ActiveSupport::Notifications.subscribe('render.active_model_serializers') do |subscribed_event|
+          @subscribed_event = subscribed_event
         end
 
         get :render_using_implicit_serializer
 
-        assert_equal 'render.active_model_serializers', @name
+        subscribed_event_name =
+          if @subscribed_event.is_a?(String)
+            @subscribed_event
+          else
+            @subscribed_event.name # is a ActiveSupport::Notifications::Event
+          end
+        assert_equal 'render.active_model_serializers', subscribed_event_name
       ensure
         ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber
       end

data/test/adapter/json_api/links_test.rb

@@ -17,7 +17,21 @@ module ActiveModelSerializers
           link :yet_another do
             "http://example.com/resource/#{object.id}"
           end
+          link :conditional1, if: -> { instance_truth } do
+            "http://example.com/conditional1/#{object.id}"
+          end
+          link :conditional2, if: :instance_falsey do
+            "http://example.com/conditional2/#{object.id}"
+          end
           link(:nil) { nil }
+
+          def instance_truth
+            true
+          end
+
+          def instance_falsey
+            false
+          end
         end
 
         def setup
@@ -85,7 +99,8 @@ module ActiveModelSerializers
             :"link-authors" => 'http://example.com/link_authors',
             resource: 'http://example.com/resource',
             posts: 'http://example.com/link_authors/1337/posts',
-            :"yet-another" => 'http://example.com/resource/1337'
+            :"yet-another" => 'http://example.com/resource/1337',
+            conditional1: 'http://example.com/conditional1/1337'
           }
           assert_equal(expected, hash[:data][:links])
         end

data/test/cache_test.rb

@@ -415,7 +415,7 @@ module ActiveModelSerializers
         adapter_options = {}
         adapter_instance = ActiveModelSerializers::Adapter::Attributes.new(serializers, adapter_options)
         serializers.serializable_hash(adapter_options, options, adapter_instance)
-        cached_attributes = adapter_options.fetch(:cached_attributes).with_indifferent_access
+        cached_attributes = options.fetch(:cached_attributes).with_indifferent_access
 
         include_directive = ActiveModelSerializers.default_include_directive
         manual_cached_attributes = ActiveModel::Serializer.cache_read_multi(serializers, adapter_instance, include_directive).with_indifferent_access
@@ -446,9 +446,9 @@ module ActiveModelSerializers
         serializers.serializable_hash(adapter_options, options, adapter_instance)
 
         # Should find something with read_multi now
-        adapter_options = {}
+        options = {}
         serializers.serializable_hash(adapter_options, options, adapter_instance)
-        cached_attributes = adapter_options.fetch(:cached_attributes)
+        cached_attributes = options.fetch(:cached_attributes)
 
         include_directive = ActiveModelSerializers.default_include_directive
         manual_cached_attributes = ActiveModel::Serializer.cache_read_multi(serializers, adapter_instance, include_directive)

data/test/serializers/associations_test.rb

@@ -285,6 +285,56 @@ module ActiveModel
         end
       end
 
+      class AssociationsNamespacedSerializersTest < ActiveSupport::TestCase
+        class Post < ::Model
+          associations :comments, :author, :description
+
+          def latest_comments
+            comments[0..3]
+          end
+        end
+        class Comment < ::Model; end
+        class Author  < ::Model; end
+        class Description < ::Model; end
+
+        class ResourceNamespace
+          class PostSerializer < ActiveModel::Serializer
+            has_many :comments, namespace: ResourceNamespace
+            has_many :latest_comments, namespace: ResourceNamespace
+            belongs_to :author, namespace: ResourceNamespace
+            has_one :description, namespace: ResourceNamespace
+          end
+          class CommentSerializer     < ActiveModel::Serializer; end
+          class AuthorSerializer      < ActiveModel::Serializer; end
+          class DescriptionSerializer < ActiveModel::Serializer; end
+        end
+
+        def setup
+          @comment = Comment.new
+          @author = Author.new
+          @description = Description.new
+          @post = Post.new(comments: [@comment],
+                           author: @author,
+                           description: @description)
+          @post_serializer = ResourceNamespace::PostSerializer.new(@post)
+        end
+
+        def test_associations_namespaced_serializers
+          @post_serializer.associations.each do |association|
+            case association.key
+            when :comments, :latest_comments
+              assert_instance_of(ResourceNamespace::CommentSerializer, association.lazy_association.serializer.first)
+            when :author
+              assert_instance_of(ResourceNamespace::AuthorSerializer, association.lazy_association.serializer)
+            when :description
+              assert_instance_of(ResourceNamespace::DescriptionSerializer, association.lazy_association.serializer)
+            else
+              flunk "Unknown association: #{key}"
+            end
+          end
+        end
+      end
+
       class NestedSerializersTest < ActiveSupport::TestCase
         class Post < ::Model
           associations :comments, :author, :description

data/test/serializers/reflection_test.rb

@@ -423,5 +423,57 @@ module ActiveModel
       end
       # rubocop:enable Metrics/AbcSize
     end
+    class ThreadedReflectionTest < ActiveSupport::TestCase
+      class Post < ::Model
+        attributes :id, :title, :body
+        associations :comments
+      end
+      class Comment < ::Model
+        attributes :id, :body
+        associations :post
+      end
+      class CommentSerializer < ActiveModel::Serializer
+        type 'comment'
+        attributes :id, :body
+        has_one :post
+      end
+      class PostSerializer < ActiveModel::Serializer
+        type 'post'
+        attributes :id, :title, :body
+        has_many :comments, serializer: CommentSerializer do
+          sleep 0.1
+          object.comments
+        end
+      end
+
+      # per https://github.com/rails-api/active_model_serializers/issues/2270
+      def test_concurrent_serialization
+        post1 = Post.new(id: 1, title: 'Post 1 Title', body: 'Post 1 Body')
+        post1.comments = [Comment.new(id: 1, body: 'Comment on Post 1', post: post1)]
+        post2 = Post.new(id: 2, title: 'Post 2 Title', body: 'Post 2 Body')
+        post2.comments = [Comment.new(id: 2, body: 'Comment on Post 2', post: post2)]
+        serialized_posts = {
+          first: Set.new,
+          second: Set.new
+        }
+        t1 = Thread.new do
+          10.times do
+            serialized_posts[:first] << PostSerializer.new(post1, {}).to_json
+          end
+        end
+        t2 = Thread.new do
+          10.times do
+            serialized_posts[:second] << PostSerializer.new(post2, {}).to_json
+          end
+        end
+        t1.join
+        t2.join
+        expected_first_post_serialization  = '{"id":1,"title":"Post 1 Title","body":"Post 1 Body","comments":[{"id":1,"body":"Comment on Post 1"}]}'
+        expected_second_post_serialization = '{"id":2,"title":"Post 2 Title","body":"Post 2 Body","comments":[{"id":2,"body":"Comment on Post 2"}]}'
+
+        assert_equal [expected_second_post_serialization], serialized_posts[:second].to_a
+        assert_equal [expected_first_post_serialization], serialized_posts[:first].to_a
+      end
+    end
   end
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.10.8
 platform: ruby
 authors:
 - Steve Klabnik
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,9 +20,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
-  name: activemodel
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,6 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,9 +40,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
-  name: actionpack
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -51,6 +51,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,9 +60,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
-  name: railties
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -71,6 +71,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
+- !ruby/object:Gem::Dependency
+  name: jsonapi-renderer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -79,9 +100,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.3'
-  name: jsonapi-renderer
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -91,20 +111,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
+  name: case_transform
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
-  name: case_transform
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -113,9 +134,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
-  name: activerecord
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -125,20 +145,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.3
-  name: kaminari
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.3
 - !ruby/object:Gem::Dependency
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -147,9 +168,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.7
-  name: will_paginate
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -159,48 +179,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.7
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
-  name: simplecov
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-  name: timecop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
+  name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -209,9 +230,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.19.1
-  name: grape
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,20 +241,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
+  name: json_schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: json_schema
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -243,9 +264,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '12.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -333,6 +353,7 @@ files:
 - lib/active_model/serializer/has_many_reflection.rb
 - lib/active_model/serializer/has_one_reflection.rb
 - lib/active_model/serializer/lazy_association.rb
+- lib/active_model/serializer/link.rb
 - lib/active_model/serializer/lint.rb
 - lib/active_model/serializer/null.rb
 - lib/active_model/serializer/reflection.rb
@@ -478,7 +499,7 @@ homepage: https://github.com/rails-api/active_model_serializers
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -493,9 +514,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.13
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.7.6
+signing_key: 
 specification_version: 4
 summary: Conventions-based JSON generation for Rails.
 test_files: