standardapi 6.0.0.32 → 7.1.0

data/lib/standard_api/views/application/_record.streamer

@@ -1,46 +1,49 @@
 json.object! do
-  
-  record.attributes.each do |name, value|
+
+  record.attribute_names.each do |name|
     # Skip if attribute is included in excludes
-    next if defined?(excludes) && excludes[record.model_name.singular.to_sym].try(:find) { |x| x.to_s == name.to_s }
-    json.set! name, value
+    next if defined?(excludes) && excludes[record.model_name.singular.to_sym].try(:find) { |x| x.to_s == name }
+
+    serialize_attribute(json, record, name, record.type_for_attribute(name).type)
   end
 
   includes.each do |inc, subinc|
     next if ["limit", "offset", "order", "when", "where", "distinct", "distinct_on"].include?(inc)
-    
+
     case association = record.class.reflect_on_association(inc)
-    when ActiveRecord::Reflection::HasManyReflection, ActiveRecord::Reflection::HasAndBelongsToManyReflection, ActiveRecord::Reflection::ThroughReflection
-      can_cache = can_cache_relation?(record.class, inc, subinc)
-      json.cache_if!(can_cache, can_cache ? association_cache_key(record, inc, subinc) : nil) do
-        partial = model_partial(association.klass)
-        json.set! inc do
-          # TODO limit causes preloaded assocations to reload
-          sub_records = record.send(inc)
+    when ActiveRecord::Reflection::AbstractReflection
+      if association.collection?
+        can_cache = can_cache_relation?(record, inc, subinc)
+        json.cache_if!(can_cache, can_cache ? [inc, association_cache_key(record, inc, subinc)] : nil) do
+          json.set! inc do
+            partial = model_partial(association.klass)
+            # TODO limit causes preloaded assocations to reload
+            sub_records = record.send(inc)
 
-          sub_records = sub_records.limit(subinc['limit']) if subinc['limit']
-          sub_records = sub_records.offset(subinc['offset']) if subinc['offset']
-          sub_records = sub_records.order(subinc['order']) if subinc['order']
-          sub_records = sub_records.filter(subinc['where']) if subinc['where']
-          sub_records = sub_records.distinct if subinc['distinct']
-          sub_records = sub_records.distinct_on(subinc['distinct_on']) if subinc['distinct_on']
+            sub_records = sub_records.limit(subinc["limit"]) if subinc["limit"]
+            sub_records = sub_records.offset(subinc["offset"]) if subinc["offset"]
+            sub_records = sub_records.reorder(subinc["order"]) if subinc["order"]
+            sub_records = sub_records.filter(subinc["where"]) if subinc["where"]
+            sub_records = sub_records.distinct if subinc["distinct"]
+            sub_records = sub_records.distinct_on(subinc["distinct_on"]) if subinc["distinct_on"]
 
-          json.array! sub_records, partial: partial, as: partial.split('/').last, locals: { includes: subinc }
+            json.array! sub_records, partial: partial, as: partial.split("/").last, locals: { includes: subinc }
+          end
         end
-      end
-    when ActiveRecord::Reflection::BelongsToReflection, ActiveRecord::Reflection::HasOneReflection
-      can_cache = can_cache_relation?(record.class, inc, subinc)
-      if association.is_a?(ActiveRecord::Reflection::BelongsToReflection)
-        can_cache = can_cache && !record.send(association.foreign_key).nil?
-      end
-      json.cache_if!(can_cache, can_cache ? association_cache_key(record, inc, subinc) : nil) do
-        value = record.send(inc)
-        if value.nil?
-          json.set! inc, nil
-        else
-          partial = model_partial(value)
+      else
+        can_cache = can_cache_relation?(record, inc, subinc)
+        if association.is_a?(ActiveRecord::Reflection::BelongsToReflection)
+          can_cache = can_cache && !record.send(association.foreign_key).nil?
+        end
+        json.cache_if!(can_cache, can_cache ? [inc, association_cache_key(record, inc, subinc)] : nil) do
           json.set! inc do
