Fix warnings

This commit is contained in:
Benjamin Fleischer 2016-03-25 10:28:01 -05:00
parent 82da04de67
commit fb06a462bb
5 changed files with 22 additions and 15 deletions

View File

@ -38,6 +38,7 @@ module ActiveModel
super
@_links = {}
@_include_data = true
@_meta = nil
end
def link(name, value = nil, &block)

View File

@ -1,5 +1,3 @@
require 'active_support/core_ext/module/delegation'
module ActiveModelSerializers
module Adapter
class JsonApi
@ -41,8 +39,7 @@ module ActiveModelSerializers
# 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 @@ module ActiveModelSerializers
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

View File

@ -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 @@ module ActiveModelSerializers
@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

View File

@ -42,7 +42,7 @@ module ActiveModelSerializers
end
def test_id_defined_on_fragmented
FragmentedSerializer.fragmented(WithDefinedIdSerializer.new(@author))
FragmentedSerializer.fragmented(WithDefinedIdSerializer.new(@model))
test_id(FragmentedSerializer, 'special_id')
end

View File

@ -2,6 +2,7 @@ require 'active_record'
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