standardapi 6.1.0 → 7.1.1

data/test/standard_api/helpers_test.rb

@@ -80,7 +80,7 @@ class HelpersTest < ActionView::TestCase
     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, {})
     )
 
@@ -88,7 +88,7 @@ class HelpersTest < ActionView::TestCase
     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: {}})
     )
 
@@ -96,7 +96,7 @@ class HelpersTest < ActionView::TestCase
     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" }}})
     )
 
@@ -105,7 +105,7 @@ class HelpersTest < ActionView::TestCase
     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: {}})
     )
 
@@ -114,7 +114,7 @@ class HelpersTest < ActionView::TestCase
     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: {}}})
     )
 
@@ -124,7 +124,7 @@ class HelpersTest < ActionView::TestCase
     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: {}})
     )
 
@@ -132,7 +132,7 @@ class HelpersTest < ActionView::TestCase
     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, {})
     )
 
@@ -140,7 +140,7 @@ class HelpersTest < ActionView::TestCase
     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
@@ -150,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')

data/test/standard_api/nested_attributes/belongs_to_test.rb

@@ -0,0 +1,71 @@
+require 'standard_api/test_helper'
+
+module NestedAttributes
+  class BelongsToTest < ActionDispatch::IntegrationTest
+    # include StandardAPI::TestCase
+    include StandardAPI::Helpers
+
+
+    # = Create Test
+
+    test 'create record and create nested record' do
+      @controller = PhotosController.new
+      post photos_path, params: { photo: { account: {name: 'Big Ben'}} }, as: :json
+
+      assert_response :created
+      photo = Photo.last
+      assert_equal 'Big Ben', photo.account.name
+    end
+  
+    test 'create record and update nested record' do
+      account = create(:account, name: 'Big Ben')
+    
+      @controller = PhotosController.new
+      post photos_path, params: { photo: { account: {id: account.id, name: 'Little Jimmie'}} }, as: :json
+
+
+      assert_response :created
+      photo = Photo.last
+      assert_equal account.id, photo.account_id
+      assert_equal 'Little Jimmie', photo.account.name
+    end
+
+    # = Update Test
+  
+    test 'update record and create nested record' do
+      photo = create(:photo)
+
+      @controller = PhotosController.new
+      put photo_path(photo), params: { photo: { account: {name: 'Big Ben'}} }, as: :json
+    
+      assert_response :ok
+      photo.reload
+      assert_equal 'Big Ben', photo.account.name
+    end
+
+    test 'update record and update nested record' do
+      account = create(:account, name: 'Big Ben')
+      photo = create(:photo, account: account)
+
+      @controller = PhotosController.new
+      put photo_path(photo), params: { photo: { account: {name: 'Little Jimmie'}} }, as: :json
+    
+      assert_response :ok
+      photo.reload
+      assert_equal 'Little Jimmie', photo.account.name
+    end
+
+    test 'update record and set relation to  nil' do
+      account = create(:account, name: 'Big Ben')
+      photo = create(:photo, account: account)
+
+      @controller = PhotosController.new
+      put photo_path(photo), params: { photo: { account: nil} }, as: :json
+    
+      assert_response :ok
+      photo.reload
+      assert_nil photo.account
+    end
+
+  end
+end

data/test/standard_api/nested_attributes/has_and_belongs_to_many_test.rb

@@ -0,0 +1,70 @@
+require 'standard_api/test_helper'
+
+module NestedAttributes
+  class HasAndBelongsToManyTest < ActionDispatch::IntegrationTest
+    # include StandardAPI::TestCase
+    include StandardAPI::Helpers
+
+
+    # = Create Test
+
+    test 'create record and create nested record' do
+      @controller = PropertiesController.new
+      post properties_path, params: { property: { name: 'Beach House', photos: [{format: 'image/jpeg'}]} }, as: :json
+
+      assert_response :created
+      property = Property.last
+      assert_equal 'Beach House', property.name
+      assert_equal ['image/jpeg'], property.photos.map(&:format)
+    end
+  
+    test 'create record and update nested record' do
+      photo = create(:photo, format: 'image/png')
+
+      @controller = PropertiesController.new
+      post properties_path, params: { property: { name: 'Beach House', photos: [{id: photo.id, format: 'image/jpeg'}] } }, as: :json
+
+      assert_response :created
+      property = Property.last
+      assert_equal 'Beach House', property.name
+      assert_equal [photo.id], property.photos.map(&:id)
+      assert_equal ['image/jpeg'], property.photos.map(&:format)
+      assert_equal 'image/jpeg', photo.reload.format
+    end
+
+    # = Update Test
+
+    test 'update record and create nested record' do
+      property = create(:property)
+
+      @controller = PropertiesController.new
+      put property_path(property), params: { property: { photos: [{format: "image/tiff"}]} }, as: :json
+
+      assert_response :ok
+      assert_equal ["image/tiff"], property.reload.photos.map(&:format)
+    end
+
+    test 'update record and update nested record' do
+      photo = create(:photo, format: 'image/gif')
+      property = create(:property, photos: [photo])
+
+      @controller = PropertiesController.new
+      put property_path(property), params: { property: { photos: [{id: photo.id, format: "image/heic"}]} }, as: :json
+
+      assert_response :ok
+      assert_equal ['image/heic'], property.reload.photos.map(&:format)
+    end
+
+    test 'update record and set relation to an empty array' do
+      photo = create(:photo, format: 'image/gif')
+      property = create(:property, photos: [photo])
+
+      @controller = PropertiesController.new
+      put property_path(property), params: { property: { photos: [] } }, as: :json
+
+      assert_response :ok
+      assert_equal [], property.reload.photos
+    end
+
+  end
+end