-            json.partial! partial, partial.split('/').last.to_sym => value, includes: subinc
+            value = record.send(inc)
+            if value.nil?
+              json.value! nil
+            else
+              partial = model_partial(value)
+              json.partial! partial, partial.split("/").last.to_sym => value, includes: subinc
+            end
           end
         end
       end
@@ -52,20 +55,20 @@ json.object! do
         elsif value.is_a?(ActiveModel::Model)
           json.set! inc do
             partial = model_partial(value)
-            json.partial! partial, partial.split('/').last.to_sym => value, includes: subinc
+            json.partial! partial, partial.split("/").last.to_sym => value, includes: subinc
           end
         else
           json.set! inc, value.as_json
         end
       end
     end
-    
+
   end
-  
+
   if !record.errors.blank?
     errs = record.errors.to_hash
     errs.default_proc = nil
-    json.set! 'errors', errs
+    json.set! "errors", errs
   end
-  
+
 end

data/lib/standard_api/views/application/_schema.json.jbuilder

@@ -50,14 +50,26 @@ else
 
   json.set! 'attributes' do
     model.columns.each do |column|
-      json.set! column.name, {
-        type: json_column_type(column.sql_type),
-        default: column.default || column.default_function,
-        primary_key: column.name == model.primary_key,
-        null: column.null,
-        array: column.array,
-        comment: column.comment
-      }
+      default = column.default ? model.connection.lookup_cast_type_from_column(column).deserialize(column.default) : nil
+      type = case model.type_for_attribute(column.name)
+      when ActiveRecord::Enum::EnumType
+        default = model.defined_enums[column.name].key(default)
+        "string"
+      else
+        json_column_type(column.sql_type)
+      end
+
+      json.set! column.name do
+        json.set! 'type', type
+        json.set! 'default', default
+        json.set! 'primary_key', column.name == model.primary_key
+        json.set! 'null', column.null
+        json.set! 'array', column.array
+        json.set! 'comment', column.comment
+        # TODO: it would be nice if rails responded with a true or false here
+        # instead of the function itself
+        json.set! 'auto_populated', !!column.auto_populated? if column.respond_to?(:auto_populated?)
+      end
     end
   end
 

data/lib/standard_api/views/application/_schema.streamer

@@ -59,14 +59,28 @@ else
     json.set! 'attributes' do
       json.object! do
         model.columns.each do |column|
-          json.set! column.name, {
-            type: json_column_type(column.sql_type),
-            default: column.default || column.default_function,
-            primary_key: column.name == model.primary_key,
-            null: column.null,
-            array: column.array,
-            comment: column.comment
-          }
+          default = column.default ? model.connection.lookup_cast_type_from_column(column).deserialize(column.default) : nil
+          type = case model.type_for_attribute(column.name)
+          when ActiveRecord::Enum::EnumType
+            default = model.defined_enums[column.name].key(default)
+            "string"
+          else
+            json_column_type(column.sql_type)
+          end
+
+          json.set! column.name do
+            json.object! do
+              json.set! 'type', type
+              json.set! 'default', default
+              json.set! 'primary_key', column.name == model.primary_key
+              json.set! 'null', column.null
+              json.set! 'array', column.array
+              json.set! 'comment', column.comment
+              # TODO: it would be nice if rails responded with a true or false here
+              # instead of the function itself
+              json.set! 'auto_populated', !!column.auto_populated? if column.respond_to?(:auto_populated?)
+            end
+          end
         end
       end
     end

data/lib/standard_api/views/application/new.streamer

@@ -1 +1 @@
-json.partial! model_partial(model), model_partial(model).split('/').last.to_sym => instance_variable_get("@#{model.model_name.singular}"), includes: includes
+json.partial! model_partial(model), model_partial(model).split('/').last.to_sym => instance_variable_get("@#{model.model_name.singular}"), includes: includes

data/lib/standard_api.rb

