diff --git a/lib/generators/serializer/serializer_generator.rb b/lib/generators/serializer/serializer_generator.rb index b7096f83..0da6c873 100644 --- a/lib/generators/serializer/serializer_generator.rb +++ b/lib/generators/serializer/serializer_generator.rb @@ -13,9 +13,6 @@ module Rails end private - def generate_id_method - RUBY_VERSION =~ /1\.8/ - end def attributes_names [:id] + attributes.select { |attr| !attr.reference? }.map { |a| a.name.to_sym } diff --git a/lib/generators/serializer/templates/serializer.rb b/lib/generators/serializer/templates/serializer.rb index 6c25609d..4ebb004e 100644 --- a/lib/generators/serializer/templates/serializer.rb +++ b/lib/generators/serializer/templates/serializer.rb @@ -4,16 +4,5 @@ class <%= class_name %>Serializer < <%= parent_class_name %> <% association_names.each do |attribute| -%> has_one :<%= attribute %> <% end -%> -<% if generate_id_method %> - - # due to the difference between 1.8 and 1.9 with respect to #id and - # #object_id, we recommend that if you wish to serialize id columns, you - # do this. Feel free to remove this if you don't feel that it's appropriate. - # - # For more: https://github.com/rails-api/active_model_serializers/issues/127 - def id - object.read_attribute_for_serialization(:id) - end -<% end -%> end <% end -%> diff --git a/test/generators_test.rb b/test/generators_test.rb index b1938cee..b1a05b3a 100644 --- a/test/generators_test.rb +++ b/test/generators_test.rb @@ -36,18 +36,6 @@ class SerializerGeneratorTest < Rails::Generators::TestCase Object.send :remove_const, :ApplicationSerializer end - def test_serializer_gets_id - run_generator - - assert_file "app/serializers/account_serializer.rb" do |content| - if RUBY_VERSION =~ /1.8/ - assert_match /def id/, content - else - assert_no_match /def id/, content - end - end - end - # def test_uses_namespace_application_serializer_if_one_exists # Object.const_set(:SerializerNamespace, Module.new) # SerializerNamespace.const_set(:ApplicationSerializer, Class.new)