From e45e5a82b70d2e93bdea0eb80bd864b89906f33a Mon Sep 17 00:00:00 2001 From: Tema Bolshakov Date: Fri, 29 Aug 2014 11:40:56 +0400 Subject: [PATCH] Remove 'Adapter' suffix from adapters since they are in Adapter:: namespace --- lib/active_model/serializer.rb | 2 +- lib/active_model/serializer/adapter.rb | 6 +++--- .../serializer/adapter/{json_adapter.rb => json.rb} | 2 +- .../adapter/{json_api_adapter.rb => json_api.rb} | 2 +- .../serializer/adapter/{null_adapter.rb => null.rb} | 2 +- test/adapter/json_api/belongs_to_test.rb | 4 ++-- test/adapter/json_api/has_many.rb | 2 +- test/adapter/{json_adapter_test.rb => json_test.rb} | 2 +- test/adapter/{null_adapter_test.rb => null_test.rb} | 4 ++-- test/serializers/adapter_for_test.rb | 8 ++++---- 10 files changed, 17 insertions(+), 17 deletions(-) rename lib/active_model/serializer/adapter/{json_adapter.rb => json.rb} (88%) rename lib/active_model/serializer/adapter/{json_api_adapter.rb => json_api.rb} (96%) rename lib/active_model/serializer/adapter/{null_adapter.rb => null.rb} (81%) rename test/adapter/{json_adapter_test.rb => json_test.rb} (92%) rename test/adapter/{null_adapter_test.rb => null_test.rb} (84%) diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index 1bfdf825..0191a883 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -77,7 +77,7 @@ module ActiveModel def self.adapter adapter_class = case config.adapter when Symbol - class_name = "ActiveModel::Serializer::Adapter::#{config.adapter.to_s.classify}Adapter" + class_name = "ActiveModel::Serializer::Adapter::#{config.adapter.to_s.classify}" if Object.const_defined?(class_name) Object.const_get(class_name) end diff --git a/lib/active_model/serializer/adapter.rb b/lib/active_model/serializer/adapter.rb index 87da1223..2fae98ff 100644 --- a/lib/active_model/serializer/adapter.rb +++ b/lib/active_model/serializer/adapter.rb @@ -2,9 +2,9 @@ module ActiveModel class Serializer class Adapter extend ActiveSupport::Autoload - autoload :JsonAdapter - autoload :NullAdapter - autoload :JsonApiAdapter + autoload :Json + autoload :Null + autoload :JsonApi attr_reader :serializer diff --git a/lib/active_model/serializer/adapter/json_adapter.rb b/lib/active_model/serializer/adapter/json.rb similarity index 88% rename from lib/active_model/serializer/adapter/json_adapter.rb rename to lib/active_model/serializer/adapter/json.rb index 8aba1c69..68dba220 100644 --- a/lib/active_model/serializer/adapter/json_adapter.rb +++ b/lib/active_model/serializer/adapter/json.rb @@ -1,7 +1,7 @@ module ActiveModel class Serializer class Adapter - class JsonAdapter < Adapter + class Json < Adapter def serializable_hash(options = {}) serializer.attributes.each_with_object({}) do |(attr, value), h| h[attr] = value diff --git a/lib/active_model/serializer/adapter/json_api_adapter.rb b/lib/active_model/serializer/adapter/json_api.rb similarity index 96% rename from lib/active_model/serializer/adapter/json_api_adapter.rb rename to lib/active_model/serializer/adapter/json_api.rb index 0a5ce947..22b44f89 100644 --- a/lib/active_model/serializer/adapter/json_api_adapter.rb +++ b/lib/active_model/serializer/adapter/json_api.rb @@ -1,7 +1,7 @@ module ActiveModel class Serializer class Adapter - class JsonApiAdapter < Adapter + class JsonApi < Adapter def serializable_hash(options = {}) @hash = serializer.attributes diff --git a/lib/active_model/serializer/adapter/null_adapter.rb b/lib/active_model/serializer/adapter/null.rb similarity index 81% rename from lib/active_model/serializer/adapter/null_adapter.rb rename to lib/active_model/serializer/adapter/null.rb index 38dd0738..547c08ba 100644 --- a/lib/active_model/serializer/adapter/null_adapter.rb +++ b/lib/active_model/serializer/adapter/null.rb @@ -1,7 +1,7 @@ module ActiveModel class Serializer class Adapter - class NullAdapter < Adapter + class Null < Adapter def serializable_hash(options = {}) {} end diff --git a/test/adapter/json_api/belongs_to_test.rb b/test/adapter/json_api/belongs_to_test.rb index d4beddf9..151fd8cc 100644 --- a/test/adapter/json_api/belongs_to_test.rb +++ b/test/adapter/json_api/belongs_to_test.rb @@ -3,7 +3,7 @@ require 'test_helper' module ActiveModel class Serializer class Adapter - class JsonApiAdapter + class JsonApi class BelongsToTest < Minitest::Test def setup @post = Post.new(id: 42, title: 'New Post', body: 'Body') @@ -12,7 +12,7 @@ module ActiveModel @comment.post = @post @serializer = CommentSerializer.new(@comment) - @adapter = ActiveModel::Serializer::Adapter::JsonApiAdapter.new(@serializer) + @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer) end def test_includes_post_id diff --git a/test/adapter/json_api/has_many.rb b/test/adapter/json_api/has_many.rb index d9377a82..ad8c3c2f 100644 --- a/test/adapter/json_api/has_many.rb +++ b/test/adapter/json_api/has_many.rb @@ -3,7 +3,7 @@ require 'test_helper' module ActiveModel class Serializer class Adapter - class JsonApiAdapter + class JsonApi class HasManyTest < Minitest::Test def setup @post = Post.new(title: 'New Post', body: 'Body') diff --git a/test/adapter/json_adapter_test.rb b/test/adapter/json_test.rb similarity index 92% rename from test/adapter/json_adapter_test.rb rename to test/adapter/json_test.rb index b4dfa373..f8e753da 100644 --- a/test/adapter/json_adapter_test.rb +++ b/test/adapter/json_test.rb @@ -8,7 +8,7 @@ module ActiveModel @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }) @profile_serializer = ProfileSerializer.new(@profile) - @adapter = JsonAdapter.new(@profile_serializer) + @adapter = Json.new(@profile_serializer) end def test_serializable_hash diff --git a/test/adapter/null_adapter_test.rb b/test/adapter/null_test.rb similarity index 84% rename from test/adapter/null_adapter_test.rb rename to test/adapter/null_test.rb index 717d7f79..9f23b778 100644 --- a/test/adapter/null_adapter_test.rb +++ b/test/adapter/null_test.rb @@ -3,12 +3,12 @@ require 'test_helper' module ActiveModel class Serializer class Adapter - class NullAdapterTest < Minitest::Test + class NullTest < Minitest::Test def setup profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }) serializer = ProfileSerializer.new(profile) - @adapter = NullAdapter.new(serializer) + @adapter = Null.new(serializer) end def test_serializable_hash diff --git a/test/serializers/adapter_for_test.rb b/test/serializers/adapter_for_test.rb index 651e511a..60641080 100644 --- a/test/serializers/adapter_for_test.rb +++ b/test/serializers/adapter_for_test.rb @@ -11,23 +11,23 @@ module ActiveModel def test_returns_default_adapter adapter = ActiveModel::Serializer.adapter - assert_equal ActiveModel::Serializer::Adapter::JsonAdapter, adapter + assert_equal ActiveModel::Serializer::Adapter::Json, adapter end def test_overwrite_adapter_with_symbol ActiveModel::Serializer.config.adapter = :null adapter = ActiveModel::Serializer.adapter - assert_equal ActiveModel::Serializer::Adapter::NullAdapter, adapter + assert_equal ActiveModel::Serializer::Adapter::Null, adapter ensure end def test_overwrite_adapter_with_class - ActiveModel::Serializer.config.adapter = ActiveModel::Serializer::Adapter::NullAdapter + ActiveModel::Serializer.config.adapter = ActiveModel::Serializer::Adapter::Null adapter = ActiveModel::Serializer.adapter - assert_equal ActiveModel::Serializer::Adapter::NullAdapter, adapter + assert_equal ActiveModel::Serializer::Adapter::Null, adapter end def test_raises_exception_if_invalid_symbol_given