active_model_serializers 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2f73f5aff52f42003b604fcc209782d1b074eb9a
-  data.tar.gz: 0fce31e1d5f8f01da8c0c9d70c30fee124dc87ff
+SHA256:
+  metadata.gz: e9f526564b9458ceea3d9391ddbf81cf996ff713dbb217bcec1c22931b4cd028
+  data.tar.gz: ac5641428e5b17ffa605bc7337f8f77000354a2a47f1a5ed7244ab50cdca84b2
 SHA512:
-  metadata.gz: 983ed0d1faf8a9e4cb9cf65e4d71fdc5064016e42190a81aa96f73a37e1e342eecead421ebe69c04cca27db142a622eb966e9fc04b79cc152af5b744d6f97812
-  data.tar.gz: 97accf62bff15dc099483199c8ca58c974fc2ee227f64bdbd10223924cdbaa923d4fb59c5ea5a8973fb5612c50e8ef9abf50f300cc8b6f64b80dd9b3a181829f
+  metadata.gz: af47a8298fbc563716f0c7b4a9e0d92b85243ead1b0ccac561703d17f09574a3e65f280adedbb24ee7d65c0634c4ca343c58aa665628ff75d7e220b89025e91d
+  data.tar.gz: 6974a26799a967fbb8b172092be014deb775909a52cf10cf4e7dc88b5c05c96f6b6acbb3d245f9ad9032c743c2048c1afd8335d3a899c3111f2d6b48015800f7

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## 0.09.x
 