@@ -16,3 +16,8 @@ require 'standard_api/helpers'
 require 'standard_api/route_helpers'
 require 'standard_api/active_record/connection_adapters/postgresql/schema_statements'
 require 'standard_api/railtie'
+
+module StandardAPI
+  autoload :AccessControlList, 'standard_api/access_control_list'
+  autoload :Middleware, 'standard_api/middleware'
+end

data/test/standard_api/caching_test.rb

@@ -1,6 +1,6 @@
 require 'standard_api/test_helper'
 
-class AccountsControllerTest < ActionController::TestCase
+class AccountsControllerTest < ActionDispatch::IntegrationTest
 
   test 'include with cache' do
     account = create(:account, photos: [])
@@ -14,20 +14,30 @@ class AccountsControllerTest < ActionController::TestCase
 
     # Cache Miss
     Account.any_instance.stubs(:photos_cached_at).returns(t1)
-    get :show, params: {id: account.id, include: :photos}, format: :json
+    get account_path(account, include: :photos, format: :json)
     assert_equal [photo.id], JSON(response.body)['photos'].map{|x| x['id']}
 
     # Cache Hit
     Account.any_instance.stubs(:photos).returns([])
     Account.any_instance.stubs(:photos_cached_at).returns(t1)
-    get :show, params: {id: account.id, include: :photos}, format: :json
+    get account_path(account, include: :photos, format: :json)
     assert_equal [photo.id], JSON(response.body)['photos'].map{|x| x['id']}
 
     # Cache Miss, photos_cached_at updated
     Account.any_instance.stubs(:photos).returns(Photo.where('false = true'))
     Account.any_instance.stubs(:photos_cached_at).returns(t2)
-    get :show, params: {id: account.id, include: :photos}, format: :json
+    get account_path(account, include: :photos, format: :json)
     assert_equal [], JSON(response.body)['photos'].map{|x| x['id']}
+
+    # Two associations that reference the same model
+    property = create(:property)
+    account = create(:account, property: property, subject: property)
+    Account.any_instance.expects(:property_cached_at).twice.returns(t1)
+    Account.any_instance.expects(:subject_cached_at).twice.returns(t1)
+    get account_path(account, include: { property: true, subject: true }, format: 'json')
+    json = JSON(response.body)
+    assert json.has_key?('property')
+    assert json.has_key?('subject')
   end
 
 end

data/test/standard_api/controller/include_test.rb

