active_model_serializers 0.10.0 → 0.10.5

data/test/adapter/json_test.rb

@@ -32,13 +32,14 @@ module ActiveModelSerializers
         adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
 
         assert_equal({
-          id: 1,
-          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!!' }
-          }, adapter.serializable_hash[:post])
+                       id: 1,
+                       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!!' }
+                     }, adapter.serializable_hash[:post])
       end
     end
   end

data/test/adapter/null_test.rb

@@ -4,7 +4,7 @@ module ActiveModelSerializers
   module Adapter
     class NullTest < ActiveSupport::TestCase
       def setup
-        profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
+        profile = Profile.new(name: 'Name 1', description: 'Description 1', comments: 'Comments 1')
         serializer = ProfileSerializer.new(profile)
 
         @adapter = Null.new(serializer)
@@ -20,4 +20,3 @@ module ActiveModelSerializers
     end
   end
 end
-

data/test/adapter/polymorphic_test.rb

@@ -27,11 +27,11 @@ module ActiveModel
               id: 1,
               title: 'headshot-1.jpg',
               imageable: {
-                  type: 'employee',
-                  employee: {
-                    id: 42,
-                    name: 'Zoop Zoopler'
-                  }
+                type: 'employee',
+                employee: {
+                  id: 42,
+                  name: 'Zoop Zoopler'
+                }
               }
             }
 

data/test/adapter_test.rb

@@ -51,7 +51,7 @@ module ActiveModelSerializers
     end
 
     def test_create_adapter_with_override
-      adapter = ActiveModelSerializers::Adapter.create(@serializer, { adapter: :json_api })
+      adapter = ActiveModelSerializers::Adapter.create(@serializer, adapter: :json_api)
       assert_equal ActiveModelSerializers::Adapter::JsonApi, adapter.class
     end
 

data/test/benchmark/app.rb

@@ -43,7 +43,7 @@ class BenchmarkApp < Rails::Application
   config.secret_key_base = 'abc123'
   config.consider_all_requests_local = false
 
-  # otherwise deadlock occured
+  # otherwise deadlock occurred
   config.middleware.delete 'Rack::Lock'
 
   # to disable log files

data/test/benchmark/benchmarking_support.rb

@@ -36,7 +36,7 @@ module Benchmark
         version: ::ActiveModel::Serializer::VERSION.to_s,
         rails_version: ::Rails.version.to_s,
         iterations_per_second: entry.ips,
-        iterations_per_second_standard_deviation: entry.stddev_percentage,
+        iterations_per_second_standard_deviation: entry.error_percentage,
         total_allocated_objects_per_iteration: count_total_allocated_objects(&block)
       }.to_json
 

data/test/benchmark/bm_active_record.rb

@@ -0,0 +1,81 @@
+require_relative './benchmarking_support'
+require_relative './app'
+
+time = 10
+disable_gc = true
+
+# This is to disable any key transform effects that may impact performance
+ActiveModelSerializers.config.key_transform = :unaltered
+
+###########################################
+# Setup active record models
+##########################################
+require 'active_record'
+require 'sqlite3'
+
+# For debugging SQL output
+# ActiveRecord::Base.logger = Logger.new(STDERR)
+
+# Change the following to reflect your database settings
+ActiveRecord::Base.establish_connection(
+  adapter: 'sqlite3',
+  database: ':memory:'
+)
+
+# Don't show migration output when constructing fake db
+ActiveRecord::Migration.verbose = false
+
+ActiveRecord::Schema.define do
+  create_table :authors, force: true do |t|
+    t.string :name
+  end
+
+  create_table :posts, force: true do |t|
+    t.text :body
+    t.string :title
+    t.references :author
+  end
+
+  create_table :profiles, force: true do |t|
+    t.text :project_url
+    t.text :bio
+    t.date :birthday
+    t.references :author
+  end
+end
+
+class Author < ActiveRecord::Base
+  has_one :profile
+  has_many :posts
+end
+
+class Post < ActiveRecord::Base
+  belongs_to :author
+end
+
+class Profile < ActiveRecord::Base
+  belongs_to :author
+end
+
+# Build out the data to serialize
+author = Author.create(name: 'Preston Sego')
+Profile.create(project_url: 'https://github.com/NullVoxPopuli', author: author)
+50.times do
+  Post.create(
+    body: 'something about how password restrictions are evil, and less secure, and with the math to prove it.',
+    title: 'Your bank is does not know how to do security',
+    author: author
+  )
+end
+
+Benchmark.ams('AR: attributes', time: time, disable_gc: disable_gc) do
+  ActiveModelSerializers::SerializableResource.new(author, adapter: :attributes, include: 'profile,posts').serializable_hash
+end
+
+Benchmark.ams('AR: json', time: time, disable_gc: disable_gc) do
+  ActiveModelSerializers::SerializableResource.new(author, adapter: :json, include: 'profile,posts').serializable_hash
+end
+
+Benchmark.ams('AR: JSON API', time: time, disable_gc: disable_gc) do
+  ActiveModelSerializers::SerializableResource.new(author, adapter: :json_api, include: 'profile,posts').serializable_hash
+end

