Moved the adapter and adapter folder to active_model_serializers folder and changed the module namespace

Changed the namespace in adapters and folder to active_model_serializers from active_model::serializer

Changed namespace of adapters in serializers and other folders

Moved adapter_for_test file to active_model_serializers folder and changed namespace of adapter inside the test file

Require ActiveSupport's string/inflections

We depend on string/inflections to define String#underscore.

Refactor JsonApi adapter to avoid redundant computations.

Update readme.md to link to v0.10.0.rc4

changed namespace of adapter folder testcases

Changed all namespaces of adapter under active_moder_serializers

Namespaced IncludeTree which is from serializer module, so needed to namespace it properly

Fixed wrong namsepacing of fieldset

namespace change in deserializer json_api

Fixed the namespace for collection serializer when used inside adapter, changed namespace for adapter to new namespace which I had forgotten previously

Modified logging test and adapter test cases to make the testcases pass

Changed the yardoc links,as old links are not taking to documentation pages,proper links for 0.10,0.9 and 0.8 in rubydoc

Rubocop errors are fixed by underscore naming unused variables

Moved the require of adapter to serializable resource

Remoeved adapter dependency inside serializer and added warning to Serializer::adapter method

Fixed frament cache test which is calling Serializer.adapter

Changed the name of lookup_adapter_from_config to configured_adapter

Changed the docs which will show the new namespace of adapters

Rubocop fix

test/adapter/json/belongs_to_test.rb

@@ -1,45 +1,43 @@
 require 'test_helper'
 
-module ActiveModel
-  class Serializer
-    module Adapter
-      class Json
-        class BelongsToTest < ActiveSupport::TestCase
-          def setup
-            @post = Post.new(id: 42, title: 'New Post', body: 'Body')
-            @anonymous_post = Post.new(id: 43, title: 'Hello!!', body: 'Hello, world!!')
-            @comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
-            @post.comments = [@comment]
-            @anonymous_post.comments = []
-            @comment.post = @post
-            @comment.author = nil
-            @anonymous_post.author = nil
-            @blog = Blog.new(id: 1, name: 'My Blog!!')
-            @post.blog = @blog
-            @anonymous_post.blog = nil
+module ActiveModelSerializers
+  module Adapter
+    class Json
+      class BelongsToTest < ActiveSupport::TestCase
+        def setup
+          @post = Post.new(id: 42, title: 'New Post', body: 'Body')
+          @anonymous_post = Post.new(id: 43, title: 'Hello!!', body: 'Hello, world!!')
+          @comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
+          @post.comments = [@comment]
+          @anonymous_post.comments = []
+          @comment.post = @post
+          @comment.author = nil
+          @anonymous_post.author = nil
+          @blog = Blog.new(id: 1, name: 'My Blog!!')
+          @post.blog = @blog
+          @anonymous_post.blog = nil
 
-            @serializer = CommentSerializer.new(@comment)
-            @adapter = ActiveModel::Serializer::Adapter::Json.new(@serializer)
-            ActionController::Base.cache_store.clear
-          end
+          @serializer = CommentSerializer.new(@comment)
+          @adapter = ActiveModelSerializers::Adapter::Json.new(@serializer)
+          ActionController::Base.cache_store.clear
+        end
 
-          def test_includes_post
-            assert_equal({ id: 42, title: 'New Post', body: 'Body' }, @adapter.serializable_hash[:comment][:post])
-          end
+        def test_includes_post
+          assert_equal({ id: 42, title: 'New Post', body: 'Body' }, @adapter.serializable_hash[:comment][:post])
+        end
 
-          def test_include_nil_author
-            serializer = PostSerializer.new(@anonymous_post)
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+        def test_include_nil_author
+          serializer = PostSerializer.new(@anonymous_post)
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
 
-            assert_equal({ post: { title: 'Hello!!', body: 'Hello, world!!', id: 43, comments: [], blog: { id: 999, name: 'Custom blog' }, author: nil } }, adapter.serializable_hash)
-          end
+          assert_equal({ post: { title: 'Hello!!', body: 'Hello, world!!', id: 43, comments: [], blog: { id: 999, name: 'Custom blog' }, author: nil } }, adapter.serializable_hash)
+        end
 
-          def test_include_nil_author_with_specified_serializer
-            serializer = PostPreviewSerializer.new(@anonymous_post)
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+        def test_include_nil_author_with_specified_serializer
+          serializer = PostPreviewSerializer.new(@anonymous_post)
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
 
