cheap_ams 0.10.5 → 0.10.6

data/test/adapter/json_api/linked_test.rb

@@ -53,94 +53,94 @@ module ActiveModel
             expected = {
               data: [
                 {
-                  id: "10",
-                  type: "posts",
+                  id: '10',
+                  type: 'posts',
                   attributes: {
-                    title: "Hello!!",
-                    body: "Hello, world!!"
+                    title: 'Hello!!',
+                    body: 'Hello, world!!'
                   },
                   relationships: {
-                    comments: { data: [ { type: "comments", id: '1' }, { type: "comments", id: '2' } ] },
-                    blog: { data: { type: "blogs", id: "999" } },
-                    author: { data: { type: "authors", id: "1" } }
+                    comments: { data: [{ type: 'comments', id: '1' }, { type: 'comments', id: '2' }] },
+                    blog: { data: { type: 'blogs', id: '999' } },
+                    author: { data: { type: 'authors', id: '1' } }
                   }
                 },
                 {
-                  id: "20",
-                  type: "posts",
+                  id: '20',
+                  type: 'posts',
                   attributes: {
-                    title: "New Post",
-                    body: "Body"
+                    title: 'New Post',
+                    body: 'Body'
                   },
                   relationships: {
                     comments: { data: [] },
-                    blog: { data: { type: "blogs", id: "999" } },
-                    author: { data: { type: "authors", id: "2" } }
+                    blog: { data: { type: 'blogs', id: '999' } },
+                    author: { data: { type: 'authors', id: '2' } }
                   }
                 }
               ],
               included: [
                 {
-                  id: "1",
-                  type: "comments",
+                  id: '1',
+                  type: 'comments',
                   attributes: {
-                    body: "ZOMG A COMMENT"
+                    body: 'ZOMG A COMMENT'
                   },
                   relationships: {
-                    post: { data: { type: "posts", id: "10" } },
+                    post: { data: { type: 'posts', id: '10' } },
                     author: { data: nil }
                   }
                 }, {
-                  id: "2",
-                  type: "comments",
+                  id: '2',
+                  type: 'comments',
                   attributes: {
-                    body: "ZOMG ANOTHER COMMENT",
+                    body: 'ZOMG ANOTHER COMMENT',
                   },
                   relationships: {
-                    post: { data: { type: "posts", id: "10" } },
+                    post: { data: { type: 'posts', id: '10' } },
                     author: { data: nil }
                   }
                 }, {
-                  id: "1",
-                  type: "authors",
+                  id: '1',
+                  type: 'authors',
                   attributes: {
-                    name: "Steve K."
+                    name: 'Steve K.'
                   },
                   relationships: {
-                    posts: { data: [ { type: "posts", id: "10" }, { type: "posts", id: "30" } ] },
+                    posts: { data: [{ type: 'posts', id: '10' }, { type: 'posts', id: '30' }] },
                     roles: { data: [] },
-                    bio: { data: { type: "bios", id: "1" } }
+                    bio: { data: { type: 'bios', id: '1' } }
                   }
                 }, {
-                  id: "1",
-                  type: "bios",
+                  id: '1',
+                  type: 'bios',
                   attributes: {
-                    content: "AMS Contributor",
+                    content: 'AMS Contributor',
                     rating: nil
                   },
                   relationships: {
-                    author: { data: { type: "authors", id: "1" } }
+                    author: { data: { type: 'authors', id: '1' } }
                   }
                 }, {
-                  id: "2",
-                  type: "authors",
+                  id: '2',
+                  type: 'authors',
                   attributes: {
-                    name: "Tenderlove"
+                    name: 'Tenderlove'
                   },
                   relationships: {
-                    posts: { data: [ { type: "posts", id:"20" } ] },
+                    posts: { data: [{ type: 'posts', id: '20' }] },
                     roles: { data: [] },
-                    bio: { data: { type: "bios", id: "2" } }
+                    bio: { data: { type: 'bios', id: '2' } }
                   }
                 }, {
-                  id: "2",
-                  type: "bios",
+                  id: '2',
+                  type: 'bios',
                   attributes: {
                     rating: nil,
-                    content: "Rails Contributor",
+                    content: 'Rails Contributor',
                   },
                   relationships: {
-                    author: { data: { type: "authors", id: "2" } }
+                    author: { data: { type: 'authors', id: '2' } }
                   }
                 }
               ]
@@ -162,39 +162,39 @@ module ActiveModel
 
             expected = [
               {
-                id: "1",
-                type: "authors",
+                id: '1',
+                type: 'authors',
                 attributes: {
-                  name: "Steve K."
+                  name: 'Steve K.'
                 },
                 relationships: {
-                  posts: { data: [ { type: "posts", id: "10"}, { type: "posts", id: "30" }] },
+                  posts: { data: [{ type: 'posts', id: '10' }, { type: 'posts', id: '30' }] },
                   roles: { data: [] },
-                  bio: { data: { type: "bios", id: "1" }}
+                  bio: { data: { type: 'bios', id: '1' } }
                 }
               }, {
-                id: "10",
-                type: "posts",
+                id: '10',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!",
-                  body: "Hello, world!!"
+                  title: 'Hello!!',
+                  body: 'Hello, world!!'
                 },
                 relationships: {
-                  comments: { data: [ { type: "comments", id: "1"}, { type: "comments", id: "2" }] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  comments: { data: [{ type: 'comments', id: '1' }, { type: 'comments', id: '2' }] },
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               }, {
-                id: "30",
-                type: "posts",
+                id: '30',
+                type: 'posts',
                 attributes: {
-                  title: "Yet Another Post",
-                  body: "Body"
+                  title: 'Yet Another Post',
+                  body: 'Body'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               }
             ]
@@ -229,21 +229,21 @@ module ActiveModel
 
             expected = [
               {
-                id: "10",
-                type: "posts",
+                id: '10',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!",
-                  body: "Hello, world!!"
+                  title: 'Hello!!',
+                  body: 'Hello, world!!'
                 },
                 relationships: {
                   comments: {
-                    data: [{type: "comments", id: "1"}, {type: "comments", id: "2"}]
+                    data: [{ type: 'comments', id: '1' }, { type: 'comments', id: '2' }]
                   },
                   blog: {
-                    data: {type: "blogs", id: "999"}
+                    data: { type: 'blogs', id: '999' }
                   },
                   author: {
-                    data: {type: "authors", id: "1"}
+                    data: { type: 'authors', id: '1' }
                   }
                 }
               }
@@ -262,14 +262,14 @@ module ActiveModel
 
             expected = {
               data: {
-                id: "10",
-                type: "posts",
+                id: '10',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!",
-                  body: "Hello, world!!"
+                  title: 'Hello!!',
+                  body: 'Hello, world!!'
                 },
                 relationships: {
-                  comments: { data: [ { type: "comments", id: '1' }, { type: "comments", id: '2' } ] },
+                  comments: { data: [{ type: 'comments', id: '1' }, { type: 'comments', id: '2' }] },
                   author: { data: nil }
                 }
               }

data/test/adapter/json_api/pagination_links_test.rb

@@ -20,9 +20,9 @@ module ActiveModel
             ]
           end
 
-          def mock_request(query_parameters={}, original_url=URI)
+          def mock_request(query_parameters = {}, original_url = URI)
             context = Minitest::Mock.new
-            context.expect(:original_url, original_url )
+            context.expect(:original_url, original_url)
             context.expect(:query_parameters, query_parameters)
             @options = {}
             @options[:context] = context
@@ -42,17 +42,17 @@ module ActiveModel
           end
 
           def data
-            { data:[
-                { id:"1", type:"profiles", attributes:{name:"Name 1", description:"Description 1" } },
-                { id:"2", type:"profiles", attributes:{name:"Name 2", description:"Description 2" } },
-                { id:"3", type:"profiles", attributes:{name:"Name 3", description:"Description 3" } }
+            { data: [
+                { id: '1', type: 'profiles', attributes: { name: 'Name 1', description: 'Description 1' } },
+                { id: '2', type: 'profiles', attributes: { name: 'Name 2', description: 'Description 2' } },
+                { id: '3', type: 'profiles', attributes: { name: 'Name 3', description: 'Description 3' } }
               ]
             }
           end
 
           def links
             {
-              links:{
+              links: {
                 self: "#{URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1",
                 first: "#{URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
                 prev: "#{URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
@@ -74,7 +74,7 @@ module ActiveModel
           end
 
           def expected_response_with_pagination_links_and_additional_params
-            new_links = links[:links].each_with_object({}) {|(key, value), hash| hash[key] = "#{value}&test=test" }
+            new_links = links[:links].each_with_object({}) { |(key, value), hash| hash[key] = "#{value}&test=test" }
             {}.tap do |hash|
               hash[:data] = [data.values.flatten.second]
               hash.merge! links: new_links

data/test/adapter/json_api/resource_type_config_test.rb

@@ -21,35 +21,35 @@ module ActiveModel
             @comment.author = nil
             @post.author = @author
             @anonymous_post.author = nil
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @blog.writer = @author
             @blog.articles = [@post, @anonymous_post]
             @author.posts = []
           end
 
           def with_jsonapi_resource_type type
-            old_type = ActiveModel::Serializer.config[:jsonapi_resource_type]
-            ActiveModel::Serializer.config[:jsonapi_resource_type] = type
+            old_type = ActiveModel::Serializer.config.jsonapi_resource_type
+            ActiveModel::Serializer.config.jsonapi_resource_type = type
             yield
           ensure
-            ActiveModel::Serializer.config[:jsonapi_resource_type] = old_type
+            ActiveModel::Serializer.config.jsonapi_resource_type = old_type
           end
 
           def test_config_plural
-            with_jsonapi_resource_type :plural do
-              serializer = CommentSerializer.new(@comment)
-              adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
-              ActionController::Base.cache_store.clear
-              assert_equal('comments', adapter.serializable_hash[:data][:type])
+            with_adapter :json_api do
+              with_jsonapi_resource_type :plural do
+                hash = ActiveModel::SerializableResource.new(@comment).serializable_hash
+                assert_equal('comments', hash[:data][:type])
+              end
             end
           end
 
           def test_config_singular
-            with_jsonapi_resource_type :singular do
-              serializer = CommentSerializer.new(@comment)
-              adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
-              ActionController::Base.cache_store.clear
-              assert_equal('comment', adapter.serializable_hash[:data][:type])
+            with_adapter :json_api do
+              with_jsonapi_resource_type :singular do
+                hash = ActiveModel::SerializableResource.new(@comment).serializable_hash
+                assert_equal('comment', hash[:data][:type])
+              end
             end
           end
         end

data/test/adapter/json_test.rb

@@ -14,7 +14,7 @@ module ActiveModel
           @first_comment.post = @post
           @second_comment.post = @post
           @post.author = @author
-          @blog = Blog.new(id: 1, name: "My Blog!!")
+          @blog = Blog.new(id: 1, name: 'My Blog!!')
           @post.blog = @blog
 
           @serializer = PostSerializer.new(@post)
@@ -23,8 +23,8 @@ module ActiveModel
 
         def test_has_many
           assert_equal([
-                         {id: 1, body: 'ZOMG A COMMENT'},
-                         {id: 2, body: 'ZOMG ANOTHER COMMENT'}
+                         { id: 1, body: 'ZOMG A COMMENT' },
+                         { id: 2, body: 'ZOMG ANOTHER COMMENT' }
                        ], @adapter.serializable_hash[:post][:comments])
         end
 
@@ -34,11 +34,11 @@ module ActiveModel
 
           assert_equal({
             id: 1,
-            reviews: [{id: 1, body: "ZOMG A COMMENT"},
-                      {id: 2, body: "ZOMG ANOTHER COMMENT"}
+            reviews: [{ id: 1, body: 'ZOMG A COMMENT' },
+                      { id: 2, body: 'ZOMG ANOTHER COMMENT' }
                     ],
-            writer: {id: 1, name: "Steve K."},
-            site: {id: 1, name: "My Blog!!"}
+            writer: { id: 1, name: 'Steve K.' },
+            site: { id: 1, name: 'My Blog!!' }
             }, adapter.serializable_hash[:post])
         end
       end

data/test/adapter_test.rb

@@ -35,12 +35,12 @@ module ActiveModel
       end
 
       def test_create_adapter_with_override
-        adapter = ActiveModel::Serializer::Adapter.create(@serializer, { adapter: :json_api})
+        adapter = ActiveModel::Serializer::Adapter.create(@serializer, { adapter: :json_api })
         assert_equal ActiveModel::Serializer::Adapter::JsonApi, adapter.class
       end
 
       def test_inflected_adapter_class_for_known_adapter
-        ActiveSupport::Inflector.inflections(:en){|inflect| inflect.acronym 'API' }
+        ActiveSupport::Inflector.inflections(:en) { |inflect| inflect.acronym 'API' }
         klass = ActiveModel::Serializer::Adapter.adapter_class(:json_api)
 
         ActiveSupport::Inflector.inflections.acronyms.clear

data/test/array_serializer_test.rb

@@ -7,14 +7,18 @@ module ActiveModel
         @comment = Comment.new
         @post = Post.new
         @resource = build_named_collection @comment, @post
-        @serializer = ArraySerializer.new(@resource, {some: :options})
+        @serializer = ArraySerializer.new(@resource, { some: :options })
       end
 
       def build_named_collection(*resource)
-        resource.define_singleton_method(:name){ 'MeResource' }
+        resource.define_singleton_method(:name) { 'MeResource' }
         resource
       end
 
+      def test_has_object_reader_serializer_interface
+        assert_equal @serializer.object, @resource
+      end
+
       def test_respond_to_each
         assert_respond_to @serializer, :each
       end
@@ -32,17 +36,17 @@ module ActiveModel
       end
 
       def test_serializer_option_not_passed_to_each_serializer
-        serializers = ArraySerializer.new([@post], {serializer: PostSerializer}).to_a
+        serializers = ArraySerializer.new([@post], { serializer: PostSerializer }).to_a
 
         refute serializers.first.custom_options.key?(:serializer)
       end
 
       def test_meta_and_meta_key_attr_readers
-        meta_content = {meta: "the meta", meta_key: "the meta key"}
+        meta_content = { meta: 'the meta', meta_key: 'the meta key' }
         @serializer = ArraySerializer.new([@comment, @post], meta_content)
 
-        assert_equal @serializer.meta, "the meta"
-        assert_equal @serializer.meta_key, "the meta key"
+        assert_equal @serializer.meta, 'the meta'
+        assert_equal @serializer.meta_key, 'the meta key'
       end
 
       def test_root_default
@@ -73,7 +77,7 @@ module ActiveModel
 
       def test_json_key_with_resource_with_nil_name_and_no_serializers
         resource = []
-        resource.define_singleton_method(:name){ nil }
+        resource.define_singleton_method(:name) { nil }
         serializer = ArraySerializer.new(resource)
         assert_equal serializer.json_key, nil
       end

data/test/capture_warnings.rb

@@ -1,15 +1,15 @@
 # https://raw.githubusercontent.com/metric_fu/metric_fu/master/spec/capture_warnings.rb
-require "tempfile"
-require "fileutils"
+require 'tempfile'
+require 'fileutils'
 
 class CaptureWarnings
   def initialize(fail_on_warnings = true)
     @fail_on_warnings = fail_on_warnings
-    @stderr_file = Tempfile.new("app.stderr")
+    @stderr_file = Tempfile.new('app.stderr')
     @app_root ||= Dir.pwd
-    @output_dir = File.join(app_root, "tmp")
+    @output_dir = File.join(app_root, 'tmp')
     FileUtils.mkdir_p(output_dir)
-    @bundle_dir = File.join(app_root, "bundle")
+    @bundle_dir = File.join(app_root, 'bundle')
   end
 
   def before_tests
@@ -40,9 +40,9 @@ class CaptureWarnings
     end
 
     if other_warnings.any?
-      File.write(File.join(output_dir, "warnings.txt"), other_warnings.join("\n") << "\n")
+      File.write(File.join(output_dir, 'warnings.txt'), other_warnings.join("\n") << "\n")
       puts
-      puts "Non-app warnings written to tmp/warnings.txt"
+      puts 'Non-app warnings written to tmp/warnings.txt'
       puts
     end
 
@@ -53,5 +53,6 @@ class CaptureWarnings
   end
 
   private
+
   attr_reader :stderr_file, :app_root, :output_dir, :bundle_dir, :fail_on_warnings
 end

data/test/fixtures/active_record.rb

@@ -40,7 +40,6 @@ module ARModels
 
     has_many :comments
     belongs_to :author
-    url :comments
   end
 
   class CommentSerializer < ActiveModel::Serializer

data/test/fixtures/poro.rb

@@ -7,7 +7,7 @@ class Model
     @_model_name ||= ActiveModel::Name.new(self)
   end
 
-  def initialize(hash={})
+  def initialize(hash = {})
     @attributes = hash
   end
 
@@ -59,8 +59,6 @@ end
 class ProfileSerializer < ActiveModel::Serializer
   attributes :name, :description
 
-  urls :posts, :comments
-
   def arguments_passed_in?
     options[:my_options] == :accessible
   end
@@ -68,8 +66,6 @@ end
 
 class ProfilePreviewSerializer < ActiveModel::Serializer
   attributes :name
-
-  urls :posts, :comments
 end
 
 Post     = Class.new(Model)
@@ -83,7 +79,7 @@ Location = Class.new(Model)
 Place    = Class.new(Model)
 Tag      = Class.new(Model)
 VirtualValue = Class.new(Model)
-Comment  = Class.new(Model) do
+Comment = Class.new(Model) do
   # Uses a custom non-time-based cache key
   def cache_key
     "#{self.class.name.downcase}/#{self.id}"
@@ -94,16 +90,15 @@ module Spam; end
 Spam::UnrelatedLink = Class.new(Model)
 
 PostSerializer = Class.new(ActiveModel::Serializer) do
-  cache key:'post', expires_in: 0.1, skip_digest: true
+  cache key: 'post', expires_in: 0.1, skip_digest: true
   attributes :id, :title, :body
 
   has_many :comments
   belongs_to :blog
   belongs_to :author
-  url :comments
 
   def blog
-    Blog.new(id: 999, name: "Custom blog")
+    Blog.new(id: 999, name: 'Custom blog')
   end
 
   def custom_options
@@ -133,7 +128,7 @@ CommentSerializer = Class.new(ActiveModel::Serializer) do
 end
 
 AuthorSerializer = Class.new(ActiveModel::Serializer) do
-  cache key:'writer', skip_digest: true
+  cache key: 'writer', skip_digest: true
   attribute :id
   attribute :name
 
@@ -249,8 +244,8 @@ end
 VirtualValueSerializer = Class.new(ActiveModel::Serializer) do
   attributes :id
 
-  has_many :reviews, virtual_value: [{id: 1}, {id: 2}]
-  has_one :maker, virtual_value: {id: 1}
+  has_many :reviews, virtual_value: [{ id: 1 }, { id: 2 }]
+  has_one :maker, virtual_value: { id: 1 }
 
   def reviews
   end

data/test/generators/scaffold_controller_generator_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-# require 'active_model/serializer/railtie'
 
 class ResourceGeneratorTest < Rails::Generators::TestCase
   destination File.expand_path('../../../tmp/generators', __FILE__)
@@ -19,6 +18,6 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
   def copy_routes
     config_dir = File.join(destination_root, 'config')
     FileUtils.mkdir_p(config_dir)
-    File.write(File.join(config_dir, 'routes.rb'), 'Rails.application.routes.draw { }')
+    File.write(File.join(config_dir, 'routes.rb'), 'Rails.application.routes.draw {}')
   end
 end

data/test/generators/serializer_generator_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'generators/serializer/serializer_generator'
 
 class SerializerGeneratorTest < Rails::Generators::TestCase
-  destination File.expand_path("../../../tmp/generators", __FILE__)
+  destination File.expand_path('../../../tmp/generators', __FILE__)
   setup :prepare_destination
 
   tests Rails::Generators::SerializerGenerator
@@ -10,33 +10,33 @@ class SerializerGeneratorTest < Rails::Generators::TestCase
 
   def test_generates_a_serializer
     run_generator
-    assert_file "app/serializers/account_serializer.rb", /class AccountSerializer < ActiveModel::Serializer/
+    assert_file 'app/serializers/account_serializer.rb', /class AccountSerializer < ActiveModel::Serializer/
   end
 
   def test_generates_a_namespaced_serializer
-    run_generator ["admin/account"]
-    assert_file "app/serializers/admin/account_serializer.rb", /class Admin::AccountSerializer < ActiveModel::Serializer/
+    run_generator ['admin/account']
+    assert_file 'app/serializers/admin/account_serializer.rb', /class Admin::AccountSerializer < ActiveModel::Serializer/
   end
 
   def test_uses_application_serializer_if_one_exists
     Object.const_set(:ApplicationSerializer, Class.new)
     run_generator
-    assert_file "app/serializers/account_serializer.rb", /class AccountSerializer < ApplicationSerializer/
+    assert_file 'app/serializers/account_serializer.rb', /class AccountSerializer < ApplicationSerializer/
   ensure
     Object.send :remove_const, :ApplicationSerializer
   end
 
   def test_uses_given_parent
     Object.const_set(:ApplicationSerializer, Class.new)
-    run_generator ["Account", "--parent=MySerializer"]
-    assert_file "app/serializers/account_serializer.rb", /class AccountSerializer < MySerializer/
+    run_generator ['Account', '--parent=MySerializer']
+    assert_file 'app/serializers/account_serializer.rb', /class AccountSerializer < MySerializer/
   ensure
     Object.send :remove_const, :ApplicationSerializer
   end
 
   def test_generates_attributes_and_associations
     run_generator
-    assert_file "app/serializers/account_serializer.rb" do |serializer|
+    assert_file 'app/serializers/account_serializer.rb' do |serializer|
       assert_match(/^  attributes :id, :name, :description$/, serializer)
       assert_match(/^  has_one :business$/, serializer)
       assert_match(/^end\n*\z/, serializer)
@@ -44,8 +44,8 @@ class SerializerGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_with_no_attributes_does_not_add_extra_space
-    run_generator ["account"]
-    assert_file "app/serializers/account_serializer.rb" do |content|
+    run_generator ['account']
+    assert_file 'app/serializers/account_serializer.rb' do |content|
       if RUBY_PLATFORM =~ /mingw/
         assert_no_match(/\r\n\r\nend/, content)
       else