From 9abf6d5ba93315787eb755f41f389664d3602f9d Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sat, 20 Aug 2016 12:28:28 +0800 Subject: [PATCH] new serializers renamed to serializers --- app/controllers/api/restful_controller.rb | 4 ---- app/serializers/event_serializer.rb | 4 ++-- app/serializers/map_serializer.rb | 15 +++++++++++++++ ...apping_serializer.rb => mapping_serializer.rb} | 6 +++--- ...acode_serializer.rb => metacode_serializer.rb} | 2 +- app/serializers/new_map_serializer.rb | 15 --------------- app/serializers/new_synapse_serializer.rb | 13 ------------- app/serializers/synapse_serializer.rb | 13 +++++++++++++ ...ew_topic_serializer.rb => topic_serializer.rb} | 6 +++--- ...{new_user_serializer.rb => user_serializer.rb} | 2 +- 10 files changed, 38 insertions(+), 42 deletions(-) create mode 100644 app/serializers/map_serializer.rb rename app/serializers/{new_mapping_serializer.rb => mapping_serializer.rb} (69%) rename app/serializers/{new_metacode_serializer.rb => metacode_serializer.rb} (67%) delete mode 100644 app/serializers/new_map_serializer.rb delete mode 100644 app/serializers/new_synapse_serializer.rb create mode 100644 app/serializers/synapse_serializer.rb rename app/serializers/{new_topic_serializer.rb => topic_serializer.rb} (51%) rename app/serializers/{new_user_serializer.rb => user_serializer.rb} (80%) diff --git a/app/controllers/api/restful_controller.rb b/app/controllers/api/restful_controller.rb index 5b6c41da..d4b1025a 100644 --- a/app/controllers/api/restful_controller.rb +++ b/app/controllers/api/restful_controller.rb @@ -16,10 +16,6 @@ class API::RestfulController < ActionController::Base private - def resource_serializer - "new_#{resource_name}_serializer".camelize.constantize - end - def accessible_records if current_user visible_records diff --git a/app/serializers/event_serializer.rb b/app/serializers/event_serializer.rb index 723768a7..891a1712 100644 --- a/app/serializers/event_serializer.rb +++ b/app/serializers/event_serializer.rb @@ -1,8 +1,8 @@ class EventSerializer < ActiveModel::Serializer attributes :id, :sequence_id, :kind, :map_id, :created_at - has_one :actor, serializer: NewUserSerializer, root: 'users' - has_one :map, serializer: NewMapSerializer + has_one :actor, serializer: UserSerializer, root: 'users' + has_one :map, serializer: MapSerializer def actor object.user || object.eventable.try(:user) diff --git a/app/serializers/map_serializer.rb b/app/serializers/map_serializer.rb new file mode 100644 index 00000000..67ed033a --- /dev/null +++ b/app/serializers/map_serializer.rb @@ -0,0 +1,15 @@ +class MapSerializer < ActiveModel::Serializer + attributes :id, + :name, + :desc, + :permission, + :screenshot, + :created_at, + :updated_at + + has_many :topics, serializer: TopicSerializer + has_many :synapses, serializer: SynapseSerializer + has_many :mappings, serializer: MappingSerializer + has_many :contributors, root: :users, serializer: UserSerializer + has_many :collaborators, root: :users, serializer: UserSerializer +end diff --git a/app/serializers/new_mapping_serializer.rb b/app/serializers/mapping_serializer.rb similarity index 69% rename from app/serializers/new_mapping_serializer.rb rename to app/serializers/mapping_serializer.rb index a0bf1700..ae53b492 100644 --- a/app/serializers/new_mapping_serializer.rb +++ b/app/serializers/mapping_serializer.rb @@ -1,4 +1,4 @@ -class NewMappingSerializer < ActiveModel::Serializer +class MappingSerializer < ActiveModel::Serializer attributes :id, :xloc, :yloc, @@ -7,8 +7,8 @@ class NewMappingSerializer < ActiveModel::Serializer :mappable_id, :mappable_type - has_one :user, serializer: NewUserSerializer - has_one :map, serializer: NewMapSerializer + has_one :user, serializer: UserSerializer + has_one :map, serializer: MapSerializer def filter(keys) keys.delete(:xloc) unless object.mappable_type == 'Topic' diff --git a/app/serializers/new_metacode_serializer.rb b/app/serializers/metacode_serializer.rb similarity index 67% rename from app/serializers/new_metacode_serializer.rb rename to app/serializers/metacode_serializer.rb index b20f25b6..e6e60211 100644 --- a/app/serializers/new_metacode_serializer.rb +++ b/app/serializers/metacode_serializer.rb @@ -1,4 +1,4 @@ -class NewMetacodeSerializer < ActiveModel::Serializer +class MetacodeSerializer < ActiveModel::Serializer attributes :id, :name, :manual_icon, diff --git a/app/serializers/new_map_serializer.rb b/app/serializers/new_map_serializer.rb deleted file mode 100644 index d4461243..00000000 --- a/app/serializers/new_map_serializer.rb +++ /dev/null @@ -1,15 +0,0 @@ -class NewMapSerializer < ActiveModel::Serializer - attributes :id, - :name, - :desc, - :permission, - :screenshot, - :created_at, - :updated_at - - has_many :topics, serializer: NewTopicSerializer - has_many :synapses, serializer: NewSynapseSerializer - has_many :mappings, serializer: NewMappingSerializer - has_many :contributors, root: :users, serializer: NewUserSerializer - has_many :collaborators, root: :users, serializer: NewUserSerializer -end diff --git a/app/serializers/new_synapse_serializer.rb b/app/serializers/new_synapse_serializer.rb deleted file mode 100644 index 3770cf13..00000000 --- a/app/serializers/new_synapse_serializer.rb +++ /dev/null @@ -1,13 +0,0 @@ -class NewSynapseSerializer < ActiveModel::Serializer - attributes :id, - :desc, - :category, - :weight, - :permission, - :created_at, - :updated_at - - has_one :topic1, root: :topics, serializer: NewTopicSerializer - has_one :topic2, root: :topics, serializer: NewTopicSerializer - has_one :user, serializer: NewUserSerializer -end diff --git a/app/serializers/synapse_serializer.rb b/app/serializers/synapse_serializer.rb new file mode 100644 index 00000000..e33be293 --- /dev/null +++ b/app/serializers/synapse_serializer.rb @@ -0,0 +1,13 @@ +class SynapseSerializer < ActiveModel::Serializer + attributes :id, + :desc, + :category, + :weight, + :permission, + :created_at, + :updated_at + + has_one :topic1, root: :topics, serializer: TopicSerializer + has_one :topic2, root: :topics, serializer: TopicSerializer + has_one :user, serializer: UserSerializer +end diff --git a/app/serializers/new_topic_serializer.rb b/app/serializers/topic_serializer.rb similarity index 51% rename from app/serializers/new_topic_serializer.rb rename to app/serializers/topic_serializer.rb index b53470d8..82a2a1b7 100644 --- a/app/serializers/new_topic_serializer.rb +++ b/app/serializers/topic_serializer.rb @@ -1,4 +1,4 @@ -class NewTopicSerializer < ActiveModel::Serializer +class TopicSerializer < ActiveModel::Serializer attributes :id, :name, :desc, @@ -7,6 +7,6 @@ class NewTopicSerializer < ActiveModel::Serializer :created_at, :updated_at - has_one :user, serializer: NewUserSerializer - has_one :metacode, serializer: NewMetacodeSerializer + has_one :user, serializer: UserSerializer + has_one :metacode, serializer: MetacodeSerializer end diff --git a/app/serializers/new_user_serializer.rb b/app/serializers/user_serializer.rb similarity index 80% rename from app/serializers/new_user_serializer.rb rename to app/serializers/user_serializer.rb index 62796f31..e2c69bac 100644 --- a/app/serializers/new_user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -1,4 +1,4 @@ -class NewUserSerializer < ActiveModel::Serializer +class UserSerializer < ActiveModel::Serializer attributes :id, :name, :avatar,