-            assert_equal({ post: { title: 'Hello!!', body: 'Hello, world!!', id: 43, comments: [], author: nil } }, adapter.serializable_hash)
-          end
+          assert_equal({ post: { title: 'Hello!!', body: 'Hello, world!!', id: 43, comments: [], author: nil } }, adapter.serializable_hash)
         end
       end
     end

test/adapter/json/collection_test.rb

@@ -1,90 +1,88 @@
 require 'test_helper'
 
-module ActiveModel
-  class Serializer
-    module Adapter
-      class Json
-        class Collection < ActiveSupport::TestCase
-          def setup
-            @author = Author.new(id: 1, name: 'Steve K.')
-            @first_post = Post.new(id: 1, title: 'Hello!!', body: 'Hello, world!!')
-            @second_post = Post.new(id: 2, title: 'New Post', body: 'Body')
-            @first_post.comments = []
-            @second_post.comments = []
-            @first_post.author = @author
-            @second_post.author = @author
-            @blog = Blog.new(id: 1, name: 'My Blog!!')
-            @first_post.blog = @blog
-            @second_post.blog = nil
+module ActiveModelSerializers
+  module Adapter
+    class Json
+      class Collection < ActiveSupport::TestCase
+        def setup
+          @author = Author.new(id: 1, name: 'Steve K.')
+          @first_post = Post.new(id: 1, title: 'Hello!!', body: 'Hello, world!!')
+          @second_post = Post.new(id: 2, title: 'New Post', body: 'Body')
+          @first_post.comments = []
+          @second_post.comments = []
+          @first_post.author = @author
+          @second_post.author = @author
+          @blog = Blog.new(id: 1, name: 'My Blog!!')
+          @first_post.blog = @blog
+          @second_post.blog = nil
 
-            ActionController::Base.cache_store.clear
-          end
+          ActionController::Base.cache_store.clear
+        end
 
-          def test_with_serializer_option
-            @blog.special_attribute = 'Special'
-            @blog.articles = [@first_post, @second_post]
-            serializer = CollectionSerializer.new([@blog], serializer: CustomBlogSerializer)
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+        def test_with_serializer_option
+          @blog.special_attribute = 'Special'
+          @blog.articles = [@first_post, @second_post]
+          serializer = ActiveModel::Serializer::CollectionSerializer.new([@blog], serializer: CustomBlogSerializer)
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
 
-            expected = { blogs: [{
+          expected = { blogs: [{
+            id: 1,
+            special_attribute: 'Special',
+            articles: [{ id: 1, title: 'Hello!!', body: 'Hello, world!!' }, { id: 2, title: 'New Post', body: 'Body' }]
+          }] }
+          assert_equal expected, adapter.serializable_hash
+        end
+
+        def test_include_multiple_posts
+          serializer = ActiveModel::Serializer::CollectionSerializer.new([@first_post, @second_post])
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
+
+          expected = { posts: [{
+            title: 'Hello!!',
+            body: 'Hello, world!!',
+            id: 1,
+            comments: [],
+            author: {
               id: 1,
-              special_attribute: 'Special',
-              articles: [{ id: 1, title: 'Hello!!', body: 'Hello, world!!' }, { id: 2, title: 'New Post', body: 'Body' }]
-            }] }
-            assert_equal expected, adapter.serializable_hash
-          end
-
-          def test_include_multiple_posts
-            serializer = CollectionSerializer.new([@first_post, @second_post])
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
-
-            expected = { posts: [{
-              title: 'Hello!!',
-              body: 'Hello, world!!',
+              name: 'Steve K.'
+            },
+            blog: {
+              id: 999,
+              name: 'Custom blog'
+            }
+          }, {
+            title: 'New Post',
+            body: 'Body',
+            id: 2,
+            comments: [],
+            author: {
               id: 1,
-              comments: [],
-              author: {
-                id: 1,
-                name: 'Steve K.'
-              },
-              blog: {
-                id: 999,
-                name: 'Custom blog'
-              }
-            }, {
-              title: 'New Post',
-              body: 'Body',
-              id: 2,
-              comments: [],
-              author: {
-                id: 1,
-                name: 'Steve K.'
-              },
-              blog: {
-                id: 999,
-                name: 'Custom blog'
-              }
-            }] }
-            assert_equal expected, adapter.serializable_hash
-          end
+              name: 'Steve K.'
+            },
+            blog: {
+              id: 999,
+              name: 'Custom blog'
+            }
+          }] }
+          assert_equal expected, adapter.serializable_hash
+        end
 