data/test/benchmark/bm_adapter.rb

@@ -0,0 +1,38 @@
+require_relative './benchmarking_support'
+require_relative './app'
+
+time = 10
+disable_gc = true
+ActiveModelSerializers.config.key_transform = :unaltered
+has_many_relationships = (0..60).map do |i|
+  HasManyRelationship.new(id: i, body: 'ZOMG A HAS MANY RELATIONSHIP')
+end
+has_one_relationship = HasOneRelationship.new(
+  id: 42,
+  first_name: 'Joao',
+  last_name: 'Moura'
+)
+primary_resource = PrimaryResource.new(
+  id: 1337,
+  title: 'New PrimaryResource',
+  virtual_attribute: nil,
+  body: 'Body',
+  has_many_relationships: has_many_relationships,
+  has_one_relationship: has_one_relationship
+)
+serializer = PrimaryResourceSerializer.new(primary_resource)
+
+Benchmark.ams('attributes', time: time, disable_gc: disable_gc) do
+  attributes = ActiveModelSerializers::Adapter::Attributes.new(serializer)
+  attributes.as_json
+end
+
+Benchmark.ams('json_api', time: time, disable_gc: disable_gc) do
+  json_api = ActiveModelSerializers::Adapter::JsonApi.new(serializer)
+  json_api.as_json
+end
+
+Benchmark.ams('json', time: time, disable_gc: disable_gc) do
+  json = ActiveModelSerializers::Adapter::Json.new(serializer)
+  json.as_json
+end

data/test/benchmark/bm_caching.rb

@@ -4,7 +4,7 @@ require_relative './app'
 # https://github.com/ruby-bench/ruby-bench-suite/blob/8ad567f7e43a044ae48c36833218423bb1e2bd9d/rails/benchmarks/actionpack_router.rb
 class ApiAssertion
   include Benchmark::ActiveModelSerializers::TestMethods
-  BadRevisionError = Class.new(StandardError)
+  class BadRevisionError < StandardError; end
 
   def valid?
     caching = get_caching