@@ -0,0 +1,107 @@
+require 'standard_api/test_helper'
+
+class ControllerIncludesTest < ActionDispatch::IntegrationTest
+
+  # = Including an invalid include
+
+  test "Controller#create with a valid include" do
+    property = build(:property)
+
+    json = assert_difference 'Property.count', 1 do
+      post "/properties", params: { property: property.attributes, include: [:photos] }, as: :json
+      JSON.parse(response.body)
+    end
+
+    assert_response :created
+    assert_equal [], json['photos']
+  end
+
+  test "Controller#update with a valid include" do
+    photo = create(:photo)
+    property = create(:property, {name: "A", photos: [photo]})
+    patch "/properties/#{property.id}", params: { property: {name: "B"}, include: [:photos] }, as: :json
+
+    json = JSON.parse(response.body)
+    assert_response :ok
+    assert_equal [photo.id], json['photos'].map { |j| j['id'] }
+  end
+
+  # test "Controller#destroy with a valid include" do
+  #   No body is returned on a destroy so includes are used
+  # end
+
+  test "Controller#create_resource with a valid include" do
+    property = create(:property, accounts: [])
+    account = build(:account)
+
+    post "/properties/#{property.id}/accounts", params: { account: account.attributes, include: [:photos] }, as: :json
+
+    json = JSON.parse(response.body)
+    assert_response :created
+    assert_equal [], json['photos']
+  end
+
+  # test "Controller#add_resource with a valid include" do
+  #   No body is returned on a destroy so includes are used
+  # end
+
+  # test "Controller#remove_resource with an invalid include" do
+  #   No body is returned on a destroy so includes are used
+  # end
+
+  # = Including an invalid include
+
+  test "Controller#create with an invalid include" do
+    property = build(:property)
+
+    assert_no_difference 'Property.count' do
+      post "/properties", params: { property: property.attributes, include: [:accounts] }, as: :json
+    end
+
+    assert_response :bad_request
+  end
+
+  test "Controller#update with an invalid include" do
+    property = create(:property, {name: "A"})
+    patch "/properties/#{property.id}", params: { property: {name: "B"}, include: [:accounts] }, as: :json
+
+    assert_response :bad_request
+    assert_equal 'A', property.reload.name
+  end
+
+  # test "Controller#destroy with an invalid include" do
+  #   No body is returned on a destroy so includes are used
+  # end
+
+  test "Controller#create_resource with an invalid include" do
+    property = create(:property, photos: [])
+    photo = build(:photo)
+
+    post "/properties/#{property.id}/photos", params: { photo: photo.attributes, include: [:camera] }, as: :json
+    assert_equal 0, property.reload.photos.count
+    assert_response :bad_request
+  end
+
+  # This test passes because includes are not used, response is a HEAD response
+  # and no includes are used.
+  test "Controller#add_resource with an invalid include" do
+    property = create(:property, photos: [])
+    photo = create(:photo)
+
+    post "/properties/#{property.id}/photos/#{photo.id}", params: { include: [:camera] }, as: :json
+    assert_equal 1, property.reload.photos.count
+    assert_response :created
+  end
+  
+  # This test passes because includes are not used, response is a HEAD response
+  # and no includes are used.
+  test "Controller#remove_resource with an invalid include" do
+    photo = create(:photo)
+    property = create(:property, photos: [photo])
+
+    delete "/properties/#{property.id}/photos/#{photo.id}", params: { include: [:camera] }, as: :json
+    assert_equal 0, property.reload.photos.count
+    assert_response :no_content
+  end
+
+end

data/test/standard_api/controller/subresource_test.rb