data/test/standard_api/nested_attributes/has_many_test.rb

@@ -0,0 +1,85 @@
+require 'standard_api/test_helper'
+
+module NestedAttributes
+  class HasManyTest < ActionDispatch::IntegrationTest
+    # include StandardAPI::TestCase
+    include StandardAPI::Helpers
+
+
+    # = Create Test
+
+    test 'create record and create nested record' do
+      @controller = PropertiesController.new
+      post properties_path, params: { property: { name: 'Beach House', accounts: [{name: 'Billabong'}]} }, as: :json
+
+      assert_response :created
+      property = Property.last
+      assert_equal 'Beach House', property.name
+      assert_equal ['Billabong'], property.accounts.map(&:name)
+    end
+  
+    test 'create record and update nested record' do
+      account = create(:account, name: 'Coco Chanel')
+
+      @controller = PropertiesController.new
+      post properties_path, params: { property: { name: 'Beach House', accounts: [{id: account.id, name: 'Crazy Chanel'}]} }, as: :json
+
+      assert_response :created
+      property = Property.last
+      assert_equal [account.id], property.accounts.map(&:id)
+      assert_equal ['Crazy Chanel'], property.accounts.map(&:name)
+      assert_equal 'Crazy Chanel', account.reload.name
+    end
+
+    # = Update Test
+
+    test 'update record and create nested record' do
+      property = create(:property)
+
+      @controller = PropertiesController.new
+      put property_path(property), params: { property: { accounts: [{name: "Hersey's"}]} }, as: :json
+
+      assert_response :ok
+      assert_equal ["Hersey's"], property.accounts.map(&:name)
+    end
+
+    test 'update record and update nested record' do
+      account = create(:account, name: 'A Co.')
+      property = create(:property, name: 'Empire State Building', accounts: [account])
+
+      @controller = PropertiesController.new
+      put property_path(property), params: { property: { name: 'John Hancock Center', accounts: [{id: account.id, name: "B Co."}]} }, as: :json
+
+      assert_response :ok
+      property.reload
+      assert_equal 'John Hancock Center', property.name
+      assert_equal ['B Co.'], property.accounts.map(&:name)
+    end
+
+    test 'update record and set relation to an empty array' do
+      account = create(:account, name: 'A Co.')
+      property = create(:property, name: 'Empire State Building', accounts: [account])
+
+      @controller = PropertiesController.new
+      put property_path(property), params: { property: { accounts: [] } }, as: :json
+
+      assert_response :ok
+      property.reload
+      assert_equal [], property.accounts
+    end
+    
+    test 'update record and include nested record in response' do
+      account = create(:account, name: 'A Co.')
+      property = create(:property, name: 'Empire State Building', accounts: [account])
+
+      @controller = PropertiesController.new
+      put property_path(property), params: { property: { name: 'John Hancock Center', accounts: [{id: account.id, name: "B Co."}]} }, as: :json
+
+      attributes = JSON.parse(response.body)
+      assert_response :ok
+      assert_equal account.id, attributes["accounts"][0]["id"]
+      assert_equal "B Co.", attributes["accounts"][0]["name"]
+    end
+
+  end
+end

data/test/standard_api/nested_attributes/has_one_test.rb