-### [0-9-stable](https://github.com/rails-api/active_model_serializers/compare/v0.9.7...0-9-stable)
+### [0-9-stable](https://github.com/rails-api/active_model_serializers/compare/v0.9.8...0-9-stable)
+
+### [v0.9.8 (2020-12-10)](https://github.com/rails-api/active_model_serializers/compare/v0.9.7...v0.9.8)
+
+- [#2373](https://github.com/rails-api/active_model_serializers/pull/2373) Fix Rails 6.0 deprecation warnings. (@supremebeing7)
 
 ### [v0.9.7 (2017-05-01)](https://github.com/rails-api/active_model_serializers/compare/v0.9.6...v0.9.7)
 

data/README.md

@@ -85,7 +85,7 @@ it exists, use it to serialize the `Post`.
 
 This also works with `respond_with`, which uses `to_json` under the hood. Also
 note that any options passed to `render :json` will be passed to your
-serializer and available as `@options` inside.
+serializer and available as `@serialization_options` inside.
 
 To specify a custom serializer for an object, you can specify the
 serializer when you render the object:

data/lib/action_controller/serialization.rb

@@ -60,7 +60,15 @@ module ActionController
     private
 
     def namespace_for_serializer
-      @namespace_for_serializer ||= self.class.parent unless self.class.parent == Object
+      @namespace_for_serializer ||= namespace_for_class(self.class) unless namespace_for_class(self.class) == Object
+    end
+
+    def namespace_for_class(klass)
+      if Module.method_defined?(:module_parent)
+        klass.module_parent
+      else
+        klass.parent
+      end
     end
 
     def default_serializer(resource)

data/lib/active_model/serializer/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Serializer
-    VERSION = '0.9.7'
+    VERSION = '0.9.8'.freeze
   end
 end

data/lib/active_model_serializers/model/caching.rb

@@ -0,0 +1,25 @@
+module ActiveModelSerializers
+  class Model
+    module Caching
+      extend ActiveSupport::Concern
+
+      included do
+        attr_writer :updated_at
+        attributes :id
+      end
+
+      # Defaults to the downcased model name and updated_at
+      def cache_key
+        ActiveSupport::Cache.expand_cache_key([
+          self.class.model_name.name.downcase,
+          "#{id}-#{updated_at.strftime('%Y%m%d%H%M%S%9N')}"
+        ].compact)
+      end
+
+      # Defaults to the time the serializer file was modified.
+      def updated_at
+        defined?(@updated_at) ? @updated_at : File.mtime(__FILE__)
+      end
+    end
+  end
+end

data/test/tmp/app/assets/javascripts/accounts.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/test/tmp/app/assets/stylesheets/accounts.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/test/tmp/app/controllers/accounts_controller.rb

@@ -0,0 +1,2 @@
+class AccountsController < ApplicationController
+end

data/test/tmp/app/helpers/accounts_helper.rb

@@ -0,0 +1,2 @@
+module AccountsHelper
+end

data/test/tmp/app/serializers/account_serializer.rb

@@ -1,3 +1,3 @@
-class AccountSerializer < MySerializer
+class AccountSerializer < ActiveModel::Serializer
   attributes :id
 end

data/test/tmp/config/routes.rb

@@ -0,0 +1 @@
+Rails.application.routes.draw { }

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - José Valim
 - Yehuda Katz
 - Santiago Pastorino
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -89,42 +89,20 @@ files:
 - lib/active_model/serializer/version.rb
 - lib/active_model/serializer_support.rb
 - lib/active_model_serializers.rb
-- lib/bulk_cache_fetcher.rb
-- test/action_controller/http_cache_test.rb
-- test/action_controller/regression_test.rb
+- lib/active_model_serializers/model/caching.rb
 - test/benchmark/app.rb
 - test/benchmark/benchmarking_support.rb
 - test/benchmark/bm_active_record.rb
-- test/benchmark/bm_rails_cache.rb
 - test/benchmark/setup.rb
-- test/benchmark/tmp/miniprofiler/mp_timers_16x1i2wkkt8b8zybbfbx
-- test/benchmark/tmp/miniprofiler/mp_timers_3aa299ezxdqvog6sfjzr
-- test/benchmark/tmp/miniprofiler/mp_timers_3f0bdfx4nib4hxfb5lmq
-- test/benchmark/tmp/miniprofiler/mp_timers_54wkvaidi0avdc8yawyt
-- test/benchmark/tmp/miniprofiler/mp_timers_6b9d32ftlk8v5xy2op05
-- test/benchmark/tmp/miniprofiler/mp_timers_7nlok5ykeley83h8bine
-- test/benchmark/tmp/miniprofiler/mp_timers_b36ymkc1vgu5fy9fvm9k
-- test/benchmark/tmp/miniprofiler/mp_timers_c3a27vo6uvfijeh105nt
-- test/benchmark/tmp/miniprofiler/mp_timers_eqcbrj14r4c341abi3h6
-- test/benchmark/tmp/miniprofiler/mp_timers_hqodkd691tbr7sbfdiez
-- test/benchmark/tmp/miniprofiler/mp_timers_j7y5frtod7cw4qc4cear
-- test/benchmark/tmp/miniprofiler/mp_timers_jpxzfgo92l24t7wzt8g1
-- test/benchmark/tmp/miniprofiler/mp_timers_m78k2w11sd7ba5oh40rw
-- test/benchmark/tmp/miniprofiler/mp_timers_mkvat4ehphrje9n2hu3t
-- test/benchmark/tmp/miniprofiler/mp_timers_nd3ymt54l1ga22i2brn8
-- test/benchmark/tmp/miniprofiler/mp_timers_o2dk1yhw6ez9jzxf6p0a
-- test/benchmark/tmp/miniprofiler/mp_timers_p76i310zb4y12iqm5o0n
-- test/benchmark/tmp/miniprofiler/mp_timers_pi3hvrrkfxnxl300wvah
-- test/benchmark/tmp/miniprofiler/mp_timers_q4w5d86flb4u9tsadqvw
-- test/benchmark/tmp/miniprofiler/mp_timers_sfa5nundogo63o056n5y
-- test/benchmark/tmp/miniprofiler/mp_timers_tkjlmqeauf5gur2u5nob
-- test/benchmark/tmp/miniprofiler/mp_timers_tngbj11ilv2i75rqn2d2
-- test/benchmark/tmp/miniprofiler/mp_timers_u4haqgvgybvc1sb5nihw
-- test/benchmark/tmp/miniprofiler/mp_timers_uc1b3hwqrd4q512gy6c9
-- test/benchmark/tmp/miniprofiler/mp_timers_uwholuf0iix2vvbo2l3c
-- test/benchmark/tmp/miniprofiler/mp_timers_waye238ygft3p4xvppc4
-- test/benchmark/tmp/miniprofiler/mp_timers_ydwo7p117loo2ky40lk3
-- test/benchmark/tmp/miniprofiler/mp_timers_zhgmyfizfa8slppitgua
+- test/benchmark/tmp/miniprofiler/mp_timers_6eqewtfgrhitvq5gqm25
+- test/benchmark/tmp/miniprofiler/mp_timers_8083sx03hu72pxz1a4d0
+- test/benchmark/tmp/miniprofiler/mp_timers_fyz2gsml4z0ph9kpoy1c
+- test/benchmark/tmp/miniprofiler/mp_timers_hjry5rc32imd42oxoi48
+- test/benchmark/tmp/miniprofiler/mp_timers_m8fpoz2cvt3g9agz0bs3
+- test/benchmark/tmp/miniprofiler/mp_timers_p92m2drnj1i568u3sta0
+- test/benchmark/tmp/miniprofiler/mp_timers_qg52tpca3uesdfguee9i
+- test/benchmark/tmp/miniprofiler/mp_timers_s15t1a6mvxe0z7vjv790
+- test/benchmark/tmp/miniprofiler/mp_timers_x8kal3d17nfds6vp4kcj
 - test/benchmark/tmp/miniprofiler/mp_views_127.0.0.1
 - test/fixtures/active_record.rb
 - test/fixtures/poro.rb
@@ -138,7 +116,12 @@ files:
 - test/integration/generators/serializer_generator_test.rb
 - test/test_app.rb
 - test/test_helper.rb
+- test/tmp/app/assets/javascripts/accounts.js
+- test/tmp/app/assets/stylesheets/accounts.css
+- test/tmp/app/controllers/accounts_controller.rb
+- test/tmp/app/helpers/accounts_helper.rb
 - test/tmp/app/serializers/account_serializer.rb
+- test/tmp/config/routes.rb
 - test/unit/active_model/array_serializer/except_test.rb
 - test/unit/active_model/array_serializer/key_format_test.rb
 - test/unit/active_model/array_serializer/meta_test.rb
@@ -169,7 +152,7 @@ homepage: https://github.com/rails-api/active_model_serializers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -184,85 +167,67 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Bringing consistency and object orientation to model serialization. Works
   great for client-side MVC frameworks!
 test_files:
-- test/action_controller/http_cache_test.rb
-- test/action_controller/regression_test.rb
 - test/benchmark/app.rb
-- test/benchmark/benchmarking_support.rb
-- test/benchmark/bm_active_record.rb
-- test/benchmark/bm_rails_cache.rb
 - test/benchmark/setup.rb
-- test/benchmark/tmp/miniprofiler/mp_timers_16x1i2wkkt8b8zybbfbx
-- test/benchmark/tmp/miniprofiler/mp_timers_3aa299ezxdqvog6sfjzr
-- test/benchmark/tmp/miniprofiler/mp_timers_3f0bdfx4nib4hxfb5lmq
-- test/benchmark/tmp/miniprofiler/mp_timers_54wkvaidi0avdc8yawyt
-- test/benchmark/tmp/miniprofiler/mp_timers_6b9d32ftlk8v5xy2op05
-- test/benchmark/tmp/miniprofiler/mp_timers_7nlok5ykeley83h8bine
-- test/benchmark/tmp/miniprofiler/mp_timers_b36ymkc1vgu5fy9fvm9k
-- test/benchmark/tmp/miniprofiler/mp_timers_c3a27vo6uvfijeh105nt
-- test/benchmark/tmp/miniprofiler/mp_timers_eqcbrj14r4c341abi3h6
-- test/benchmark/tmp/miniprofiler/mp_timers_hqodkd691tbr7sbfdiez
-- test/benchmark/tmp/miniprofiler/mp_timers_j7y5frtod7cw4qc4cear
-- test/benchmark/tmp/miniprofiler/mp_timers_jpxzfgo92l24t7wzt8g1
-- test/benchmark/tmp/miniprofiler/mp_timers_m78k2w11sd7ba5oh40rw
-- test/benchmark/tmp/miniprofiler/mp_timers_mkvat4ehphrje9n2hu3t
-- test/benchmark/tmp/miniprofiler/mp_timers_nd3ymt54l1ga22i2brn8
-- test/benchmark/tmp/miniprofiler/mp_timers_o2dk1yhw6ez9jzxf6p0a
-- test/benchmark/tmp/miniprofiler/mp_timers_p76i310zb4y12iqm5o0n
-- test/benchmark/tmp/miniprofiler/mp_timers_pi3hvrrkfxnxl300wvah
-- test/benchmark/tmp/miniprofiler/mp_timers_q4w5d86flb4u9tsadqvw
-- test/benchmark/tmp/miniprofiler/mp_timers_sfa5nundogo63o056n5y
-- test/benchmark/tmp/miniprofiler/mp_timers_tkjlmqeauf5gur2u5nob
-- test/benchmark/tmp/miniprofiler/mp_timers_tngbj11ilv2i75rqn2d2
-- test/benchmark/tmp/miniprofiler/mp_timers_u4haqgvgybvc1sb5nihw
-- test/benchmark/tmp/miniprofiler/mp_timers_uc1b3hwqrd4q512gy6c9
-- test/benchmark/tmp/miniprofiler/mp_timers_uwholuf0iix2vvbo2l3c
-- test/benchmark/tmp/miniprofiler/mp_timers_waye238ygft3p4xvppc4
-- test/benchmark/tmp/miniprofiler/mp_timers_ydwo7p117loo2ky40lk3
-- test/benchmark/tmp/miniprofiler/mp_timers_zhgmyfizfa8slppitgua
+- test/benchmark/bm_active_record.rb
+- test/benchmark/tmp/miniprofiler/mp_timers_m8fpoz2cvt3g9agz0bs3
+- test/benchmark/tmp/miniprofiler/mp_timers_s15t1a6mvxe0z7vjv790
+- test/benchmark/tmp/miniprofiler/mp_timers_hjry5rc32imd42oxoi48
+- test/benchmark/tmp/miniprofiler/mp_timers_qg52tpca3uesdfguee9i
 - test/benchmark/tmp/miniprofiler/mp_views_127.0.0.1
-- test/fixtures/active_record.rb
-- test/fixtures/poro.rb
-- test/fixtures/template.html.erb
-- test/integration/action_controller/namespaced_serialization_test.rb
-- test/integration/action_controller/serialization_test.rb
-- test/integration/action_controller/serialization_test_case_test.rb
-- test/integration/active_record/active_record_test.rb
-- test/integration/generators/resource_generator_test.rb
-- test/integration/generators/scaffold_controller_generator_test.rb
-- test/integration/generators/serializer_generator_test.rb
-- test/test_app.rb
-- test/test_helper.rb
-- test/tmp/app/serializers/account_serializer.rb
-- test/unit/active_model/array_serializer/except_test.rb
-- test/unit/active_model/array_serializer/key_format_test.rb
-- test/unit/active_model/array_serializer/meta_test.rb
-- test/unit/active_model/array_serializer/only_test.rb
-- test/unit/active_model/array_serializer/options_test.rb
-- test/unit/active_model/array_serializer/root_test.rb
-- test/unit/active_model/array_serializer/scope_test.rb
-- test/unit/active_model/array_serializer/serialization_test.rb
-- test/unit/active_model/default_serializer_test.rb
+- test/benchmark/tmp/miniprofiler/mp_timers_fyz2gsml4z0ph9kpoy1c
+- test/benchmark/tmp/miniprofiler/mp_timers_p92m2drnj1i568u3sta0
+- test/benchmark/tmp/miniprofiler/mp_timers_6eqewtfgrhitvq5gqm25
+- test/benchmark/tmp/miniprofiler/mp_timers_x8kal3d17nfds6vp4kcj
+- test/benchmark/tmp/miniprofiler/mp_timers_8083sx03hu72pxz1a4d0
+- test/benchmark/benchmarking_support.rb
+- test/unit/active_model/serializer/config_test.rb
+- test/unit/active_model/serializer/has_one_test.rb
 - test/unit/active_model/serializer/associations/build_serializer_test.rb
+- test/unit/active_model/serializer/key_format_test.rb
+- test/unit/active_model/serializer/url_helpers_test.rb
 - test/unit/active_model/serializer/associations_test.rb
+- test/unit/active_model/serializer/options_test.rb
 - test/unit/active_model/serializer/attributes_test.rb
-- test/unit/active_model/serializer/config_test.rb
-- test/unit/active_model/serializer/filter_test.rb
+- test/unit/active_model/serializer/root_test.rb
+- test/unit/active_model/serializer/meta_test.rb
 - test/unit/active_model/serializer/has_many_polymorphic_test.rb
+- test/unit/active_model/serializer/has_one_polymorphic_test.rb
 - test/unit/active_model/serializer/has_many_test.rb
 - test/unit/active_model/serializer/has_one_and_has_many_test.rb
-- test/unit/active_model/serializer/has_one_polymorphic_test.rb
-- test/unit/active_model/serializer/has_one_test.rb
-- test/unit/active_model/serializer/key_format_test.rb
-- test/unit/active_model/serializer/meta_test.rb
-- test/unit/active_model/serializer/options_test.rb
-- test/unit/active_model/serializer/root_test.rb
+- test/unit/active_model/serializer/filter_test.rb
 - test/unit/active_model/serializer/scope_test.rb
-- test/unit/active_model/serializer/url_helpers_test.rb
+- test/unit/active_model/default_serializer_test.rb
+- test/unit/active_model/array_serializer/serialization_test.rb
+- test/unit/active_model/array_serializer/key_format_test.rb
+- test/unit/active_model/array_serializer/options_test.rb
+- test/unit/active_model/array_serializer/only_test.rb
+- test/unit/active_model/array_serializer/root_test.rb
+- test/unit/active_model/array_serializer/except_test.rb
+- test/unit/active_model/array_serializer/meta_test.rb
+- test/unit/active_model/array_serializer/scope_test.rb
 - test/unit/active_model/serilizable_test.rb
+- test/test_app.rb
+- test/integration/action_controller/serialization_test.rb
+- test/integration/action_controller/serialization_test_case_test.rb
+- test/integration/action_controller/namespaced_serialization_test.rb
+- test/integration/active_record/active_record_test.rb
+- test/integration/generators/scaffold_controller_generator_test.rb
+- test/integration/generators/resource_generator_test.rb
+- test/integration/generators/serializer_generator_test.rb
+- test/fixtures/poro.rb
+- test/fixtures/template.html.erb
+- test/fixtures/active_record.rb
+- test/test_helper.rb
+- test/tmp/app/serializers/account_serializer.rb
+- test/tmp/app/controllers/accounts_controller.rb
+- test/tmp/app/assets/javascripts/accounts.js
+- test/tmp/app/assets/stylesheets/accounts.css
+- test/tmp/app/helpers/accounts_helper.rb
+- test/tmp/config/routes.rb

data/lib/bulk_cache_fetcher.rb

@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-# https://github.com/justinweiss/bulk_cache_fetcher/blob/df1c83e06b9641b7ec3408ec577b37528021190f/lib/bulk_cache_fetcher.rb
-# Fetches many objects from a cache in order. In the event that some
-# objects can't be served from the cache, you will have the
-# opportunity to fetch them in bulk. This allows you to preload and
-# cache entire object hierarchies, which works particularly well with
-# Rails' nested caching while avoiding the n+1 queries problem in the
-# uncached case.
-class BulkCacheFetcher
-  VERSION = '1.0.0'
-
-  # Creates a new bulk cache fetcher, backed by +cache+. Cache must
-  # respond to the standard Rails cache API, described on
-  # http://guides.rubyonrails.org/caching_with_rails.html
-  def initialize(cache)
-    @cache = cache
-  end
-
-  # Returns a list of objects identified by
-  # <tt>object_identifiers</tt>. +fetch+ will try to find the objects
-  # from the cache first. Identifiers for objects that aren't in the
-  # cache will be passed as an ordered list to <tt>finder_block</tt>,
-  # where you can find the objects as you see fit. These objects
-  # should be returned in the same order as the identifiers that were
-  # passed into the block, because they'll be cached under their
-  # respective keys. The objects returned by +fetch+ will be returned
-  # in the same order as the <tt>object_identifiers</tt> passed in.
-  #
-  # +options+ will be passed along unmodified when caching newly found
-  # objects, so you can use it for things like setting cache
-  # expiration.
-  def fetch(object_identifiers, options = {}, &finder_block)
-    object_identifiers = normalize(object_identifiers)
-    cached_keys_with_objects, uncached_identifiers = partition(object_identifiers)
-    found_objects = find(uncached_identifiers, options, &finder_block)
-    coalesce(cache_keys(object_identifiers), cached_keys_with_objects, found_objects)
-  end
-
-  private
-
-  # Splits a list of identifiers into two objects. The first is a hash
-  # of <tt>{cache_key: object}</tt> for all the objects we were able to serve
-  # from the cache. The second is a list of all of the identifiers for
-  # objects that weren't cached.
-  def partition(object_identifiers)
-    uncached_identifiers = object_identifiers.dup
-
-    cache_keys = cache_keys(object_identifiers)
-    cached_keys_with_objects = @cache.read_multi(*cache_keys)
-
-    cache_keys.each do |cache_key|
-      uncached_identifiers.delete(cache_key) if cached_keys_with_objects.key?(cache_key)
-    end
-
-    [cached_keys_with_objects, uncached_identifiers]
-  end
-
-  # Finds all of the objects identified by +identifiers+, using the
-  # +finder_block+. Will pass +options+ on to the cache.
-  def find(identifiers, options = {})
-    return [] if identifiers.empty?
-    Array(yield(identifiers)).tap do |objects|
-      verify_equal_key_and_value_counts!(identifiers, objects)
-      cache_all(identifiers, objects, options)
-    end
-  end
-
-  # Makes sure we have enough +identifiers+ to cache all of our
-  # +objects+, and vice-versa.
-  def verify_equal_key_and_value_counts!(identifiers, objects)
-    fail ArgumentError, 'You are returning too many objects from your cache block!' if objects.length > identifiers.length
-    fail ArgumentError, 'You are returning too few objects from your cache block!' if objects.length < identifiers.length
-  end
-
-  # Caches all +values+ under their respective +keys+.
-  def cache_all(keys, values, options = {})
-    keys.zip(values) { |k, v| @cache.write(cache_key(k), v, options) }
-  end
-
-  # Given a list of +cache_keys+, either find associated objects from
-  # +cached_keys_with_objects, or grab them from +found_objects+, in
-  # order.
-  def coalesce(cache_keys, cached_keys_with_objects, found_objects)
-    found_objects = Array(found_objects)
-    cache_keys.map { |key| cached_keys_with_objects.fetch(key) { found_objects.shift } }
-  end
-
-  # Returns the part of the identifier that we can use as the cache
-  # key. For simple identifiers, it's just the identifier, for
-  # identifiers with extra information attached, it's the first part
-  # of the identifier.
-  def cache_key(identifier)
-    Array(identifier).first
-  end
-
-  # Returns the cache keys for all of the +identifiers+.
-  def cache_keys(identifiers)
-    identifiers.map { |identifier| cache_key(identifier) }
-  end
-
-  # Makes sure we can iterate over identifiers.
-  def normalize(identifiers)
-    identifiers.respond_to?(:each) ? identifiers : Array(identifiers)
-  end
-end

data/test/action_controller/http_cache_test.rb

@@ -1,56 +0,0 @@
-# require 'test_helper'
-#
-# # https://github.com/rails/rails/blob/4-2-stable/actionpack/lib/action_dispatch/testing/integration.rb
-# # rubocop:disable Style/ClassAndModuleChildren:
-# class ActionController::Serialization::HttpCacheTest < ActionController::TestCase
-#   # class ActionController::Serialization::HttpCacheTest < ActionDispatch::IntegrationTest
-#   class HttpCacheTestController < ActionController::Base
-#     class Model < ActiveModelSerializers::Model
-#       attr_accessor :name, :description, :comments
-#     end
-#     class ModelSerializer < ActiveModel::Serializer
-#       attributes :name, :description, :comments
-#     end
-#
-#     def render_as_serializable_object
-#       render serialization_options.merge!(json: model)
-#     end
-#
-#     def render_as_json_string
-#       json = ActiveModelSerializers::SerializableResource.new(model, serialization_options).to_json
-#       render json: json
-#     end
-#
-#     private
-#
-#     def model
-#       Model.new(name: 'Name 1', description: 'Description 1', comments: 'Comments 1')
-#     end
-#
-#     def serialization_options
-#       { serializer: ModelSerializer, adapter: :json }
-#     end
-#   end
-#
-#   tests HttpCacheTestController
-#
-#   DATE          = 'Date'.freeze
-#   LAST_MODIFIED = 'Last-Modified'.freeze
-#   ETAG          = 'ETag'.freeze
-#   CACHE_CONTROL = 'Cache-Control'.freeze
-#   SPECIAL_KEYS  = Set.new(%w(extras no-cache max-age public must-revalidate))
-#   def test_render_as_serializable_object
-#     10.times do
-#       get :render_as_serializable_object
-#     end
-#     p [@response.etag?, @response.last_modified, @response.date, @response.headers[CACHE_CONTROL], @response.headers[ETAG], @response.headers[LAST_MODIFIED], @response.headers[DATE]]
-#   end
-#
-#   def test_render_as_json_string
-#     10.times do
-#       get :render_as_json_string
-#     end
-#     p [@response.etag?, @response.last_modified, @response.date, @response.headers[CACHE_CONTROL], @response.headers[ETAG], @response.headers[LAST_MODIFIED], @response.headers[DATE]]
-#   end
-# end
-# # rubocop:enable Style/ClassAndModuleChildren:

data/test/action_controller/regression_test.rb

@@ -1,35 +0,0 @@
-# require 'test_helper'
-#
-# module ActionController
-#   module Serialization
-#     class ImplicitSerializerTest < ActionController::TestCase
-#       class PostWithoutSerializer < ActiveRecord::Base
-#         self.table_name = :posts
-#       end
-#       class ImplicitSerializationTestController < ActionController::Base
-#         def render_record_without_serializer
-#           @post = PostWithoutSerializer.new(title: 'Title', body: 'Body')
-#           render json: @post
-#         end
-#       end
-#
-#       tests ImplicitSerializationTestController
-#
-#       def test_record_without_serializer
-#         with_adapter :json do
-#           get :render_record_without_serializer
-#         end
-#
-#         expected = {}
-#         PostWithoutSerializer.column_names.each { |field| expected[field] ||= nil }
-#         expected.update(
-#           title: 'Title',
-#           body: 'Body'
-#         )
-#
-#         assert_equal 'application/json', @response.content_type
-#         assert_equal expected.to_json, @response.body
-#       end
-#     end
-#   end
-# end

data/test/benchmark/bm_rails_cache.rb

@@ -1,141 +0,0 @@
-require 'bundler/setup'
-require_relative './benchmarking_support'
-require_relative './app'
-
-time = 10
-cache_store = ActiveSupport::Cache.lookup_store(:memory_store)
-comments = (0..50).map do |i|
-  Comment.new(id: i, body: 'ZOMG A COMMENT')
-end
-author = Author.new(id: 42, first_name: 'Joao', last_name: 'Moura')
-model = Post.new(id: 1337, title: 'New Post', blog: nil, body: 'Body', comments: comments, author: author)
-
-define_method :json do
-  model.to_json
-end
-define_method :cached_json do
-  parts = []
-  parts << 'key_name'
-  parts << 'adapter_name'
-  cache_key = parts.join('/')
-  cache_store.fetch(cache_key) { model.to_json }
-end
-define_method :ams do
-  ActiveModelSerializers::SerializableResource.new(model, adapter: :json, serializer: PostSerializer).as_json
-end
-define_method :cached_ams do
-  ActiveModelSerializers::SerializableResource.new(model, adapter: :json, serializer: CachingPostSerializer).as_json
-end
-def as_json(serializer_instance, adapter_instance, fields, includes = '*')
-  if serializer_instance.respond_to?(:each)
-    return serializer_instance.map do |each_serializer|
-      as_json(each_serializer, adapter_instance, fields, includes)
-    end
-  end
-  cache_key = serializer_instance.cache_key(adapter_instance)
-  include_tree = includes || ActiveModel::Serializer::IncludeTree.from_include_args(includes)
-  cache_store = ActiveModelSerializers.config.cache_store
-  json = cache_store.fetch(cache_key) do
-    serializer_instance.attributes(fields)
-  end
-  serializer_instance.associations(include_tree).each do |association|
-    # FIXME: yields each association twice
-    json[association.key] ||= as_json(association.serializer, adapter_instance, [], includes[association.key])
-  end
-  json
-end
-
-define_method :cached_virtual_ams do
-  ### OMG
-  post_serializer = CachingPostSerializer.new(model)
-  adapter_instance = ActiveModelSerializers::Adapter::Attributes.new(post_serializer)
-  fields = nil
-  includes = ActiveModel::Serializer::IncludeTree.from_include_args('*')
-  { post: as_json(post_serializer, adapter_instance, fields, includes) }
-  # parts = []
-  # parts << 'ams_blog'
-  # parts << 'attributes'
-  # cache_key = parts.join('/')
-  # cache_store.fetch(cache_key) do
-  #   include_tree = ActiveModel::Serializer::IncludeTree.from_include_args('*')
-  #   post_serializer = CachingPostSerializer.new(model)
-  #   json = { post: post_serializer.attributes }
-  #   post_serializer.associations(include_tree).each do |association|
-  #     # FIXME: yields each association twice
-  #     json[:post][association.key] ||=
-  #       case association.key
-  #       when :comments
-  #         cache_store.fetch(%w(ams_comments attributes).join('/')) do
-  #           association.serializer.map(&:attributes)
-  #         end
-  #       when :blog
-  #         association.serializer.attributes
-  #       when :author
-  #         cache_store.fetch(%w(ams_author attributes).join('/')) do
-  #           association.serializer.attributes
-  #         end
-  #       else
-  #         fail ArgumentError, "unexpected association #{association}"
-  #       end
-  #   end
-  #   json
-  # end
-end
-puts JSON.pretty_generate(
-  equality: { cached_ams: ams == cached_ams, cached_virtual_ams: ams == cached_virtual_ams },
-  ams: ams,
-  cached_ams: cached_ams,
-  cached_virtual_ams: cached_virtual_ams
-)
-
-{
-  # 'cached json' => { disable_gc: true, send: :cached_json },
-  # 'json'        => { disable_gc: true, send: :json },
-  # 'cached ams' => { disable_gc: true, send: :cached_ams },
-  'cached virtual ams' => { disable_gc: true, send: :cached_virtual_ams },
-  'ams' => { disable_gc: true, send: :ams }
-}.each do |label, options|
-  Benchmark.ams(label, time: time, disable_gc: options[:disable_gc]) do
-    send(options[:send])
-  end
-end
-__END__
-cached json 121321.3745504354/ips; 16 objects
-json 1177.243210850789/ips; 1984 objects
-cached ams 251.90341731442047/ips; 5879 objects
-cached virtual ams 89169.87612473704/ips; 16 objects
-ams 598.9890084759535/ips; 2348 objects
-Benchmark results:
-{
-  "commit_hash": "aa0be94",
-  "version": "0.10.0.rc5",
-  "rails_version": "4.2.5.1",
-  "benchmark_run[environment]": "2.2.3p173",
-  "runs": [
-    {
-      "benchmark_type[category]": "cached json",
-      "benchmark_run[result][iterations_per_second]": 121321.375,
-      "benchmark_run[result][total_allocated_objects_per_iteration]": 16
-    },
-    {
-      "benchmark_type[category]": "json",
-      "benchmark_run[result][iterations_per_second]": 1177.243,
-      "benchmark_run[result][total_allocated_objects_per_iteration]": 1984
-    },
-    {
-      "benchmark_type[category]": "cached ams",
-      "benchmark_run[result][iterations_per_second]": 251.903,
-      "benchmark_run[result][total_allocated_objects_per_iteration]": 5879
-    },
-    {
-      "benchmark_type[category]": "cached virtual ams",
-      "benchmark_run[result][iterations_per_second]": 89169.876,
-      "benchmark_run[result][total_allocated_objects_per_iteration]": 16
-    },
-    {
-      "benchmark_type[category]": "ams",
-      "benchmark_run[result][iterations_per_second]": 598.989,
-      "benchmark_run[result][total_allocated_objects_per_iteration]": 2348
-    }
-  ]
-}