@@ -0,0 +1,157 @@
+require 'standard_api/test_helper'
+
+class ControllerSubresourceTest < ActionDispatch::IntegrationTest
+  
+  # add_resource
+  test 'Controller#add_resource with has_many' do
+    property = create(:property, photos: [])
+    photo = create(:photo)
+
+    post "/properties/#{property.id}/photos/#{photo.id}"
+    assert_equal property.photos.reload.map(&:id), [photo.id]
+    assert_response :created
+
+    assert_raises ActiveRecord::RecordNotFound do
+      post "/properties/#{property.id}/photos/9999999"
+    end
+  end
+
+  test 'Controller#add_resource with has_and_belongs_to_many' do
+    photo1 = create(:photo)
+    photo2 = create(:photo)
+    property = create(:property, photos: [photo1])
+
+    post "/properties/#{property.id}/photos/#{photo2.id}"
+    assert_equal property.photos.reload.map(&:id), [photo1.id, photo2.id]
+    assert_response :created
+
+    assert_raises ActiveRecord::RecordNotFound do
+      post "/properties/#{property.id}/photos/9999999"
+    end
+  end
+
+  test 'Controller#add_resource with belongs_to' do
+    photo = create(:photo)
+    account = create(:account)
+
+    post "/photos/#{photo.id}/account/#{account.id}"
+    assert_equal photo.reload.account_id, account.id
+    assert_response :created
+  end
+
+  test 'Controller#add_resource with has_one' do
+    photo = create(:document)
+    property = create(:property)
+    post "/properties/#{property.id}/document/#{photo.id}"
+    assert_equal property.reload.document, photo
+    assert_response :created
+  end
+  
+  test 'Controller#add_resource that is already there' do
+    photo = create(:photo)
+    property = create(:property, photos: [photo])
+
+    post "/properties/#{property.id}/photos/#{photo.id}"
+    assert_response :bad_request
+    assert_equal JSON(response.body), {
+      "errors" => [
+        "Relationship between Property and Photo violates unique constraints"
+      ]
+    }
+
+    assert_raises ActiveRecord::RecordNotFound do
+      post "/properties/#{property.id}/photos/9999999"
+    end
+  end
+
+  # create_resource
+  test 'Controller#create_resource with has_many' do
+    property = create(:property, photos: [])
+    photo = build(:photo)
+
+    post "/properties/#{property.id}/photos", params: { photo: photo.attributes }, as: :json
+    assert_equal property.photos.reload.map(&:id), [JSON.parse(response.body)['id']]
+    assert_equal property.photos.count, 1
+    assert_response :created
+  end
+
+  test 'Controller#create_resource with has_and_belongs_to_many' do
+    photo1 = create(:photo)
+    photo2 = build(:photo)
+    property = create(:property, photos: [photo1])
+
+    post "/properties/#{property.id}/photos", params: { photo: photo2.attributes }, as: :json
+    assert_equal property.photos.reload.map(&:id).sort, [photo1.id, JSON.parse(response.body)['id']].sort
+    assert_equal property.photos.count, 2
+    assert_response :created
+  end
+
+  test 'Controller#create_resource with belongs_to' do
+    photo = create(:photo)
+    account = build(:account)
+
+    post "/photos/#{photo.id}/account", params: { account: account.attributes }, as: :json
+    assert_equal photo.reload.account_id, JSON.parse(response.body)['id']
+    assert_response :created
+  end
+
+  test 'Controller#create_resource with has_one' do
+    account = build(:account)
+    property = create(:property)
+    post "/properties/#{property.id}/landlord", params: { landlord: account.attributes }, as: :json
+    assert_equal property.reload.landlord.id, JSON.parse(response.body)['id']
+    assert_response :created
+  end
+
+  # remove_resource
+  test 'Controller#remove_resource' do
+    photo = create(:photo)
+    property = create(:property, photos: [photo])
+    assert_equal property.photos.reload, [photo]
+    delete "/properties/#{property.id}/photos/#{photo.id}"
+    assert_equal property.photos.reload, []
+    assert_response :no_content
+
+    assert_raises ActiveRecord::RecordNotFound do
+      delete "/properties/#{property.id}/photos/9999999"
+    end
+  end
+
+  test 'Controller#remove_resource with has_one' do
+    photo = create(:document)
+    property = create(:property, document: photo)
+    assert_equal property.document, photo
+    delete "/properties/#{property.id}/document/#{photo.id}"
+    assert_nil property.reload.document
+    assert_response :no_content
+  end
+
+  test 'Controller#remove_resource with belongs_to' do
+    account = create(:account)
+    photo = create(:photo, account: account)
+
+    delete "/photos/#{photo.id}/account/#{account.id}"
+    assert_nil photo.reload.account_id
+    assert_response :no_content
+  end
+
+  test 'Controller#remove_resource with belongs_to unless not match' do
+    account1 = create(:account)
+    account2 = create(:account)
+    photo = create(:photo, account: account1)
+
+    delete "/photos/#{photo.id}/account/#{account2.id}"
+    assert_equal photo.reload.account_id, account1.id
+    assert_response :not_found
+  end
+
+  test 'Controller#remove_resource with belongs_to unless not match and is nil' do
+    account = create(:account)
+    photo = create(:photo)
+
+    delete "/photos/#{photo.id}/account/#{account.id}"
+    assert_nil photo.reload.account_id
+    assert_response :not_found
+  end
+
+end

data/test/standard_api/helpers_test.rb

@@ -45,86 +45,102 @@ class HelpersTest < ActionView::TestCase
     assert can_cache?(Account, {photos: {account: {}}})
   end
 
-  test '::can_cache_relation?' do
+  test '::can_cache_relation? with non-persisted record' do
+    account = build(:account)
+    assert !can_cache_relation?(account, :photos, {})
+    assert !can_cache_relation?(account, :photos, {})
+    assert !can_cache_relation?(account, :photos, {account: {}})
+    assert !can_cache_relation?(account, :photos, {account: {}})
+  end
+
+  test '::can_cache_relation? with persisted record' do
+    account = create(:account)
+
     Account.expects(:column_names).returns(['id', 'cached_at'])