@@ -66,27 +66,27 @@ class ApiAssertion
   def expected
     @expected ||=
       {
-        'post' =>  {
-          'id' =>  1337,
-          'title' => 'New Post',
+        'primary_resource' => {
+          'id' => 1337,
+          'title' => 'New PrimaryResource',
           'body' =>  'Body',
-          'comments' => [
-            {
-              'id' => 1,
-              'body' => 'ZOMG A COMMENT'
-            }
-          ],
-          'blog' =>  {
-            'id' =>  999,
-            'name' => 'Custom blog'
+          'virtual_attribute' => {
+            'id' => 999,
+            'name' => 'Free-Range Virtual Attribute'
           },
-          'author' => {
+          'has_one_relationship' => {
             'id' => 42,
             'first_name' => 'Joao',
             'last_name' => 'Moura'
-          }
+          },
+          'has_many_relationships' => [
+            {
+              'id' => 1,
+              'body' => 'ZOMG A HAS MANY RELATIONSHIP'
+            }
+          ]
         }
-    }
+      }
   end
 
   def assert_equal(expected, actual, message)

data/test/benchmark/bm_lookup_chain.rb

@@ -0,0 +1,83 @@
+require_relative './benchmarking_support'
+require_relative './app'
+
+time = 10
+disable_gc = true
+ActiveModelSerializers.config.key_transform = :unaltered
+
+module AmsBench
+  module Api
+    module V1
+      class PrimaryResourceSerializer < ActiveModel::Serializer
+        attributes :title, :body
+
+        has_many :has_many_relationships
+      end
+
+      class HasManyRelationshipSerializer < ActiveModel::Serializer
+        attribute :body
+      end
+    end
+  end
+  class PrimaryResourceSerializer < ActiveModel::Serializer
+    attributes :title, :body
+
+    has_many :has_many_relationships
+
+    class HasManyRelationshipSerializer < ActiveModel::Serializer
+      attribute :body
+    end
+  end
+end
+
+resource = PrimaryResource.new(
+  id: 1,
+  title: 'title',
+  body: 'body',
+  has_many_relationships: [
+    HasManyRelationship.new(id: 1, body: 'body1'),
+    HasManyRelationship.new(id: 2, body: 'body1')
+  ]
+)
+
+serialization = lambda do
+  ActiveModelSerializers::SerializableResource.new(resource, serializer: AmsBench::PrimaryResourceSerializer).as_json
+  ActiveModelSerializers::SerializableResource.new(resource, namespace: AmsBench::Api::V1).as_json
+  ActiveModelSerializers::SerializableResource.new(resource).as_json
+end
+
+def clear_cache
+  AmsBench::PrimaryResourceSerializer.serializers_cache.clear
+  AmsBench::Api::V1::PrimaryResourceSerializer.serializers_cache.clear
+  ActiveModel::Serializer.serializers_cache.clear
+end
+
+configurable = lambda do
+  clear_cache
+  Benchmark.ams('Configurable Lookup Chain', time: time, disable_gc: disable_gc, &serialization)
+end
+
+old = lambda do
+  clear_cache
+  module ActiveModel
+    class Serializer
+      def self.serializer_lookup_chain_for(klass, namespace = nil)
+        chain = []
+
+        resource_class_name = klass.name.demodulize
+        resource_namespace = klass.name.deconstantize
+        serializer_class_name = "#{resource_class_name}Serializer"
+
+        chain.push("#{namespace}::#{serializer_class_name}") if namespace
+        chain.push("#{name}::#{serializer_class_name}") if self != ActiveModel::Serializer
+        chain.push("#{resource_namespace}::#{serializer_class_name}")
+        chain
+      end
+    end
+  end
+
+  Benchmark.ams('Old Lookup Chain (v0.10)', time: time, disable_gc: disable_gc, &serialization)
+end
+
+configurable.call
+old.call

data/test/benchmark/bm_transform.rb

@@ -4,31 +4,42 @@ require_relative './app'
 time = 10
 disable_gc = true
 ActiveModelSerializers.config.key_transform = :unaltered
-comments = (0..50).map do |i|
-  Comment.new(id: i, body: 'ZOMG A COMMENT')
+has_many_relationships = (0..50).map do |i|
+  HasManyRelationship.new(id: i, body: 'ZOMG A HAS MANY RELATIONSHIP')
 end
-author = Author.new(id: 42, first_name: 'Joao', last_name: 'Moura')
-post = Post.new(id: 1337, title: 'New Post', blog: nil, body: 'Body', comments: comments, author: author)
-serializer = PostSerializer.new(post)
+has_one_relationship = HasOneRelationship.new(
+  id: 42,
+  first_name: 'Joao',
+  last_name: 'Moura'
+)
+primary_resource = PrimaryResource.new(
+  id: 1337,
+  title: 'New PrimaryResource',
+  virtual_attribute: nil,
+  body: 'Body',
+  has_many_relationships: has_many_relationships,
+  has_one_relationship: has_one_relationship
+)
+serializer = PrimaryResourceSerializer.new(primary_resource)
 adapter = ActiveModelSerializers::Adapter::JsonApi.new(serializer)
 serialization = adapter.as_json
 
 Benchmark.ams('camel', time: time, disable_gc: disable_gc) do
-  ActiveModelSerializers::KeyTransform.camel(serialization)
+  CaseTransform.camel(serialization)
 end
 
 Benchmark.ams('camel_lower', time: time, disable_gc: disable_gc) do
-  ActiveModelSerializers::KeyTransform.camel_lower(serialization)
+  CaseTransform.camel_lower(serialization)
 end
 
 Benchmark.ams('dash', time: time, disable_gc: disable_gc) do
-  ActiveModelSerializers::KeyTransform.dash(serialization)
+  CaseTransform.dash(serialization)
 end
 
 Benchmark.ams('unaltered', time: time, disable_gc: disable_gc) do
-  ActiveModelSerializers::KeyTransform.unaltered(serialization)
+  CaseTransform.unaltered(serialization)
 end
 
 Benchmark.ams('underscore', time: time, disable_gc: disable_gc) do
-  ActiveModelSerializers::KeyTransform.underscore(serialization)
+  CaseTransform.underscore(serialization)
 end

data/test/benchmark/controllers.rb

@@ -1,31 +1,30 @@
-class PostController < ActionController::Base
-  POST =
+class PrimaryResourceController < ActionController::Base
+  PRIMARY_RESOURCE =
     begin
-      updated_at = Time.current
       if ENV['BENCH_STRESS']
-        comments = (0..50).map do |i|
-          Comment.new(id: i, body: 'ZOMG A COMMENT', updated_at: updated_at + i)
+        has_many_relationships = (0..50).map do |i|
+          HasManyRelationship.new(id: i, body: 'ZOMG A HAS MANY RELATIONSHIP')
         end
       else
-        comments = [Comment.new(id: 1, body: 'ZOMG A COMMENT', updated_at: updated_at)]
+        has_many_relationships = [HasManyRelationship.new(id: 1, body: 'ZOMG A HAS MANY RELATIONSHIP')]
       end
-      author = Author.new(id: 42, first_name: 'Joao', last_name: 'Moura')
-      Post.new(id: 1337, title: 'New Post', blog: nil, body: 'Body', comments: comments, author: author)
+      has_one_relationship = HasOneRelationship.new(id: 42, first_name: 'Joao', last_name: 'Moura')
+      PrimaryResource.new(id: 1337, title: 'New PrimaryResource', virtual_attribute: nil, body: 'Body', has_many_relationships: has_many_relationships, has_one_relationship: has_one_relationship)
     end
 
   def render_with_caching_serializer
     toggle_cache_status
-    render json: POST, serializer: CachingPostSerializer, adapter: :json, meta: { caching: perform_caching }
+    render json: PRIMARY_RESOURCE, serializer: CachingPrimaryResourceSerializer, adapter: :json, meta: { caching: perform_caching }
   end
 
   def render_with_fragment_caching_serializer
     toggle_cache_status
-    render json: POST, serializer: FragmentCachingPostSerializer, adapter: :json, meta: { caching: perform_caching }
+    render json: PRIMARY_RESOURCE, serializer: FragmentCachingPrimaryResourceSerializer, adapter: :json, meta: { caching: perform_caching }
   end
 
   def render_with_non_caching_serializer
     toggle_cache_status
-    render json: POST, adapter: :json, meta: { caching: perform_caching }
+    render json: PRIMARY_RESOURCE, adapter: :json, meta: { caching: perform_caching }
   end
 
   def render_cache_status
@@ -33,7 +32,7 @@ class PostController < ActionController::Base
     # Uncomment to debug
     # STDERR.puts cache_store.class
     # STDERR.puts cache_dependencies
-    # ActiveSupport::Cache::Store.logger.debug [ActiveModelSerializers.config.cache_store, ActiveModelSerializers.config.perform_caching, CachingPostSerializer._cache, perform_caching, params].inspect
+    # ActiveSupport::Cache::Store.logger.debug [ActiveModelSerializers.config.cache_store, ActiveModelSerializers.config.perform_caching, CachingPrimaryResourceSerializer._cache, perform_caching, params].inspect
     render json: { caching: perform_caching, meta: { cache_log: cache_messages, cache_status: cache_status } }.to_json
   end
 
@@ -76,9 +75,9 @@ class PostController < ActionController::Base
 end
 
 Rails.application.routes.draw do
-  get '/status(/:on)' => 'post#render_cache_status'
-  get '/clear' => 'post#clear'
-  get '/caching(/:on)' => 'post#render_with_caching_serializer'
-  get '/fragment_caching(/:on)' => 'post#render_with_fragment_caching_serializer'
-  get '/non_caching(/:on)' => 'post#render_with_non_caching_serializer'
+  get '/status(/:on)' => 'primary_resource#render_cache_status'
+  get '/clear' => 'primary_resource#clear'
+  get '/caching(/:on)' => 'primary_resource#render_with_caching_serializer'
+  get '/fragment_caching(/:on)' => 'primary_resource#render_with_fragment_caching_serializer'
+  get '/non_caching(/:on)' => 'primary_resource#render_with_non_caching_serializer'
 end