Skip to content

Commit fb06a46

Browse files
committed
Fix warnings
1 parent 82da04d commit fb06a46

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

lib/active_model/serializer/reflection.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ def initialize(*)
3838
super
3939
@_links = {}
4040
@_include_data = true
41+
@_meta = nil
4142
end
4243

4344
def link(name, value = nil, &block)

lib/active_model_serializers/adapter/json_api/link.rb

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
require 'active_support/core_ext/module/delegation'
2-
31
module ActiveModelSerializers
42
module Adapter
53
class JsonApi
@@ -41,8 +39,7 @@ class JsonApi
4139
# meta: meta,
4240
# }.reject! {|_,v| v.nil? }
4341
class Link
44-
include SerializationContext.url_helpers
45-
delegate :default_url_options, to: SerializationContext
42+
include SerializationContext::UrlHelpers
4643

4744
def initialize(serializer, value)
4845
@object = serializer.object
@@ -70,8 +67,8 @@ def as_json
7067
return @value if @value
7168

7269
hash = {}
73-
hash[:href] = @href if @href
74-
hash[:meta] = @meta if @meta
70+
hash[:href] = @href if defined?(@href)
71+
hash[:meta] = @meta if defined?(@meta)
7572

7673
hash
7774
end

lib/active_model_serializers/serialization_context.rb

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@ module ActiveModelSerializers
22
class SerializationContext
33
class << self
44
attr_writer :url_helpers, :default_url_options
5+
def url_helpers
6+
@url_helpers ||= Module.new
7+
end
8+
9+
def default_url_options
10+
@default_url_options ||= {}
11+
end
12+
end
13+
module UrlHelpers
14+
def self.included(base)
15+
base.send(:include, SerializationContext.url_helpers)
16+
end
17+
18+
def default_url_options
19+
SerializationContext.default_url_options
20+
end
521
end
622

723
attr_reader :request_url, :query_parameters, :key_transform
@@ -13,13 +29,5 @@ def initialize(request, options = {})
1329
@default_url_options = options.delete(:default_url_options) || self.class.default_url_options
1430
@key_transform = options.delete(:key_transform)
1531
end
16-
17-
def self.url_helpers
18-
@url_helpers ||= Module.new
19-
end
20-
21-
def self.default_url_options
22-
@default_url_options ||= {}
23-
end
2432
end
2533
end

test/adapter/json_api/resource_identifier_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_id_defined_on_serializer
4242
end
4343

4444
def test_id_defined_on_fragmented
45-
FragmentedSerializer.fragmented(WithDefinedIdSerializer.new(@author))
45+
FragmentedSerializer.fragmented(WithDefinedIdSerializer.new(@model))
4646
test_id(FragmentedSerializer, 'special_id')
4747
end
4848

test/fixtures/active_record.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
44
ActiveRecord::Schema.define do
5+
self.verbose = false
56
create_table :posts, force: true do |t|
67
t.string :title
78
t.text :body

0 commit comments

Comments
 (0)