-    assert !can_cache_relation?(Account, :photos, {})
+    assert !can_cache_relation?(account, :photos, {})
 
     Account.expects(:column_names).returns(['id', 'cached_at', 'photos_cached_at'])
-    assert can_cache_relation?(Account, :photos, {})
+    assert can_cache_relation?(account, :photos, {})
 
     Account.expects(:column_names).returns(['id', 'cached_at', 'photos_cached_at'])
-    assert !can_cache_relation?(Account, :photos, {account: {}})
+    assert !can_cache_relation?(account, :photos, {account: {}})
 
     Account.expects(:column_names).returns(['id', 'cached_at', 'photos_cached_at', 'photos_account_cached_at'])
-    assert can_cache_relation?(Account, :photos, {account: {}})
+    assert can_cache_relation?(account, :photos, {account: {}})
   end
 
   test '::association_cache_key(record, relation, subincludes)' do
     account = create(:account)
+    photo = create(:photo, account: account)
     t1 = Time.now
     t2 = 1.day.from_now
     t3 = 2.days.from_now
 
+    Account.expects(:column_names).returns(['id', 'cached_at', 'photos_cached_at', 'photos_property_cached_at'])
     account.expects(:photos_cached_at).returns(t1)
 
     assert_equal(
-      "accounts/#{account.id}/photos-#{t1.utc.to_s(ActiveRecord::Base.cache_timestamp_format)}",
+      "accounts/#{account.id}/photos-#{t1.utc.to_fs(ActiveRecord::Base.cache_timestamp_format)}",
       association_cache_key(account, :photos, {})
     )
 
-
+    Account.expects(:column_names).returns(['id', 'cached_at', 'photos_cached_at', 'photos_property_cached_at'])
     account.expects(:photos_cached_at).returns(t1)
     account.expects(:photos_property_cached_at).returns(t2)
     assert_equal(
-      "accounts/#{account.id}/photos-2ea683a694a33359514c41435f8f0646-#{t2.utc.to_s(ActiveRecord::Base.cache_timestamp_format)}",
+      "accounts/#{account.id}/photos-2ea683a694a33359514c41435f8f0646-#{t2.utc.to_fs(ActiveRecord::Base.cache_timestamp_format)}",
       association_cache_key(account, :photos, {property: {}})
     )
 
+    Account.expects(:column_names).returns(['id', 'cached_at', 'photos_cached_at', 'photos_property_cached_at'])
     account.expects(:photos_cached_at).returns(t1)
     account.expects(:photos_property_cached_at).returns(t2)
     assert_equal(
-      "accounts/#{account.id}/photos-779c17ef027655fd8c06c3083d2df64b-#{t2.utc.to_s(ActiveRecord::Base.cache_timestamp_format)}",
+      "accounts/#{account.id}/photos-779c17ef027655fd8c06c3083d2df64b-#{t2.utc.to_fs(ActiveRecord::Base.cache_timestamp_format)}",
       association_cache_key(account, :photos, { "property" =>  { "order" => { "x" => "desc" }}})
     )
 
+    Account.expects(:column_names).returns(['id', 'cached_at', 'photos_cached_at', 'photos_property_cached_at', 'photos_agents_cached_at'])
     account.expects(:photos_cached_at).returns(t1)
     account.expects(:photos_property_cached_at).returns(t2)
     account.expects(:photos_agents_cached_at).returns(t3)
     assert_equal(
-      "accounts/#{account.id}/photos-abbee2d4535400c162c8dbf14bbef6d5-#{t3.utc.to_s(ActiveRecord::Base.cache_timestamp_format)}",
+      "accounts/#{account.id}/photos-abbee2d4535400c162c8dbf14bbef6d5-#{t3.utc.to_fs(ActiveRecord::Base.cache_timestamp_format)}",
       association_cache_key(account, :photos, {property: {}, agents: {}})
     )
 