@@ -0,0 +1,71 @@
+require 'standard_api/test_helper'
+
+module NestedAttributes
+  class HasOneTest < ActionDispatch::IntegrationTest
+    # include StandardAPI::TestCase
+    include StandardAPI::Helpers
+
+
+    # = Create Test
+
+    test 'create record and create nested record' do
+      @controller = PhotosController.new
+
+      post photos_path, params: { photo: { camera: {make: 'Sony'}} }, as: :json
+
+      photo = Photo.last
+      assert_equal photo.id, photo.camera.photo_id
+      assert_equal 'Sony', photo.camera.make
+    end
+  
+    test 'create record and update nested record' do
+      camera = create(:camera, make: 'Sony')
+
+      @controller = PhotosController.new
+      post photos_path, params: { photo: { camera: {id: camera.id, make: 'Nokia'} } }, as: :json
+
+      assert_response :created
+      photo = Photo.last
+      assert_equal photo.id, photo.camera.photo_id
+      assert_equal 'Nokia', photo.camera.make
+    end
+
+    # = Update Test
+  
+    test 'update record and create nested record' do
+      photo = create(:photo)
+
+      @controller = PhotosController.new
+      put photo_path(photo), params: { photo: { camera: {make: 'Canon'}} }, as: :json
+
+      assert_response :ok
+      photo.reload
+      assert_equal 'Canon', photo.camera.make
+    end
+
+    test 'update record and update nested record' do
+      camera = create(:camera, make: 'Leica')
+      photo = create(:photo, camera: camera)
+
+      @controller = PhotosController.new
+      put photo_path(photo), params: { photo: { camera: {make: 'Nokia'}} }, as: :json
+
+      assert_response :ok
+      photo.reload
+      assert_equal 'Nokia', photo.camera.make
+    end
+
+    test 'update record and set relation to  nil' do
+      camera = create(:camera, make: 'Leica')
+      photo = create(:photo, camera: camera)
+
+      @controller = PhotosController.new
+      put photo_path(photo), params: { photo: { camera: nil} }, as: :json
+
+      assert_response :ok
+      photo.reload
+      assert_nil photo.camera
+    end
+
+  end
+end

data/test/standard_api/route_helpers_test.rb

@@ -30,4 +30,60 @@ class RouteHelpersTest < ActionDispatch::IntegrationTest
     assert_routing({ path: '/photos/1/properties/1', method: :delete }, { controller: 'photos', action: 'remove_resource', id: '1', relationship: 'properties', resource_id: '1' })
   end
 
+  test "standard_resources with only option" do
+    with_routing do |set|
+      set.draw do
+        standard_resources :photos, only: [ :index, :show ]
+      end
+      assert_routing({ path: '/photos', method: :get }, { controller: 'photos', action: 'index' })
+      assert_routing({ path: '/photos/1', method: :get }, { controller: 'photos', action: 'show', id: '1' })
+      assert_equal 2, set.routes.size
+    end
+  end
+
+  test "standard_resources with except option" do
+    with_routing do |set|
+      set.draw do
+        standard_resources :photos, except: [ :destroy ]
+      end
+      assert_routing({ path: '/photos', method: :get }, { controller: 'photos', action: 'index' })
+      assert_routing({ path: '/photos/1', method: :get }, { controller: 'photos', action: 'show', id: '1' })
+      assert_routing({ path: '/photos/new', method: :get }, { controller: 'photos', action: 'new' })
+      assert_routing({ path: '/photos', method: :post }, { controller: 'photos', action: 'create' })
+      assert_routing({ path: '/photos/1', method: :put }, { controller: 'photos', action: 'update', id: '1' })
+      assert_routing({ path: '/photos/1', method: :patch }, { controller: 'photos', action: 'update', id: '1' })
+      assert_routing({ path: '/photos/schema', method: :get }, { controller: 'photos', action: 'schema' })
+      assert_routing({ path: '/photos/calculate', method: :get }, { controller: 'photos', action: 'calculate' })
+      assert_routing({ path: '/photos/1/properties/1', method: :post }, { controller: 'photos', action: 'add_resource', id: '1', relationship: 'properties', resource_id: '1' })
+      assert_routing({ path: '/photos/1/properties/1', method: :delete }, { controller: 'photos', action: 'remove_resource', id: '1', relationship: 'properties', resource_id: '1' })
+      assert_routing({ path: '/photos/1/properties', method: :post }, { controller: 'photos', action: 'create_resource', id: '1', relationship: 'properties' })
+      assert_equal 12, set.routes.size
+    end
+  end
+
+  test "standard_resource with only option" do
+    with_routing do |set|
+      set.draw do
+        standard_resource :accounts, only: :show
+      end
+      assert_routing({ path: '/accounts', method: :get }, { controller: 'accounts', action: 'show' })
+      assert_equal 1, set.routes.size
+    end
+  end
+
+  test "standard_resource with except option" do
+    with_routing do |set|
+      set.draw do
+        standard_resource :accounts, except: [ :destroy ]
+      end
+      assert_routing({ path: '/accounts', method: :get }, { controller: 'accounts', action: 'show' })
+      assert_routing({ path: '/accounts/new', method: :get }, { controller: 'accounts', action: 'new' })
+      assert_routing({ path: '/accounts', method: :post }, { controller: 'accounts', action: 'create' })
+      assert_routing({ path: '/accounts', method: :put }, { controller: 'accounts', action: 'update' })
+      assert_routing({ path: '/accounts', method: :patch }, { controller: 'accounts', action: 'update' })
+      assert_routing({ path: '/accounts/schema', method: :get }, { controller: 'accounts', action: 'schema' })
+      assert_routing({ path: '/accounts/calculate', method: :get }, { controller: 'accounts', action: 'calculate' })
+      assert_equal 10, set.routes.size
+    end
+  end
 end