rails-api · groyoh · Mar 27, 2016 · Mar 25, 2016 · Mar 25, 2016
diff --git a/active_model_serializers.gemspec b/active_model_serializers.gemspec
@@ -54,7 +54,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'simplecov', '~> 0.11'
   spec.add_development_dependency 'timecop', '~> 0.7'
-  spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'grape', ['>= 0.13', '< 1.0']
   spec.add_development_dependency 'json_schema'
   spec.add_development_dependency 'rake', ['>= 10.0', '< 12.0']

diff --git a/lib/active_model/serializer/reflection.rb b/lib/active_model/serializer/reflection.rb
@@ -38,6 +38,7 @@ def initialize(*)
         super
         @_links = {}
         @_include_data = true
+        @_meta = nil
       end
 
       def link(name, value = nil, &block)

diff --git a/lib/active_model_serializers/adapter/json_api/link.rb b/lib/active_model_serializers/adapter/json_api/link.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/module/delegation'
-
 module ActiveModelSerializers
   module Adapter
     class JsonApi
@@ -41,8 +39,7 @@ class JsonApi
       #     meta: meta,
       #   }.reject! {|_,v| v.nil? }
       class Link
-        include SerializationContext.url_helpers
-        delegate :default_url_options, to: SerializationContext
+        include SerializationContext::UrlHelpers
 
         def initialize(serializer, value)
           @object = serializer.object
@@ -70,8 +67,8 @@ def as_json
           return @value if @value
 
           hash = {}
-          hash[:href] = @href if @href
-          hash[:meta] = @meta if @meta
+          hash[:href] = @href if defined?(@href)
+          hash[:meta] = @meta if defined?(@meta)
 
           hash
         end

diff --git a/lib/active_model_serializers/serialization_context.rb b/lib/active_model_serializers/serialization_context.rb
@@ -2,6 +2,22 @@ module ActiveModelSerializers
   class SerializationContext
     class << self
       attr_writer :url_helpers, :default_url_options
+      def url_helpers
+        @url_helpers ||= Module.new
+      end
+
+      def default_url_options
+        @default_url_options ||= {}
+      end
+    end
+    module UrlHelpers
+      def self.included(base)
+        base.send(:include, SerializationContext.url_helpers)
+      end
+
+      def default_url_options
+        SerializationContext.default_url_options
+      end
     end
 
     attr_reader :request_url, :query_parameters, :key_transform
@@ -13,13 +29,5 @@ def initialize(request, options = {})
       @default_url_options = options.delete(:default_url_options) || self.class.default_url_options
       @key_transform = options.delete(:key_transform)
     end
-
-    def self.url_helpers
-      @url_helpers ||= Module.new
-    end
-
-    def self.default_url_options
-      @default_url_options ||= {}
-    end
   end
 end
diff --git a/test/adapter/json_api/resource_identifier_test.rb b/test/adapter/json_api/resource_identifier_test.rb
@@ -42,7 +42,7 @@ def test_id_defined_on_serializer
         end
 
         def test_id_defined_on_fragmented
-          FragmentedSerializer.fragmented(WithDefinedIdSerializer.new(@author))
+          FragmentedSerializer.fragmented(WithDefinedIdSerializer.new(@model))
           test_id(FragmentedSerializer, 'special_id')
         end
 

diff --git a/test/fixtures/active_record.rb b/test/fixtures/active_record.rb
@@ -2,6 +2,7 @@
 
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 ActiveRecord::Schema.define do
+  self.verbose = false
   create_table :posts, force: true do |t|
     t.string :title
     t.text :body

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -36,8 +36,6 @@
   # https://github.com/seattlerb/minitest/blob/e21fdda9d/lib/minitest/autorun.rb
   # https://github.com/seattlerb/minitest/blob/e21fdda9d/lib/minitest.rb#L45-L59
 end
-require 'minitest/reporters'
-Minitest::Reporters.use!
 
 require 'support/rails_app'