Skip to content

Commit 5fbdedf

Browse files
authored
Merge pull request #214 from plural/set-http-cache-headers
Add a PublicController as the base for cacheable public resources.
2 parents bebc0a0 + 40b50e0 commit 5fbdedf

16 files changed

+41
-15
lines changed

app/controllers/api/v3/public/card_cycles_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::CardCyclesController < JSONAPI::ResourceController
4+
class Api::V3::Public::CardCyclesController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/card_pools_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::CardPoolsController < JSONAPI::ResourceController
4+
class Api::V3::Public::CardPoolsController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/card_set_types_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::CardSetTypesController < JSONAPI::ResourceController
4+
class Api::V3::Public::CardSetTypesController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/card_sets_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::CardSetsController < JSONAPI::ResourceController
4+
class Api::V3::Public::CardSetsController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/card_subtypes_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::CardSubtypesController < JSONAPI::ResourceController
4+
class Api::V3::Public::CardSubtypesController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/card_types_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::CardTypesController < JSONAPI::ResourceController
4+
class Api::V3::Public::CardTypesController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/cards_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::CardsController < JSONAPI::ResourceController
4+
class Api::V3::Public::CardsController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/factions_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::FactionsController < JSONAPI::ResourceController
4+
class Api::V3::Public::FactionsController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/formats_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::FormatsController < JSONAPI::ResourceController
4+
class Api::V3::Public::FormatsController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/illustrators_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::IllustratorsController < JSONAPI::ResourceController
4+
class Api::V3::Public::IllustratorsController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/printings_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::PrintingsController < JSONAPI::ResourceController
4+
class Api::V3::Public::PrintingsController < Api::V3::Public::PublicController
55
end
66
end
77
end
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
module API
2+
module V3
3+
module Public
4+
# Set default caching behavior for public resources.
5+
class Api::V3::Public::PublicController < ApplicationController
6+
include JSONAPI::ActsAsResourceController
7+
def index_related_resources
8+
expires_in 1.hour
9+
super
10+
end
11+
def index
12+
expires_in 1.hour
13+
super
14+
end
15+
def show
16+
expires_in 1.hour
17+
super
18+
end
19+
def show_relationship
20+
expires_in 1.hour
21+
super
22+
end
23+
end
24+
end
25+
end
26+
end

app/controllers/api/v3/public/restrictions_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::RestrictionsController < JSONAPI::ResourceController
4+
class Api::V3::Public::RestrictionsController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/rulings_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::RulingsController < JSONAPI::ResourceController
4+
class Api::V3::Public::RulingsController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/sides_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::SidesController < JSONAPI::ResourceController
4+
class Api::V3::Public::SidesController < Api::V3::Public::PublicController
55
end
66
end
77
end

app/controllers/api/v3/public/snapshots_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module API
22
module V3
33
module Public
4-
class Api::V3::Public::SnapshotsController < JSONAPI::ResourceController
4+
class Api::V3::Public::SnapshotsController < Api::V3::Public::PublicController
55
end
66
end
77
end

0 commit comments

Comments
 (0)