+    Account.expects(:column_names).returns(['id', 'cached_at', 'photos_cached_at', 'photos_property_cached_at', 'photos_property_agents_cached_at'])
     account.expects(:photos_cached_at).returns(t1)
     account.expects(:photos_property_cached_at).returns(t2)
     account.expects(:photos_property_agents_cached_at).returns(t3)
     assert_equal(
-      "accounts/#{account.id}/photos-0962ae73347c5c605d329eaa25e2be49-#{t3.utc.to_s(ActiveRecord::Base.cache_timestamp_format)}",
+      "accounts/#{account.id}/photos-0962ae73347c5c605d329eaa25e2be49-#{t3.utc.to_fs(ActiveRecord::Base.cache_timestamp_format)}",
       association_cache_key(account, :photos, {property: {agents: {}}})
     )
 
+    Account.expects(:column_names).returns(['id', 'cached_at', 'photos_cached_at', 'photos_property_cached_at', 'photos_agents_cached_at', 'photos_property_addresses_cached_at'])
     account.expects(:photos_cached_at).returns(t1)
     account.expects(:photos_property_cached_at).returns(t2)
     account.expects(:photos_agents_cached_at).returns(t2)
     account.expects(:photos_property_addresses_cached_at).returns(t3)
     assert_equal(
-      "accounts/#{account.id}/photos-00ea6afe3ff68037f8b4dcdb275e2a24-#{t3.utc.to_s(ActiveRecord::Base.cache_timestamp_format)}",
+      "accounts/#{account.id}/photos-00ea6afe3ff68037f8b4dcdb275e2a24-#{t3.utc.to_fs(ActiveRecord::Base.cache_timestamp_format)}",
       association_cache_key(account, :photos, {property: {addresses: {}}, agents: {}})
     )
 
     # Belongs to
-    photo = create(:photo, account: account)
+    Photo.expects(:column_names).returns(['id', 'cached_at', 'account_cached_at'])
     photo.expects(:account_cached_at).returns(t1)
     assert_equal(
-      "accounts/#{account.id}-#{t1.utc.to_s(ActiveRecord::Base.cache_timestamp_format)}",
+      "accounts/#{account.id}-#{t1.utc.to_fs(ActiveRecord::Base.cache_timestamp_format)}",
       association_cache_key(photo, :account, {})
     )
 
-    photo = create(:photo, account: account)
+    Photo.expects(:column_names).returns(['id', 'cached_at', 'account_cached_at', 'account_photos_cached_at'])
     photo.expects(:account_cached_at).returns(t1)
     photo.expects(:account_photos_cached_at).returns(t2)
     assert_equal(
-      "accounts/#{account.id}/07437ce3863467f4cd715ae1ef930f08-#{t2.utc.to_s(ActiveRecord::Base.cache_timestamp_format)}",
+      "accounts/#{account.id}/07437ce3863467f4cd715ae1ef930f08-#{t2.utc.to_fs(ActiveRecord::Base.cache_timestamp_format)}",
       association_cache_key(photo, :account, {photos: {}})
     )
   end
@@ -134,6 +150,7 @@ class HelpersTest < ActionView::TestCase
     assert_equal 'string', json_column_type('character varying(2)')
     assert_equal 'string', json_column_type('character varying(255)')
     assert_equal 'datetime', json_column_type('timestamp without time zone')
+    assert_equal 'datetime', json_column_type('timestamp(6) without time zone')
     assert_equal 'datetime', json_column_type('time without time zone')
     assert_equal 'string', json_column_type('text')
     assert_equal 'hash', json_column_type('json')
@@ -151,6 +168,6 @@ class HelpersTest < ActionView::TestCase
     assert_equal 'boolean', json_column_type('boolean')
     assert_equal 'ewkb', json_column_type('geometry')
     assert_equal 'string', json_column_type('uuid')
-    end
+  end
 
 end