rename simple adapter to json

This commit is contained in:
Tema Bolshakov 2014-08-29 11:01:39 +04:00
parent 3dd4928279
commit 6496b08464
7 changed files with 7 additions and 8 deletions

View File

@ -2,7 +2,7 @@ module ActiveModel
class Serializer
class Adapter
extend ActiveSupport::Autoload
autoload :SimpleAdapter
autoload :JsonAdapter
autoload :NullAdapter
autoload :JsonApiAdapter

View File

@ -1,7 +1,7 @@
module ActiveModel
class Serializer
class Adapter
class SimpleAdapter < Adapter
class JsonAdapter < Adapter
def serializable_hash(options = {})
serializer.attributes.each_with_object({}) do |(attr, value), h|
h[attr] = value

View File

@ -6,7 +6,7 @@ module ActiveModel
included do |base|
base.config.array_serializer = ActiveModel::Serializer::ArraySerializer
base.config.adapter = :simple
base.config.adapter = :json
end
end
end

View File

@ -1,7 +1,6 @@
require "active_model"
require "active_model/serializer/version"
require "active_model/serializer"
require "active_model/serializer/adapter/simple_adapter"
begin
require 'action_controller'

View File

@ -3,12 +3,12 @@ require 'test_helper'
module ActiveModel
class Serializer
class Adapter
class SimpleAdapterTest < Minitest::Test
class JsonAdapterTest < Minitest::Test
def setup
@profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
@profile_serializer = ProfileSerializer.new(@profile)
@adapter = SimpleAdapter.new(@profile_serializer)
@adapter = JsonAdapter.new(@profile_serializer)
end
def test_serializable_hash

View File

@ -11,7 +11,7 @@ module ActiveModel
def test_returns_default_adapter
adapter = ActiveModel::Serializer.adapter
assert_equal ActiveModel::Serializer::Adapter::SimpleAdapter, adapter
assert_equal ActiveModel::Serializer::Adapter::JsonAdapter, adapter
end
def test_overwrite_adapter_with_symbol

View File

@ -8,7 +8,7 @@ module ActiveModel
end
def test_adapter
assert_equal :simple, ActiveModel::Serializer.config.adapter
assert_equal :json, ActiveModel::Serializer.config.adapter
end
end
end