-          def test_root_is_underscored
-            virtual_value = VirtualValue.new(id: 1)
-            serializer = CollectionSerializer.new([virtual_value])
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+        def test_root_is_underscored
+          virtual_value = VirtualValue.new(id: 1)
+          serializer = ActiveModel::Serializer::CollectionSerializer.new([virtual_value])
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
 
-            assert_equal 1, adapter.serializable_hash[:virtual_values].length
-          end
+          assert_equal 1, adapter.serializable_hash[:virtual_values].length
+        end
 
-          def test_include_option
-            serializer = CollectionSerializer.new([@first_post, @second_post])
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer, include: '')
-            actual = adapter.serializable_hash
-            expected = { posts: [{ id: 1, title: 'Hello!!', body: 'Hello, world!!' },
-                                 { id: 2, title: 'New Post', body: 'Body' }] }
+        def test_include_option
+          serializer = ActiveModel::Serializer::CollectionSerializer.new([@first_post, @second_post])
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer, include: '')
+          actual = adapter.serializable_hash
+          expected = { posts: [{ id: 1, title: 'Hello!!', body: 'Hello, world!!' },
+                               { id: 2, title: 'New Post', body: 'Body' }] }
 
-            assert_equal(expected, actual)
-          end
+          assert_equal(expected, actual)
         end
       end
     end

test/adapter/json/has_many_test.rb

@@ -1,45 +1,43 @@
 require 'test_helper'
 
-module ActiveModel
-  class Serializer
-    module Adapter
-      class Json
-        class HasManyTestTest < ActiveSupport::TestCase
-          def setup
-            ActionController::Base.cache_store.clear
-            @author = Author.new(id: 1, name: 'Steve K.')
-            @post = Post.new(id: 42, title: 'New Post', body: 'Body')
-            @first_comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
-            @second_comment = Comment.new(id: 2, body: 'ZOMG ANOTHER COMMENT')
-            @post.comments = [@first_comment, @second_comment]
-            @post.author = @author
-            @first_comment.post = @post
-            @second_comment.post = @post
-            @blog = Blog.new(id: 1, name: 'My Blog!!')
-            @post.blog = @blog
-            @tag = Tag.new(id: 1, name: '#hash_tag')
-            @post.tags = [@tag]
-          end
+module ActiveModelSerializers
+  module Adapter
+    class Json
+      class HasManyTestTest < ActiveSupport::TestCase
+        def setup
+          ActionController::Base.cache_store.clear
+          @author = Author.new(id: 1, name: 'Steve K.')
+          @post = Post.new(id: 42, title: 'New Post', body: 'Body')
+          @first_comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
+          @second_comment = Comment.new(id: 2, body: 'ZOMG ANOTHER COMMENT')
+          @post.comments = [@first_comment, @second_comment]
+          @post.author = @author
+          @first_comment.post = @post
+          @second_comment.post = @post
+          @blog = Blog.new(id: 1, name: 'My Blog!!')
+          @post.blog = @blog
+          @tag = Tag.new(id: 1, name: '#hash_tag')
+          @post.tags = [@tag]
+        end
 
-          def test_has_many
-            serializer = PostSerializer.new(@post)
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
-            assert_equal([
-                           { id: 1, body: 'ZOMG A COMMENT' },
-                           { id: 2, body: 'ZOMG ANOTHER COMMENT' }
-                         ], adapter.serializable_hash[:post][:comments])
-          end
+        def test_has_many
+          serializer = PostSerializer.new(@post)
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
+          assert_equal([
+                         { id: 1, body: 'ZOMG A COMMENT' },
+                         { id: 2, body: 'ZOMG ANOTHER COMMENT' }
+                       ], adapter.serializable_hash[:post][:comments])
+        end
 
-          def test_has_many_with_no_serializer
-            serializer = PostWithTagsSerializer.new(@post)
-            adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
-            assert_equal({
-              id: 42,
-              tags: [
-                { 'id' => 1, 'name' => '#hash_tag' }
-              ]
-            }.to_json, adapter.serializable_hash[:post].to_json)
-          end
+        def test_has_many_with_no_serializer
+          serializer = PostWithTagsSerializer.new(@post)
+          adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
+          assert_equal({
+            id: 42,
+            tags: [
+              { 'id' => 1, 'name' => '#hash_tag' }
+            ]
+          }.to_json, adapter.serializable_hash[:post].to_json)
         end
       end
     end